Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
7ffbf36461
@ -216,7 +216,6 @@ export default {
|
|||||||
delete e.optionstriggerConditionOperator
|
delete e.optionstriggerConditionOperator
|
||||||
|
|
||||||
});
|
});
|
||||||
delete this.openlist.triggerConditionList.optionstriggerConditionOperator
|
|
||||||
loading.close();
|
loading.close();
|
||||||
// return;
|
// return;
|
||||||
triggerCondition(this.openlist).then((res) => {
|
triggerCondition(this.openlist).then((res) => {
|
||||||
|
|||||||
@ -489,10 +489,9 @@ export default {
|
|||||||
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;
|
||||||
|
|
||||||
loading.close();
|
loading.close();
|
||||||
// console.log(this.updata.triggerConditionList, "this.updata");
|
|
||||||
// return
|
// return
|
||||||
triggerConditionadd(this.updata).then((res) => {
|
triggerConditionadd(this.updata).then((res) => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user