diff --git a/src/components/360View/commonForm/deveopmentFIle.vue b/src/components/360View/commonForm/deveopmentFIle.vue index ec2bbdb..22f7a37 100644 --- a/src/components/360View/commonForm/deveopmentFIle.vue +++ b/src/components/360View/commonForm/deveopmentFIle.vue @@ -33,8 +33,15 @@
-
- +
+ + +
@@ -71,8 +78,19 @@
-
- +
+ + + + + + +
@@ -95,7 +113,11 @@ + + + + + + @@ -384,33 +440,42 @@ export default { type: '' }, { name: '1', + value: '', pupil: [ { name: '正常瞳孔', + id: '1', isSelect: false }, { name: '复方托吡卡胺', + id: '2', isSelect: false }, { name: '美多丽', + id: '3', isSelect: false }, { name: '赛飞杰', + id: '4', isSelect: false }, { name: '阿托品', + id: '5', isSelect: false } ], type: '' }, { name: '2', + value: '', examine: [ { name: '检影', + id: '1', isSelect: false }, { name: '综合', + id: '2', isSelect: false } ], @@ -425,7 +490,9 @@ export default { b: '', c: '', d: '', - e: '' + e: '', + f: '', + g: '' }, { name: '4', type: '', @@ -433,7 +500,9 @@ export default { b: '', c: '', d: '', - e: '' + e: '', + f: '', + g: '' }, { name: '最终处方', value: [ @@ -453,7 +522,9 @@ export default { b: '', c: '', d: '', - e: '' + e: '', + f: '', + g: '' }, { name: '6', type: '', @@ -461,7 +532,9 @@ export default { b: '', c: '', d: '', - e: '' + e: '', + f: '', + g: '' }, { name: '配镜建议', suggest: [ @@ -497,38 +570,32 @@ export default { } } }, - computed: { - operationRecord: { - get() { - return this.$store.getters.operationRecord - } - } - }, - watch: { - operationRecord: { - handler(value) { - }, - deep: true, - immediate: true - } - }, destroyed() { this.ws.close() }, mounted() { + this.setSign() this.initWebSoket() this.originTableData = JSON.parse(JSON.stringify(this.tableData)) this.getPatientData() - const shili = window.localStorage.getItem('shili') ? JSON.parse(window.localStorage.getItem('shili')) : [] - if (shili.length) { - this.tableData[0].od = shili[0].odVan - this.tableData[0].os = shili[0].osVan - } }, methods: { + setSign() { + const userData = JSON.parse(window.localStorage.getItem('qg-userData')) + const date = this.$moment().format('YYYY-MM-DD') + const mzName = window.localStorage.getItem('mzDoctorName') + this.tableData.forEach(item => { + if (item.name == '7') { + item.a = userData.signImgBase + item.b = mzName + item.c = date + } + }) + }, setData() { this.dataForm = this.formContent.a this.tableData = this.formContent.b + this.setSign() this.getPatientData() }, reSet() { @@ -541,8 +608,33 @@ export default { fileNUm: '' } this.tableData = this.originTableData + this.setSign() this.getPatientData() }, + copyData() { + const ods = this.tableData.filter(item => item.name === '3') + const oss = this.tableData.filter(item => item.name === '4') + this.tableData.forEach(item => { + if (item.name === '5') { + item.a = ods[0].a + item.b = ods[0].b + item.c = ods[0].c + item.d = ods[0].d + item.e = ods[0].e + item.f = ods[0].f + item.g = ods[0].g + } + if (item.name === '6') { + item.a = oss[0].a + item.b = oss[0].b + item.c = oss[0].c + item.d = oss[0].d + item.e = oss[0].e + item.f = oss[0].f + item.g = oss[0].g + } + }) + }, async getPatientData() { const shili = window.localStorage.getItem('shili') ? JSON.parse(window.localStorage.getItem('shili')) : [] if (shili.length) { @@ -610,24 +702,22 @@ export default { // wss://127.0.0.1:8030/data // const url = 'ws://47.110.224.240:8036/xiangan-crf/websocket/0071' // const url = 'ws://192.168.0.167:8036/xiangan-crf/websocket/0071' - const url = 'wss://127.0.0.1:8030/data' - console.log(123) + const url = 'ws://127.0.0.1:8030/data' const self = this this.ws = new WebSocket(url) this.ws.onopen = function() { console.log('连接成功') - self.start(); + self.start() } this.ws.onclose = function() { - console.log('连接关闭') - self.reconnect(); + // console.log('连接关闭') + self.reconnect() } this.ws.onerror = function() { - console.log('连接失败') - self.reconnect(); + // console.log('连接失败') + self.reconnect() } this.ws.onmessage = function(msg) { - console.log(msg) const message = JSON.parse(msg.data) // const message = JSON.parse(data.msgTxt) console.log(message) @@ -646,7 +736,7 @@ export default { item.e = message.LData.ADD } }) - self.reset(); + self.reset() } }, handleSaveTable() { @@ -659,14 +749,6 @@ export default { handleDelete() { this.$emit('del') }, - // 签名 - singHandle(text) { - const value = { - text: text, - pageName: 'operationRecord' - } - this.$store.commit('beginSign', value) - }, objectSpanMethod({ row, column, rowIndex, columnIndex }) { if (columnIndex === 0) { if (rowIndex === 0 || rowIndex === 3 || rowIndex === 6) { @@ -676,35 +758,42 @@ export default { colspan: 1 } } - // [0,11] 最后一行 7列合并城1行 + // [0,11] 最后一行 9列合并城1行 if (rowIndex === 11) { return { rowspan: 1, - colspan: 7 + colspan: 9 } } } else if (columnIndex === 1) { if (rowIndex === 6 || rowIndex === 9 || rowIndex === 10) { return { rowspan: 1, - colspan: 6 + colspan: 8 } } if (rowIndex === 1 || rowIndex === 2) { return { rowspan: 1, - colspan: 6 + colspan: 7 } } - } else if (columnIndex === 4) { + } else if (columnIndex === 3) { if (rowIndex === 0) { return { rowspan: 1, colspan: 2 } } + } else if (columnIndex === 5) { + if (rowIndex === 0) { + return { + rowspan: 1, + colspan: 3 + } + } } else if (rowIndex === 6 || rowIndex === 9 || rowIndex === 10) { - if (columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5 || columnIndex === 6) { + if (columnIndex === 2 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5 || columnIndex === 3) { return { rowspan: 0, colspan: 0 @@ -786,9 +875,14 @@ export default { width: 120px; } } - .width-180 { + .width-160 { + .el-input { + width: 160px; + } + } + .width-80 { .el-input { - width: 180px; + width: 80px; } } .el-input__inner { @@ -811,7 +905,7 @@ export default { width: 140px; } .el-input__suffix { - top: -7px; + //top: -7px; } .el-checkbox__input.is-checked + .el-checkbox__label { color: #606266; @@ -857,17 +951,5 @@ export default { ::v-deep .el-table .el-table__cell{ padding: 5px 0; } - // .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed { - // border-right: 1px solid #808080; - // } - // .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf { - // border-bottom: 1px solid #808080 !important; - // } - // .el-table--border, .el-table--group { - // border: 1px solid #808080; - // } - // .el-table--border { - // border-bottom: 0; - // } } diff --git a/src/components/360View/commonForm/threeVision.vue b/src/components/360View/commonForm/threeVision.vue index 1c59673..318b201 100644 --- a/src/components/360View/commonForm/threeVision.vue +++ b/src/components/360View/commonForm/threeVision.vue @@ -64,14 +64,20 @@
-
- 视光师: - +
+ + + 视光师: +
-
- 日期: - + + + +
+
+ 日期： @@ -233,6 +239,7 @@ export default { patientAge: '' }, patientData: {}, + originTableData: [], tableData: [ { name: '基础信息', @@ -320,36 +327,35 @@ export default { }, { name: '签名', a: '', - b: '' + b: '', + c: '' }] } }, - computed: { - operationRecord: { - get() { - return this.$store.getters.operationRecord - } - } - }, - watch: { - operationRecord: { - handler(value) { - console.log(value) - }, - deep: true, - immediate: true - } - }, created() { - // this.printPage('threeFunc') }, mounted() { + this.originTableData = JSON.parse(JSON.stringify(this.tableData)) + this.setSign() this.getPatientData() }, methods: { + setSign() { + const userData = JSON.parse(window.localStorage.getItem('qg-userData')) + const date = this.$moment().format('YYYY-MM-DD') + const mzName = window.localStorage.getItem('mzDoctorName') + this.tableData.forEach(item => { + if (item.name === '签名') { + item.a = userData.signImgBase + item.b = mzName + item.c = date + } + }) + }, setData() { this.dataForm = this.formContent.a this.tableData = this.formContent.b + this.setSign() this.getPatientData() }, reSet() { @@ -359,77 +365,8 @@ export default { sex: '', age: '' } - this.tableData = [ - { - name: '基础信息', - type: '' - }, - { - name: '屈光状态', - OD: '', - VA: '', - type: '' - }, { - name: '屈光状态a', - OS: '', - VA: '', - type: '' - }, { - name: 'CT+Prism', - ct: '', - type: '' - }, { - name: '同时视检查', - type: '' - }, { - name: '检查画片', - value: '', - type: '1' - }, { - name: '主观斜视角', - od: '', - os: '' - }, { - name: '客观斜视角', - od: '', - os: '' - }, { - name: '融合功能检查' - }, { - name: '检查画片', - value: '', - type: '2' - }, { - name: '融合点', - od: '', - os: '', - type: '' - }, { - name: 'Worth-4-dot', - a: '', - b: '', - c: '', - d: '' - }, { - name: '立体式检查', - value: '' - }, { - name: 'TITMUS(近)', - a: '', - b: '', - c: '' - }, { - name: '同视机九方位检查' - }, { - name: 'ODOS' - }, { - name: '报告描述', - value: '' - }, { - name: '签名', - a: '', - b: '' - }] + this.tableData = JSON.parse(JSON.stringify(this.originTableData)) + this.setSign() this.getPatientData() }, async getPatientData() { @@ -447,14 +384,6 @@ export default { this.$message.error(res.msg) } }, - // 签名 - singHandle(text) { - const value = { - text: text, - pageName: 'operationRecord' - } - this.$store.commit('beginSign', value) - }, objectSpanMethod({ row, column, rowIndex, columnIndex }) { if (columnIndex === 0) { if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8 || rowIndex === 12 || rowIndex === 17 || rowIndex === 15 || rowIndex === 16 || rowIndex === 14) { @@ -523,7 +452,7 @@ export default { padding: 7px 0 !important; } } -.printBox{ +.printBox { .btnBox{ display: flex; justify-content: flex-end; diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue index 309dc25..4b162ce 100644 --- a/src/components/360View/medicalRecord/index.vue +++ b/src/components/360View/medicalRecord/index.vue @@ -172,7 +172,7 @@ export default { const params = { flag: 8, name: this.name, - jsonText, + jsonText: JSON.stringify(data), patientId: this.patientId, id: this.id, platform: this.isSearch @@ -248,6 +248,7 @@ export default { } else { this.$message.error(res.msg) } + this.getPatientData() } } } diff --git a/src/components/360View/opticalFile/index.vue b/src/components/360View/opticalFile/index.vue index 3cf5732..4b14b0f 100644 --- a/src/components/360View/opticalFile/index.vue +++ b/src/components/360View/opticalFile/index.vue @@ -101,7 +101,7 @@ export default { } }, mounted() { - this.getFormList() + this.getFormList(1) }, methods: { handleForm(index, item) { @@ -224,6 +224,8 @@ 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 }) } } else { this.$message.error(res.msg) diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue index b0a7715..01136d5 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue @@ -261,6 +261,8 @@ export default { this.detailViewVisible = true this.patientId = scopeRow.patientId this.patientIdNumber = scopeRow.patientIdNumber + const mzName = scopeRow.mzDoctorName ? scopeRow.mzDoctorName : '' + window.localStorage.setItem('mzDoctorName', mzName) this.$nextTick(() => { // // 根据id获取患者信息--中间上侧患者信息 this.$refs.viewRef.getPatientData() diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue index 3c96217..a25af42 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue @@ -65,7 +65,7 @@ export default { // 打印 printerHandle() { this.$refs.crfComponent.$el.contentWindow.print() - }, + } } } diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue new file mode 100644 index 0000000..420fff4 --- /dev/null +++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue @@ -0,0 +1,564 @@ + + + diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue index d0b908f..10ae522 100644 --- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue +++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue @@ -309,7 +309,7 @@ export default { width: 100%; height: calc( 100vh - 50px - 32px - 42px - 48px - 15px); padding: 16px; - background: #EDEDED; + background: #ffffff; overflow-x: auto; } .vision{ diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue index 2d2739b..3d3133c 100644 --- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue +++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue @@ -265,7 +265,8 @@ export default { this.detailViewVisible = true this.patientId = scopeRow.patientId this.patientIdNumber = scopeRow.patientIdNumber - // this.patientId = '797064' + const mzName = scopeRow.mzDoctorName ? scopeRow.mzDoctorName : '' + window.localStorage.setItem('mzDoctorName', mzName) this.$nextTick(() => { // // 根据id获取患者信息--中间上侧患者信息 this.$refs.viewRef.getPatientData() diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue index f362a51..988af80 100644 --- a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue +++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue @@ -271,6 +271,8 @@ export default { this.detailViewVisible = true this.patientId = scopeRow.patientId this.patientIdNumber = scopeRow.patientIdNumber + const mzName = scopeRow.mzDoctorName ? scopeRow.mzDoctorName : '' + window.localStorage.setItem('mzDoctorName', mzName) this.$nextTick(() => { // // 根据id获取患者信息--中间上侧患者信息 this.$refs.viewRef.getPatientData()