xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
shidongli 2024-07-01 15:45:15 +08:00
commit c8b11bbecc
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/system/ManageNodeInformation/indexjs.js
View File

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