diff --git a/src/components/360View/afterPart/index-copy.vue b/src/components/360View/afterPart/index-copy.vue index 81d5c04..e33a5a5 100644 --- a/src/components/360View/afterPart/index-copy.vue +++ b/src/components/360View/afterPart/index-copy.vue @@ -260,7 +260,7 @@ export default { caseId: { handler: function(newV, oldV) { this.getforeList().then(() => { - // this.queryOptions() + this.queryOptions() }) } } diff --git a/src/components/360View/commonForm/deveopmentFIle-copy.vue b/src/components/360View/commonForm/deveopmentFIle-copy.vue index 199fb73..7cc7178 100644 --- a/src/components/360View/commonForm/deveopmentFIle-copy.vue +++ b/src/components/360View/commonForm/deveopmentFIle-copy.vue @@ -326,6 +326,7 @@ export default { }, dataForm: { id: '', + caseId: this.caseId, patientId: '', patientName: '', patientSex: '', @@ -511,9 +512,15 @@ export default { }] } }, + watch: { + caseId: { + handler: function(newV, oldV) { + this.queryForm() + } + } + }, mounted() { - // this.originTableData = JSON.parse(JSON.stringify(this.tableData)) - // this.originHeadData = JSON.parse(JSON.stringify(this.headData)) + this.queryForm() this.getPatientData() }, methods: { diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue index 1451d5d..6dd7b63 100644 --- a/src/components/360View/commonForm/optometryForm-copy.vue +++ b/src/components/360View/commonForm/optometryForm-copy.vue @@ -13,7 +13,7 @@ 验光报告单

- 登记号: + 登记号: 姓名: 性别: 年龄: @@ -537,12 +537,22 @@ export default { } } }, - destroyed() { + watch: { + caseId: { + handler: function(newV, oldV) { + this.queryForm() + this.initWebSoket() + } + } + }, + beforeUnmount() { + clearTimeout(this.timeoutObj) + clearTimeout(this.serverTimeoutObj) this.ws.close() }, mounted() { this.queryForm() - // this.initWebSoket() + this.initWebSoket() this.getPatientData() }, methods: { @@ -976,6 +986,12 @@ export default { margin-right: 5px; } } + .el-input__inner { + padding: 0; + border: none; + text-align: center; + border-bottom: 1px solid #8e8c8c; + } .bold{ font-weight: 700; } diff --git a/src/components/360View/forePart/index-copy.vue b/src/components/360View/forePart/index-copy.vue index d4bb83c..0fcd026 100644 --- a/src/components/360View/forePart/index-copy.vue +++ b/src/components/360View/forePart/index-copy.vue @@ -942,7 +942,6 @@ export default { async saveFore() { for (const resKey in this.dataForm) { if (Array.isArray(this.dataForm[resKey])) { - console.log(this.dataForm[resKey].join(',')) this.dataForm[resKey] = this.dataForm[resKey].join(',') } } diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue index 9e2bc57..e913a69 100644 --- a/src/components/360View/index1.vue +++ b/src/components/360View/index1.vue @@ -381,7 +381,6 @@ export default { { params: { patientId: this.patientId - // patientId: '797064' } } ) diff --git a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue index d9fbbf4..e515d50 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue @@ -122,8 +122,6 @@ export default { } }, mounted() { - console.log(this.tableData) - console.log(this.dataForm) }, methods: { moveHandle(index, type, row) { diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue index 4fedc7e..42dec24 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/index.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue @@ -3,7 +3,6 @@
打印 保存 - 保存为模板
@@ -14,13 +13,13 @@ - + - + - + @@ -171,29 +170,29 @@ export default { async getDiagnosis() { const { data: res } = await this.$http.get('/mjz/getMjzZdczInfo', { params: { - caseId: this.caseId, + caseId: this.caseId, patientId: this.patientId - } + } }) if (res.code === 0) { this.diagnosis = res.data - } else { + } else { this.$message.error(res.msg) - } + } }, // 保存表单数据 async saveHistory() { const { data: res } = await this.$http.post('/mjz/saveMjzBscj', this.formData) if (res.code === 0) { - this.getMedicalHistory() - } else { + await this.getMedicalHistory() + } else { this.$message.error(res.msg) - } + } }, async saveDiagnosis() { const { data: res } = await this.$http.post('/mjz/saveMjzZdcz', this.diagnosis) if (res.code === 0) { - this.getDiagnosis() + await this.getDiagnosis() } else { this.$message.error(res.msg) } diff --git a/src/components/360View/opticalFile/index.vue b/src/components/360View/opticalFile/index.vue index 2a511da..378191f 100644 --- a/src/components/360View/opticalFile/index.vue +++ b/src/components/360View/opticalFile/index.vue @@ -44,8 +44,8 @@
-
- +
+