Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
c8b11bbecc
@ -115,6 +115,8 @@ export default {
|
||||
this.$set(this.form, "specialDiseaseNodeId", this.$route.query.id);
|
||||
this.$set(this.openlist, "suitRange", this.$route.query.suitRange);
|
||||
this.openlist.routeId = this.$route.query.id;
|
||||
this.itemlist.routeName = this.$route.query.routeName
|
||||
|
||||
}
|
||||
this.taskinfo();
|
||||
this.infolistname();
|
||||
@ -196,13 +198,7 @@ export default {
|
||||
title: "提示",
|
||||
message: "修改触发条件成功",
|
||||
});
|
||||
|
||||
this.routeName = res.data;
|
||||
Cookies.remove("routeName");
|
||||
|
||||
Cookies.set("routeName", this.routeName);
|
||||
// this.$router.go(0);
|
||||
// window.location.reload();
|
||||
this.itemlist.routeName = res.data;
|
||||
}
|
||||
this.infolist();
|
||||
// this.handlelist();
|
||||
@ -345,7 +341,6 @@ export default {
|
||||
this.changelisy();
|
||||
}, 1000);
|
||||
this.itemlist.specialDiseaseRouteId = this.$route.query.id;
|
||||
this.itemlist.routeName = Cookies.get("routeName");
|
||||
selectSpecialDisease(this.$route.query.id).then((res) => {
|
||||
loading.close();
|
||||
this.agreeNumber = res.data.agreeNumber;
|
||||
@ -571,7 +566,7 @@ export default {
|
||||
)?.dictDataType;
|
||||
var dictType = "trigger_condition_operator";
|
||||
getList(dictType, o.dictDataType).then((res) => {
|
||||
this.$set(o,'optionstriggerConditionOperator' ,res.data)
|
||||
this.$set(o, 'optionstriggerConditionOperator', res.data)
|
||||
this.$forceUpdate()
|
||||
});
|
||||
var dictType = o.triggerConditionCode;
|
||||
@ -672,12 +667,8 @@ export default {
|
||||
// !e.taskSubdivision &&
|
||||
// !e.taskStatus
|
||||
// );
|
||||
// if (this.routeName) {
|
||||
// this.itemlist.routeName = this.routeName;
|
||||
// } else {
|
||||
// this.itemlist.routeName = this.$route.query.routeName;
|
||||
// }
|
||||
this.itemlist.routeName = Cookies.get("routeName");
|
||||
console.log(this.itemlist, 'itemlist')
|
||||
// return
|
||||
specialDiseaseNode(this.itemlist).then((res) => {
|
||||
this.info();
|
||||
loading.close();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user