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 cc77908..1987682 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue @@ -74,35 +74,23 @@ - - + + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - 打印 @@ -130,6 +118,9 @@ export default { isEdit: { type: Boolean, default: false + }, + isPm: { + type: Boolean } }, data() { @@ -156,6 +147,17 @@ 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: [ @@ -178,9 +180,8 @@ 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] + this.form.date2 = this.patientDetail.appointDate.split(' ')[1].substring(0, 5) this.patientInfo = this.patientDetail } }, @@ -217,7 +218,7 @@ export default { return false } const params = { - appointDate: this.$moment(this.form.date).format('YYYY-MM-DD HH:mm:ss'), + appointDate: `${this.form.date1} ${this.form.date2}:00`, patientName: this.patientInfo.patientName, jzNumber: this.patientInfo.jzNumber, appointSource: this.patientInfo.source, @@ -233,7 +234,7 @@ export default { }) } else { const params = { - appointDate: this.$moment(this.form.date).format('YYYY-MM-DD HH:mm:ss'), + appointDate: `${this.form.date1} ${this.form.date2}:00`, doctorId: this.form.doctorId, doctorName: this.form.doctorName, patientId: this.form.patientId, 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 d3c0290..e93b4cc 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 @@ -375,11 +375,8 @@ export default { mounted() { const index = _.findIndex(this.days, function (o) { - // console.log('o: ', o.getDate()); - // console.log('new Date().getDate(): ', new Date().getDate()); return o.getDate() === new Date().getDate(); }); - console.log("index: ", index); this.tabIndex = index; }, @@ -568,18 +565,16 @@ export default { }, // 默认开关 switchChange(index,e) { - console.log(index,e); this.doctorList[index].isDefault = e ? 1 : 0 }, // 新增日程安排 addPatientHandle(item, weekInfoItem, flag) { - // console.log(weekInfoItem); this.addScheduleVisible = true 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.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() @@ -612,8 +607,8 @@ 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.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 473c1bb..40a77c1 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,6 +27,7 @@ { - this.$refs.dataForm ? this.$refs.dataForm.resetFields() : '' // 重置表单 - this.dataForm.morOrAft = this.morOrAft - }) }, addOrder() { this.addPatientVisible = true @@ -137,90 +111,6 @@ export default { }) }) }, - // 获取排台管理列表 - async getSourceList() { - const { data: res } = await this.$http.get('/num/source/getList', { - params: { - doctorCode: this.dataForm.doctorCode, // 医生工号 - morOrAft: this.morOrAft, // morOrAft --1:上午,2:下午 - searchDate: this.dataForm.operaDate // 搜索日期 - } - }) - if (res.code === 0) { - this.dataList = res.data - // 选中哪一行 - this.dataList.forEach((item, index) => { - if (this.rowListObj.id === item.id) { - this.rowListObj.operaTime && this.$refs.multipleTable ? this.$refs.multipleTable.setCurrentRow(this.dataList[index]) : '' - } - }) - } else { - this.$message.error(res.msg) - } - }, - // 表格批量选择 - handleSelectionChange(val) { - // console.log(val) - this.currentTableList = val - this.currentTableId = [] - this.currentTableList.forEach(item => { - this.currentTableId.push(item.id) - }) - }, - // 点击行 - rowClick(val) { - console.log('点击rowClick', val) - this.rowListObj = val - }, - // 把每一行的索引放进row - tableRowClassName({ row, rowIndex }) { - row.index = rowIndex - }, - // 修改 - editHandle(scopeRow) { - this.editOperationVisible = true - this.$nextTick(() => { - this.$refs.editOperationRef.dataForm.operaTime = scopeRow.appointmentTime.substr(0, 5) - this.$refs.editOperationRef.dataForm.morOrAft = scopeRow.morOrAft - this.$refs.editOperationRef.patientInfo = scopeRow - - this.$refs.editOperationRef.init() - }) - }, - // 删除 - async deleteHandle(scopeRow) { - this.deleteClickFun([scopeRow.id]) - }, - // 批量删除 - batchDeleteClick() { - if (this.currentTableId.length > 0) { - this.deleteClickFun(this.currentTableId) - } else { - this.$message({ - message: '请选择删除项', - type: 'warning' - }) - } - }, - // 删除--保存过的预约号 - deleteClickFun(id) { - this.$confirmFun('您确定要删除吗?').then(async() => { - const { data: res } = await this.$http({ - url: '/num/source', - method: 'delete', - data: id - }) - if (res.code === 0) { - this.$message({ - message: '删除成功', - type: 'success' - }) - this.getSourceList() - } else { - this.$message.error(res.msg) - } - }) - }, closeAddDialog() { this.addPatientVisible = false },