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:
闫晓茹 2024-07-16 17:27:57 +08:00
commit fc71e84132
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/manage/LookAuditing/index.vue
View File

@ -174,7 +174,7 @@
宣教模板：{{ uitem.propagandaTitle }}
</div>
<div class="textarea" v-if="uitem.taskType == 'TEXT_REMIND'">
提醒内容：{{ uitem.textRemindContent }}
提醒内容：{{ uitem.nodeContent }}
</div>
<div
class="text"

2
src/views/manage/components/PathReview.vue
View File

@ -292,7 +292,7 @@
<div class="lefttext">
文字提醒
</div>
<div class="righttextarea" v-html="item.textRemindContent">
<div class="righttextarea" v-html="item.nodeContent">
</div>
</div>
</div>

2
src/views/manage/components/RehabilitationPlanandRecords.vue
View File

@ -74,7 +74,7 @@
宣教模板：{{ uitem.propagandaTitle }}
</div>
<div class="textarea" v-if="uitem.taskType == 'TEXT_REMIND'">
提醒内容：{{ uitem.textRemindContent }}
提醒内容：{{ uitem.nodeContent }}
</div>
<div
class="text"

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

@ -163,7 +163,7 @@
<propaganda @on-template="propagandaontemplate"></propaganda>
</el-form-item>
<el-form-item label="提醒内容" v-if="formInline.taskNodeType == 'TEXT_REMIND'">
<el-input type="textarea" v-model="formInline.textRemindContent" :rows="6" style="width: 600px"
<el-input type="textarea" v-model="formInline.nodeContent" :rows="6" style="width: 600px"
placeholder="请输入内容" />
</el-form-item>
<!-- <el-form-item label="人工随访模板" v-if="formInline.taskNodeType == 'ARTIFICIAL_FOLLOW_UP'">
@ -398,7 +398,7 @@ export default {
phoneTemplateName: "",
propagandaInfoId: "",
propagandaTitle: "",
textRemindContent: "",
nodeContent: "",
officialPushSign: "0",
messagePushSign: "0",
appletPushSign: "0",
@ -422,7 +422,7 @@ export default {
phoneTemplateName: "",
propagandaInfoId: "",
propagandaTitle: "",
textRemindContent: "",
nodeContent: "",
officialPushSign: "0",
messagePushSign: "0",
appletPushSign: "0",
@ -687,7 +687,7 @@ export default {
phoneTemplateName: "",
propagandaInfoId: "",
propagandaTitle: "",
textRemindContent: "",
nodeContent: "",
officialPushSign: "0",
messagePushSign: "0",
appletPushSign: "0",

8
src/views/system/record/record.vue
View File

@ -465,12 +465,12 @@
label-width="110px"
:inline="true"
>
<el-form-item label="提醒内容" prop="textRemindContent">
<el-form-item label="提醒内容" prop="nodeContent">
<el-input
disabled
type="textarea"
style="width: 500px"
v-model="formlists.textRemindContent"
v-model="formlists.nodeContent"
placeholder="请输入提醒内容"
/>
</el-form-item>
@ -538,8 +538,8 @@ export default {
// this.infolistMESSAGE();
// this.infolistword();
// 文字提醒
if (this.$route.query.textRemindContent) {
this.formlists.textRemindContent = this.$route.query.textRemindContent;
if (this.$route.query.nodeContent) {
this.formlists.nodeContent = this.$route.query.nodeContent;
}
if (this.$route.query.routeHandleRemark) {
this.formlist.routeHandleRemark = this.$route.query.routeHandleRemark;

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

@ -150,7 +150,7 @@ export default {
patientPhone: row.patientPhone,
sex: row.sex,
routeHandleRemark: row.routeHandleRemark,
textRemindContent: row.textRemindContent,
nodeContent: row.nodeContent,
birthDate: row.birthDate,
address: row.address,
patientSource: row.patientSource,

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

@ -341,7 +341,7 @@ export default {
patientPhone: row.patientPhone,
sex: row.sex,
routeHandleRemark: row.routeHandleRemark,
textRemindContent: row.textRemindContent,
nodeContent: row.nodeContent,
birthDate: row.birthDate,
familyMemberPhone: row.familyMemberPhone,
address: row.address,

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

@ -136,7 +136,7 @@
<!-- 文字提醒 -->
<div style="margin-top: -13px" v-if="form.taskType == 'TEXT_REMIND'">
<el-form-item label="提醒内容:" prop="patientId" v-if="form.taskType == 'TEXT_REMIND'">
<el-input type="textarea" disabled v-model="form.textRemindContent" style="width: 635px" />
<el-input type="textarea" disabled v-model="form.nodeContent" style="width: 635px" />
<!-- 短信 -->
<!-- <el-input
v-if="form.messagePushSign == 1"