工号配置

config/dev.env.js

@@ -8,7 +8,7 @@ module.exports = merge(prodEnv, {
   ctx:'"http://127.0.0.1:8080"',
   // ctxForm: '"http://10.149.85.91:8000"',//dev
   ctxForm: '"http://43.138.50.94:8880"',//test
-  // ctxForm: '"http://192.168.2.69:8880"',//test
+  // ctxForm: '"http://192.168.2.92:8880"',//test
   // ctxForm: '"http://10.230.26.15:8000"',//生产
 
   excludeMeWhenSelectNextHandler:false,

src/components/workflowBase.vue

@@ -331,7 +331,7 @@ export default {
               list.nextDealMan = this.backThree[0].loginNoStr;
             }
           } else {
-            if (this.clicknextName === "结束") {
+            if (this.clicknextName === "流程结束") {
             } else {
               this.$message.error("请选择候选人");
               return false;
@@ -355,6 +355,7 @@ export default {
       });
     },
     async nextWork(list) {
+      console.log(list);
       //e:yes||no,list：传入数组，title:结束标签，res:驳回标签,id:工单更新id
       let _this = this;
       let obj = {
@@ -496,7 +497,8 @@ export default {
     },
     //查询候选人接口
     getTreeLists(e, status) {
-      let createdId = "createld";
+      console.log(this.list);
+      let createdId = "createId";
       let id =
         e.nextShapes[0].properties.documentation === createdId
           ? this.list.createId

src/pages/main/postage/formTable.vue

@@ -82,7 +82,10 @@
               </el-select>
             </el-form-item>
             <div class="flex-textarea">
-              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.costPayWayInput"></el-input>
+              <el-form-item prop="costPayWayInput" style="width:100%">
+                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.costPayWayInput"></el-input>
+              </el-form-item>
+              
             </div>
           </div>
           <div class="flex-input-tare flex-header">
@@ -91,17 +94,7 @@
             </el-form-item>
           </div>
           <div class="flex-header" style="justify-content: space-between;">
-            <!-- <el-form-item label="活动性质">
-              <el-checkbox-group v-model="form.type">
-                <el-checkbox
-                  label="美食/餐厅线上活动"
-                  name="type"
-                ></el-checkbox>
-                <el-checkbox label="地推活动" name="type"></el-checkbox>
-                <el-checkbox label="线下主题活动" name="type"></el-checkbox>
-                <el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
-              </el-checkbox-group>
-            </el-form-item> -->
+  
             <el-form-item label="提醒短信:" prop="remindMmsg" label-width="220px" style="width: 33%;">
               <el-checkbox-group v-model="remindMmsg" style="display:flex">
                 <el-checkbox label="无" name="remindMmsg" :disabled="checkBoxNone"></el-checkbox>
@@ -113,25 +106,7 @@
                 <el-checkbox label="用尽失效" name="remindMmsg" :disabled="checkBoxStatus"></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
-            <!-- <el-form-item
-              label="提醒短信:"
-              prop="remindMmsg"
-              label-width="220px"
-            >
-              <el-select v-model="form.remindMsg" placeholder="请选择">
-                <el-option label="无" value="无"></el-option>
-                <el-option label="办理成功" value="办理成功"></el-option>
-                <el-option label="退订成功" value="退订成功"></el-option>
-                <el-option label="到期提醒" value="到期提醒"></el-option>
-                <el-option label="限速提醒" value="限速提醒"></el-option>
-                <el-option label="余额提醒" value="余额提醒"></el-option>
-                <el-option label="用尽失效" value="用尽失效"></el-option>
-                <el-option
-                  label="优惠到期提醒"
-                  value="优惠到期提醒"
-                ></el-option>
-              </el-select>
-            </el-form-item> -->
+      
             <div class="flex-textarea" style="margin-right:5%;width:60%">
               <el-input type="textarea" maxlength="300" show-word-limit v-model="form.remindMsgInput"></el-input>
             </div>
@@ -144,7 +119,10 @@
               </el-select>
             </el-form-item>
             <div class="flex-textarea">
-              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.gratuityInput"></el-input>
+              <el-form-item prop="gratuityInput" style="width:100%">
+                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.gratuityInput"></el-input>
+              </el-form-item>
+
             </div>
           </div>
           <div class="flex-header">
@@ -155,7 +133,10 @@
               </el-select>
             </el-form-item>
             <div class="flex-textarea">
-              <el-input type="textarea" maxlength="300" show-word-limit v-model="form.reportFormInput"></el-input>
+              <el-form-item prop="reportFormInput" style="width:100%">
+                <el-input type="textarea" maxlength="300" show-word-limit v-model="form.reportFormInput"></el-input>
+              </el-form-item>
+
             </div>
           </div>
           <div class="flex-input-tare flex-header">
@@ -201,6 +182,21 @@ export default {
   },
   data() {
     return {
+      costPayWayInputRule: {
+        costPayWayInput: [
+          { required: true, message: "请填写", trigger: "blur" },
+        ],
+      },
+      gratuityInputRule: {
+        gratuityInput: [
+          { required: true, message: "请填写", trigger: "blur" },
+        ],
+      },
+      reportFormInputRule: {
+        reportFormInput: [
+          { required: true, message: "请填写", trigger: "blur" },
+        ],
+      },
       checkBoxNone: false,
       checkBoxStatus: false,
       fileInfo: {
@@ -260,6 +256,7 @@ export default {
   },
   created() {
     this.form = this.list;
+    this.copyRule = this.rule;
   },
 
   methods: {
@@ -398,7 +395,40 @@ export default {
         })
 
       }
+    },
+    "form.costPayWay": {
+      handler(newVal) {
+        console.log(newVal);
+        if (newVal === '其他') {
+          this.rule = { ...this.rule, ...this.costPayWayInputRule }
+
+        } else {
+          this.rule = this.copyRule
+        }
+      }
+    },
+    "form.gratuity": {
+      handler(newVal) {
+        console.log(newVal);
+        if (newVal === '有') {
+          this.rule = { ...this.rule, ...this.gratuityInputRule }
+          console.log(this.rule);
+        } else {
+          this.rule = this.copyRule
+        }
+      }
+    },
+    "form.reportForm": {
+      handler(newVal) {
+        if (newVal === '有') {
+          this.rule = { ...this.rule, ...this.reportFormInputRule }
+
+        } else {
+          this.rule = this.copyRule
+        }
+      }
     }
+
   },
 };
 </script>

src/pages/main/postage/index.vue

@@ -594,32 +594,52 @@ export default {
         // this.fromList = concat;
       });
     },
+    setUpdateCopy(e){
+      this.$http({
+        url: "/market/zfpzProcess/update",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data:e
+      }).then((res) => {
+        console.log(res);
+        this.$message.success(res.data.desc)
+      });
+
+    },
     //点击保存
     clickSave() {
-      if (this.fromList.id) {
-        this.setUpdate(this.$refs.formTable.form)
-      } else {
-        this.getUserIds();
-        this.setForm();
-      }
+      // if (this.fromList.id) {
+      //   let list = this.$refs.formTable.form;
+      //   // list.tableName = this.request_form.processDefinitionKey;
+      //   // list.processId = null
+      //   // list.taskId = null
+      //   this.setUpdateCopy(list)
+      // } else {
+      //   this.getUserIds();
+      //   this.setForm();
+      // }
 
-      // this.$refs.formTable.$refs.form.validate((valid) => {
-      //   if (valid) {
-      //     if (this.fromList.id) {
-      //       this.setUpdate(this.$refs.formTable.form);
-      //     } else {
-      //       this.getUserIds();
-      //       this.setForm();
-      //     }
-      //   } else {
-      //     this.$message.error("请完善表单信息");
-      //     return false;
-      //   }
-      // });
+      this.$refs.formTable.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.fromList.id) {
+            this.setUpdate(this.$refs.formTable.form);
+          } else {
+            this.getUserIds();
+            this.setForm();
+          }
+        } else {
+          this.$message.error("请完善表单信息");
+          return false;
+        }
+      });
     },
     //点击新建
     async clickNewTag() {
+      console.log(123);
       this.dialogStatus = true;
+      console.log(this.dialogStatus);
       this.lables.data = [];
       this.disabled = false;
       this.saveStatus = true;
@@ -628,6 +648,7 @@ export default {
     },
     //处理按钮,开始工作流接口
     clickHandles() {
+      console.log(123);
       this.getNextPath(this.fromList.resourceId || "");
     },
     //查询form表单数据
@@ -642,6 +663,9 @@ export default {
       }).then((res) => {
         // this.dialogStatus = true;
         this.fromList = res.data
+       this.fromList.resourceId = e.resourceId
+       this.fromList.taskId = e.taskId
+       this.fromList.createId = e.createId
         this.fromList.mkFileShareAttachList = res.data.mkFileShareAttachList;
         this.dialogStatus = true;
       });
@@ -674,7 +698,7 @@ export default {
           // this.destroy = true;
           // this.handleStatus = true;
         }
-        if (this.fromList.taskId) {
+        if (this.fromList.processId || this.fromList.taskId) {
           this.destroy = true;
           this.handleStatus = true;
         } else {

vue.config.js

@@ -133,10 +133,10 @@ 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.92: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",
+                // target: "http://43.138.50.94:9600",
                 changeOrigin: true,
             },
         },