Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
7d3ccaab57
@ -532,7 +532,7 @@ export default {
|
|||||||
// 回显一条时
|
// 回显一条时
|
||||||
this.updata = res.data[0];
|
this.updata = res.data[0];
|
||||||
this.updata.triggerConditionOperatorName =
|
this.updata.triggerConditionOperatorName =
|
||||||
this.openlistoptionstriggerConditionOperator.find(
|
this.optionstriggerConditionOperator.find(
|
||||||
(el) => el.dictValue == this.updata.triggerConditionOperator
|
(el) => el.dictValue == this.updata.triggerConditionOperator
|
||||||
)?.dictLabel;
|
)?.dictLabel;
|
||||||
this.updatalist = [];
|
this.updatalist = [];
|
||||||
@ -633,7 +633,8 @@ export default {
|
|||||||
TemporaryStorage() {
|
TemporaryStorage() {
|
||||||
if (
|
if (
|
||||||
this.form.taskSubdivisiontemplateType != "QUESTIONNAIRE" &&
|
this.form.taskSubdivisiontemplateType != "QUESTIONNAIRE" &&
|
||||||
this.form.taskSubdivisiontemplateType != "PROPAGANDA"
|
this.form.taskSubdivisiontemplateType != "PROPAGANDA" &&
|
||||||
|
this.form.taskSubdivisiontemplateType != 'SCRIPT'
|
||||||
) {
|
) {
|
||||||
this.$refs.wangeditor.emit();
|
this.$refs.wangeditor.emit();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user