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

This commit is contained in:
2024-07-01 14:09:17 +08:00
commit 7d3ccaab57
2 changed files with 4 additions and 3 deletions

View File

@ -776,4 +776,4 @@ export default indexjs;
position: relative !important;
margin-top: 20px !important;
}
</style>
</style>

View File

@ -532,7 +532,7 @@ export default {
// 回显一条时
this.updata = res.data[0];
this.updata.triggerConditionOperatorName =
this.openlistoptionstriggerConditionOperator.find(
this.optionstriggerConditionOperator.find(
(el) => el.dictValue == this.updata.triggerConditionOperator
)?.dictLabel;
this.updatalist = [];
@ -633,7 +633,8 @@ export default {
TemporaryStorage() {
if (
this.form.taskSubdivisiontemplateType != "QUESTIONNAIRE" &&
this.form.taskSubdivisiontemplateType != "PROPAGANDA"
this.form.taskSubdivisiontemplateType != "PROPAGANDA" &&
this.form.taskSubdivisiontemplateType != 'SCRIPT'
) {
this.$refs.wangeditor.emit();
}