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 @@ 取消发布 发布 - 复制 + 编辑