From fd8b0f1524a4f748fe3d797260b909dc9b0bf148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 9 Apr 2024 13:51:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/components/signingRecords.vue | 13 +++--- .../system/editorialSpecialization/index.vue | 43 ++++++++++++++++++- .../system/specialDiseaseRoute/index.vue | 4 +- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue index 15b57c2..8b66312 100644 --- a/src/views/manage/components/signingRecords.vue +++ b/src/views/manage/components/signingRecords.vue @@ -24,13 +24,15 @@ {{ ByRecord.packageName }} {{ - ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' ? - '未缴费' : '' - }} + ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' + ? + '未缴费' : '' + }} {{ ByRecord.serviceEndTime }} {{ ByRecord.packagePrice }} {{ ByRecord.serviceStartTime }} - {{ ByRecord.serviceCycle }}月 + {{ ByRecord.packageTerm }}{{ ByRecord.packageTermUnit }} + {{ ByRecord.signTime }} @@ -175,5 +177,4 @@ export default { } } } - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue index 8036b48..300dd23 100644 --- a/src/views/system/editorialSpecialization/index.vue +++ b/src/views/system/editorialSpecialization/index.vue @@ -8,7 +8,7 @@ - + @@ -26,6 +26,14 @@ 人工添加触发条件 + + + + + + +
@@ -172,6 +180,9 @@ import { import { specialDiseaseRoute, triggerConditiondel, specialDiseaseRoutedel, triggerConditionadd, triggerCondition, triggerConditionedit } from "@/api/system/editorialSpecialization"; +import { + servicepackageinfo +} from '@/api/manage/signRecord.js' export default { name: "editorialSpecialization", data() { @@ -181,6 +192,8 @@ export default { routeName: '', id: '', diseaseTypeName: '', + servicePackageId: [], + routePackageList: [], }, open: false, updata: { @@ -196,6 +209,9 @@ export default { updataform: {}, // 表单校验 rules: { + servicePackageId: [ + { required: true, message: '不能为空', trigger: 'change' } + ], routeName: [ { required: true, message: '不能为空', trigger: 'change' } ], @@ -203,7 +219,8 @@ export default { { required: true, message: '不能为空', trigger: 'change' } ], }, - list: undefined, + list: {}, + addpackagelist: [], }; }, created() { @@ -220,6 +237,13 @@ export default { specialDiseaseRoute(this.$route.query.id).then(res => { this.list = res.data this.list.percentage = this.list.agreeNumber / this.list.totalNumber * 100 + res.data.routePackageList.forEach(e => { + this.form.servicePackageId.push(e.servicePackageId) + }) + //服务包 + servicepackageinfo({ departmentId: res.data.departmentId }).then(res => { + this.addpackagelist = res.data + }) }) }, edit() { @@ -318,6 +342,21 @@ export default { }, //保存 preserve() { + if (this.form.servicePackageId?.length > 0 && this.addpackagelist?.length > 0) { + let routePackageList = [] + this.addpackagelist.forEach(e => { + this.form.servicePackageId.forEach(el => { + if (e.id == el) { + let item = { + servicePackageId: el, + packageName: e.packageName + } + routePackageList.push(item) + } + }) + }) + this.form.routePackageList = routePackageList + } this.$confirm('是否确认保存?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/system/specialDiseaseRoute/index.vue b/src/views/system/specialDiseaseRoute/index.vue index 2a49be7..32b6414 100644 --- a/src/views/system/specialDiseaseRoute/index.vue +++ b/src/views/system/specialDiseaseRoute/index.vue @@ -120,7 +120,7 @@ 取消发布 发布 - 复制 + 编辑 Date: Tue, 9 Apr 2024 13:54:00 +0800 Subject: [PATCH 2/8] =?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/components/signingRecords.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue index 8b66312..b15600e 100644 --- a/src/views/manage/components/signingRecords.vue +++ b/src/views/manage/components/signingRecords.vue @@ -23,11 +23,8 @@ {{ ByRecord.packageName }} - {{ - ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : ByRecord.packagePaymentStatus == 'UNPAID_FEES' - ? - '未缴费' : '' - }} + {{ ByRecord.packagePaymentStatus == 'PAID' ? '已缴费' : + ByRecord.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }} {{ ByRecord.serviceEndTime }} {{ ByRecord.packagePrice }} {{ ByRecord.serviceStartTime }} From c2e63da777f82a7334cf0ec317be236f807fbe3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 9 Apr 2024 14:02:17 +0800 Subject: [PATCH 3/8] =?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/components/signingRecords.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue index b15600e..431e3b0 100644 --- a/src/views/manage/components/signingRecords.vue +++ b/src/views/manage/components/signingRecords.vue @@ -51,6 +51,8 @@ +
@@ -66,6 +68,7 @@ export default { name: "signingRecords", data() { return { + srcList: [], //左侧类型选中 categoryindex: 0, //左侧选中的item @@ -91,6 +94,10 @@ export default { getByRecordIdinfo() { getByRecordId(this.categoryItem.id).then(res => { this.ByRecord = res.data + this.ByRecord.signPatientInformeds.forEach(e => { + e.informedFilePath = process.env.VUE_APP_BASE_API + e.informedFilePath + this.srcList(e.informedFilePath) + }) }) }, clickcategory(item, index) { @@ -102,6 +109,11 @@ export default { }; \ No newline at end of file From 810532a948d92de364c27035648f13a5ab13f195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Tue, 9 Apr 2024 14:59:14 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/ManuallyCreatingTasks/index.vue | 142 +++++++++++++----- 1 file changed, 101 insertions(+), 41 deletions(-) diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index a1d4262..a14631c 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -2,7 +2,7 @@
@@ -31,7 +31,7 @@ :color="listindex == index ? '#409EFF' : ''" @click.native='clicktimelineitem(item, index)'>
- + @@ -39,7 +39,7 @@ - +
@@ -59,48 +59,72 @@
- - - - 电话外呼 - 问卷量表 - 宣教文案 - 文字提醒 - 人工随访 - - - - - - - - - - - - - - - - - - - - - - +
+ + + + 电话外呼 + 问卷量表 + 宣教文案 + 文字提醒 + 人工随访 + + + + + + + + + + + + + + + + + + + + + + 天 + + +
+
+ 推送方式:短信 + + +
+
+ 推送方式:公众号 + + +
+
+ 推送方式:小程序 + + +