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

src/pages/main/gridDivision/workersList.vue

@@ -29,19 +29,15 @@
       @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"
           :rules="{
-                        required: true,
-                        message: '提出人不能为空',
-                        trigger: 'blur',
-                    }"
+            required: true,
+            message: '提出人不能为空',
+            trigger: 'blur',
+          }"
         >
           <el-input v-model="add_form.proposer"></el-input>
         </el-form-item>
@@ -49,10 +45,10 @@
           label="联系电话"
           prop="telephone"
           :rules="{
-                        required: true,
-                        message: '联系电话不能为空',
-                        trigger: 'blur',
-                    }"
+            required: true,
+            message: '联系电话不能为空',
+            trigger: 'blur',
+          }"
         >
           <el-input v-model="add_form.telephone"></el-input>
         </el-form-item>
@@ -60,58 +56,37 @@
           label="网格划分需求"
           prop="wanggeText"
           :rules="{
-                        required: true,
-                        message: '网格划分需求不能为空',
-                        trigger: 'blur',
-                    }"
+            required: true,
+            message: '网格划分需求不能为空',
+            trigger: 'blur',
+          }"
         >
-          <el-input
-            type="textarea"
-            v-model="add_form.wanggeText"
-          ></el-input>
+          <el-input type="textarea" v-model="add_form.wanggeText"></el-input>
         </el-form-item>
-        <el-form-item
-          label="附件上传"
-          prop="file"
-        >
+        <el-form-item label="附件上传" prop="file">
           <myUpload
             @uploadBack="uploadBack"
             :fileInfo="fileInfo"
             :fileList="fileInfo.fileList"
           ></myUpload>
         </el-form-item>
-        <el-form-item
-          label="审批轨迹"
-          prop=""
-          v-if="edit_visible"
-        >
+        <el-form-item label="审批轨迹" prop="" v-if="edit_visible">
           <simple-table
             :list="table_list_approve"
             :config="table_config_approve"
             :loading="table_loading_approve"
           ></simple-table>
         </el-form-item>
-        <el-form-item
-          label="审批意见"
-          prop="desc"
-          v-if="edit_visible"
-        >
-          <el-input
-            type="textarea"
-            v-model="add_form.desc"
-          ></el-input>
+        <el-form-item label="审批意见" prop="desc" v-if="edit_visible">
+          <el-input type="textarea" v-model="add_form.desc"></el-input>
         </el-form-item>
       </el-form>
       <template v-slot:footer>
         <div v-if="!isCheck">
-          <el-button
-            @click="handleSubmit"
-            type="primary"
-          >保存</el-button>
-          <el-button
-            @click="handleVisible('add')"
-            type="default"
-          >取消</el-button>
+          <el-button @click="handleSubmit" type="primary">保存</el-button>
+          <el-button @click="handleVisible('add')" type="default"
+            >取消</el-button
+          >
         </div>
         <div v-else></div>
       </template>
@@ -125,7 +100,9 @@
     >
       <div class="summary">
         <p>是否要对所选工单进行汇总？</p>
-        <p class="summary-tip">可对未审批的区县网格划分审批工单合并为同一条工单，由相关审批人员进行审批，减少审批工作量</p>
+        <p class="summary-tip">
+          可对未审批的区县网格划分审批工单合并为同一条工单，由相关审批人员进行审批，减少审批工作量
+        </p>
       </div>
     </simple-dialog>
   </div>
@@ -204,20 +181,20 @@ export default {
       ],
       // 列表数据
       table_list: [
-        {
-          id: 1,
-          companyName: "xq",
-          proposer: "mll",
-          createTime: 1654563154824,
-          status: 0,
-        },
-        {
-          id: 2,
-          companyName: "xq",
-          proposer: "mll",
-          createTime: 1654963568455,
-          status: 1,
-        },
+        // {
+        //   id: 1,
+        //   companyName: "xq",
+        //   proposer: "mll",
+        //   createTime: 1654563154824,
+        //   status: 0,
+        // },
+        // {
+        //   id: 2,
+        //   companyName: "xq",
+        //   proposer: "mll",
+        //   createTime: 1654963568455,
+        //   status: 1,
+        // },
       ],
       table_loading: false,
       //   表格里的操作按钮
@@ -229,9 +206,9 @@ export default {
         {
           label: "处理",
           props: "edit",
-          // visible: {
-          //   status: [1],
-          // },
+          visible: {
+            sts: ['0'],
+          },
         },
       ],
       //  表头配置
@@ -255,7 +232,7 @@ export default {
         },
         {
           label: "状态",
-          props: "status",
+          props: "sts",
           type: "dictionary",
           dictionary: { 0: "待办", 1: "已办" },
         },
@@ -271,15 +248,15 @@ export default {
         },
         {
           label: "流程环节",
-          props: "taskName",
+          props: "actionName",
         },
         {
           label: "处理人",
-          props: "opName",
+          props: "proposer",
         },
         {
           label: "处理工号",
-          props: "opNo",
+          props: "procId",
         },
         {
           label: "处理时间",
@@ -364,7 +341,7 @@ export default {
       this.summaryIds = val.map((item) => {
         return item.id.toString();
       });
-      console.log(this.summaryIds);
+      // console.log(this.summaryIds);
     },
     //文件返回值
     uploadBack(v) {
@@ -417,7 +394,7 @@ export default {
         console.log(body, "body");
         this.add_form = {
           id: body.id,
-          proposer: body.createName,
+          proposer: body.proposer,
           telephone: body.telephone,
           wanggeText: body.wanggeText,
         };
@@ -430,7 +407,7 @@ export default {
       // let _this = this;
       this.$refs.add_ref.validate((valid) => {
         if (valid) {
-          let reqdata = [{ ...this.add_form, processId: "729294602773110788" }];
+          let reqdata = [{ ...this.add_form, procId: "729294602773110788",draft:'1',num: '1' }];
           this.$http({
             url: "/mkWangge/saveOrUpdateList",
             method: "post",
@@ -443,6 +420,7 @@ export default {
           });
           this.handleInit({
             ...this.table_search,
+            type: "0",
             page: this.page,
             pageSize: this.rows,
           });
@@ -454,9 +432,9 @@ export default {
     handleSummary() {
       if (this.summaryIds.length === 0) {
         this.$message({
-          message:'还未选择要合并的项目',
-          type:'error'
-        })
+          message: "还未选择要合并的项目",
+          type: "error",
+        });
         this.handleVisible("summary");
         return;
       } else {
@@ -469,6 +447,17 @@ export default {
           data: this.summaryIds,
         }).then((res) => {
           console.log(res);
+          if (res.data.result === 1) {
+            this.$message({
+              message: res.data.desc,
+              type: "error",
+            });
+          }else{
+            this.$message({
+              message: res.data.desc,
+              type: "success",
+            });
+          }
         });
         this.handleVisible("summary");
       }