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 1987682..285158d 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -82,13 +82,14 @@
-
-
+
+
+
@@ -118,9 +119,6 @@ export default {
isEdit: {
type: Boolean,
default: false
- },
- isPm: {
- type: Boolean
}
},
data() {
@@ -136,7 +134,6 @@ export default {
eyeType: '',
pupilDilate: '',
pupilShrink: '',
- date: '',
date1: '',
date2: ''
},
@@ -147,23 +144,15 @@ export default {
}
},
computed: {
- timeRange() {
- return this.isPm ? {
- start: '12:00',
- step: '00:15',
- end: '21:30'
- } : {
- start: '07:30',
- step: '00:15',
- end: '12:00'
- }
- },
dataRule() {
return {
patientId: [
{ required: true, message: '请选择患者' }
],
- date: [
+ date1: [
+ { required: true, message: '请选择日期' }
+ ],
+ date2: [
{ required: true, message: '请选择时间' }
]
}
@@ -180,8 +169,9 @@ export default {
this.form.pupilShrink = this.patientDetail.pupilShrink
this.form.remark = this.patientDetail.remark
this.form.yzOpen = this.patientDetail.yzOpen
+ this.form.date = this.patientDetail.appointDate
this.form.date1 = this.patientDetail.appointDate.split(' ')[0]
- this.form.date2 = this.patientDetail.appointDate.split(' ')[1].substring(0, 5)
+ this.form.date2 = this.patientDetail.appointDate.split(' ')[1]
this.patientInfo = this.patientDetail
}
},
@@ -218,7 +208,7 @@ export default {
return false
}
const params = {
- appointDate: `${this.form.date1} ${this.form.date2}:00`,
+ appointDate: `${this.form.date1} ${this.form.date2}`,
patientName: this.patientInfo.patientName,
jzNumber: this.patientInfo.jzNumber,
appointSource: this.patientInfo.source,
@@ -234,7 +224,7 @@ export default {
})
} else {
const params = {
- appointDate: `${this.form.date1} ${this.form.date2}:00`,
+ appointDate: `${this.form.date1} ${this.form.date2}`,
doctorId: this.form.doctorId,
doctorName: this.form.doctorName,
patientId: this.form.patientId,
@@ -293,3 +283,4 @@ input{
}
}
+
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
index e93b4cc..67281e1 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
@@ -573,8 +573,6 @@ export default {
this.$nextTick(() => {
this.$refs.addScheduleRef.dataForm.title = '预约医生'
this.$refs.addScheduleRef.dataForm.doctorName = item.doctorName
- // this.$refs.addScheduleRef.dataForm.doctorCode = item.doctorCode
- // this.$refs.addScheduleRef.dataForm.operaName = item.expertise
this.$refs.addScheduleRef.dataForm.operaTime = flag === 'morning' ? weekInfoItem.date + ' 07:30:00' : weekInfoItem.date + ' 14:00:00'
this.$refs.addScheduleRef.params = item
this.$refs.addScheduleRef.init()
@@ -607,8 +605,6 @@ export default {
this.$refs.numberManageRef.projectName = item.itemName
this.$refs.numberManageRef.weekName = weekInfoItem.weekName
this.$refs.numberManageRef.morOrAft = morOrAft
- // this.$refs.numberManageRef.dataForm.doctorCode = item.doctorCode
- // this.$refs.numberManageRef.dataForm.operaDate = weekInfoItem.date
this.$refs.numberManageRef.init()
})
},
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
index 40a77c1..b20be98 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
@@ -27,7 +27,6 @@