From 4879faaaee606960d15c01d0094a83a87e37ff5f Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 18 Jun 2024 10:52:00 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=AF=A6=E9=A2=84=E8=A7=88+=E4=BB=BB=E5=8A=A1=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/specialDiseaseNodeopen.vue | 649 ++++++++++++------ src/views/system/record/record.vue | 5 +- 2 files changed, 461 insertions(+), 193 deletions(-) diff --git a/src/views/manage/components/specialDiseaseNodeopen.vue b/src/views/manage/components/specialDiseaseNodeopen.vue index 249ab51..f5eae8b 100644 --- a/src/views/manage/components/specialDiseaseNodeopen.vue +++ b/src/views/manage/components/specialDiseaseNodeopen.vue @@ -8,11 +8,18 @@
适用范围 - - - - - + + +
@@ -23,32 +30,69 @@ - +
- - + + + + - + 天
- +
- +

{{ uitem.taskTypeName }}

- 已执行 - 未执行 -

{{ uitem.taskPartitionDictName }}

+ 已审核 + 不同意 + 未审核 +

{{ uitem.taskSubdivisionName }}

 @@ -57,82 +101,102 @@
- - + + - - + + - - + + - + - + - + +
- - -
-
- 文章模板:{{ lookitemnew.propagandaTitle }} -
-
-
{{ lookitemnew.propagandaTitle }}
-
- -
知识卡片
-
- -
-
-
-
-
- -
-
+ +
推送方式： @@ -140,20 +204,31 @@
模板： - +
- +
-
+
-
+
推送方式： @@ -162,21 +237,33 @@
模板： - + +
- +
-
+
-
+
推送方式： @@ -185,89 +272,136 @@
模板： - + +
- +
-
+ +
+
+
+
+ 推送方式： + 人工电话 +
+
+ 模板： + +
+
+ + +
+
+
+
+ 重播次数： + + + + + + +
+
+ 时间间隔: + + + + + +
+
+ 短信提醒： + + + + +
+
+ 短信模板： + + + + + + +
-
@@ -281,18 +415,24 @@ import message from '@/views/system/components/message.vue' import propaganda from '@/views/system/components/propaganda.vue' import officialAccount from '@/views/system/components/officialAccount.vue' import miniProgram from '@/views/system/components/miniProgram.vue' +import scripts from '@/views/system/components/script.vue' + import { - selectTaskTypeList, taskPartitionList, taskStatusDictList, specialDiseaseNode, selectSpecialDiseasenew, updateRouteCheckStatus, getById + selectTaskTypeList, taskPartitionList, taskStatusDictList, specialDiseaseNode, selectSpecialDiseasenew, updateRouteCheckStatus, getById, selectSpecialDisease, } from '@/api/system/specialDiseaseNode' import questionopennew from '../components/questionopennew.vue'; import Editorxj from "../../system/Editorxj/index.vue"; +import { getAgencytype } from "@/api/system/agency"; export default { - components: { wangeditor, question, propaganda, message, officialAccount, miniProgram, questionopennew, Editorxj }, + components: { wangeditor, question, propaganda, message, officialAccount, miniProgram, questionopennew, Editorxj, scripts,}, props: ['lookitem'], name: "specialDiseaseNodeopen", data() { return { + options: [], + optionslist: [], + optionslistS: [], show: false, baseUrl: process.env.VUE_APP_BASE_API, dialogVisible: false, @@ -308,6 +448,7 @@ export default { totalNumber: 0, agreeNumber: 0, updata: { + specialDiseaseRouteId: "", manageRouteId: '', suitRange: '', routeName: '', @@ -325,7 +466,7 @@ export default { executionTime: '', appletPushSign: '0', officialPushSign: '0', - messagePushSign: '0', + messagePushSign: 0, taskSubdivisiontemplateType: '', officialRemindContent: '', messagePreview: '', @@ -338,18 +479,25 @@ export default { lookitemnew: {}, value: '', input: '', + parentDictCode: "", //任务类型 selectTaskTypeList: [], //任务状态 taskStatusDictList: [], //任务细分 taskPartitionList: [], + parentDictCodelist: [], }; }, created() { this.updata = this.lookitem + console.log(this.updata) this.updata.manageRouteId = this.lookitem.manageRouteId + this.updata.specialDiseaseRouteId =this.updata.id this.taskinfo(); + this.infolistword(); + this.infolistMESSAGE(); + this.infolist(); }, beforeDestroy() { }, watch: { @@ -362,25 +510,115 @@ export default { mounted() { }, methods: { + infolistword() { + var dictType = "text_message_remind"; + getAgencytype(dictType).then((res) => { + this.optionslist = res.data; + // this.taskinfo(); + }); + }, + infolistMESSAGE() { + var dictType = "redial_times"; + getAgencytype(dictType).then((res) => { + this.optionslistS = res.data; + // this.taskinfo(); + }); + }, + infolist() { + var dictType = "suit_range"; + getAgencytype(dictType).then((res) => { + this.options = res.data; + this.taskinfo(); + }); + }, + changeoptions(e) { + this.parentDictCode = this.options.find( + (el) => el.dictValue == e + )?.dictCode; + this.changelisy(); + }, + changelisy() { + list(this.parentDictCode).then((res) => { + this.parentDictCodelist = res.rows; + }); + }, info() { - selectSpecialDiseasenew(this.updata.manageRouteId).then(res => { - this.agreeNumber = res.data.agreeNumber - this.totalNumber = res.data.totalNumber - res.data.forEach(e => { - e.messagePushSign = '' + e.messagePushSign - e.officialPushSign = '' + e.officialPushSign - e.appletPushSign = '' + e.appletPushSign - }) - this.lists = this.handleData(res.data, 'routeNodeDay', 'routeNodeName') - getById(this.lists[0].list[0].id).then(res => { - this.form = res.data - this.lookitemnew = res.data.detailInfo + const loading = this.$loading({ + lock: true, + text: "数据加载中", + spinner: "el-icon-loading", + background: "rgba(0, 0, 0, 0.7)", + }); + this.lists = []; + if (this.$route.query) { + this.parentDictCode = this.options.find( + (el) => el.dictValue == this.updata.suitRange + )?.dictCode; + // this.changelisy(); + this.updata.routeName = this.$route.query.routeName; + // this.updata.specialDiseaseRouteId = this.$route.query.id; + selectSpecialDisease(this.updata.id).then((res) => { + loading.close(); + this.agreeNumber = res.data.agreeNumber; + this.totalNumber = res.data.totalNumber; + res.data.specialDiseaseNodeList.forEach((e) => { + console.log(e, "eeeeeeeeeeeeeeeee"); + if(e.messagePushSign){ + e.messagePushSign = "" + e.messagePushSign; + + }if( e.officialPushSign ){ + e.officialPushSign = "" + e.officialPushSign; + + } + if(e.appletPushSign){ + e.appletPushSign = "" + e.appletPushSign; + + } + if(e.phonePushSign){ + e.phonePushSign = ""+e.phonePushSign + + } + }); + this.lists = this.handleData( + res.data.specialDiseaseNodeList, + "routeNodeDay", + "routeNodeName" + ); + this.form = this.lists[0].list[0]; if (this.form.taskType) { - this.changeTaskType(this.form.taskType, this.form.taskSubdivision) + this.changeTaskType(this.form.taskType, this.form.taskSubdivision); } - }) - this.$refs.wangeditor.disable(); - }) + }); + } else { + loading.close(); + this.lists.push({ + routeNodeName: "", + routeNodeDay: "", + list: [ + { + nodeContent: "

", + templateId: "", + templateName: "", + taskType: "", + taskSubdivision: "", + taskSubdivisionName: "", + taskStatus: "", + secondClassifyDescribe: "", + executionTime: "", + appletPushSign: "0", + officialPushSign: "0", + messagePushSign: "0", + messagePreview: "", + officialRemindContent: "", + taskSubdivisiontemplateType: "", + appletRemindContent: "", + appletPromptDescription: "", + }, + ], + }); + this.form = this.lists[0].list[0]; + console.log(this.form, "6555555555555555"); + } }, handleData(list, key, keytwo) { //得到数据的主键列表 @@ -447,6 +685,18 @@ export default { this.form.templateId = item.templateId this.form.templateName = item.templateName }, + // 短信 + messageontemplateMESSAGE(item) { + this.form.phoneMessageTemplateId = item.templateId; + this.form.phoneMessageTemplateName = item.templateName; + this.form.messagePreview = item.templateContent; + }, + // 话术 + messageontemplateword(item) { + this.form.phoneTemplateId = item.templateId; + this.form.phoneTemplateName = item.templateName; + // this.form.messagePreview = item.templateContent; + }, //宣教传值 propagandaontemplate(item) { this.form.templateId = item.templateId @@ -516,31 +766,39 @@ export default { }) }, addlist() { + list(this.parentDictCode).then((res) => { + // this.parentDictCodelist = res.rows; + res.rows.forEach((e) => { + this.lists.forEach((el) => { + el.routeNodeName = e.dictLabel; + }); + }); + }); this.lists.push({ routeNodeName: "", - routeNodeDay: '', + routeNodeDay: "", list: [ { - nodeContent: '

', - templateId: '', - templateName: '', - taskType: '', - officialRemindContent: '', - taskSubdivision: '', - taskSubdivisionName: '', - appletRemindContent: '', - appletPromptDescription: '', - taskStatus: '', - secondClassifyDescribe: '', - executionTime: '', - appletPushSign: '0', - officialPushSign: '0', - messagePushSign: '0', - messagePreview: '', - taskSubdivisiontemplateType: '', + nodeContent: "

", + templateId: "", + templateName: "", + taskType: "", + officialRemindContent: "", + taskSubdivision: "", + taskSubdivisionName: "", + appletRemindContent: "", + appletPromptDescription: "", + taskStatus: "", + secondClassifyDescribe: "", + executionTime: "", + appletPushSign: "0", + officialPushSign: "0", + messagePushSign: "0", + messagePreview: "", + taskSubdivisiontemplateType: "", }, - ] - }) + ], + }); }, additem(item) { item.list.push({ @@ -691,8 +949,6 @@ export default { padding: 20px 50px 0px 20px; .flextwo { - display: flex; - align-items: center; margin-top: 20px; .text { @@ -700,6 +956,12 @@ export default { color: #64666a; } + ::v-deep .el-input__inner { + color: black !important; + background-color: #fff !important; + cursor: default !important; + } + .textarea { width: 90%; padding: 0 10px; @@ -728,15 +990,20 @@ export default { .flex { display: flex; + width: 100%; align-items: center; + // background: red; justify-content: space-between; .pushMethod { height: 30px; + margin-top: 30px; line-height: 30px; font-size: 13px; color: #64666a; - + .spanname { + pointer-events: none; + } ::v-deep .el-input__inner { color: black; font-size: 13px; diff --git a/src/views/system/record/record.vue b/src/views/system/record/record.vue index 6059013..661f218 100644 --- a/src/views/system/record/record.vue +++ b/src/views/system/record/record.vue @@ -332,7 +332,7 @@ Date: Tue, 18 Jun 2024 14:50:35 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E6=82=A3=E8=80=85-?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/ManuallyCreatingTasks/index.vue | 332 +++++++++++++++--- 1 file changed, 292 insertions(+), 40 deletions(-) diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index 675152d..f5fc7bb 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -5,25 +5,43 @@ 保存
- + - +
触发条件 - 添加触发条件 + 添加触发条件
-
-
+
+
触发条件{{ index + 1 }}
@@ -33,14 +51,24 @@ - + - - + +
@@ -51,20 +79,35 @@
- +
- + - + 天
- +
@@ -80,8 +123,10 @@
-
+
@@ -92,57 +137,192 @@ 人工随访 - + + - - + + - + - + - + 天
-
+
推送方式：短信 - +
推送方式：公众号 - +
推送方式：小程序 - +
-
- 推送方式：人工电话 - - +
+
+
+ 推送方式： + 人工电话 +
+
+ 模板： + +
+
+ + +
+
+
+
+ 重播次数： + + + + + + +
+
+ 时间间隔: + + + + +
+
+ 短信提醒： + + + + +
+
+ 短信模板： + + + + + + +
+
+
+
@@ -150,17 +330,21 @@ + + \ No newline at end of file diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index 2843a21..6d30d1d 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -50,8 +50,8 @@
- + @@ -84,8 +84,10 @@
- + + @@ -130,13 +132,16 @@ + + \ No newline at end of file From 9b196899aeeb5721c1985c0df9dbd779e29d0ed4 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 18 Jun 2024 17:46:55 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/record/record.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/system/record/record.vue b/src/views/system/record/record.vue index 661f218..7c6c141 100644 --- a/src/views/system/record/record.vue +++ b/src/views/system/record/record.vue @@ -403,6 +403,7 @@ import { selectPatientQuestionSubmit, } from "@/api/system/taskExecuteRecord"; import { getScript } from "@/api/manage/script"; +import { getAgencytype } from "@/api/system/agency"; export default { components: { message, @@ -436,6 +437,8 @@ export default { created() { console.log(this.$route.query); this.info(); + this.infolistMESSAGE(); + this.infolistword() // 文字提醒 if (this.$route.query.textRemindContent) { this.formlists.textRemindContent = this.$route.query.textRemindContent; From d749d10ccb934332154cfdfa96f15fdd03032f06 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 18 Jun 2024 17:53:35 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/servicepackage/index.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue index 196835f..3aa16c9 100644 --- a/src/views/manage/servicepackage/index.vue +++ b/src/views/manage/servicepackage/index.vue @@ -272,7 +272,7 @@ + :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/> @@ -300,7 +300,7 @@ + :limit.sync="querydisease.pageSize" @pagination="infodisease" class="pag" /> @@ -1148,6 +1148,13 @@ export default { };