From f791f9b145f9bf85444a48c611cbeaaaf738cf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 20 Mar 2024 11:06:58 +0800 Subject: [PATCH 1/4] =?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/api/manage/signRecord.js | 10 ++- src/views/manage/continueSigning/index.vue | 90 ++++++++++++++++++---- src/views/manage/newSigning/index.vue | 61 ++++++++++++--- src/views/manage/preHospitalized/index.vue | 2 +- src/views/manage/signRecord/index.vue | 5 +- 5 files changed, 138 insertions(+), 30 deletions(-) diff --git a/src/api/manage/signRecord.js b/src/api/manage/signRecord.js index f1a3e2a..ef5ab01 100644 --- a/src/api/manage/signRecord.js +++ b/src/api/manage/signRecord.js @@ -59,4 +59,12 @@ export function servicepackageinfo(query) { method: 'get', params: query }) -} \ No newline at end of file +} + +// 获取服务包基础信息 +export function getById(id) { + return request({ + url: `/manage/servicepackage/getById/${id}`, + method: 'get', + }) +} diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue index 06056e3..103df3f 100644 --- a/src/views/manage/continueSigning/index.vue +++ b/src/views/manage/continueSigning/index.vue @@ -23,7 +23,7 @@ {{ list.patientName }} {{ list.sex == 'MALE' ? '男' : '' }}{{ list.sex == 'FEMALE' ? '女' : '' }} - {{ list.age }} + {{ list.patientPhone }} {{ list.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : list.visitMethod == @@ -35,9 +35,6 @@ {{ list.inHospitalNumber }} {{ list.hospitalAgencyName }} {{ list.departmentName }} - {{ list.packagePaymentStatus == 'PAID' ? '已缴费' : '' }} - {{ list.packagePaymentStatus == 'UNPAID_FEES' ? '未缴费' : '' }} - @@ -56,14 +53,23 @@ + + + + + + + +
- - + 年 月 日 @@ -72,13 +78,13 @@ + @change="changestarttime" placeholder="选择日期" style="width:150px"> 至 - @@ -130,6 +136,9 @@ import { import { addsign } from '@/api/manage/newSigning.js' +import { + getById +} from '@/api/manage/signRecord.js' import { getAge } from "@/utils/age"; import { getToken } from '@/utils/auth' export default { @@ -195,19 +204,72 @@ export default { methods: { //签约详情 info() { + let datetime = new Date(); + let year = datetime.getFullYear(); + let month = datetime.getMonth() + 1; + let day = datetime.getDate(); + month >= 1 && month <= 9 ? (month = "0" + month) : ""; + day >= 0 && day <= 9 ? (day = "0" + day) : ""; getByRecordId(this.$route.query.patientSignRecordId).then(res => { this.list = res.data - this.signPackage.packageName = this.list.packageName - this.signPackage.packageId = this.list.servicePackageId - this.signPackage.serviceCycle = this.list.serviceCycle - this.signPackage.serviceStartTime = this.list.serviceStartTime - this.signPackage.serviceEndTime = this.list.serviceEndTime - this.signPackage.packagePrice = this.list.packagePrice + this.signPackage.packagePaymentStatus = res.data.packagePaymentStatus + // this.signPackage.packageName = this.list.packageName + // this.signPackage.packageId = this.list.servicePackageId + // this.signPackage.serviceCycle = this.list.serviceCycle + // this.signPackage.serviceStartTime = this.list.serviceStartTime + // this.signPackage.serviceEndTime = this.list.serviceEndTime + // this.signPackage.packagePrice = this.list.packagePrice this.form.devices = this.list.signDevices this.form.record = this.list this.list.age = this.list.birthDate ? getAge(this.list.birthDate) : '' + getById(res.data.servicePackageId).then(resp => { + this.signPackage = { ...this.signPackage, ...resp.data } + this.signPackage.serviceStartTime = `${year}-${month}-${day}` + this.signPackage.servicePackageId = resp.data.id + this.obtainendtime(this.signPackage) + }) }) }, + //获取endtime + obtainendtime(item) { + if (item.packageTermUnit == '年') { + const nextdate = new Date(this.signPackage.serviceStartTime); + nextdate.setFullYear(nextdate.getFullYear() + Number(item.packageTerm)); + nextdate.setDate(nextdate.getDate() - 1); + let nextYear = nextdate.getFullYear(); + let nextMonth = this.checkMonth(nextdate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = this.checkMonth(nextdate.getDate()) + let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + this.signPackage.serviceEndTime = nextDate + } else if (item.packageTermUnit == '月') { + const currentDate = new Date(this.signPackage.serviceStartTime); + currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月 + currentDate.setDate(currentDate.getDate() - 1); // 减一天 + let nextYear = currentDate.getFullYear(); + let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = this.checkMonth(currentDate.getDate()) + let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + this.signPackage.serviceEndTime = nextDate + } else if (item.packageTermUnit == '日') { + let currentDate = new Date(this.signPackage.serviceStartTime) + currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm))); + let nextYear = currentDate.getFullYear(); + let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = this.checkMonth(currentDate.getDate()) + let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + this.signPackage.serviceEndTime = nextDate + } + }, + checkMonth(i) { + if (i < 10) { + i = "0" + i; + } + return i; + }, + //选择开始时间 + changestarttime(item) { + this.obtainendtime(this.signPackage) + }, //续约 signupload() { const files = this.$refs.upload.uploadFiles diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index be4bcee..521f960 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -11,7 +11,7 @@ {{ $route.query.patientName }} {{ $route.query.sex == 'MALE' ? '男' : '' }}{{ $route.query.sex == 'FEMALE' ? '女' : '' }} - {{ $route.query.age }} + {{ $route.query.patientPhone }} {{ $route.query.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : $route.query.visitMethod == @@ -38,8 +38,8 @@ - - + @@ -157,7 +157,7 @@ export default { packagePaymentStatus: [ { required: true, message: '缴费状态不能为空', trigger: 'change' } ], - servicePackageld: [ + servicePackageId: [ { required: true, message: '请选择服务包', trigger: 'change' } ], devices: { @@ -190,14 +190,48 @@ export default { }, methods: { tappackage(id) { - this.signPackage = { ...this.signPackage, ...this.packagelist.find(e => e.id == id) } - let currentDate = new Date(); - let year = currentDate.getFullYear(); - let month = currentDate.getMonth() + 1; - let day = currentDate.getDate(); + let item = this.packagelist.find(e => e.id == id) + this.signPackage = { ...this.signPackage, ...item } + let datetime = new Date(); + let year = datetime.getFullYear(); + let month = datetime.getMonth() + 1; + let day = datetime.getDate(); month >= 1 && month <= 9 ? (month = "0" + month) : ""; day >= 0 && day <= 9 ? (day = "0" + day) : ""; this.signPackage.serviceStartTime = `${year}-${month}-${day}` + if (item.packageTermUnit == '年') { + const nextdate = new Date(this.signPackage.serviceStartTime); + nextdate.setFullYear(nextdate.getFullYear() + Number(item.packageTerm)); + nextdate.setDate(nextdate.getDate() - 1); + let nextYear = nextdate.getFullYear(); + let nextMonth = this.checkMonth(nextdate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = this.checkMonth(nextdate.getDate()) + let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + this.signPackage.serviceEndTime = nextDate + } else if (item.packageTermUnit == '月') { + const currentDate = new Date(this.signPackage.serviceStartTime); + currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月 + currentDate.setDate(currentDate.getDate() - 1); // 减一天 + let nextYear = currentDate.getFullYear(); + let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = this.checkMonth(currentDate.getDate()) + let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + this.signPackage.serviceEndTime = nextDate + } else if (item.packageTermUnit == '日') { + let currentDate = new Date(this.signPackage.serviceStartTime) + currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm))); + let nextYear = currentDate.getFullYear(); + let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = this.checkMonth(currentDate.getDate()) + let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + this.signPackage.serviceEndTime = nextDate + } + }, + checkMonth(i) { + if (i < 10) { + i = "0" + i; + } + return i; }, //签约 signupload() { @@ -209,8 +243,8 @@ export default { } }, uploadsave() { - if (this.signPackage.servicePackageld) { - this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageld).packageName + if (this.signPackage.servicePackageId) { + this.signPackage.packageName = this.packagelist.find(e => e.id == this.signPackage.servicePackageId).packageName } this.form.signPackage = this.signPackage addsign(this.form).then(res => { @@ -219,7 +253,10 @@ export default { cancelButtonText: '取消', type: 'success' }).then(() => { - this.$router.go(-1); + // this.$router.go(-1); + this.$router.push({ + path: "/patient/signRecord", + }); }).catch(() => { this.$modal.msgSuccess("签约成功"); }); diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue index 126194e..e849aae 100644 --- a/src/views/manage/preHospitalized/index.vue +++ b/src/views/manage/preHospitalized/index.vue @@ -477,7 +477,7 @@ export default { this.$router.push({ path: "/patient/patientdetails", query: { - patientId: row.id, + patientId: row.patientId, cardNo: row.cardNo, patientName: row.patientName, patientPhone: row.patientPhone, diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index 245e7df..460167a 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -421,12 +421,13 @@ export default { signDiagnosis: row.signDiagnosis, visitSerialNumber: row.visitSerialNumber, hospitalAgencyName: row.hospitalAgencyName, + hospitalAgencyId: row.hospitalAgencyId, inHospitalNumber: row.inHospitalNumber, departmentName: row.departmentName, paymentStatus: row.paymentStatus, sex: row.sex, age: row.birthDate ? getAge(row.birthDate) : '', - patientId: row.id, + patientId: row.patientId, createTime: row.createTime, }, }); @@ -512,7 +513,7 @@ export default { this.$router.push({ path: "/patient/patientdetails", query: { - patientId: row.id, + patientId: row.patientId, cardNo: row.cardNo, patientName: row.patientName, patientPhone: row.patientPhone, From 6569d4fd53d3475431199d11523e41a299605cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 20 Mar 2024 11:31:50 +0800 Subject: [PATCH 2/4] =?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/utils/obtainendtime.js | 35 ++++++++++++++ src/views/manage/continueSigning/index.vue | 53 +++++--------------- src/views/manage/newSigning/index.vue | 50 +++++-------------- src/views/manage/signRecord/index.vue | 56 ++++++++++++---------- 4 files changed, 90 insertions(+), 104 deletions(-) create mode 100644 src/utils/obtainendtime.js diff --git a/src/utils/obtainendtime.js b/src/utils/obtainendtime.js new file mode 100644 index 0000000..b502b83 --- /dev/null +++ b/src/utils/obtainendtime.js @@ -0,0 +1,35 @@ +//获取endtime +function obtainendtime(starttime, item) { + let currentDate = new Date(starttime) + let nextDate + console.log(item) + if (item.packageTermUnit == '年') { + currentDate.setFullYear(currentDate.getFullYear() + Number(item.packageTerm)); + currentDate.setDate(currentDate.getDate() - 1); + let nextYear = currentDate.getFullYear(); + let nextMonth = checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = checkMonth(currentDate.getDate()) + nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + } else if (item.packageTermUnit == '月') { + currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月 + currentDate.setDate(currentDate.getDate() - 1); // 减一天 + let nextYear = currentDate.getFullYear(); + let nextMonth = checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = checkMonth(currentDate.getDate()) + nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + } else if (item.packageTermUnit == '日') { + currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm))); + let nextYear = currentDate.getFullYear(); + let nextMonth = checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 + let nextday = checkMonth(currentDate.getDate()) + nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" + } + return nextDate +} +function checkMonth(i) { + if (i < 10) { + i = "0" + i; + } + return i; +} +export { obtainendtime } diff --git a/src/views/manage/continueSigning/index.vue b/src/views/manage/continueSigning/index.vue index 103df3f..9f83bef 100644 --- a/src/views/manage/continueSigning/index.vue +++ b/src/views/manage/continueSigning/index.vue @@ -140,6 +140,7 @@ import { getById } from '@/api/manage/signRecord.js' import { getAge } from "@/utils/age"; +import { obtainendtime } from "@/utils/obtainendtime"; import { getToken } from '@/utils/auth' export default { dicts: ['hardware_type'], @@ -226,49 +227,13 @@ export default { this.signPackage = { ...this.signPackage, ...resp.data } this.signPackage.serviceStartTime = `${year}-${month}-${day}` this.signPackage.servicePackageId = resp.data.id - this.obtainendtime(this.signPackage) + this.signPackage.serviceEndTime = obtainendtime(this.signPackage.serviceStartTime, this.signPackage) }) }) }, - //获取endtime - obtainendtime(item) { - if (item.packageTermUnit == '年') { - const nextdate = new Date(this.signPackage.serviceStartTime); - nextdate.setFullYear(nextdate.getFullYear() + Number(item.packageTerm)); - nextdate.setDate(nextdate.getDate() - 1); - let nextYear = nextdate.getFullYear(); - let nextMonth = this.checkMonth(nextdate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 - let nextday = this.checkMonth(nextdate.getDate()) - let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" - this.signPackage.serviceEndTime = nextDate - } else if (item.packageTermUnit == '月') { - const currentDate = new Date(this.signPackage.serviceStartTime); - currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月 - currentDate.setDate(currentDate.getDate() - 1); // 减一天 - let nextYear = currentDate.getFullYear(); - let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 - let nextday = this.checkMonth(currentDate.getDate()) - let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" - this.signPackage.serviceEndTime = nextDate - } else if (item.packageTermUnit == '日') { - let currentDate = new Date(this.signPackage.serviceStartTime) - currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm))); - let nextYear = currentDate.getFullYear(); - let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 - let nextday = this.checkMonth(currentDate.getDate()) - let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" - this.signPackage.serviceEndTime = nextDate - } - }, - checkMonth(i) { - if (i < 10) { - i = "0" + i; - } - return i; - }, //选择开始时间 changestarttime(item) { - this.obtainendtime(this.signPackage) + this.signPackage.serviceEndTime = obtainendtime(item, this.signPackage) }, //续约 signupload() { @@ -297,7 +262,11 @@ export default { cancelButtonText: '取消', type: 'success' }).then(() => { - this.$router.go(-1); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/patient/signRecord", + }); + }) }).catch(() => { this.$modal.msgSuccess("签约成功"); }); @@ -318,7 +287,11 @@ export default { }, handlePictureCardPreview(file) { }, goback() { - this.$router.go(-1); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/patient/signRecord", + }); + }) }, } }; diff --git a/src/views/manage/newSigning/index.vue b/src/views/manage/newSigning/index.vue index 521f960..e377697 100644 --- a/src/views/manage/newSigning/index.vue +++ b/src/views/manage/newSigning/index.vue @@ -131,6 +131,7 @@ import { servicepackageinfo } from '@/api/manage/signRecord.js' import { getToken } from '@/utils/auth' +import { obtainendtime } from "@/utils/obtainendtime"; export default { dicts: ['hardware_type'], name: "newSigning", @@ -199,39 +200,7 @@ export default { month >= 1 && month <= 9 ? (month = "0" + month) : ""; day >= 0 && day <= 9 ? (day = "0" + day) : ""; this.signPackage.serviceStartTime = `${year}-${month}-${day}` - if (item.packageTermUnit == '年') { - const nextdate = new Date(this.signPackage.serviceStartTime); - nextdate.setFullYear(nextdate.getFullYear() + Number(item.packageTerm)); - nextdate.setDate(nextdate.getDate() - 1); - let nextYear = nextdate.getFullYear(); - let nextMonth = this.checkMonth(nextdate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 - let nextday = this.checkMonth(nextdate.getDate()) - let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" - this.signPackage.serviceEndTime = nextDate - } else if (item.packageTermUnit == '月') { - const currentDate = new Date(this.signPackage.serviceStartTime); - currentDate.setMonth(currentDate.getMonth() + Number(item.packageTerm)); // 加一个月 - currentDate.setDate(currentDate.getDate() - 1); // 减一天 - let nextYear = currentDate.getFullYear(); - let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 - let nextday = this.checkMonth(currentDate.getDate()) - let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" - this.signPackage.serviceEndTime = nextDate - } else if (item.packageTermUnit == '日') { - let currentDate = new Date(this.signPackage.serviceStartTime) - currentDate = new Date(currentDate.setDate(currentDate.getDate() + Number(item.packageTerm))); - let nextYear = currentDate.getFullYear(); - let nextMonth = this.checkMonth(currentDate.getMonth() + 1);// 因日期中的月份表示为0-11，所以要显示正确的月份，需要 + 1 - let nextday = this.checkMonth(currentDate.getDate()) - let nextDate = nextYear + "-" + nextMonth + "-" + nextday; // "2019-05" - this.signPackage.serviceEndTime = nextDate - } - }, - checkMonth(i) { - if (i < 10) { - i = "0" + i; - } - return i; + this.signPackage.serviceEndTime = obtainendtime(this.signPackage.serviceStartTime, item) }, //签约 signupload() { @@ -253,10 +222,11 @@ export default { cancelButtonText: '取消', type: 'success' }).then(() => { - // this.$router.go(-1); - this.$router.push({ - path: "/patient/signRecord", - }); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/patient/signRecord", + }); + }) }).catch(() => { this.$modal.msgSuccess("签约成功"); }); @@ -287,7 +257,11 @@ export default { handlePictureCardPreview(file) { }, goback() { - this.$router.go(-1); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/patient/signRecord", + }); + }) }, } }; diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index 460167a..50edb23 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -411,26 +411,28 @@ export default { this.getList(); }, handlenewsign(row) { - this.$router.push({ - path: "/patient/newSigning", - query: { - departmentId: row.departmentId, - patientName: row.patientName, - patientPhone: row.patientPhone, - visitMethod: row.visitMethod, - signDiagnosis: row.signDiagnosis, - visitSerialNumber: row.visitSerialNumber, - hospitalAgencyName: row.hospitalAgencyName, - hospitalAgencyId: row.hospitalAgencyId, - inHospitalNumber: row.inHospitalNumber, - departmentName: row.departmentName, - paymentStatus: row.paymentStatus, - sex: row.sex, - age: row.birthDate ? getAge(row.birthDate) : '', - patientId: row.patientId, - createTime: row.createTime, - }, - }); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.replace({ + path: "/patient/newSigning", + query: { + departmentId: row.departmentId, + patientName: row.patientName, + patientPhone: row.patientPhone, + visitMethod: row.visitMethod, + signDiagnosis: row.signDiagnosis, + visitSerialNumber: row.visitSerialNumber, + hospitalAgencyName: row.hospitalAgencyName, + hospitalAgencyId: row.hospitalAgencyId, + inHospitalNumber: row.inHospitalNumber, + departmentName: row.departmentName, + paymentStatus: row.paymentStatus, + sex: row.sex, + age: row.birthDate ? getAge(row.birthDate) : '', + patientId: row.patientId, + createTime: row.createTime, + }, + }); + }) }, selectAgencyinfo() { let query = { @@ -501,12 +503,14 @@ export default { }, //续约 handleContinue(row) { - this.$router.push({ - path: "/patient/continueSigning", - query: { - patientSignRecordId: row.id, - }, - }); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.replace({ + path: "/patient/continueSigning", + query: { + patientSignRecordId: row.id, + }, + }); + }) }, /** 详情操作 */ handleAuthRole(row) { From 5c33f154e1ba712833d566ba2591c9095a13aad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Wed, 20 Mar 2024 11:33:48 +0800 Subject: [PATCH 3/4] =?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/system/addQuestionnaire/index.vue | 18 ++++++++++++++--- src/views/system/question/index.vue | 22 ++++++++++++--------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/views/system/addQuestionnaire/index.vue b/src/views/system/addQuestionnaire/index.vue index 1427579..549a76f 100644 --- a/src/views/system/addQuestionnaire/index.vue +++ b/src/views/system/addQuestionnaire/index.vue @@ -1033,7 +1033,11 @@ export default { cancelButtonText: '取消', type: 'success' }).then(() => { - this.$router.go(-1); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/question/question", + }); + }) }).catch(() => { this.$modal.msgSuccess("编辑保存成功"); }); @@ -1045,7 +1049,11 @@ export default { cancelButtonText: '取消', type: 'success' }).then(() => { - this.$router.go(-1); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/question/question", + }); + }) }).catch(() => { this.$modal.msgSuccess("新增保存成功"); }); @@ -1108,7 +1116,11 @@ export default { }) }, goback() { - this.$router.go(-1); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/question/question", + }); + }) }, } }; diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue index ed52632..654733d 100644 --- a/src/views/system/question/index.vue +++ b/src/views/system/question/index.vue @@ -259,18 +259,22 @@ export default { }, /** 新增按钮操作 */ handleAdd() { - this.$router.push({ - path: "/question/addQuestionnaire", - }); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/question/addQuestionnaire", + }); + }) }, /** 修改按钮操作 */ handleUpdate(row) { - this.$router.push({ - path: "/question/addQuestionnaire", - query: { - id: row.id, - }, - }); + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/question/addQuestionnaire", + query: { + id: row.id, + }, + }); + }) }, /** 删除按钮操作 */ handleDelete(row) { From ef6dfd0e7e74c53b02bd9ccab791bf9de9a71f5c Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 20 Mar 2024 13:04:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A3=E6=95=99=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/propaganda/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/manage/propaganda/index.vue b/src/views/manage/propaganda/index.vue index 7586a00..635759d 100644 --- a/src/views/manage/propaganda/index.vue +++ b/src/views/manage/propaganda/index.vue @@ -740,7 +740,7 @@ export default { // 表单校验 rules: { departmentId: [ - { required: true, message: "科室不能为空", trigger: "blur" } + { required: true, message: "科室名称不能为空", trigger: "blur" } ], propagandaType: [ { required: true, message: "宣教类型不能为空", trigger: "blur" } @@ -1019,6 +1019,7 @@ export default { propagandaStatus:null, departmentName: null, propagandaTitle: null, + departmentId:null, propagandaType: null, propagandaCode: null, propagandaContent: null, @@ -1242,4 +1243,4 @@ audio { font-size: 16px; } } - \ No newline at end of file +