diff --git a/src/page-subspecialty/views/modules/formList/laserSurgery.vue b/src/page-subspecialty/views/modules/formList/laserSurgery.vue index 01ad9e6..9820a80 100644 --- a/src/page-subspecialty/views/modules/formList/laserSurgery.vue +++ b/src/page-subspecialty/views/modules/formList/laserSurgery.vue @@ -15,106 +15,134 @@

-
-
姓名：
-
年龄：岁
-
性别：
-
登记号：
+
+
+
姓名:
+
+
年龄:岁
+
性别:
+
登记号:
-
-
联系电话：
-
家庭住址：
+
+
+
联系电话:
+ +
+
家庭住址:
+
+
+
诊断:
+ +
+
+
+ 治疗眼别: +
+ + +
-
诊断：
-
治疗前
- - - - - - - - - - - - - - - -
ODOS
-
视力1：
-
疾病分期：
- 		-
-
示意图
- -
- 		-
视力2：
-
疾病分期：
- 		-
-
示意图
- -
-
+
+
+ 治疗前: +
+ + + + + + + + + + + +
+ 视力 + + 疾病分期 +
+ + + +
+
-
激光治疗
- - - - - - - - - - - - - - - -
ODOS
-
日期： - -
-
次数：
-
视力：
-
光斑大小：
-
功率：
-
点数：
- 		-
-
示意图
- -
- 		-
日期： - -
-
次数：
-
视力：
-
光斑大小：
-
功率：
-
点数：
- 		-
-
示意图
- -
-
+
+
+ 激光治疗: +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ 次数 + + +
+ 曝光时间 + + +
+ 光斑大小 + + +
+ 功率 + + +
+ 点数 + + +
+
+
示意图
+ +
+
+
+
+
操作人:
+ +
+
+
操作时间:
+ +
+
@@ -145,8 +173,6 @@ export default { }, data() { return { - curType: '', - curIndex: '', origin: '', confirmData: { patientAddress: '', @@ -158,85 +184,36 @@ export default { jzNumber: '', diagnostic: '', idList: [], + eyeType: '', // 治疗前 zlqSlOd: '', zlqJbfqOd: '', - zlqSytOd: '', - zlqSlOs: '', - zlqJbfqOs: '', - zlqSytOs: '', // 治疗后 jgzlCountOd1: '', - jgzlDateOd1: '', jgzlDsOd1: '', jgzlGbOd1: '', jgzlGlOd1: '', jgzlSlOd1: '', - jgzlSytOd1: '' + operator: '', + operationDate: '' }, // 治疗后 - treatData: [ - { - OD: { - date: '', - order: '', - vision: '', - flareSize: '', - power: '', - count: '', - imgSrc: '' - }, - OS: { - date: '', - order: '', - vision: '', - flareSize: '', - power: '', - count: '', - imgSrc: '' - } - }, - { - OD: { - date: '', - order: '', - vision: '', - flareSize: '', - power: '', - count: '', - imgSrc: '' - }, - OS: { - date: '', - order: '', - vision: '', - flareSize: '', - power: '', - count: '', - imgSrc: '' - } - }, - { - OD: { - date: '', - order: '', - vision: '', - flareSize: '', - power: '', - count: '', - imgSrc: '' - }, - OS: { - date: '', - order: '', - vision: '', - flareSize: '', - power: '', - count: '', - imgSrc: '' - } - } - ] + options: [{ + value: 'OD', + label: 'OD' + }, { + value: 'OS', + label: 'OS' + }], + treatData: { + date: '', + order: '', + vision: '', + flareSize: '', + power: '', + count: '', + imgSrc: '' + } } }, watch: { @@ -257,24 +234,12 @@ export default { this.getConfirmDetail() }, methods: { - editImg(val, index) { - this.curType = val - this.curIndex = index + editImg() { this.$refs.imgEditorRef.init() }, fullImgBack(val) { - switch (this.curType) { - case 'OD': - this.confirmData.zlqSytOd = val - break - case 'OS': - this.confirmData.zlqSytOs = val - break - case 'treat-OD': - this.formData.treatData[this.curIndex].OD.imgSrc = val - break - case 'treat-OS': - this.formData.treatData[this.curIndex].OS.imgSrc = val + if (val) { + this.treatData.imgSrc = val } }, getConfirmDetail() { @@ -290,43 +255,10 @@ export default { this.confirmData.zlqSlOs = detail.zlqSlOs || '' this.confirmData.zlqJbfqOs = detail.zlqJbfqOs || '' this.confirmData.zlqSytOs = detail.zlqSytOs || '' - // 治疗 - this.treatData.forEach((item, index) => { - item.OD.date = detail[`jgzlDateOd${index + 1}`] - item.OD.order = detail[`jgzlCountOd${index + 1}`] - item.OD.count = detail[`jgzlDsOd${index + 1}`] - item.OD.vision = detail[`jgzlSlOd${index + 1}`] - item.OD.power = detail[`jgzlGlOd${index + 1}`] - item.OD.flareSize = detail[`jgzlGbOd${index + 1}`] - item.OD.imgSrc = detail[`jgzlSytOd${index + 1}`] - item.OS.date = detail[`jgzlDateOs${index + 1}`] - item.OS.order = detail[`jgzlCountOs${index + 1}`] - item.OS.count = detail[`jgzlDsOs${index + 1}`] - item.OS.vision = detail[`jgzlSlOs${index + 1}`] - item.OS.power = detail[`jgzlGlOs${index + 1}`] - item.OS.flareSize = detail[`jgzlGbOs${index + 1}`] - item.OS.imgSrc = detail[`jgzlSytOs${index + 1}`] - }) }) }, // 保存传值处理 handleConfirmData() { - this.treatData.forEach((item, index) => { - this.confirmData[`jgzlDateOd${index + 1}`] = item.OD.date - this.confirmData[`jgzlCountOd${index + 1}`] = item.OD.order - this.confirmData[`jgzlDsOd${index + 1}`] = item.OD.count - this.confirmData[`jgzlSlOd${index + 1}`] = item.OD.vision - this.confirmData[`jgzlGlOd${index + 1}`] = item.OD.power - this.confirmData[`jgzlGbOd${index + 1}`] = item.OD.flareSize - this.confirmData[`jgzlSytOd${index + 1}`] = item.OD.imgSrc - this.confirmData[`jgzlDateOS${index + 1}`] = item.OS.date - this.confirmData[`jgzlCountOS${index + 1}`] = item.OS.order - this.confirmData[`jgzlDsOS${index + 1}`] = item.OS.count - this.confirmData[`jgzlSlOS${index + 1}`] = item.OS.vision - this.confirmData[`jgzlGlOS${index + 1}`] = item.OS.power - this.confirmData[`jgzlGbOS${index + 1}`] = item.OS.flareSize - this.confirmData[`jgzlSytOS${index + 1}`] = item.OS.imgSrc - }) }, // 保存 handleSaveTable() { @@ -355,6 +287,11 @@ export default { 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 d69d914..cc77908 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue @@ -81,6 +81,28 @@ placeholder="选择日期时间" /> + + + + + + + + + + + + + + + + + + + + + + 打印 @@ -123,7 +145,9 @@ export default { eyeType: '', pupilDilate: '', pupilShrink: '', - date: '' + date: '', + date1: '', + date2: '' }, doctorList: [], print: { @@ -155,6 +179,8 @@ export default { 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.patientInfo = this.patientDetail } }, 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 895ab92..d3c0290 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 @@ -411,14 +411,16 @@ export default { if (res.code === 0) { this.pageLoading = false this.doctorList = res.data - if (this.curTime===1){ - const weekInfoItem = this.doctorList[this.curIndex].weekInfo[this.curWeekInfoIndex] - this.curPatients = weekInfoItem.morning.appointPatients - this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum - }else { - const weekInfoItem = this.doctorList[this.curIndex].weekInfo[this.curWeekInfoIndex] - this.curPatients = weekInfoItem.after.appointPatients - this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum + if (typeof this.curIndex === 'number'){ + if (this.curTime===1){ + const weekInfoItem = this.doctorList.length && this.doctorList[this.curIndex].weekInfo[this.curWeekInfoIndex] + this.curPatients = weekInfoItem.morning.appointPatients + this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum + }else { + const weekInfoItem = this.doctorList.length && this.doctorList[this.curIndex].weekInfo[this.curWeekInfoIndex] + this.curPatients = weekInfoItem.after.appointPatients + this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum + } } } else { this.pageLoading = false diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/addProject.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/addProject.vue index c2c890e..8d404ab 100644 --- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/addProject.vue +++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subSetting/addProject.vue @@ -17,7 +17,7 @@ v-model="form.workTimeAm" :picker-options="{ start: '07:30', - end: '12:00' + end: '13:30' }" placeholder="选择时间" style="width: 100%;" @@ -34,7 +34,7 @@ - + { + if (value && !isIDNumber(value)) { + return callback(new Error('您输入的身份证格式不正确')) + } else if (!value) { + return callback(new Error('请输入身份证号')) + } + callback() + } return { patientId: [ { required: true, message: '请输入登记号', trigger: 'blur' } @@ -168,7 +176,7 @@ export default { { required: true, message: '请输入患者姓名', trigger: 'blur' } ], patientIdNumber: [ - { required: true, message: '请输入患者身份证号', trigger: 'blur' } + { validator: validataIDNumber, trigger: 'blur' } ], sgDoctorId: [ { required: true, message: '请选择视光医师', trigger: 'blur' } @@ -198,6 +206,14 @@ export default { } }) }, + handleBirth(value) { + if (value) { + const year = value.substr(6, 4) + const month = value.substr(10, 2) + const day = value.substr(12, 2) + this.dataForm.patientBirthday = `${year}-${month}-${day}` + } + }, // 获取医师列表 getDoctorList(val) { this.$http.get('/sys/user', { params: { position: val }}).then(data => { diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue index 27079ea..50961a5 100644 --- a/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue +++ b/src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue @@ -14,7 +14,7 @@ - + { - // if (value && !isIDNumber(value)) { - // return callback(new Error('您输入的身份证格式不正确')) - // } else if (!value) { - // return callback(new Error('请输入身份证号')) - // } - // callback() - // } + var validataIDNumber = (rule, value, callback) => { + if (value && !isIDNumber(value)) { + return callback(new Error('您输入的身份证格式不正确')) + } else if (!value) { + return callback(new Error('请输入身份证号')) + } + callback() + } return { patientId: [ { required: true, message: '请输入登记号', trigger: 'blur' } @@ -176,7 +176,7 @@ export default { { required: true, message: '请输入患者姓名', trigger: 'blur' } ], patientIdNumber: [ - { required: true, message: '请输入患者身份证号', trigger: 'blur' } + { validator: validataIDNumber, trigger: 'blur' } ], sgDoctorId: [ { required: true, message: '请选择视光医师', trigger: 'blur' } @@ -206,6 +206,14 @@ export default { } }) }, + handleBirth(value) { + if (value) { + const year = value.substr(6, 4) + const month = value.substr(10, 2) + const day = value.substr(12, 2) + this.dataForm.patientBirthday = `${year}-${month}-${day}` + } + }, // 获取医师列表 getDoctorList(val) { this.$http.get('/sys/user', { params: { position: val }}).then(data => { diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue index ba750d6..085dde0 100644 --- a/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue +++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue @@ -14,7 +14,7 @@ - + { + if (value && !isIDNumber(value)) { + return callback(new Error('您输入的身份证格式不正确')) + } else if (!value) { + return callback(new Error('请输入身份证号')) + } + callback() + } return { patientId: [ { required: true, message: '请输入登记号', trigger: 'blur' } @@ -164,7 +172,7 @@ export default { { required: true, message: '请输入患者姓名', trigger: 'blur' } ], patientIdNumber: [ - { required: true, message: '请输入患者身份证号', trigger: 'blur' } + { validator: validataIDNumber, trigger: 'blur' } ], sgDoctorId: [ { required: true, message: '请选择视光医师', trigger: 'blur' } @@ -194,6 +202,14 @@ export default { } }) }, + handleBirth(value) { + if (value) { + const year = value.substr(6, 4) + const month = value.substr(10, 2) + const day = value.substr(12, 2) + this.dataForm.patientBirthday = `${year}-${month}-${day}` + } + }, // 获取医师列表 getDoctorList(val) { this.$http.get('/sys/user', { params: { position: val }}).then(data => {