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

This commit is contained in:
闫晓茹 2024-07-18 15:40:09 +08:00
commit 8356883771

View File

@ -426,7 +426,7 @@ export default {
}, },
], ],
listindex: 0, listindex: 0,
optionstriggerConditionOperator: [], // // optionstriggerConditionOperator: [], //
dictDataType: "", dictDataType: "",
}; };
}, },
@ -459,24 +459,24 @@ export default {
}, },
// //
infolistoptionslistS() { infolistoptionslistS() {
var dictType = "trigger_logic"; // var dictType = "trigger_logic";
getAgencytype(dictType).then((res) => { // getAgencytype(dictType).then((res) => {
this.optionslistS = res.data; // this.optionslistS = res.data;
}); // });
}, },
// //
optiononditionOperators() { optiononditionOperators() {
var dictType = "trigger_condition_name"; // var dictType = "trigger_condition_name";
getAgencytype(dictType).then((res) => { // getAgencytype(dictType).then((res) => {
this.optionsname = res.data; // this.optionsname = res.data;
}); // });
}, },
// //
optiononditionOperator() { optiononditionOperator() {
var dictType = "trigger_condition_operator"; // var dictType = "trigger_condition_operator";
getAgencytype(dictType).then((res) => { // getAgencytype(dictType).then((res) => {
this.updata.triggerConditionList.optionstriggerConditionOperator = res.data; // this.updata.triggerConditionList.optionstriggerConditionOperator = res.data;
}); // });
}, },
// //
changetriggerLogic(e, index) { changetriggerLogic(e, index) {
@ -484,43 +484,43 @@ export default {
// this.openlist.triggerConditionList[index].optionstriggerConditionOperator.find( // this.openlist.triggerConditionList[index].optionstriggerConditionOperator.find(
// (el) => el.dictValue == e // (el) => el.dictValue == e
// ).dictLabel; // ).dictLabel;
this.updata.triggerConditionList[index].triggerConditionValue = null; // this.updata.triggerConditionList[index].triggerConditionValue = null;
}, },
// //
changetriggerConditionName(e, index) { changetriggerConditionName(e, index) {
var dictType = e; // var dictType = e;
getAgencytype(dictType).then((res) => { // getAgencytype(dictType).then((res) => {
this.ConditionValue = res.data; // this.ConditionValue = res.data;
}); // });
this.updata.triggerConditionList[index].triggerConditionName = // this.updata.triggerConditionList[index].triggerConditionName =
this.optionsname.find((el) => el.dictValue == e).dictLabel; // this.optionsname.find((el) => el.dictValue == e).dictLabel;
this.updata.triggerConditionList[index].triggerConditionValue = null; // this.updata.triggerConditionList[index].triggerConditionValue = null;
this.updata.triggerConditionList[index].triggerConditionOperator = null // this.updata.triggerConditionList[index].triggerConditionOperator = null
this.dictDataType = this.optionsname.find((el) => el.dictValue == e).dictDataType; // this.dictDataType = this.optionsname.find((el) => el.dictValue == e).dictDataType;
this.handlelist(index) // this.handlelist(index)
this.updata.triggerConditionList[index].dictDataType = // this.updata.triggerConditionList[index].dictDataType =
this.optionsname.find((el) => el.dictValue == e).dictDataType; // this.optionsname.find((el) => el.dictValue == e).dictDataType;
}, },
// //
handlelist(index) { handlelist(index) {
var dictType = "trigger_condition_operator"; // var dictType = "trigger_condition_operator";
// this.openlist.triggerConditionList[index].optionstriggerConditionOperator=[] // // this.openlist.triggerConditionList[index].optionstriggerConditionOperator=[]
getList(dictType, this.dictDataType).then((res) => { // getList(dictType, this.dictDataType).then((res) => {
this.$set(this.updata.triggerConditionList[index], 'optionstriggerConditionOperator', res.data) // this.$set(this.updata.triggerConditionList[index], 'optionstriggerConditionOperator', res.data)
this.$forceUpdate(); // this.$forceUpdate();
}); // });
}, },
// //
optiononditionOperator() { optiononditionOperator() {
var dictType = "trigger_condition_operator"; // var dictType = "trigger_condition_operator";
getAgencytype(dictType).then((res) => { // getAgencytype(dictType).then((res) => {
this.updata.triggerConditionList.optionstriggerConditionOperator = res.data; // this.updata.triggerConditionList.optionstriggerConditionOperator = res.data;
}); // });
}, },
// //
changetriggerLogicsname(e, index) { changetriggerLogicsname(e, index) {
this.updata.triggerConditionList[index].triggerLogic = e; // this.updata.triggerConditionList[index].triggerLogic = e;
this.updata.triggerConditionList[index].triggerLogicName = this.optionslistS.find((el) => el.dictValue == e).dictLabel; // this.updata.triggerConditionList[index].triggerLogicName = this.optionslistS.find((el) => el.dictValue == e).dictLabel;
}, },
// //
// submit() { // submit() {
@ -585,31 +585,31 @@ export default {
}, },
// //
delitemlistname(index, item) { delitemlistname(index, item) {
this.updata.triggerConditionList.splice(index, 1); // this.updata.triggerConditionList.splice(index, 1);
setTimeout(() => { // setTimeout(() => {
this.getMaxTableHeight() // this.getMaxTableHeight()
}, 20); // }, 20);
}, },
addtriggerCondition() { addtriggerCondition() {
var obj = { // var obj = {
routeId: "", // routeId: "",
routeName: "", // routeName: "",
triggerConditionName: "", // triggerConditionName: "",
triggerConditionOperator: "", // triggerConditionOperator: "",
triggerConditionValue: "", // triggerConditionValue: "",
triggerConditionOperatorName: "", // triggerConditionOperatorName: "",
dictDataType: "STRING", // dictDataType: "STRING",
triggerLogic: "AND", // triggerLogic: "AND",
triggerLogicName: "", // triggerLogicName: "",
}; // };
if (this.updata.triggerConditionList.length == 3) { // if (this.updata.triggerConditionList.length == 3) {
this.$message.error("至多仅支持两种属性"); // this.$message.error("");
} else { // } else {
this.updata.triggerConditionList.push(obj); // this.updata.triggerConditionList.push(obj);
} // }
setTimeout(() => { // setTimeout(() => {
this.getMaxTableHeight() // this.getMaxTableHeight()
}, 20); // }, 20);
}, },
// //
propagandaontemplate(item) { propagandaontemplate(item) {
@ -720,12 +720,12 @@ export default {
// el.templateType = "SCRIPT"; // el.templateType = "SCRIPT";
// } // }
// }); // });
this.updata.triggerConditionList.forEach((e) => { // this.updata.triggerConditionList.forEach((e) => {
e.routeId = this.$route.query.id; // e.routeId = this.$route.query.id;
e.routeName = this.$route.query.routeName; // e.routeName = this.$route.query.routeName;
delete e.optionstriggerConditionOperator // delete e.optionstriggerConditionOperator
}); // });
delete this.updata.triggerConditionList.optionstriggerConditionOperator // delete this.updata.triggerConditionList.optionstriggerConditionOperator
// return // return
signrouteadd(this.updata).then((res) => { signrouteadd(this.updata).then((res) => {
this.$notify({ this.$notify({