diff --git a/public/index.html b/public/index.html index f449c2f..6f52be6 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/InformedConsent.vue b/src/page-subspecialty/views/modules/formList/InformedConsent.vue index a8f3c27..23c5cc7 100644 --- a/src/page-subspecialty/views/modules/formList/InformedConsent.vue +++ b/src/page-subspecialty/views/modules/formList/InformedConsent.vue @@ -92,11 +92,16 @@
主诊/谈话医生签名: -
- - -
-
日期:
+ +
+
日期: + +
@@ -114,7 +119,14 @@ -
日期:
+
日期: + +
@@ -322,12 +334,6 @@ export default { } }, computed: { - informedDocSign: { - get() { - return this.$store.getters.informedDocSign - }, - set(val) {} - }, informPatientSign: { get() { return this.$store.getters.informPatientSign @@ -347,6 +353,10 @@ export default { this.confirmData.patientName = this.patientDetail.patientName this.confirmData.patientAge = this.patientDetail.patientAge this.confirmData.patientGender = this.patientDetail.patientSex + const userData = JSON.parse(window.localStorage.getItem('qg-userData')) + this.confirmData.operationSign = userData.signImgBase + this.confirmData.operationDate = new Date() + this.confirmData.patientDate = new Date() this.getInfoDetail() this.queryProject() this.$store.commit('initPlugin') @@ -370,7 +380,6 @@ export default { const jgshAreaList = detail.jgshArea && detail.jgshArea.split('/') || [] this.handleDetail(bnzList, qgyList, ydbList, swmList, detail.coats, mzfsList, jgshList, jgshAreaList) this.confirmData.other = detail.other || '' - this.$store.commit('informedDocSign', detail.operationSign) this.$store.commit('informPatientSign', detail.patientSign) }) }, @@ -522,7 +531,6 @@ export default { this.handleList() this.handleNarcotism() this.handleMode() - this.confirmData.operationSign = this.informedDocSign this.confirmData.patientSign = this.informPatientSign this.confirmData.jzNumber = window.localStorage.getItem('jzNumber') this.$http.post('/mzbl/saveMzblJgshzqtys', { diff --git a/src/page-subspecialty/views/modules/formList/laserSurgery.vue b/src/page-subspecialty/views/modules/formList/laserSurgery.vue index d705c5b..724b07d 100644 --- a/src/page-subspecialty/views/modules/formList/laserSurgery.vue +++ b/src/page-subspecialty/views/modules/formList/laserSurgery.vue @@ -131,11 +131,7 @@
操作人:
-
- - -
- +
操作时间:
@@ -188,11 +184,10 @@ export default { jzNumber: '', diagnostic: '', idList: [], - eyeType: '', + eyeType: 'OD', // 治疗前 zlqSl: '', zlqJbfq: '', - operationDate: '', operateSign: '', operateDate: '', jgzlCount: '', @@ -212,14 +207,6 @@ export default { }] } }, - computed: { - operator: { - get() { - return this.$store.getters.operator - }, - set(val) {} - } - }, watch: { caseId(val) { if (val) { @@ -278,24 +265,24 @@ export default { caseId: this.caseId }}).then(data => { const detail = data.data.data - this.confirmData = { ...detail } - this.confirmData.patientName = this.patientDetail.patientName - this.confirmData.patientAge = this.patientDetail.patientAge - this.confirmData.patientSex = this.patientDetail.patientSex - this.confirmData.patientId = this.patientDetail.patientId - this.confirmData.patientAddress = this.patientDetail.patientAddress - this.confirmData.patientPhone = this.patientDetail.patientPhone - this.$store.commit('operator', detail.operateSign) + if (detail.jzNumber) { + this.confirmData = { ...detail } + } else { + this.confirmData.patientName = this.patientDetail.patientName + this.confirmData.patientAge = this.patientDetail.patientAge + this.confirmData.patientSex = this.patientDetail.patientSex + this.confirmData.patientId = this.patientDetail.patientId + this.confirmData.patientAddress = this.patientDetail.patientAddress + this.confirmData.patientPhone = this.patientDetail.patientPhone + this.confirmData.operateDate = new Date() + } + const userData = JSON.parse(window.localStorage.getItem('qg-userData')) + this.confirmData.operateSign = userData.signImgBase }) }, - // 保存传值处理 - handleConfirmData() { - }, // 保存 handleSaveTable() { this.confirmData.jzNumber = window.localStorage.getItem('jzNumber') - this.handleConfirmData() - this.confirmData.operateSign = this.operator this.$http.post('/mzbl/saveMzblJgshzl', { caseId: this.caseId, ...this.confirmData diff --git a/src/page-subspecialty/views/modules/formList/reportForm.vue b/src/page-subspecialty/views/modules/formList/reportForm.vue index ec89493..a506591 100644 --- a/src/page-subspecialty/views/modules/formList/reportForm.vue +++ b/src/page-subspecialty/views/modules/formList/reportForm.vue @@ -45,7 +45,7 @@
- 操作者: + 操作者:
@@ -144,6 +144,8 @@ export default { created() { this.origin = JSON.parse(JSON.stringify(this.formData)) this.confirmData.patientName = this.patientDetail.patientName + const userData = JSON.parse(window.localStorage.getItem('qg-userData')) + this.confirmData.operator = userData.signImgBase this.getReportInfo() }, methods: {