From 69e0f2a708fc1cd60cdc2906a77517e895f03f35 Mon Sep 17 00:00:00 2001 From: newPeter7 Date: Fri, 14 Apr 2023 16:16:39 +0800 Subject: [PATCH] peter --- .../commonForm/deveopmentFIle-copy.vue | 798 +++++++++++++ .../360View/commonForm/optometryForm-copy.vue | 1019 ++++++++++++++++ .../360View/forePart/index-copy.vue | 1060 +++++++++++++++++ src/components/360View/index1.vue | 2 +- src/components/360View/key-indicators.vue | 4 +- src/components/360View/opticalFile/index.vue | 36 +- src/components/360View/routine/index.vue | 18 +- .../seeDoctor/informBook/rgp-book.vue | 2 +- 8 files changed, 2896 insertions(+), 43 deletions(-) create mode 100644 src/components/360View/commonForm/deveopmentFIle-copy.vue create mode 100644 src/components/360View/commonForm/optometryForm-copy.vue create mode 100644 src/components/360View/forePart/index-copy.vue diff --git a/src/components/360View/commonForm/deveopmentFIle-copy.vue b/src/components/360View/commonForm/deveopmentFIle-copy.vue new file mode 100644 index 0000000..199fb73 --- /dev/null +++ b/src/components/360View/commonForm/deveopmentFIle-copy.vue @@ -0,0 +1,798 @@ + + + diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue new file mode 100644 index 0000000..70307a3 --- /dev/null +++ b/src/components/360View/commonForm/optometryForm-copy.vue @@ -0,0 +1,1019 @@ + + + + + + diff --git a/src/components/360View/forePart/index-copy.vue b/src/components/360View/forePart/index-copy.vue new file mode 100644 index 0000000..5a8279e --- /dev/null +++ b/src/components/360View/forePart/index-copy.vue @@ -0,0 +1,1060 @@ + + + + diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue index 2b22b90..9e2bc57 100644 --- a/src/components/360View/index1.vue +++ b/src/components/360View/index1.vue @@ -204,7 +204,7 @@ ref="keyIndicatorRef" class="key-content" v-bind="$attrs" - :patient-id="patientBaseData.patientId" + :patient-id="patientId" :patient-id-number="patientBaseData.patientIdNumber" /> diff --git a/src/components/360View/key-indicators.vue b/src/components/360View/key-indicators.vue index d0c4cae..c35461f 100644 --- a/src/components/360View/key-indicators.vue +++ b/src/components/360View/key-indicators.vue @@ -146,8 +146,8 @@ export default { async getShiLiAndYanYaData() { const { data: res } = await this.$http.get('/patient/view/getYanZouAndYanYaData', { params: { - patientId: '200203836' - // patientId: this.patientId + // patientId: '200203836' + patientId: this.patientId } }) if (res.code === 0) { diff --git a/src/components/360View/opticalFile/index.vue b/src/components/360View/opticalFile/index.vue index 01c53fa..9c64a31 100644 --- a/src/components/360View/opticalFile/index.vue +++ b/src/components/360View/opticalFile/index.vue @@ -56,7 +56,7 @@ @save="updateForm" @del="deleteForm" /> - + - + @@ -78,8 +78,8 @@ import ourPatientRecord from './outPatientRecord' import eyesVision from '@/components/360View/commonForm/eyesVision' // import threeVision from '@/components/360View/commonForm/threeVision' // -import optometryForm from '@/components/360View/commonForm/optometryForm' // -import deveopmentFile from '@/components/360View/commonForm/deveopmentFIle' // +import optometryForm from '@/components/360View/commonForm/optometryForm-copy' // +import deveopmentFile from '@/components/360View/commonForm/deveopmentFIle-copy' // export default { components: { ourPatientRecord, @@ -132,32 +132,14 @@ export default { this.id = item.id this.name = item.name this.formDate = item.createTime - if (item.name === '双眼视功能检查报告单') { - this.eyesData = item.jsonText ? JSON.parse(item.jsonText) : {} - } else if (item.name === '验光报告单') { - this.optomeData = item.jsonText ? JSON.parse(item.jsonText) : {} - if (item.jsonText) { + if (item.name === '验光报告单') { this.$nextTick(() => { - this.$refs.optome.setData() + this.$refs.optome.queryForm() }) - } else { - this.$nextTick(() => { - this.$refs.optome.reSet() - }) - } - } else if (item.name === '三级视功能检查报告单') { - this.threeData = item.jsonText ? JSON.parse(item.jsonText) : {} } else if (item.name === '屈光发育档案') { - this.deveopData = item.jsonText ? JSON.parse(item.jsonText) : {} - if (item.jsonText) { this.$nextTick(() => { - this.$refs.deveope.setData() + this.$refs.deveope.queryForm() }) - } else { - this.$nextTick(() => { - this.$refs.deveope.reSet() - }) - } } }, // 添加表单 @@ -216,8 +198,7 @@ export default { this.curIndex = 0 this.id = this.formList.length ? this.formList[0].id : '' this.name = this.formList.length ? this.formList[0].name : '' - const jsonText = this.formList.length ? this.formList[0].jsonText : '' - this.handleForm(this.curIndex, { name: this.name, id: this.id, jsonText: jsonText }) + this.handleForm(this.curIndex, { name: this.name, id: this.id }) } } else { this.$message.error(res.msg) @@ -479,3 +460,4 @@ export default { padding-left: 14px !important; } + diff --git a/src/components/360View/routine/index.vue b/src/components/360View/routine/index.vue index 1bf8fe5..6a5478c 100644 --- a/src/components/360View/routine/index.vue +++ b/src/components/360View/routine/index.vue @@ -3,7 +3,6 @@
色觉检查 - OD: -
@@ -229,9 +227,7 @@ export default { } ], routineData: {}, - osType: '', osStatus: '', - odType: '', odStatus: '', selectionDL: [], selectionZJ: [], @@ -249,19 +245,17 @@ export default { async getroutineDataData() { const { data: res } = await this.$http.get('/patient/view/getVaAndIopAndRefAndLast', { params: { - // patientId: this.patientId, - patientId: '2328656', + patientId: this.patientId, + // patientId: '2328656', date: '' } }) if (res.code === 0) { this.routineData = res.data - this.osType = res.data.sejue.length ? res.data.sejue[0].eyeType : '' - this.osStatus = res.data.sejue.length ? res.data.sejue[0].eyeStatus : '' - this.odType = res.data.sejue.length ? res.data.sejue[1].eyeType : '' - this.odStatus = res.data.sejue.length ? res.data.sejue[1].eyeStatus : '' this.shiliLast = res.data.shiliLast || [] this.yanyaLast = res.data.yanyaLast || [] + this.odStatus = this.shiliLast.length ? this.shiliLast[0].odCvText : '' + this.osStatus = this.shiliLast.length ? this.shiliLast[0].osCvText : '' if (this.shiliLast.length) { window.localStorage.setItem('shili', JSON.stringify(res.data.shiliLast)) } else { @@ -337,8 +331,8 @@ export default { osValue: '' }] data[0].name = '色觉检查' - data[0].odValue = this.osType === 'OD' ? this.setResult(this.osStatus) : this.setResult(this.odStatus) - data[0].osValue = this.osType === 'OS' ? this.setResult(this.osStatus) : this.setResult(this.odStatus) + data[0].odValue = this.odStatus + data[0].osValue = this.osStatus data[0].id = 'SJ001' dataArray = dataArray.concat(data) } diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue index 8c3aa87..058efe2 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/rgp-book.vue @@ -239,7 +239,7 @@ export default { }, mounted() { this.doctorSignDate = this.$moment().format('YYYY-MM-DD') - this.getNoticeName() + // this.getNoticeName() }, methods: { selectRadio(index) {