Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front

src/pages/main/gridDivision/approvalExamination.vue

@@ -224,6 +224,7 @@ export default {
   methods: {
     // 表格数据初始化
     handleInit() {
+      this.table_loading = true;
       let reqdata = {
         ...this.table_search,
         type: "2",
@@ -393,7 +394,7 @@ export default {
 
       this.handleVisible("opinion");
     },
-    // 审批轨迹--同意
+    // 审批轨迹--确定关闭模态框
     handleConsent() {
       this.handleVisible("track");
     },

src/pages/main/gridDivision/workersList.vue

@@ -31,7 +31,11 @@
       @cancel="handleVisible('add')"
       :visible="add_visible"
     >
-      <el-form label-width="120px" :model="add_form" ref="add_ref">
+      <el-form
+        label-width="120px"
+        :model="add_form"
+        ref="add_ref"
+      >
         <el-form-item
           label="提出人"
           prop="proposer"
@@ -41,7 +45,7 @@
             trigger: 'blur',
           }"
         >
-          <el-input v-model="add_form.proposer"></el-input>
+          <el-input :disabled="title === '审批' || title === '查看'"  v-model="add_form.proposer"></el-input>
         </el-form-item>
         <el-form-item
           label="联系电话"
@@ -52,7 +56,7 @@
             trigger: 'blur',
           }"
         >
-          <el-input v-model="add_form.telephone"></el-input>
+          <el-input :disabled="title === '审批' || title === '查看'" v-model="add_form.telephone"></el-input>
         </el-form-item>
         <el-form-item
           label="网格划分需求"
@@ -63,16 +67,19 @@
             trigger: 'blur',
           }"
         >
-          <el-input type="textarea" v-model="add_form.wanggeText"></el-input>
+          <el-input type="textarea" :disabled="title === '审批' || title === '查看'" v-model="add_form.wanggeText"></el-input>
         </el-form-item>
         <el-form-item label="附件上传" prop="file">
           <myUpload
-            v-if="title === '新建'"
+            v-if="title === '新建' || title === '发起人处理'"
             @uploadBack="uploadBack"
             :fileInfo="fileInfo"
             :fileList="fileInfo.fileList"
           ></myUpload>
           <div v-else>
+            <div v-if="fileInfo.fileList.length === 0">
+              暂无附件
+            </div>
             <div
               v-for="(item, index) in fileInfo.fileList"
               :key="index"
@@ -201,7 +208,6 @@ export default {
         {
           label: "新建",
           props: "add",
-          
         },
       ],
       table_form: [
@@ -407,6 +413,7 @@ export default {
         fileName.push(element.fileName);
         fileIds.push(element.fileCode);
       });
+      console.log(v);
       this.add_form.fileNames = fileName.join(",");
       this.add_form.fileIds = fileIds.join(",");
       // console.log(this.add_form,'this.add_form')
@@ -596,11 +603,11 @@ export default {
         return true;
       }
     },
+    // 附件下载
+    handleDownload(item) {
+      console.log(item);
+    },
   },
-  // 附件下载
-  handleDownload(item){
-    console.log(item);
-  }
 };
 </script>