From 84a24f9413aaaa95f5cc48b97adb0223f703799d Mon Sep 17 00:00:00 2001 From: bianyaqi Date: Thu, 20 Apr 2023 11:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=B2=BB=E7=96=97=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outPatientRecord/leftFormList.vue | 39 +++++++++---- .../modules/nurseManagement/numberManage.vue | 56 ++++++++++++------- .../{nurseSchedule => reservation}/index.vue | 4 +- .../schedule/add-schedule.vue | 0 .../schedule/doctor-schedule.vue | 6 +- .../schedule/edit-operation.vue | 0 .../{ => reservation}/schedule/index.vue | 2 +- .../schedule/number-detail-manage.vue | 2 +- .../schedule/operation-detail.vue | 1 - .../schedule/setOperaTime.vue | 2 +- 10 files changed, 71 insertions(+), 41 deletions(-) rename src/page-subspecialty/views/modules/nurseManagement/{nurseSchedule => reservation}/index.vue (68%) rename src/page-subspecialty/views/modules/nurseManagement/{ => reservation}/schedule/add-schedule.vue (100%) rename src/page-subspecialty/views/modules/nurseManagement/{ => reservation}/schedule/doctor-schedule.vue (99%) rename src/page-subspecialty/views/modules/nurseManagement/{ => reservation}/schedule/edit-operation.vue (100%) rename src/page-subspecialty/views/modules/nurseManagement/{ => reservation}/schedule/index.vue (95%) rename src/page-subspecialty/views/modules/nurseManagement/{ => reservation}/schedule/number-detail-manage.vue (99%) rename src/page-subspecialty/views/modules/nurseManagement/{ => reservation}/schedule/operation-detail.vue (98%) rename src/page-subspecialty/views/modules/nurseManagement/{ => reservation}/schedule/setOperaTime.vue (99%) diff --git a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue index 5e5590f..7cbe8d3 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/leftFormList.vue @@ -21,20 +21,22 @@
- - - + -
-
-

{{ item }}

- +
+
+
+

{{ item }}

+ +
-
-

报告

- -
@@ -48,7 +50,20 @@ export default { return { formType: '门诊', defaultChecked: true, - outFormNameList: ['门急诊电子病历', '眼科激光手术患者知情同意书', '眼科激光手术治疗', '眼底血管造影知情同意书'] + formTypeList: [ + { + type: '门诊', + list: ['门急诊电子病历'] + }, + { + type: '治疗', + list: ['眼科激光手术患者知情同意书', '眼科激光手术治疗', '眼底血管造影知情同意书'] + }, + { + type: '其他', + list: ['报告'] + } + ] } }, methods: { diff --git a/src/page-subspecialty/views/modules/nurseManagement/numberManage.vue b/src/page-subspecialty/views/modules/nurseManagement/numberManage.vue index bf1d270..3379545 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/numberManage.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/numberManage.vue @@ -32,7 +32,7 @@ width="50" > @@ -61,7 +61,7 @@ width="50" > @@ -90,7 +90,7 @@ width="50" > - + > + + - + > + + + > + + + > + + @@ -286,10 +296,16 @@ export default { tableData: [ { projectName: '视诱发电位', - MonTime: false, - MonFront: false, - TuesTime: false, - WedTime: false, + monFront: false, + monAfter: false, + tuesFront: false, + tuesAfter: false, + webFront: false, + webAfter: false, + thurFront: false, + thurAfter: false, + friFront: false, + friAfter: false, ThurTime: false, FriTime: false, SatTime: false, diff --git a/src/page-subspecialty/views/modules/nurseManagement/nurseSchedule/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/index.vue similarity index 68% rename from src/page-subspecialty/views/modules/nurseManagement/nurseSchedule/index.vue rename to src/page-subspecialty/views/modules/nurseManagement/reservation/index.vue index b809d87..783b8ca 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/nurseSchedule/index.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/index.vue @@ -1,10 +1,10 @@ diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/add-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/add-schedule.vue similarity index 100% rename from src/page-subspecialty/views/modules/nurseManagement/schedule/add-schedule.vue rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/add-schedule.vue diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/doctor-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue similarity index 99% rename from src/page-subspecialty/views/modules/nurseManagement/schedule/doctor-schedule.vue rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue index 2d5379c..40b4057 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/schedule/doctor-schedule.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue @@ -210,9 +210,9 @@ import moment from 'moment' import addSchedule from './add-schedule.vue' import _ from 'lodash' -import { dateFilterTwo } from '@/filters/index.js' -import NumberDetailManage from '@/page-subspecialty/views/modules/nurseManagement/schedule/number-detail-manage.vue' -import SetOperaTime from '@/page-subspecialty/views/modules/nurseManagement/schedule/setOperaTime.vue' +import { dateFilterTwo } from '@/filters' +import NumberDetailManage from '@/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue' +import SetOperaTime from '@/page-subspecialty/views/modules/nurseManagement/reservation/schedule/setOperaTime.vue' /* eslint-disable */ export default { props: { diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/edit-operation.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/edit-operation.vue similarity index 100% rename from src/page-subspecialty/views/modules/nurseManagement/schedule/edit-operation.vue rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/edit-operation.vue diff --git a/src/page-subspecialty/views/modules/nurseManagement/schedule/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/index.vue similarity index 95% rename from src/page-subspecialty/views/modules/nurseManagement/schedule/index.vue rename to src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/index.vue index 7a59015..427f025 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/schedule/index.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/index.vue @@ -19,7 +19,7 @@