From bdebe670fb431e72610b4cb13167dec6c240b62b Mon Sep 17 00:00:00 2001 From: liucan Date: Tue, 22 Apr 2025 14:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/H5form/consent-book-jmjl.vue | 5 +- .../H5form/consent-book-zfz-jgzl.vue | 5 +- .../H5form/lhopera-consent-book.vue | 2 + .../H5form/operation-nursing-record.vue | 27 +- src/components/H5form/operation-plan.vue | 17 +- src/components/H5form/operation-record.vue | 97 ++-- src/components/H5form/payDemandNote.vue | 3 +- src/components/H5form/qg-dzbl.vue | 4 +- src/components/H5form/talk-record.vue | 2 + src/mixins/operationPlan.js | 23 - src/mixins/operationRecord.js | 119 ++++- src/mixins/yiXinQianSign.js | 2 +- src/page-subspecialty/App.vue | 9 +- src/page-subspecialty/router/index.js | 8 +- src/page-subspecialty/views/authorize.vue | 2 +- src/page-subspecialty/views/main.vue | 1 + .../alertSet/add-or-update.vue | 260 +++++++---- .../chargeManagement/alertSet/index.vue | 14 +- .../modules/outpatientManagement/index.vue | 154 +++---- .../views/modules/patientManagement/index.vue | 188 +++----- .../modules/seeDoctor/archives/index.vue | 419 +++++------------- .../operationList/index.vue | 1 + .../formSet/operaRecordSet.vue | 4 +- .../systemManagement/operaFs/index.vue | 75 ++++ .../systemManagement/operaFs/operaAdd.vue | 102 +++++ 25 files changed, 835 insertions(+), 708 deletions(-) create mode 100644 src/page-subspecialty/views/modules/systemManagement/operaFs/index.vue create mode 100644 src/page-subspecialty/views/modules/systemManagement/operaFs/operaAdd.vue diff --git a/src/components/H5form/consent-book-jmjl.vue b/src/components/H5form/consent-book-jmjl.vue index b0debc9..ceb3b5d 100644 --- a/src/components/H5form/consent-book-jmjl.vue +++ b/src/components/H5form/consent-book-jmjl.vue @@ -360,6 +360,7 @@ import h5formButton from '@/components/H5formOhter/h5formButton' // import recordFile from '@/page-subspecialty/views/modules/seeDoctor/archives/record-file' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' import { isIDNumber, isHuzhao } from '@/utils/validate' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' import { Base64 } from 'js-base64' export default { components: { @@ -367,7 +368,7 @@ export default { crfEditor // recordFile }, - mixins: [signGet, publicFile, htmlToPdfToBlob], + mixins: [signGet, publicFile, htmlToPdfToBlob,yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -792,7 +793,9 @@ export default { sendCaSign() { if (this.formListValue.zdName && this.formListValue.ysName && this.formListValue.dlrYj && this.formListValue.ysSignDate && this.formListValue.dlrSignDate) { this.formListValue.zdSign = '' + this.formListValue.zdName = '' this.formListValue.ysSign = '' + this.formListValue.ysName = '' this.formListValue.dlrSign = '' this.loading = this.$loading({ lock: true, diff --git a/src/components/H5form/consent-book-zfz-jgzl.vue b/src/components/H5form/consent-book-zfz-jgzl.vue index f3f92f4..006e1b7 100644 --- a/src/components/H5form/consent-book-zfz-jgzl.vue +++ b/src/components/H5form/consent-book-zfz-jgzl.vue @@ -372,6 +372,7 @@ import h5formButton from '@/components/H5formOhter/h5formButton' // import recordFile from '@/page-subspecialty/views/modules/seeDoctor/archives/record-file' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' import { isIDNumber, isHuzhao } from '@/utils/validate' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' import { Base64 } from 'js-base64' export default { components: { @@ -379,7 +380,7 @@ export default { crfEditor // recordFile }, - mixins: [signGet, publicFile, htmlToPdfToBlob], + mixins: [signGet, publicFile, htmlToPdfToBlob,yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -804,7 +805,9 @@ export default { sendCaSign() { if (this.formListValue.zdName && this.formListValue.ysName && this.formListValue.dlrYj && this.formListValue.ysSignDate && this.formListValue.dlrSignDate) { this.formListValue.zdSign = '' + this.formListValue.zdName = '' this.formListValue.ysSign = '' + this.formListValue.ysName = '' this.formListValue.dlrSign = '' this.loading = this.$loading({ lock: true, diff --git a/src/components/H5form/lhopera-consent-book.vue b/src/components/H5form/lhopera-consent-book.vue index 0e77b15..0dd8072 100644 --- a/src/components/H5form/lhopera-consent-book.vue +++ b/src/components/H5form/lhopera-consent-book.vue @@ -878,7 +878,9 @@ export default { sendCaSign() { if (this.formListValue.zdName && this.formListValue.ysName) { this.formListValue.zdSign = '' + this.formListValue.zdName = '' this.formListValue.ysSign = '' + this.formListValue.ysName = '' this.formListValue.dlrSign = '' this.loading = this.$loading({ lock: true, diff --git a/src/components/H5form/operation-nursing-record.vue b/src/components/H5form/operation-nursing-record.vue index 1f0b162..caff705 100644 --- a/src/components/H5form/operation-nursing-record.vue +++ b/src/components/H5form/operation-nursing-record.vue @@ -332,28 +332,13 @@ -
+ - -
+ -->

器械名称：

@@ -719,12 +704,12 @@
-
已CA签
未CA签 -
+
-->
保存人：{{ formListValue.createName ? formListValue.createName : "-" @@ -1078,7 +1063,7 @@ export default { }) console.log(this.formListValue) } - res.data.centerDoctorSign ? '' : this.getZdDoctorSign('centerDoctorSign', '', 'centerDoctorCode', 'centerDoctorName') + // res.data.centerDoctorSign ? '' : this.getZdDoctorSign('centerDoctorSign', '', 'centerDoctorCode', 'centerDoctorName') res.data.backNurseSign ? '' : this.getSystomSign('backNurseSign', '', 'backNurseCode', 'backNurseName') } else { this.$message.error(res.msg) @@ -1233,7 +1218,7 @@ export default { this.operaFormDataCaSign({ caSignData: JSON.stringify(this.formListValue), doctorCode: this.formListValue.backNurseCode, - formFlag: '7', + formFlag: '12', formId: res.data, formName: '屈光手术护理记录单', patientId: this.archiveCaseCRFItem.patientId, diff --git a/src/components/H5form/operation-plan.vue b/src/components/H5form/operation-plan.vue index af893cc..57a7c20 100644 --- a/src/components/H5form/operation-plan.vue +++ b/src/components/H5form/operation-plan.vue @@ -293,13 +293,12 @@
医生签字： - - - - + + {{ formListValue.doctorName ? formListValue.doctorName : '-' }} + -
+
日 期： @@ -501,6 +500,7 @@ export default { qtOs: [], bz: '', // 医生签名 + doctorName:'', doctorSign: '', doctorSignTime: '', // 证件选择 @@ -598,7 +598,8 @@ export default { }, // 点编辑按钮自动获取签名 getSign() { - this.getSystomSign('doctorSign', 'doctorSignTime', 'createCode', 'createName') + this.getSystomSign('doctorSign', '', '', 'doctorName') + this.formListValue.doctorSignTime ? '' : this.formListValue.doctorSignTime = this.$moment().format('YYYY-MM-DD HH:mm') this.formListValue.patientOrDlrSignTime ? '' : this.formListValue.patientOrDlrSignTime = this.$moment().add(5, 'minutes').format('YYYY-MM-DD HH:mm') }, // 签名 @@ -779,7 +780,6 @@ export default { }) this.saveEidtTitle = '编辑' // this.statusHandle() // 保存时改变状态暂时关闭 - setTimeout(() => { if (this.formListValue.isShowPatientOrDlrSign && this.caOpenStatus) { this.sendCaSign() @@ -809,8 +809,9 @@ export default { }, // 触发CA封装 sendCaSign() { - if (this.formListValue.doctorSign) { + if (this.formListValue.doctorName) { this.formListValue.doctorSign = '' + this.formListValue.doctorName = '' this.formListValue.patientOrDlrSign = '' this.loading = this.$loading({ lock: true, diff --git a/src/components/H5form/operation-record.vue b/src/components/H5form/operation-record.vue index f185de9..87e7fc4 100644 --- a/src/components/H5form/operation-record.vue +++ b/src/components/H5form/operation-record.vue @@ -77,23 +77,25 @@

验光核查：

- OD：{{bljcList.plan.zjygXtOd1 ? bljcList.plan.zjygXtOd1 : '-'}} - / {{bljcList.plan.zjygXtOd2 ? bljcList.plan.zjygXtOd2 : -''}} + OD：{{bljcList.plan.zjygXtOd1 ? bljcList.plan.zjygXtOd1 : '-'}} + / {{bljcList.plan.zjygXtOd2 ? bljcList.plan.zjygXtOd2 : -''}} / {{bljcList.plan.zjygXtOd3 ? bljcList.plan.zjygXtOd3 : '-'}}
-
- OS：{{bljcList.plan.zjygXtOs1 ? bljcList.plan.zjygXtOs1 : '-'}} - / {{bljcList.plan.zjygXtOs2 ? bljcList.plan.zjygXtOs2 : -''}} +
+ OS：{{bljcList.plan.zjygXtOs1 ? bljcList.plan.zjygXtOs1 : '-'}} + / {{bljcList.plan.zjygXtOs2 ? bljcList.plan.zjygXtOs2 : -''}} / {{bljcList.plan.zjygXtOs3 ? bljcList.plan.zjygXtOs3 : '-'}}

预留屈光度

- OD：{{bljcList.plan.ylqgdOd ? bljcList.plan.ylqgdOd : '-'}} / {{bljcList.plan.ylsgdOd ? bljcList.plan.ylsgdOd : '-'}} + OD：{{bljcList.plan.ylqgdOd ? bljcList.plan.ylqgdOd : '-'}} / + {{bljcList.plan.ylsgdOd ? bljcList.plan.ylsgdOd : '-'}}
-
- OS：{{bljcList.plan.ylqgdOs ? bljcList.plan.ylqgdOs : '-'}} / {{bljcList.plan.ylsgdOs ? bljcList.plan.ylsgdOs : '-'}} +
+ OS：{{bljcList.plan.ylqgdOs ? bljcList.plan.ylqgdOs : '-'}} / + {{bljcList.plan.ylsgdOs ? bljcList.plan.ylsgdOs : '-'}}
@@ -202,7 +204,8 @@ 右眼（OD）
-
+
手术方式： {{ formListValue.ssfsOd }} @@ -223,6 +226,34 @@
+
nomo： / @@ -1202,6 +1233,13 @@
+
@@ -1246,13 +1284,14 @@ import blDataInfo from '@/components/H5form/blDataInfo' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' import yiXinQianSign from '@/mixins/yiXinQianSign.js' import { pinyin } from 'pinyin-pro' - +import draggable from 'vuedraggable' export default { components: { h5formButton, intoTemplate, operaRecordIntoMrz, - blDataInfo + blDataInfo, + draggable }, mixins: [signGet, publicFile, operationRecord, htmlToPdfToBlob, yiXinQianSign], props: { @@ -1438,22 +1477,7 @@ export default { operaOsType: '', ssfsFlag: 0, bljcList: [], - options: [{ - bieMing: '选项1', - operaName: '黄金糕' - }, { - bieMing: '选项2', - operaName: '双皮奶' - }, { - bieMing: '选项3', - operaName: '蚵仔煎' - }, { - bieMing: '选项4', - operaName: '龙须面' - }, { - bieMing: '选项5', - operaName: '北京烤鸭' - }], + checkList: [], value: '', value1: '', isSaveSeccess: false, @@ -1538,6 +1562,14 @@ export default { this.$message.error(res.msg) } }, + // 拖拽后改变sort顺序 + onDragEnd(evt) { + console.log('evt', evt); + this.operaParamsList.forEach((item, index) => { + item.sort = index + 1 + }) + console.log('this.operaParamsList', this.operaParamsList); + }, // 获取表单 async getInfo() { console.log(this.archiveCaseCRFItem) @@ -1890,6 +1922,10 @@ export default { diff --git a/src/components/H5form/payDemandNote.vue b/src/components/H5form/payDemandNote.vue index 776fbae..f0439d2 100644 --- a/src/components/H5form/payDemandNote.vue +++ b/src/components/H5form/payDemandNote.vue @@ -509,7 +509,8 @@ export default { }, sendCaSign() { if (this.formListValue.gzrName) { - this.formListValue.ysSign = '' + this.formListValue.gzrSign = '' + this.formListValue.gzrName = '' this.formListValue.dlrSign = '' this.loading = this.$loading({ lock: true, diff --git a/src/components/H5form/qg-dzbl.vue b/src/components/H5form/qg-dzbl.vue index a7e2b5b..2f45488 100644 --- a/src/components/H5form/qg-dzbl.vue +++ b/src/components/H5form/qg-dzbl.vue @@ -880,7 +880,7 @@
mm / - μm + μm
@@ -1329,7 +1329,7 @@
mm / - μm + μm
diff --git a/src/components/H5form/talk-record.vue b/src/components/H5form/talk-record.vue index 7ba9e75..2939099 100644 --- a/src/components/H5form/talk-record.vue +++ b/src/components/H5form/talk-record.vue @@ -920,7 +920,9 @@ export default { sendCaSign() { if (this.formListValue.zdName && this.formListValue.ysName && this.formListValue.dlrYj && this.formListValue.ysSignDate && this.formListValue.dlrSignDate) { this.formListValue.zdSign = '' + this.formListValue.zdName = '' this.formListValue.ysSign = '' + this.formListValue.ysName = '' this.formListValue.dlrSign = '' this.loading = this.$loading({ lock: true, diff --git a/src/mixins/operationPlan.js b/src/mixins/operationPlan.js index d4d2e9e..92c4543 100644 --- a/src/mixins/operationPlan.js +++ b/src/mixins/operationPlan.js @@ -95,29 +95,6 @@ export default { // 患者签字 patientOrDlrSign:'', },{ - name: 'nomo', - nameClass: 'nomo', - // 验光核查 - YGHC: '', - // 预留屈光度 - YLQGD: '', - // 预期矫正度数 - YQJZDS: '', - //散光预留度数 - SGYLDS:'', - // 手术方式 - operationList: '', - // nomo - nomo:'nomo', - // 其他 - QT: '', - // 备注 - bz: '', - // 医生签字 - doctorSign: '', - // 患者签字 - patientOrDlrSign:'', - }, { name: '其他', nameClass: 'qt', // 验光核查 diff --git a/src/mixins/operationRecord.js b/src/mixins/operationRecord.js index 9d9fbab..c5a4794 100644 --- a/src/mixins/operationRecord.js +++ b/src/mixins/operationRecord.js @@ -157,7 +157,124 @@ export default { ssyqOd: '', // 备注 bz: '' - } + }, + operaParamsList: [{ + name:'nomo', + sort:1, + checked: false, + },{ + name:'手术类型', + sort:2, + checked: false, + },{ + name:'模式', + sort:3, + checked: false, + },{ + name:'矫正度数', + sort:4, + checked: false, + },{ + name:'光学/治疗区直径', + sort:5, + checked: false, + },{ + name:'帽厚度', + sort:6, + checked: false, + },{ + name:'吸引环参数', + sort:7, + checked: false, + },{ + name:'瓣厚度', + sort:8, + checked: false, + },{ + name:'切削深度', + sort:9, + checked: false, + },{ + name:'剩余基质厚度', + sort:10, + checked: false, + },{ + name:'上皮中央/周边厚度', + sort:11, + checked: false, + },{ + name:'总切削深度', + sort:12, + checked: false, + },{ + name:'移心量', + sort:13, + checked: false, + },{ + name:'MCC', + sort:14, + checked: false, + },{ + name:'Tr', + sort:15, + checked: false, + },{ + name:'Ts', + sort:16, + checked: false, + },{ + name:'ADD', + sort:17, + checked: false, + },{ + name:'核黄素类型', + sort:18, + checked: false, + },{ + name:'渗透时间', + sort:19, + checked: false, + },{ + name:'渗透评估', + sort:20, + checked: false, + },{ + name:'角膜厚度', + sort:21, + checked: false, + },{ + name:'角膜厚度照射后', + sort:22, + checked: false, + },{ + name:'照射模式', + sort:23, + checked: false, + },{ + name:'照射直径', + sort:24, + checked: false, + },{ + name:'辐照度', + sort:25, + checked: false, + },{ + name:'照射时间', + sort:26, + checked: false, + },{ + name:'总能量', + sort:27, + checked: false, + },{ + name:'术中情况', + sort:28, + checked: false, + },{ + name:'手术仪器', + sort:29, + checked: false, + }], } } } diff --git a/src/mixins/yiXinQianSign.js b/src/mixins/yiXinQianSign.js index ff026c5..1ecbb72 100644 --- a/src/mixins/yiXinQianSign.js +++ b/src/mixins/yiXinQianSign.js @@ -34,7 +34,7 @@ export default { console.log('customParams', customParams) console.log('CA医生签名接口调取base64', base64) // console.log('customParams.caParams.signUrl', customParams.caParams.signUrl) - const url = caBack ? (caBack.signUrl ? caBack.signUrl : '/hz_quguang/caSign') : (customParams.caParams.signUrl ? customParams.caParams.signUrl : 'quguang/caSign') + const url = caBack ? (caBack.signUrl ? caBack.signUrl : '/hz_quguang/caSign') : (customParams.caParams.signUrl ? customParams.caParams.signUrl : 'hz_quguang/caSign') const { data: res } = await this.$http.post(url, caBack || { // 待签名文件（Base64/string） fileData: base64 || '', diff --git a/src/page-subspecialty/App.vue b/src/page-subspecialty/App.vue index a24401a..2ddeec3 100644 --- a/src/page-subspecialty/App.vue +++ b/src/page-subspecialty/App.vue @@ -1,9 +1,13 @@ @@ -24,6 +28,7 @@ export default { '$i18n.locale': 'i18nHandle' }, created() { + console.log('app...') this.i18nHandle(this.$i18n.locale) }, methods: { diff --git a/src/page-subspecialty/router/index.js b/src/page-subspecialty/router/index.js index ce0c9c7..24352af 100644 --- a/src/page-subspecialty/router/index.js +++ b/src/page-subspecialty/router/index.js @@ -219,7 +219,7 @@ router.beforeEach((to, from, next) => { } // window.SITE_CONFIG['menuList'] = res.data const menuListChild = res.data.filter(item => item.children.length > 0) - // console.log(menuListChild) + console.log(menuListChild) fnAddDynamicMenuRoutes(JSON.parse(JSON.stringify(res.data)), menuListChild.length) next({ ...to, replace: true }) @@ -260,7 +260,7 @@ function fnCurrentRouteIsPageRoute(route, pageRoutes = []) { */ function fnAddDynamicMenuRoutes(menuList = [], menuListChildLength, routes = []) { let index = 0 - // console.log(menuList) + // console.log('menuList',menuList) menuList.forEach((item, i) => { // eslint-disable-next-line // console.log('=================',item); @@ -303,12 +303,12 @@ function fnAddDynamicMenuRoutes(menuList = [], menuListChildLength, routes = []) } }) // routes = menuList - // console.log(routes) + // console.log('routes',routes) // 此处一定要加判断，因为此方法在递归，要等到递归完成后再执行下面的内容 // 坑！！！如果不加此判断，this.$route.matched面包屑的父级就不会展示 if (menuListChildLength === index) { routes = menuList - console.log(routes) + // console.log('routes1',routes) // PH：底层调用一次 // 添加路由 router.addRoutes([ diff --git a/src/page-subspecialty/views/authorize.vue b/src/page-subspecialty/views/authorize.vue index ced9b15..5162381 100644 --- a/src/page-subspecialty/views/authorize.vue +++ b/src/page-subspecialty/views/authorize.vue @@ -31,8 +31,8 @@ 您的签名CA未授权，请先进行CA授权 - CA授权
+ CA授权
diff --git a/src/page-subspecialty/views/main.vue b/src/page-subspecialty/views/main.vue index d580155..c40b6e3 100644 --- a/src/page-subspecialty/views/main.vue +++ b/src/page-subspecialty/views/main.vue @@ -43,6 +43,7 @@ export default { $route: 'routeHandle' }, created() { + console.log('main...'); this.windowResizeHandle() this.routeHandle(this.$route) Promise.all([ diff --git a/src/page-subspecialty/views/modules/chargeManagement/alertSet/add-or-update.vue b/src/page-subspecialty/views/modules/chargeManagement/alertSet/add-or-update.vue index fa58815..ed17600 100644 --- a/src/page-subspecialty/views/modules/chargeManagement/alertSet/add-or-update.vue +++ b/src/page-subspecialty/views/modules/chargeManagement/alertSet/add-or-update.vue @@ -1,38 +1,54 @@ @@ -42,7 +42,6 @@ export default { mixins: [mixinViewModule, tableAutoHeight], data() { return { - targetNameList: [], mixinViewModuleOptions: { getDataListURL: '/hz_quguang/sys/target/targetList', deleteURL: '/hz_quguang/sys/target' @@ -50,18 +49,9 @@ export default { } }, created() { - this.getTargetName() }, methods: { - // 获取指标名称 - async getTargetName() { - const { data: res } = await this.$http.get('/hz_quguang/sys/target/selectTarget') - if (res.code === 0) { - this.targetNameList = res.data - } else { - this.$message.error(res.msg) - } - }, + // 修改预警状态 async switchHandle(scopeRow, e) { console.log(scopeRow, e) diff --git a/src/page-subspecialty/views/modules/outpatientManagement/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/index.vue index 5ca4401..30b7b07 100644 --- a/src/page-subspecialty/views/modules/outpatientManagement/index.vue +++ b/src/page-subspecialty/views/modules/outpatientManagement/index.vue @@ -4,37 +4,17 @@
@@ -166,6 +130,7 @@ import tableAutoHeight from '@/mixins/tableAutoHeight' import detailView from '@/components/360View' // 360试图 import hotPrint from '@/components/H5formOhter/hotPrint' export default { + name:'outpatientManagement', components: { headTemplate, detailView, @@ -330,7 +295,7 @@ export default { } .el-form-item { margin-bottom: 0; - width: 25%; + // width: 25%; } .el-form-item__content, .el-select, @@ -341,11 +306,22 @@ export default { .el-select { width: 100%; } - .min-width-80 { + + .min-width-100 { .el-form-item__label { min-width: 100px; } } + .min-width-90 { + .el-form-item__label { + min-width: 90px; + } + } + .min-width-80 { + .el-form-item__label { + min-width: 80px; + } + } .min-width-65 { .el-form-item__label { min-width: 66px; @@ -358,13 +334,13 @@ export default { } .range_inner-220 { .el-range-editor.el-input__inner { - min-width: 220px; + min-width: 220px; } } .min-width-inner-180 { - .el-input__inner { + .el-input__inner { min-width: 220px; - } + } } } diff --git a/src/page-subspecialty/views/modules/patientManagement/index.vue b/src/page-subspecialty/views/modules/patientManagement/index.vue index 170d799..5b72a03 100644 --- a/src/page-subspecialty/views/modules/patientManagement/index.vue +++ b/src/page-subspecialty/views/modules/patientManagement/index.vue @@ -4,37 +4,17 @@ - + @@ -133,42 +105,21 @@ - +
- + - + - - + + - +
diff --git a/src/page-subspecialty/views/modules/systemManagement/operaFs/operaAdd.vue b/src/page-subspecialty/views/modules/systemManagement/operaFs/operaAdd.vue new file mode 100644 index 0000000..ba0accb --- /dev/null +++ b/src/page-subspecialty/views/modules/systemManagement/operaFs/operaAdd.vue @@ -0,0 +1,102 @@ + + +