diff --git a/src/views/manage/components/signingRecords.vue b/src/views/manage/components/signingRecords.vue index 15b57c2..3a57469 100644 --- a/src/views/manage/components/signingRecords.vue +++ b/src/views/manage/components/signingRecords.vue @@ -23,14 +23,13 @@ {{ 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 }} @@ -52,6 +51,8 @@ + @@ -67,6 +68,7 @@ export default { name: "signingRecords", data() { return { + srcList: [], //左侧类型选中 categoryindex: 0, //左侧选中的item @@ -92,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.push(e.informedFilePath) + }) }) }, clickcategory(item, index) { @@ -103,6 +109,11 @@ export default { }; - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/system/ManuallyCreatingTasks/index.vue b/src/views/system/ManuallyCreatingTasks/index.vue index a533e1c..f45165d 100644 --- a/src/views/system/ManuallyCreatingTasks/index.vue +++ b/src/views/system/ManuallyCreatingTasks/index.vue @@ -2,7 +2,7 @@
- 执行 + 执行
@@ -19,6 +19,11 @@ + + + + +
@@ -31,7 +36,7 @@ :color="listindex == index ? '#409EFF' : ''" @click.native='clicktimelineitem(item, index)'>
- + @@ -39,7 +44,7 @@ - + 天
@@ -47,52 +52,84 @@
-

2

-

3333333

+

+ {{ item.taskType == 'PHONE_OUTBOUND' ? "电话外呼" : "" }} + {{ item.taskType == 'QUESTIONNAIRE_SCALE' ? "问卷量表" : "" }} + {{ item.taskType == 'PROPAGANDA_ARTICLE' ? "宣教文案" : "" }} + {{ item.taskType == 'TEXT_REMIND' ? "文字提醒" : "" }} + {{ item.taskType == 'ARTIFICIAL_FOLLOW_UP' ? "人工随访" : "" }} +

- - - - 电话外呼 - 问卷量表 - 宣教文案 - 文字提醒 - 人工随访 - - - - - - - - - - - - - - - - - - - - - - +
+ + + + 电话外呼 + 问卷量表 + 宣教文案 + 文字提醒 + 人工随访 + + + + + + + + + + + + + + + + + + + + + + 天 + + +
+
+ 推送方式：短信 + + +
+
+ 推送方式：公众号 + + +
+
+ 推送方式：小程序 + + +
\ No newline at end of file diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue index 8036b48..8f1d595 100644 --- a/src/views/system/editorialSpecialization/index.vue +++ b/src/views/system/editorialSpecialization/index.vue @@ -8,7 +8,7 @@ - + @@ -26,8 +26,16 @@ 人工添加触发条件 + + + + + + +
-
+
主路径 {{ list.routeName }} @@ -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 => { + e.servicePackageId ? this.form.servicePackageId.push(e.servicePackageId) : '' + }) + //服务包 + servicepackageinfo({ departmentId: res.data.departmentId }).then(res => { + this.addpackagelist = res.data + }) }) }, edit() { @@ -318,25 +342,44 @@ export default { }, //保存 preserve() { - this.$confirm('是否确认保存?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - }).then(() => { - updateSpecialDiseaseRoute(this.form).then(response => { - this.$notify({ - type: 'success', - title: '提示', - message: '保存成功,即将返回上一页', - duration: 0 - }); - setTimeout(() => { - this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { - this.$router.push({ - path: "/specialdisease/specialDiseaseRoute", + 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.$refs["form"].validate(valid => { + if (valid) { + this.$confirm('是否确认保存?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + }).then(() => { + updateSpecialDiseaseRoute(this.form).then(response => { + this.$notify({ + type: 'success', + title: '提示', + message: '保存成功,即将返回上一页', + duration: 3000 }); - }) - }, 3000); - }); + setTimeout(() => { + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/specialdisease/specialDiseaseRoute", + }); + }) + }, 3000); + }); + }) + } }) }, //触发条件修改详情 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 @@ 取消发布 发布 - 复制 + 编辑