|
@@ -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
|
|
|
+ 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",
|
|
@@ -492,40 +487,38 @@ 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);
|
|
|
-
|
|
|
- }
|
|
|
+ arr = item.paramsJson.split('|').slice(1)//截取字符串
|
|
|
+ arr.pop()
|
|
|
+ console.log('arr');
|
|
|
+ console.log(arr);
|
|
|
+ arr3 = arr3.concat(arr)
|
|
|
+ console.log('arr3');
|
|
|
+ console.log(arr3);
|
|
|
+ })
|
|
|
+ let Array2 = []
|
|
|
+ arr3.map((items, index) => {
|
|
|
+ console.log('items');
|
|
|
+ console.log(items);
|
|
|
+ Array2.push(items.split(':')[0])//拼接paramsJson中的属性
|
|
|
})
|
|
|
- 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)) {
|
|
|
- // 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) {
|
|
@@ -573,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",
|