hujunwei@agilestar.cn 1 год назад
Родитель
Сommit
ede491a57c
2 измененных файлов с 14 добавлено и 59 удалено
  1. 13 10
      src/components/workDeptThree.vue
  2. 1 49
      src/components/workflowBase.vue

+ 13 - 10
src/components/workDeptThree.vue

@@ -9,7 +9,7 @@
       @check-change="handleCheckChange"
       :data="treeList"
       node-key="id"
-      :default-checked-keys="defaultListc"
+      :default-checked-keys="defaultListcs"
       :default-expanded-keys="defaultListc"
     >
       <span
@@ -48,6 +48,7 @@ export default {
         label: "label",
       },
       defaultListc: [],
+      defaultListcs: [],
       loading: false,
       filterText: "",
     };
@@ -147,19 +148,21 @@ export default {
   },
   watch: {
     treeList(newVal, oldVal) {
+      this.defaultListc = []
       console.log(newVal);
       this.$nextTick(() => {
         if (newVal.length <= 1) {
-          this.isexpand = true;
+          this.defaultListc.push(newVal[0].id)
+          // this.isexpand = true;
 
-          for (
-            var i = 0;
-            i < this.$refs.tree.store._getAllNodes().length;
-            i++
-          ) {
+          // for (
+          //   var i = 0;
+          //   i < this.$refs.tree.store._getAllNodes().length;
+          //   i++
+          // ) {
 
-            this.$refs.tree.store._getAllNodes()[i].expanded = true;
-          }
+          //   this.$refs.tree.store._getAllNodes()[i].expanded = true;
+          // }
         } else {
           for (
             var i = 0;
@@ -167,7 +170,7 @@ export default {
             i++
           ) {
 
-            this.$refs.tree.store._getAllNodes()[i].expanded =false;
+            this.$refs.tree.store._getAllNodes()[i].expanded = false;
           }
         }
       });

+ 1 - 49
src/components/workflowBase.vue

@@ -423,11 +423,9 @@ export default {
       e ? (list.resourceId = e) : list;
       console.log(this.paramsJson);
       console.log(this.getNextPathindex);
-      // if (this.getNextPathindex == 3) {
       if (this.paramsJson.length > 1) {
         list.paramsJson = this.paramsJson//增加查询条件
       }
-      // }
       this.$http({
         url: "/market/waf/queryPath",
         method: "post",
@@ -475,10 +473,7 @@ export default {
             this.node = res.data.body;
           } else {
             this.resourceId = res.data.body.nextShapes[0].resourceId
-            // alert(111)
-            // if (this.getNextPathindex == 2) {
             let paramsJson = '|'
-            // let biggestNum = 0;
             this.$http({
               url: "/market/CfgWorkflowChooseNode/queryList",//筛选自定义候选节点
               method: "post",
@@ -496,34 +491,19 @@ export default {
               let arr3 = []
               if (ress.data.length > 0) {
                 ress.data.map((item) => {
-                  // if (item.paramsJson.length > biggestNum) {
-                  // biggestNum = item.paramsJson.length
                   arr = item.paramsJson.split('|').slice(1)//截取字符串
                   arr.pop()
                   console.log('arr');
                   console.log(arr);
                   arr3 = arr3.concat(arr)
-                  // arr2.push(arr)
-
                   console.log('arr3');
                   console.log(arr3);
-                  // }
                 })
-                // ress.data.map((item) => {
-                //   biggestNum = item.paramsJson.length
-                //   arr = item.paramsJson.split('|').slice(1)
-                //   arr.pop()
-                //   console.log(arr);
-                //   arr2.push(arr)
-                //   console.log(arr2);
-                // })
                 let Array2 = []
                 arr3.map((items, index) => {
                   console.log('items');
                   console.log(items);
-                  // console.log(items.split(':'));
                   Array2.push(items.split(':')[0])//拼接paramsJson中的属性
-                  // paramsJson += items.split(':')[0] + ':' + this.list[items.split(':')[0]] + '|'
                 })
                 console.log('Array2');
                 console.log(Array2);
@@ -533,26 +513,12 @@ export default {
                 uniqueArray.map((itemss, index) => {
                   paramsJson += itemss + ':' + this.list[itemss] + '|'//从接口中的属性 向表单取值
                 })
-                // this.getNextPathindex = 0
-                // for (var key in JSON.parse(ress.data[0].paramsJson)) {
-                //   console.log(key, JSON.parse(ress.data[0].paramsJson)[key])
-                //   if (this.requestForm.processDefinitionKey == ress.data[0].tableName) {
-                //     
-                //   }
-                // }
-                // console.log(key)
               }
-              // paramsJson.nodeResourceId=ress.data[0].nodeResourceId
               console.log(paramsJson);
               this.paramsJson = paramsJson
               this.getNextPathindex++
-              this.getNextPath(res.data.body.nextShapes[0].resourceId, 2);
+              this.getNextPath(res.data.body.nextShapes[0].resourceId, 2);//循环查询节点
             })
-            // }
-
-            // console.log(this.paramsJson);
-
-
           }
         }
         if (status === 3) {
@@ -600,28 +566,14 @@ export default {
               }
             }
           })
-
-          // console.log(key)
         }
         console.log(paramsJson);
-        // console.log(this.list);
-        // console.log(this.requestForm);
-
         let createdId = "createId";
         let id =
           e.nextShapes[0].properties.documentation.indexOf(createdId) != -1
             ? this.list.createId
             : e.nextShapes[0].properties.documentation;
         console.log(id);
-
-
-        // if (this.requestForm.processDefinitionKey == 'BOMC_process' || this.requestForm.processDefinitionKey == 'ZHQX_process' || this.requestForm.processDefinitionKey == 'ZYSQ_process') {
-        //   paramsJson.proposerType = this.list.proposerType
-        // }
-        // if (this.requestForm.processDefinitionKey == 'YHBG_process') {
-        //   paramsJson.changeType = this.list.changeType
-        // }
-
         this.$http({
           url: "/market/api/user/info/queryNodePers?params=" + id,
           method: "post",