diff --git a/public/index.html b/public/index.html index 708e470..6192670 100644 --- a/public/index.html +++ b/public/index.html @@ -39,8 +39,8 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% } %> diff --git a/src/page-subspecialty/views/modules/formList/mraOrder.vue b/src/page-subspecialty/views/modules/formList/mraOrder.vue index f1fb90e..c223af4 100644 --- a/src/page-subspecialty/views/modules/formList/mraOrder.vue +++ b/src/page-subspecialty/views/modules/formList/mraOrder.vue @@ -32,7 +32,12 @@
- 出生日期: +
+ 出生日期: +
+
+ 来源: +
@@ -254,7 +259,8 @@ export default { isPrint: '', examineDate: '', checkAdvice: '', - docAdvice: '' + docAdvice: '', + source: '' }, context: [ { @@ -307,7 +313,7 @@ export default { }) }, handleSaveTable() { - this.formData.jzNumber = window.sessionStorage.getItem('jzNumber') + this.formData.jzNumber = window.sessionStorage.getItem('jzNumber') || this.$route.query.jzNumber || '' this.$http.post('/mzbl/saveMzblYdxgzy', { caseId: this.caseId, ...this.formData @@ -315,6 +321,21 @@ export default { this.$emit('handleSaveTable') }) }, + // 新增预约时数据带入 + queryOrderForm() { + this.$http.get('/mzbl/getLastAppointInfo', { params: { + patientId: this.formData.patientId + }}).then(data => { + const formDetail = data.data.data + this.formData.source = formDetail.source + this.formData.remark = formDetail.remark + this.formData.project = formDetail.project + this.formData.doctor = formDetail.doctor + this.formData.checkAdvice = formDetail.checkAdvice + this.formData.examineDate = formDetail.examineDate + this.formData.lightEye = formDetail.lightEye + }) + }, getOrderDetail() { this.$http.get('/mzbl/getMzblYdxgzyInfo', { params: { caseId: this.caseId, @@ -330,6 +351,7 @@ export default { this.formData.patientId = this.patientDetail.patientId this.formData.patientBirthday = this.$moment(this.patientDetail.patientBirthday).format('YYYY-MM-DD') this.formData.patientPhone = this.patientDetail.patientPhone + this.queryOrderForm() } }) }, diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue index 137ee98..3d09ce3 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue @@ -39,20 +39,7 @@ - - - +
@@ -166,13 +153,6 @@ export default { startTime: '08:30', step: '00:15', endTime: '18:00', - options: [{ - value: 'FFA', - label: 'FFA' - }, { - value: 'ICGA', - label: 'ICGA' - }], doctorList: [] } }, @@ -301,13 +281,15 @@ export default { this.$emit('closeDialog') }, goFormList() { + this.handleSave() if (this.patientInfo) { const { href } = this.$router.resolve({ path: '/360view', query: { onlyRead: false, isSearch: '2', - patientId: this.patientInfo.patientId + patientId: this.patientInfo.patientId, + jzNumber: this.patientInfo.jzNumber } }) window.open(href, '_blank')