merge

src/components/workflowBase.vue

@@ -276,7 +276,8 @@ export default {
         content: this.textarea, //意见内容
       };
       if (this.manyPeopleStatus == true) {
-        list.procinstid = this.list.processId;
+        console.log('[ 是否多人处理 ] >', this.list)
+        list.procinstid = this.list.process_id;
         // if (this.backThree.length <= 1) {
         // this.$message.error("请选择多人");
         // return;

src/pages/main/postage/formTable.vue

@@ -12,7 +12,7 @@
         <div class="flex-header">
           <el-form-item
             style="width: 42%"
-            label="需求名称:"
+            label="文件标题:"
             prop="needName"
             label-width="140px"
           >
@@ -255,7 +255,7 @@
             <el-form-item label="资费工单协议条款内容调整" prop="clause">
               <el-input
                 type="textarea"
-                maxlength="300"
+                maxlength="500"
                 show-word-limit
                 v-model="form.clause"
               ></el-input>
@@ -379,9 +379,10 @@ export default {
       });
     },
     download() {
+      console.log(123);
       if (this.form.mkFileShareAttachList.length > 1) {
         this.$http({
-          url: "/market/CMKFile/downAllFile",
+          url: "/market/waf/downAllFile",
           method: "post",
           headers: {
             "Content-Type": "application/json",
@@ -414,9 +415,10 @@ export default {
           }
         });
       } else {
+        console.log(this.form.mkFileShareAttachList);
         let list = {
           id: this.form.mkFileShareAttachList[0].fileCode,
-          fileName: this.form.mkFileShareAttachList[0].fileName,
+          fileName: this.form.mkFileShareAttachList[0].name,
         };
         this.$http({
           url: "/market/waf/downFile",
@@ -435,7 +437,7 @@ export default {
             //window.navigator.msSaveOrOpenBlob(blob, this.form.needName);
             window.navigator.msSaveOrOpenBlob(
               blob,
-              this.form.mkFileShareAttachList[0].fileName
+              this.form.mkFileShareAttachList[0].name
             );
           } else {
             /* 火狐谷歌的文件下载方式 */
@@ -444,7 +446,7 @@ export default {
             var href = window.URL.createObjectURL(blob);
             downloadElement.href = href;
             downloadElement.download =
-              this.form.mkFileShareAttachList[0].fileName;
+              this.form.mkFileShareAttachList[0].name;
             document.body.appendChild(downloadElement);
             downloadElement.click();
             document.body.removeChild(downloadElement);
@@ -453,7 +455,6 @@ export default {
         });
       }
     },
-    download() {},
   },
   watch: {
     "form.operationType": {

src/pages/main/postage/index.vue

@@ -198,7 +198,7 @@ export default {
           pageSize: 10, // 每页数量
           pageNum: 1, // 页码
         },
-        isSelection: true, // 表格有多选时设置
+        isSelection: false, // 表格有多选时设置
         isOperation: false, // 表格有操作列时设置
         isIndex: false, // 列表序号
         operation: {
@@ -263,7 +263,7 @@ export default {
           pageSize: 10, // 每页数量
           pageNum: 1, // 页码
         },
-        isSelection: true, // 表格有多选时设置
+        isSelection: false, // 表格有多选时设置
         isOperation: false, // 表格有操作列时设置
         isIndex: false, // 列表序号
         operation: {
@@ -322,7 +322,7 @@ export default {
           pageSize: 10, // 每页数量
           pageNum: 1, // 页码
         },
-        isSelection: true, // 表格有多选时设置
+        isSelection: false, // 表格有多选时设置
         isOperation: false, // 表格有操作列时设置
         isIndex: false, // 列表序号
         operation: {
@@ -404,7 +404,7 @@ export default {
           ],
         },
       },
-      clickTagNameTop: "",
+      clickTagNameTop: "first",
       totalPage: "1",
     };
   },
@@ -703,17 +703,16 @@ export default {
             this.getLastName();
           } else {
             this.adminResourceId = "";
-
-            this.destroy = true;
-            this.handleStatus = true;
           }
         } else {
           this.adminResourceId = "";
 
-          this.destroy = true;
-          this.handleStatus = true;
+          // this.destroy = true;
+          // this.handleStatus = true;
         }
         if (this.fromList.taskId) {
+          this.destroy = true;
+          this.handleStatus = true;
         } else {
           this.$message.error("请先点击保存按钮");
         }
@@ -764,14 +763,17 @@ export default {
       }
     },
     clickDemand(e, res) {
+      console.log(this.clickTagNameTop);
       if (e === "工单状态" || e === "文件标题") {
         if (this.clickTagNameTop === "first") {
           // this.disabled = true;
           // this.dialogTitle = "查看";
           if (res.taskName === "起草") {
+            console.log(123);
             this.disabled = false;
             this.saveStatus = true;
           } else {
+            console.log(456);
             this.disabled = true;
             this.saveStatus = false;
           }
@@ -823,7 +825,7 @@ export default {
       if (this.clickTagNameTop === "first") {
         this.getQueryList();
       } else if (this.clickTagNameTop === "two") {
-        this.etQueryDone();
+        this.getQueryDone();
       } else if (this.clickTagNameTop === "three") {
         this.getMeLaunch();
       }

vue.config.js

@@ -133,7 +133,7 @@ module.exports = {
                 // target: 'http://192.168.1.9:9600/spfm',
                 // target: 'http://127.0.0.1:9600/',
                 // target: 'http://192.168.0.156:9600/',
-                target: 'http://192.168.2.69:9600/',
+                target: 'http://192.168.2.92:9600/',
                 // target: 'http://192.168.2.124:9600/',
                 // target: "http://124.223.66.248:9600",
                 // target: "http://43.138.50.94:9600",