Ver Fonte

门禁参数无法上传修复

wangtao há 2 anos atrás
pai
commit
92b7cab462
1 ficheiros alterados com 29 adições e 24 exclusões
  1. 29 24
      src/views/business/Middleware/bpmn/customModeler.vue

+ 29 - 24
src/views/business/Middleware/bpmn/customModeler.vue

@@ -128,7 +128,7 @@
                 show-word-limit
               />
             </el-form-item>
-            <el-form-item :label="formData.describe2" prop="deptName">
+            <!-- <el-form-item :label="formData.describe2" prop="deptName">
               <el-select
                 v-model="formData.deptName"
                 :placeholder="'请输入' + formData.describe2"
@@ -142,7 +142,7 @@
                   :value="dict.name"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
       </el-form>
@@ -299,7 +299,7 @@ export default {
         nodes: [],
         //暂时(人员同步)
         describe1: undefined,
-        describe2: undefined,
+        // describe2: undefined,
         blurry: undefined,
         deptName: undefined,
         xlStatus: undefined,
@@ -326,13 +326,13 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
-        deptName: [
-          {
-            required: true,
-            message: "部门不能为空",
-            trigger: ["blur", "change"],
-          },
-        ],
+        // deptName: [
+        //   {
+        //     required: true,
+        //     message: "部门不能为空",
+        //     trigger: ["blur", "change"],
+        //   },
+        // ],
       },
       deptOptions: [{ name: "物业" }, { name: "非物业" }],
       //最终提交框状态
@@ -418,7 +418,7 @@ export default {
               name:undefined,
               runName:undefined,
               describe1:undefined,
-              describe2:undefined,
+              // describe2:undefined,
               blurry:undefined,
               deptName:undefined,
               procedefKey:undefined,
@@ -429,7 +429,7 @@ export default {
             data[i].procedefKey = res.data[i].procedefKey
             if(res.data[i].id == "1"){
               data[i].describe1 = JSON.parse(res.data[i].params)[0].describe
-              data[i].describe2 = JSON.parse(res.data[i].params)[1].describe
+              // data[i].describe2 = JSON.parse(res.data[i].params)[1].describe
               if(res.data[i].runParam){
                 if(JSON.parse(res.data[i].runParam).blurry){
                   data[i].blurry = JSON.parse(res.data[i].runParam).blurry
@@ -451,7 +451,7 @@ export default {
               let arr =  {
                   runName:undefined,
                   describe1:undefined,
-                  describe2:undefined,
+                  // describe2:undefined,
                   blurry:undefined,
                   deptName:undefined,
                   procedefKey:undefined,
@@ -461,7 +461,7 @@ export default {
                 arr.procedefKey = res.data[i].procedefKey
                 if(res.data[i].id == "1"){
                   arr.describe1 = JSON.parse(res.data[i].params)[0].describe
-                  arr.describe2 = JSON.parse(res.data[i].params)[1].describe
+                  // arr.describe2 = JSON.parse(res.data[i].params)[1].describe
                   if(res.data[i].runParam){
                     if(JSON.parse(res.data[i].runParam).blurry){
                       arr.blurry = JSON.parse(res.data[i].runParam).blurry
@@ -497,9 +497,9 @@ export default {
             this.formData.describe1 = JSON.parse(
               SelectedObj.checkedNodes[i].params
             )[0].describe;
-            this.formData.describe2 = JSON.parse(
-              SelectedObj.checkedNodes[i].params
-            )[1].describe;
+            // this.formData.describe2 = JSON.parse(
+            //   SelectedObj.checkedNodes[i].params
+            // )[1].describe;
             break;
           }else{
             this.status = false
@@ -594,7 +594,7 @@ export default {
                 name:undefined,
                 nodes: [],
                 describe1: undefined,
-                describe2: undefined,
+                // describe2: undefined,
                 blurry: undefined,
                 deptName: undefined,
                 xlStatus: false,
@@ -764,7 +764,7 @@ export default {
           }, 1);
           this.msgSuccess("节点属性保存成功");
         }
-        console.log("节点提交", this.bpmnData);
+        console.log("节点提交111", this.bpmnData);
       });
     },
     /** 流程图节点提交按钮(弹框展示) */
@@ -810,25 +810,30 @@ export default {
             for (let i = 0; i < arr.length; i++) {
               for (let a = 0; a < arr[i].nodes.length; a++) {
                 let node = {}
+                console.log(arr[i].nodes[a])
                 node.name = arr[i].runName;
                 node.procedefKey = arr[i].procedefKey;
                 node.nodeId = arr[i].nodes[a].id;
                 node.param = {};
                 let data = JSON.parse(arr[i].nodes[a].params);
                 for (let b = 0; b < data.length; b++) {
-                  if (data[b].name === "blurry") {
+                  //人员
+                  if (data[b].name == "blurry") {
                     node.param.blurry = arr[i].blurry;
                   } else if (data[b].name === "deptName") {
                     node.param.deptName = arr[i].deptName;
-                  } else {
-                    node.param[data[0].name] = data[0].value;
                   }
                 }
+                //门禁
+                if (data.name == "doorVOS") {
+                    for(let b =0;b<data.value.length;b++){
+                      node.param.doorVOS = data.value[b];
+                    }
+                  }
                 node.param = JSON.stringify(node.param)
                 params.nodes.push(node)
               }
             }
-            console.log(params)
             if (this.bpmnDataFH.id) {
               params.id = this.bpmnDataFH.id;
               updataBpmnZkReProcdef(params).then((res) => {
@@ -969,7 +974,7 @@ export default {
                       that.formData.procedefKey = data[i].procedefKey;
                       if (data[i].nodes[a].id == "1") {
                         that.formData.describe1 = data[i].describe1
-                        that.formData.describe2 = data[i].describe2
+                        // that.formData.describe2 = data[i].describe2
                         if (data[i].blurry) {
                             that.formData.blurry = data[i].blurry
                             that.status = true