工作流选节点优化

.env.development

@@ -1,6 +1,6 @@
 VUE_APP_FILE_API = http://192.168.1.9:9114
 VUE_APP_GRID_API = http://192.168.1.19:9114
-NODE_ENV = development
+NODE_ENV = production
 
-VUE_APP_ENV = development
+VUE_APP_ENV = devs
 outputDir = dist-dev

src/components/workflowBase.vue

@@ -425,7 +425,7 @@ export default {
       console.log(this.getNextPathindex);
       // if (this.getNextPathindex == 3) {
       if (this.paramsJson.length > 1) {
-        list.paramsJson = this.paramsJson
+        list.paramsJson = this.paramsJson//增加查询条件
       }
       // }
       this.$http({
@@ -478,7 +478,7 @@ export default {
             // alert(111)
             // if (this.getNextPathindex == 2) {
             let paramsJson = '|'
-            let biggestNum = 0;
+            // let biggestNum = 0;
             this.$http({
               url: "/market/CfgWorkflowChooseNode/queryList",//筛选自定义候选节点
               method: "post",
@@ -492,19 +492,46 @@ export default {
               },
             }).then((ress) => {
               let arr = []
+              let arr2 = []
+              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);
-
-                  }
+                  // 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]] + '|'
                 })
-                arr.map((items, index) => {
-                  console.log(items.split(':'));
-                  paramsJson += items.split(':')[0] + ':' + this.list[items.split(':')[0]] + '|'
+                console.log('Array2');
+                console.log(Array2);
+                let uniqueArray = Array.from(new Set(Array2))//去重属性
+                console.log('uniqueArray');
+                console.log(uniqueArray);
+                uniqueArray.map((itemss, index) => {
+                  paramsJson += itemss + ':' + this.list[itemss] + '|'//从接口中的属性 向表单取值
                 })
                 // this.getNextPathindex = 0
                 // for (var key in JSON.parse(ress.data[0].paramsJson)) {

src/config/dev.js

@@ -5,7 +5,7 @@ let devs = {
     BASE_URL: "http://43.138.50.94:9600/", //本地环境
     BASE_API: "http://43.138.50.94:8880/api",//工作流本地环境
     EXCEL_URL: "http://43.138.50.94:7777", //本地excel路径
-    OFFICE_URL:'http://43.138.50.94:7779',  //在线office路径
+    OFFICE_URL:'http://150.158.79.10:7779',  //在线office路径
     provincialWorkOrderAreafresourceId: 'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
     provincialWorkOrderfresourceId: '08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
     riskMaterialsfresourceId: 'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
@@ -38,7 +38,7 @@ let devs = {
 let dev = {
     TITLE: '本地环境',
     KNOWLEDGE_URL: "http://150.158.79.10:8012", //本地环境知识库预览
-    OFFICE_URL:'http://43.138.50.94:7779',  //在线office路径
+    OFFICE_URL:'http://150.158.79.10:7779',  //在线office路径
     BASE_URL: "http://127.0.0.1:8080", //本地环境
     BASE_API: "http://43.138.50.94:8880/api",//工作流本地环境
     EXCEL_URL: "http://43.138.50.94:7777", //本地excel路径

src/pages/main/workflowdef/qathList.vue

@@ -58,13 +58,8 @@
         <el-dialog title="配置节点信息" :visible.sync="dialogStatus2" width="100%" style="height: 100%" :fullscreen="true"
             :before-close="handleClose4" :modal="false" v-if="dialogStatus2" :destroy-on-close="true">
             <!-- <el-button type="primary" @click="dialogTreeStatus3 = true">新增</el-button> -->
-            <!-- <el-button type="primary" v-if="delarr.length > 0" @click="delarrbtn2">批量删除</el-button> -->
             <div style="display: flex;">
-                <el-table :data="tableData3" style="width: 100%;min-height: 600px;" ref="refTable4" height="600px"
-                    @selection-change="selectionChange">
-                    <!-- 是否多选 -->
-                    <!-- <el-table-column type="selection" width="55">
-                    </el-table-column> -->
+                <el-table :data="tableData3" style="width: 100%;min-height: 600px;" ref="refTable4" height="600px">
                     <el-table-column type="expand">
                         <template slot-scope="props">
                             <el-table :data="props.row.nextNodes" size="mini" style="width: 95%;margin-left: 5%;"
@@ -79,6 +74,8 @@
                                             </el-table-column>
                                             <el-table-column label="操作" align="center">
                                                 <template slot-scope="scope">
+                                                    <el-button size="mini" type="text" @click="jiedianadd(scope.row)">
+                                                        新增字段</el-button>
                                                     <el-button size="mini" type="text" @click="jiedianedit(scope.row)">
                                                         配置字段</el-button>
                                                     <el-button size="mini" type="text" @click="delarrbtn2(scope.row)">
@@ -94,6 +91,8 @@
                                 </el-table-column>
                                 <el-table-column label="操作" align="center">
                                     <template slot-scope="scope">
+                                        <el-button size="mini" type="text" @click="jiedianadd(scope.row)">
+                                            新增字段</el-button>
                                         <el-button size="mini" type="text" @click="jiedianedit(scope.row)">
                                             配置字段</el-button>
                                         <el-button size="mini" type="text" @click="delarrbtn2(scope.row)">
@@ -111,6 +110,8 @@
                     </el-table-column>
                     <el-table-column label="操作" align="center">
                         <template slot-scope="scope">
+                            <el-button size="mini" type="text" @click="jiedianadd(scope.row)">
+                                新增字段</el-button>
                             <el-button size="mini" type="text" @click="jiedianedit(scope.row)">
                                 配置字段</el-button>
                             <el-button size="mini" type="text" @click="delarrbtn2(scope.row)">
@@ -120,7 +121,7 @@
                 </el-table>
 
             </div>
-         
+
         </el-dialog>
 
         <el-dialog title="配置候选人字段" :visible.sync="dialogTreeStatus2" width="100%" style="height: 100%" :fullscreen="true"
@@ -288,8 +289,9 @@ export default {
             this.dialogTreeStatus3 = true
         },
         jiedianadd(v) {
-
+            this.updatestatusId = ''
             this.nodeResourceId = v.resourceId
+            this.resourceId = v.parentResourceId
             this.dialogTreeStatus3 = true
         },
         delarrbtn() {///CfgWorkflowChoosePerson/delBatch
@@ -309,7 +311,7 @@ export default {
                 this.getRiskadminform(this.resourceId)
             });
         },
-        delarrbtn2(v) {///CfgWorkflowChoosePerson/delBatch
+        delarrbtn2(v) {///CfgWorkflowChooseNode/delBatch
             this.$http({
                 url: "/market/CfgWorkflowChooseNode/del",
                 method: "post",
@@ -397,7 +399,7 @@ export default {
             // this.loading = true
             this.tableData3 = v.nextNodes
             this.dialogStatus2 = true
-         
+
 
         },
         async clickSave(v) {