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-05-24 11:35:27 +08:00
commit 3bd0c0d505
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/system/partition/index.vue
View File

@ -87,7 +87,7 @@
<el-form-item label="任务细分备注" prop="taskPartitionRemark"> <el-form-item label="任务细分备注" prop="taskPartitionRemark">
<el-input v-model="form.taskPartitionRemark" placeholder="请输入任务细分备注" /> <el-input v-model="form.taskPartitionRemark" placeholder="请输入任务细分备注" />
</el-form-item> </el-form-item>
<el-form-item label="模板类型" prop="templateType"> <el-form-item label="模板类型">
<el-select v-model="form.templateType" placeholder="请选择模板类型" style="width: 350px;"> <el-select v-model="form.templateType" placeholder="请选择模板类型" style="width: 350px;">
<el-option v-for="dict in dict.type.template_type" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.template_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option> :value="dict.value"></el-option>

8
src/views/system/specialDiseaseNode/index.vue
View File

@ -104,6 +104,7 @@
</div> </div>
<div class="bottomform"> <div class="bottomform">
<wangeditor style="width: 100%" :nodeContent="form.nodeContent" @on-nodeContent="onNodeContent" <wangeditor style="width: 100%" :nodeContent="form.nodeContent" @on-nodeContent="onNodeContent"
v-if="form.taskSubdivisiontemplateType != 'QUESTIONNAIRE' && form.taskSubdivisiontemplateType != 'PROPAGANDA'"
ref="wangeditor" /> ref="wangeditor" />
<div class="card"> <div class="card">
<div class="flex"> <div class="flex">
@ -514,7 +515,9 @@ export default {
}, },
//暂存 //暂存
TemporaryStorage() { TemporaryStorage() {
if (this.form.taskSubdivisiontemplateType != 'QUESTIONNAIRE' && this.form.taskSubdivisiontemplateType != 'PROPAGANDA') {
this.$refs.wangeditor.emit(); this.$refs.wangeditor.emit();
}
this.$confirm( this.$confirm(
"确认暂存时将过滤掉部分内容未填写完成的子节点,是否确认暂存？", "确认暂存时将过滤掉部分内容未填写完成的子节点,是否确认暂存？",
"提示", "提示",
@ -569,8 +572,9 @@ export default {
this.form.templateName = item.templateName; this.form.templateName = item.templateName;
}, },
bottomclickevent(uitem, index, uindex) { bottomclickevent(uitem, index, uindex) {
console.log(this.form, uitem, index, uindex) if (this.form.taskSubdivisiontemplateType != 'QUESTIONNAIRE' && this.form.taskSubdivisiontemplateType != 'PROPAGANDA') {
this.$refs.wangeditor.emit(); this.$refs.wangeditor.emit();
}
setTimeout(() => { setTimeout(() => {
this.form = uitem; this.form = uitem;
this.taskPartitionList = []; this.taskPartitionList = [];
@ -579,7 +583,7 @@ export default {
} }
this.listindex = index; this.listindex = index;
this.itemindex = uindex; this.itemindex = uindex;
}, 100); }, 150);
}, },
handleStep() { handleStep() {
this.active = 2; this.active = 2;