From 5afd50e30550fd3fb0ed9bf4116ba02e51609e5b Mon Sep 17 00:00:00 2001 From: newPeter7 Date: Thu, 27 Apr 2023 16:55:02 +0800 Subject: [PATCH] peter --- .../360View/afterPart/index-copy.vue | 14 - .../commonForm/deveopmentFIle-copy.vue | 831 ------------------ .../360View/commonForm/deveopmentFIle.vue | 405 ++++----- .../360View/commonForm/threeVision.vue | 1 - src/components/360View/index1.vue | 4 +- .../outPatientRecord/afterForm-copy.vue | 265 ------ .../outPatientRecord/afterForm.vue | 240 ++++- .../outPatientRecord/allFormPrint.vue | 2 +- .../medicalRecord/outPatientRecord/index.vue | 61 -- src/components/360View/opticalFile/index.vue | 2 +- src/components/360View/special/index.vue | 1 - 11 files changed, 393 insertions(+), 1433 deletions(-) delete mode 100644 src/components/360View/commonForm/deveopmentFIle-copy.vue delete mode 100644 src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue diff --git a/src/components/360View/afterPart/index-copy.vue b/src/components/360View/afterPart/index-copy.vue index 045c743..62af523 100644 --- a/src/components/360View/afterPart/index-copy.vue +++ b/src/components/360View/afterPart/index-copy.vue @@ -132,17 +132,6 @@ - - - - - - - - - - - @@ -186,10 +175,8 @@ import eventBus from '@/page-subspecialty/utils/eventBus' import treeSelect from '@/components/360View/itemSelect' import axios from 'axios' import Cookies from 'js-cookie' -import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue' export default { components: { - // AfterForm, treeSelect }, mixins: [], @@ -481,7 +468,6 @@ export default { }) }) } - // this.sourceData = Object.assign([], this.tableData) }).catch((error) => { console.log(error) }) diff --git a/src/components/360View/commonForm/deveopmentFIle-copy.vue b/src/components/360View/commonForm/deveopmentFIle-copy.vue deleted file mode 100644 index 373a080..0000000 --- a/src/components/360View/commonForm/deveopmentFIle-copy.vue +++ /dev/null @@ -1,831 +0,0 @@ - - - diff --git a/src/components/360View/commonForm/deveopmentFIle.vue b/src/components/360View/commonForm/deveopmentFIle.vue index 0c622bb..fb7c0d5 100644 --- a/src/components/360View/commonForm/deveopmentFIle.vue +++ b/src/components/360View/commonForm/deveopmentFIle.vue @@ -1,6 +1,6 @@ - + @@ -113,7 +109,7 @@
@@ -121,7 +117,7 @@
- +
@@ -136,7 +132,7 @@ @@ -250,7 +246,7 @@ @@ -313,9 +309,13 @@ export default { type: String, default: '' }, - formContent: { - type: Object, - default: () => { } + caseId: { + type: String, + default: '' + }, + isPlatform: { + type: Boolean, + default: true }, onlyRead: { type: Boolean, @@ -329,28 +329,59 @@ export default { extraHead: ', diff --git a/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue b/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue index 9d8ee0e..ffc5466 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/afterForm.vue @@ -4,62 +4,82 @@ ref="multipleTable" :data="tableData" style="margin: 8px 8px 0 0" - @select="selection" > - - - - @@ -69,41 +89,173 @@ - - diff --git a/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue b/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue index 02bc924..1209ef8 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue @@ -30,7 +30,7 @@ import ForeForm from '@/components/360View/medicalRecord/outPatientRecord/foreFo import SpecialExamine from '@/components/360View/specialExamine/index.vue' import DiagnosisForm from '@/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue' import eventBus from '@/page-subspecialty/utils/eventBus' -import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue' +import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm.vue' export default { name: 'AllFormPrint', components: { AfterForm, DiagnosisForm, SpecialExamine, ForeForm, HistoryForm }, diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue index 994a149..26dfe0e 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/index.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue @@ -212,67 +212,6 @@ export default { this.$message.error(res.msg) } } - // async getOutPatientList(flag) { - // const { data: res } = await this.$http.get('/case/getCaseByCaseId', { - // params: { - // caseId: this.caseId, - // patientId: this.patientId, - // platform: this.isSearch, - // flag: flag - // } - // }) - // if (res.code === 0) { - // if (flag === '1') { - // this.formData = res.data ? JSON.parse(res.data.jsonText) : {} - // this.formId = res.data ? res.data.id : '' - // } else if (flag === '5') { - // this.diagnosis = res.data ? JSON.parse(res.data.jsonText) : {} - // this.diagnosisId = res.data ? res.data.id : '' - // } - // } else { - // this.$message.error(res.msg) - // } - // }, - // async saveTableData(flag, name) { - // let data = '' - // let url = '' - // const params = { - // flag: flag, - // name: name, - // caseId: this.caseId, - // patientId: this.patientId, - // platform: this.isSearch - // } - // if (flag === '1') { - // data = JSON.stringify(this.formData) - // params.jsonText = data - // if (this.formId) { - // url = '/case/update' - // params.id = this.formId - // } else { - // url = '/case/save' - // } - // } else if (flag === '5') { - // data = JSON.stringify(this.diagnosis) - // params.jsonText = data - // if (this.diagnosisId) { - // url = '/case/update' - // params.id = this.diagnosisId - // } else { - // url = '/case/save' - // } - // } - // - // const { data: res } = await this.$http.post(url, params) - // if (res.code === 0) { - // if (flag === '1') { - // this.$message.success('保存成功') - // } - // this.getOutPatientList(flag) - // } else { - // this.$message.error(res.msg) - // } - // } } } diff --git a/src/components/360View/opticalFile/index.vue b/src/components/360View/opticalFile/index.vue index 7db14dd..6ab2cf5 100644 --- a/src/components/360View/opticalFile/index.vue +++ b/src/components/360View/opticalFile/index.vue @@ -76,7 +76,7 @@ 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-copy' // -import deveopmentFile from '@/components/360View/commonForm/deveopmentFIle-copy' // +import deveopmentFile from '@/components/360View/commonForm/deveopmentFIle' // export default { components: { ourPatientRecord, diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue index d5ad764..9fd5de7 100644 --- a/src/components/360View/special/index.vue +++ b/src/components/360View/special/index.vue @@ -21,7 +21,6 @@ width="195" />