diff --git a/.env.development b/.env.development index b3e6d9f..37eda79 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,9 @@ NODE_ENV=development # VUE_APP_NODE_ENV=dev -VUE_APP_LOGIN_URL='http://47.110.224.240:8022' # 公司内网环境 -# VUE_APP_LOGIN_URL='http://192.168.0.35:8001' \ No newline at end of file +# 孟工本地:http://192.168.0.121:8028 +# VUE_APP_LOGIN_URL='http://192.168.0.35:8028' +# 温州的 +VUE_APP_LOGIN_URL='http://47.110.224.240:8022' diff --git a/.env.production b/.env.production index 95e5dad..09798e5 100644 --- a/.env.production +++ b/.env.production @@ -1,21 +1,14 @@ NODE_ENV=production VUE_APP_NODE_ENV=prod # 温州正式环境 -VUE_APP_LOGIN_URL='http://192.168.2.32:8022' +# VUE_APP_LOGIN_URL='http://192.168.2.32:8022' -# 温州测试环境 -# VUE_APP_LOGIN_URL='http://192.168.4.109:83' - - - -# VUE_APP_LOGIN_URL='https://quguang.huimu.cloud/api/' -# VUE_APP_LOGIN_URL='http://47.110.224.240:8022' # 公司内网环境 -# VUE_APP_LOGIN_URL='http://192.168.0.35:8001' +VUE_APP_LOGIN_URL='http://192.168.0.35:8028' # 后缀 -- 公司内部环境打开 -# VUE_APP_BASE_HOUZHUI='/wz_qg' +VUE_APP_BASE_HOUZHUI='/hz_qg' # 信创 # VUE_APP_LOGIN_URL='http://192.168.0.36:8022' diff --git a/src/components/H5form/consent-book-jmjl.vue b/src/components/H5form/consent-book-jmjl.vue index 6cfa35d..39f1276 100644 --- a/src/components/H5form/consent-book-jmjl.vue +++ b/src/components/H5form/consent-book-jmjl.vue @@ -75,19 +75,19 @@
术前诊断: - {{ formListValue.sqzdEyeValue ? formListValue.sqzdEyeValue : '-' }} + style="border-bottom:1px solid #ccc;padding:0 16px;">{{ formListValue.zdQgInput ? formListValue.zdQgInput : '-' }} - 圆锥角膜 - 其他: + 圆锥角膜 + 其他: - + {{ formListValue.sqzdQtInput ? formListValue.sqzdQtInput : '-' }} + style="border-bottom:1px solid #ccc;padding:0 16px;">{{ formListValue.zdQtInput ? formListValue.zdQtInput : '-' }}
@@ -142,11 +142,11 @@
拟施麻醉方式: - + {{ formListValue.nsMzfs ? formListValue.nsMzfs : '-' }} + style="border-bottom:1px solid #ccc;padding:0 16px;">{{ formListValue.zlfaMz ? formListValue.zlfaMz : '-' }}
@@ -432,19 +432,19 @@ export default { // 专科 zk: '', // 术前诊断眼别 - sqzdEyeValue: '', + zdQgInput: '', // 复发性角膜上皮糜烂 - sqzdCheck1: '', + zdCheck1: '', // 诊断其他选择项 - sqzdQtCheck: '', + zdQtCheck: '', // 诊断其他输入框 - sqzdQtInput: '', + zdQtInput: '', // 拟施手术 ssfsOd: '', ssfsOs: '', ssfsOu: '', // 拟施麻醉方式 - nsMzfs: '表面麻醉', + zlfaMz: '表面麻醉', // 替代治疗方案 dtzlfaValue: '除手术外患者可以选择佩戴框架眼镜或硬性隐形眼镜作为替代方案,但由于患者手术意愿强烈,故患者及家属慎重考虑后要求选择本次手术治疗方案。', // 术前准备及防范措施 @@ -555,12 +555,11 @@ export default { } }, destroyed() { - console.log('激光手术同意书destroyed') + console.log('角膜交联术治疗同意书destroyed') // this.$store.commit('clearSignDate', 'lhOperaRecord') // this.$parent.deleteErmUpdating(this.archiveCaseCRFItem.id) }, mounted() { - this.formListValue.content = `

扩张性角膜病变包括原发性圆锥角膜、继发于屈光手术(如LASIK)的角膜扩张、透明性边缘性角膜变性等角膜发生扩张膨隆并不断进展的一类疾病。其中以圆锥角膜为典型代表,常造成高度不规则近视散光和不同程度的视力损害,严重的圆锥角膜病变需要角膜移植。角膜交联术是针对扩张性角膜病变发病机制和改变角膜胶原内在生物力学特性的治疗方法,已成为目前惟一可以阻止扩张性角膜病变病情进展的治疗方法。它通过加固角膜基质,延缓或阻止角膜膨隆的进展,从而维持患者有效视力,延迟甚至避免接受角膜移植。

提醒所有患者:术前一定要明确自己的手术目的和术中、术后可能出现的不良后果。

diff --git a/src/components/H5form/consent-book-zfz-jgzl.vue b/src/components/H5form/consent-book-zfz-jgzl.vue index 25dc67a..00b78cd 100644 --- a/src/components/H5form/consent-book-zfz-jgzl.vue +++ b/src/components/H5form/consent-book-zfz-jgzl.vue @@ -75,19 +75,19 @@
术前诊断: - {{ formListValue.sqzdEyeValue ? formListValue.sqzdEyeValue : '-' }} + style="border-bottom:1px solid #ccc;padding:0 16px;">{{ formListValue.zdQgInput ? formListValue.zdQgInput : '-' }} - 复发性角膜上皮糜烂 - 其他: + 复发性角膜上皮糜烂 + 其他: - + {{ formListValue.sqzdQtInput ? formListValue.sqzdQtInput : '-' }} + style="border-bottom:1px solid #ccc;padding:0 16px;">{{ formListValue.zdQtInput ? formListValue.zdQtInput : '-' }}
@@ -154,11 +154,11 @@
拟施麻醉方式: - + {{ formListValue.nsMzfs ? formListValue.nsMzfs : '-' }} + style="border-bottom:1px solid #ccc;padding:0 16px;">{{ formListValue.zlfaMz ? formListValue.zlfaMz : '-' }}
@@ -444,19 +444,19 @@ export default { // 专科 zk: '', // 术前诊断眼别 - sqzdEyeValue: '', + zdQgInput: '', // 复发性角膜上皮糜烂 - sqzdCheck1: '', + zdCheck1: '', // 诊断其他选择项 - sqzdQtCheck: '', + zdQtCheck: '', // 诊断其他输入框 - sqzdQtInput: '', + zdQtInput: '', // 拟施手术 ssfsOd: '', ssfsOs: '', ssfsOu: '', // 拟施麻醉方式 - nsMzfs: '表面麻醉', + zlfaMz: '表面麻醉', // 替代治疗方案 dtzlfaValue: '除手术外患者可以选择佩戴软性或硬性隐形眼镜、角膜热烧灼、机械性刮除角膜上皮等方法作为替代方案,但由于患者要求尝试激光手术意愿强烈,故患者及家属慎重考虑后要求选择本次手术治疗方案。', // 术前准备及防范措施 @@ -567,7 +567,7 @@ export default { } }, destroyed() { - console.log('激光手术同意书destroyed') + console.log('准分子激光治疗性角膜切削术同意书destroyed') // this.$store.commit('clearSignDate', 'lhOperaRecord') // this.$parent.deleteErmUpdating(this.archiveCaseCRFItem.id) }, diff --git a/src/components/H5form/consent-book.vue b/src/components/H5form/consent-book.vue index 6f40462..8698b99 100644 --- a/src/components/H5form/consent-book.vue +++ b/src/components/H5form/consent-book.vue @@ -162,11 +162,12 @@ import h5formButton from '@/components/H5formOhter/h5formButton' import signNSV from '@/mixins/sign-NSV' import { isIDNumber, isHuzhao } from '@/utils/validate' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' export default { components: { h5formButton }, - mixins: [signGet, publicFile, signNSV, htmlToPdfToBlob], + mixins: [signGet, publicFile, signNSV, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, diff --git a/src/components/H5form/dzblLookFun.vue b/src/components/H5form/dzblLookFun.vue index bd39bc7..daa15e2 100644 --- a/src/components/H5form/dzblLookFun.vue +++ b/src/components/H5form/dzblLookFun.vue @@ -1,132 +1,88 @@ diff --git a/src/components/H5form/jmjl-dzbl.vue b/src/components/H5form/jmjl-dzbl.vue deleted file mode 100644 index f17ba54..0000000 --- a/src/components/H5form/jmjl-dzbl.vue +++ /dev/null @@ -1,3020 +0,0 @@ - - - - diff --git a/src/components/H5form/jmjl-opera-check-record.vue b/src/components/H5form/jmjl-opera-check-record.vue deleted file mode 100644 index 9a92029..0000000 --- a/src/components/H5form/jmjl-opera-check-record.vue +++ /dev/null @@ -1,2128 +0,0 @@ - - - - diff --git a/src/components/H5form/jmjlDzblBook.vue b/src/components/H5form/jmjlDzblBook.vue deleted file mode 100644 index f5abda8..0000000 --- a/src/components/H5form/jmjlDzblBook.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - diff --git a/src/components/H5form/jmjlDzblBookFun.vue b/src/components/H5form/jmjlDzblBookFun.vue deleted file mode 100644 index 74af856..0000000 --- a/src/components/H5form/jmjlDzblBookFun.vue +++ /dev/null @@ -1,1085 +0,0 @@ - - - - diff --git a/src/components/H5form/jmjlDzblBookPdf.vue b/src/components/H5form/jmjlDzblBookPdf.vue deleted file mode 100644 index d4aa3b3..0000000 --- a/src/components/H5form/jmjlDzblBookPdf.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - diff --git a/src/components/H5form/jmjlOperaCheckLook.vue b/src/components/H5form/jmjlOperaCheckLook.vue deleted file mode 100644 index 0f51edd..0000000 --- a/src/components/H5form/jmjlOperaCheckLook.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - - diff --git a/src/components/H5form/jmjlOperaCheckLookPdf.vue b/src/components/H5form/jmjlOperaCheckLookPdf.vue deleted file mode 100644 index 267b1c8..0000000 --- a/src/components/H5form/jmjlOperaCheckLookPdf.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - diff --git a/src/components/H5form/jmjlOperaCheckLookPdfFun.vue b/src/components/H5form/jmjlOperaCheckLookPdfFun.vue deleted file mode 100644 index 11d827f..0000000 --- a/src/components/H5form/jmjlOperaCheckLookPdfFun.vue +++ /dev/null @@ -1,561 +0,0 @@ - - - - diff --git a/src/components/H5form/lhopera-consent-book.vue b/src/components/H5form/lhopera-consent-book.vue index 4058ac7..e17298c 100644 --- a/src/components/H5form/lhopera-consent-book.vue +++ b/src/components/H5form/lhopera-consent-book.vue @@ -421,6 +421,7 @@ import publicFile from '@/mixins/publicFile' import h5formButton from '@/components/H5formOhter/h5formButton' // import recordFile from '@/page-subspecialty/views/modules/seeDoctor/archives/record-file' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' import { isIDNumber, isHuzhao } from '@/utils/validate' import { Base64 } from 'js-base64' export default { @@ -429,7 +430,7 @@ export default { crfEditor // recordFile }, - mixins: [signGet, publicFile, htmlToPdfToBlob], + mixins: [signGet, publicFile, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -476,7 +477,7 @@ export default { // 表单id formId: '', // 表单名称 - formName: '激光手术同意书', + formName: '联合手术同意书', // 表单日期 formDate: '', // 就诊号 diff --git a/src/components/H5form/operaCheckLookPdf.vue b/src/components/H5form/operaCheckLookPdf.vue index 06a8ef8..e80a519 100644 --- a/src/components/H5form/operaCheckLookPdf.vue +++ b/src/components/H5form/operaCheckLookPdf.vue @@ -34,8 +34,8 @@ export default { } }, methods: { - init(id, formFlag) { - this.$refs.operaCheckLookPdfFunRef.init(id, formFlag) + init(id, flag) { + this.$refs.operaCheckLookPdfFunRef.init(id, flag) } } } diff --git a/src/components/H5form/operaCheckLookPdfFun.vue b/src/components/H5form/operaCheckLookPdfFun.vue index 232e097..805ee22 100644 --- a/src/components/H5form/operaCheckLookPdfFun.vue +++ b/src/components/H5form/operaCheckLookPdfFun.vue @@ -1,41 +1,29 @@ @@ -378,61 +304,29 @@ export default { return { formListValue: { }, - flag: 0, + isShow: 0, zsOdcheckArr: [], zsOscheckArr: [], zsTextOd: '', zsTextOs: '', recordId: '', - formFlag: '' } }, methods: { // CA启动逻辑判断 - init(id, formFlag) { + init(id, flag) { this.recordId = id - this.formFlag = formFlag - const parentFormlistValue = this.$parent.$parent.formListValue - const parentFZsTextOd = this.$parent.$parent.zsTextOd - const parentFZsTextOs = this.$parent.$parent.zsTextOs - // console.log('parentFormlistValue', parentFormlistValue) - // console.log('parentFZsTextOd', parentFZsTextOd) - // console.log('parentFZsTextOs', parentFZsTextOs) - if ((parentFormlistValue.ssOuOperaBieM || parentFormlistValue.ssOdOperaBieM || parentFormlistValue.ssOsOperaBieM || parentFormlistValue.ssOuOperaName || parentFormlistValue.ssOdOperaName || parentFormlistValue.ssOsOperaName) && - (parentFormlistValue.zsOperaDayOd || parentFormlistValue.zsOperaDayOs) && parentFormlistValue.zd && parentFormlistValue.clyj || - (parentFZsTextOd.zsTextOd || parentFZsTextOs.zsTextOs)) { - this.getSendCaStatus(id) - } - }, - // 是否开启了CA认证表单状态 - async getSendCaStatus(id) { - const { data: res } = await this.$http.get('/quguang/caSign/getSendCaStatus', { - params: { - name: this.archiveCaseCRFItem.formName - } - }) - if (res.code === 0) { - res.data === 1 ? this.getQgEmrRecordInfo(id, 'savePdf') : '' - } else { - this.$message.error(res.msg) - } + this.getQgEmrRecordInfo(id, flag) }, // 获取括号内容 getContentInParentheses(str) { - console.log('str',str); + console.log('str', str); const matches = str.match(/\((.*?)\)/); return matches ? matches[1] : null; }, // 获取屈光电子病历信息 - async getQgEmrRecordInfo(id, savePdf) { - // savePdf ? this.loading = this.$loading({ - // lock: true, - // text: '转存PDF中请稍等...', - // spinner: 'el-icon-loading', - // background: 'rgba(255, 255, 255, 0.7)' - // }) : '' - // this.base64Flag = false - this.flag = 0 + async getQgEmrRecordInfo(id, flag) { + this.isShow = 0 const { data: res } = await this.$http.get('/quguang/opera/after/getOperaAfterInfoRecord', { params: { id: id @@ -486,66 +380,16 @@ export default { zscheckTextOs.push((item.split('、')[1] === '其它' ? '' : item.split('、')[1]) + (dataObj[item.split('、')[0] + 'RemarkOs'] ? dataObj[item.split('、')[0] + 'RemarkOs'] : '')) }) this.zsTextOs = (dataObj.zsBsbcOs ? dataObj.zsBsbcOs : '') + (dataObj.zsWbsCheckOs === 'true' ? ',目前无不适' : zscheckTextOs.join('、')) - this.flag = 1 - if (savePdf) { - this.formListValue.createSign = '' - window.localStorage.getItem('qg-userData') ? this.userData = JSON.parse(window.localStorage.getItem('qg-userData')) : '' - const caParams = { - // 文件名称 - fileName: this.archiveCaseCRFItem.formName, - // 表单标志位,1:屈光电子病历/屈光电子病历(复诊) 2:术后检查记录表,3:角膜交联病历/角膜交联病历(复诊),4:角膜交联术后检查记录单,5:复诊病历,6:手术计划 - formFlag: 2, - patientIdNumber: this.archiveCaseCRFItem.patientIdNumber, - patientCentreId: this.userData.centreId, - patientName: this.archiveCaseCRFItem.patientName, - patientId: this.archiveCaseCRFItem.patientId, - // 表单id - formId: this.archiveCaseCRFItem.id, - // 表单记录id - recordId: this.recordId, - signUser: { - // 签署位置集合 - position: [ - { - // 坐标签署X轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coX: '', - // 坐标签署Y轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coY: '', - // 关键字 签署位置类型为:1必填 - keyword: '医生签字:', - // 关键字偏移(左右),单位像素 签署位置类型为:1必填 - offsetX: '0.1', - // 关键字偏移(上下),单位像素 签署位置类型为:1必填 - offsetY: '0', - // 签署位置类型为:2必填 * 坐标签署页码,格式“A-B",A为起始页,B为结束页,如“1-5"表示从第1到第5页。“0-0"表示签所有页 - pageNo: '', - // 签名图片和时间戳分开时必填 * 1:签字位置(默认); * 6: 签署时间 - signatureType: '', - // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效 * 1:附加;0:不附加 (默认) - timestamp: '1', - // 签署位置类型(1:关键字;2:坐标;3:签名域) - type: '1', - // 签字/盖章宽度 - width: '75', - // 签字/盖章高度 - height: '30' - } - ], - // 是否必填:是 医护人员编号,用户需要在系统中已导入、实名认证和采集了签字 - userId: this.userData.employeeId - } - } + this.isShow = 1 + if (flag === 'savepdf') { setTimeout(() => { - this.exportPDF({ - customMargin: [15, 15], - customElementId: 'printButtonA5', - caParams: caParams, - isJavaTransformPdf: true, + console.log(document.getElementById('printButtonA5')); + this.html2Pdf({ marginStyle: Base64.encode(''), - htmlBase: Base64.encode(document.getElementById('printButtonA5').innerHTML) - + htmlBase: Base64.encode(document.getElementById('printButtonA5').innerHTML), + pageSize: 'A5' }) - }, 5) + }, 100); } } }) diff --git a/src/components/H5form/operation-nursing-record.vue b/src/components/H5form/operation-nursing-record.vue index 7558923..33c75d3 100644 --- a/src/components/H5form/operation-nursing-record.vue +++ b/src/components/H5form/operation-nursing-record.vue @@ -38,29 +38,34 @@ PID: - {{formListValue.patientId}} + {{formListValue.patientId}} 姓名: - {{formListValue.patientName}} + {{formListValue.patientName}} 性别: - {{formListValue.patientSex}} + {{formListValue.patientSex}} 出生日期: - {{formListValue.patientBirthday}} + {{formListValue.patientBirthday}} 手术日期: - {{formListValue.operaDate}} + {{formListValue.operaDate}}
@@ -185,7 +190,8 @@ {{ item.name }} - {{formListValue.beforeSf}} + {{formListValue.beforeSf}}
@@ -195,7 +201,8 @@ {{ item.name }} - {{formListValue.beforeBw}} + {{formListValue.beforeBw}}
@@ -205,7 +212,8 @@ {{ item.name }} - {{formListValue.beforeBs}} + {{formListValue.beforeBs}}
@@ -364,8 +372,7 @@
- 开睑器 * 1、有齿镊 * 1、 掀瓣针 * 1、透镜取出镊 * 1、 无齿镊 * - 1 + 开睑器 * 1、有齿镊 * 1、 掀瓣针 * 2、透镜取出镊 * 1
@@ -493,15 +500,14 @@
- +
KXL手术器械 - + @@ -712,13 +718,21 @@
-
- 保存人:{{ +
+
已CA签 +
+
未CA签 +
+
+ 保存人:{{ formListValue.createName ? formListValue.createName : "-" }} - 保存时间:{{ + 保存时间:{{ formListValue.createDate ? formListValue.createDate : "-" }} +
@@ -728,11 +742,12 @@ import signGet from '@/mixins/signGet' import publicFile from '@/mixins/publicFile' import h5formButton from '@/components/H5formOhter/h5formButton' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' export default { components: { h5formButton }, - mixins: [signGet, publicFile, htmlToPdfToBlob], + mixins: [signGet, publicFile, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -936,7 +951,7 @@ export default { } ], // 其它 - qxOtherList: ['掀瓣针', '开睑器', '1大圈', '其它'], + qxOtherList: ['其它'], // 健康教育列表 healthEducationList: [ { @@ -993,13 +1008,10 @@ export default { }, methods: { init() { + this.getSendCaStatus() this.getInfo() this.getOperaList() }, - // 点编辑按钮自动获取签名 - getSign() { - this.getSystomSign('backNurseSign', '', 'backNurseCode', 'backNurseName') - }, // 签名 singHandle(text) { const value = { @@ -1066,10 +1078,8 @@ export default { }) console.log(this.formListValue) } - window.localStorage.getItem('qg-userData') ? this.userData = JSON.parse(window.localStorage.getItem('qg-userData')) : '' - res.data.backNurseCode ? '' : this.formListValue.backNurseCode = this.userData.employeeId - res.data.backNurseName ? '' : this.formListValue.backNurseName = this.userData.realName - res.data.backNurseSign ? '' : this.getSign() + res.data.centerDoctorSign ? '' : this.getZdDoctorSign('centerDoctorSign', '', 'centerDoctorCode', 'centerDoctorName') + res.data.backNurseSign ? '' : this.getSystomSign('backNurseSign', '', 'backNurseCode', 'backNurseName') } else { this.$message.error(res.msg) } @@ -1204,140 +1214,64 @@ export default { message: '您已保存成功', type: 'success' }) - this.getSendCaStatus(res.data) - // this.$emit('closeDialog') - } else { - this.$message.error(res.msg) - } - }, - // 是否开启了CA认证表单状态 - async getSendCaStatus(resData) { - const { data: res } = await this.$http.get('/quguang/caSign/getSendCaStatus', { - params: { - name: '屈光手术护理记录单' - } - }) - if (res.code === 0) { - console.log('是否开启了CA认证表单状态') - res.data === 1 ? this.sendCaSign(resData) : this.$emit('closeDialog') + setTimeout(() => { + // 不保存pdf直接走ca + // caOpenStatus true 说明已开启CA + if (this.caOpenStatus) { + this.operaFormDataCaSign({ + caSignData: JSON.stringify(this.formListValue), + doctorCode: this.formListValue.centerDoctorCode, + formFlag: '12', + formId: res.data, + formName: '屈光手术护理记录单', + patientId: this.archiveCaseCRFItem.patientId, + patientName: this.archiveCaseCRFItem.patientName, + }, () => { + this.getInfo() + }) + + this.operaFormDataCaSign({ + caSignData: JSON.stringify(this.formListValue), + doctorCode: this.formListValue.backNurseCode, + formFlag: '7', + formId: res.data, + formName: '屈光手术护理记录单', + patientId: this.archiveCaseCRFItem.patientId, + patientName: this.archiveCaseCRFItem.patientName, + }, () => { + this.getInfo() + }) + this.$emit('closeDialog') + } + + // 我转出正常-暂时不开 + // 无论是否ca先走保存pdf--> 保存后再判断ca是否开启--> 如开启则走数据签 + // jspdf转可选pdf + // const caParams = { + // // 文件名称 + // fileName: '屈光手术护理记录单', + // // 表单标志位 + // formFlag: '', + // // 表单id + // formId: this.archiveCaseCRFItem.id, + // } + // this.exportPDF({ + // paperSize: 'A4', // 纸张格式 + // customOrientation: 'portrait', // 纸张方向 + // header: '100', // 页眉 + // customMargin: [25, 20, 0, 20], // 页边距 上 右 下 左 + // customElementId: 'printH5', + // isTransform: 'scale(0.83)', // 是否需要缩放 + // isCurrentPageLoad: false, // CA发送后端接口是否使用loading + // isJavaTransformPdf: false, // 是否java转换pdf + // caParams: caParams, + // isDataSign: true, + // }) + }, 100) } else { this.$message.error(res.msg) } }, - // async ceshipdf() { - // const dom = document.getElementById('printH5').innerHTML - // console.log(dom) - // const { data: res } = await this.$http.post('/quguang/survey/htmlToPdf', { - // html: Base64.encode(document.getElementById('printH5').innerHTML) - // }) - // }, - // 触发CA封装 - sendCaSign(resData) { - console.log('触发CA封装') - this.pageTitle === '手术列表' ? this.$emit('closeDialog') : '' - // this.formListValue.centerDoctorName 医院这个表单不需要医生签了 - if (this.formListValue.backNurseName) { - // this.formListValue.centerDoctorSign = '' - // this.formListValue.backNurseSign = '' - // this.loading = this.$loading({ - // lock: true, - // text: '转存PDF中请稍等...', - // spinner: 'el-icon-loading', - // background: 'rgba(255, 255, 255, 0.7)' - // }) - const caParams = { - // 多人医生签名的url - signUrl: '/quguang/caSign/multiCaSign', - // 文件名称 - fileName: '屈光手术护理记录单', - formFlag: 12, // 12-屈光手术护理记录单 - patientIdNumber: this.archiveCaseCRFItem.patientIdNumber, - patientCentreId: this.userData.centreId, - patientName: this.archiveCaseCRFItem.patientName, - patientId: this.archiveCaseCRFItem.patientId, - operaPatientId: this.archiveCaseCRFItem.id, - // 表单id - formId: resData, - zdSign: { - // 签署位置集合 - position: [ - { - // 坐标签署X轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coX: '', // 0.642 - // 坐标签署Y轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coY: '', // 0.179 - // 关键字 签署位置类型为:1必填 - keyword: '医生签字:', - // 关键字偏移(左右),单位像素 签署位置类型为:1必填 - offsetX: '0.1', - // 关键字偏移(上下),单位像素 签署位置类型为:1必填 - offsetY: '0', - // 签署位置类型为:2必填 * 坐标签署页码,格式“A-B",A为起始页,B为结束页,如“1-5"表示从第1到第5页。“0-0"表示签所有页 - pageNo: '', // 1-1 - // 签名图片和时间戳分开时必填 * 1:签字位置(默认); * 6: 签署时间 - signatureType: '', - // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效 * 1:附加;0:不附加 (默认) - timestamp: '1', - // 签署位置类型(1:关键字;2:坐标;3:签名域) - type: '1', - // 签字/盖章宽度 - width: '75', - // 签字/盖章高度 - height: '30' - } - ], - // 是否必填:是 医护人员编号,用户需要在系统中已导入、实名认证和采集了签字 - userId: this.formListValue.centerDoctorCode - }, - jsSign: { - // 签署位置集合 - position: [ - { - // 坐标签署X轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coX: '', // 0.154 - // 坐标签署Y轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coY: '', // 0.179 - // 关键字 签署位置类型为:1必填 - keyword: '巡回护士签字:', - // 关键字偏移(左右),单位像素 签署位置类型为:1必填 - offsetX: '0.1', - // 关键字偏移(上下),单位像素 签署位置类型为:1必填 - offsetY: '0', - // 签署位置类型为:2必填 * 坐标签署页码,格式“A-B",A为起始页,B为结束页,如“1-5"表示从第1到第5页。“0-0"表示签所有页 - pageNo: '', // 1-1 - // 签名图片和时间戳分开时必填 * 1:签字位置(默认); * 6: 签署时间 - signatureType: '1', - // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效 * 1:附加;0:不附加 (默认) - timestamp: '1', - // 签署位置类型(1:关键字;2:坐标;3:签名域) - type: '1', - // 签字/盖章宽度 - width: '75', - // 签字/盖章高度 - height: '30' - } - ], - // 是否必填:是 医护人员编号,用户需要在系统中已导入、实名认证和采集了签字 - userId: this.formListValue.backNurseCode - } - } - console.log('this.exportPDF') - this.exportPDF({ - // jsPDF配置 - paperSize: 'A4', // 纸张格式 - customOrientation: 'portrait', - customMargin: [25, 0, 0, 15], // 页边距 上 右 下 左 - isTransform: 'scale(0.85)', // 是否需要缩放 - customElementId: 'printH5', - isCurrentPageLoad: false, // CA发送后端接口是否使用loading - caParams: caParams, - isHaveDoctorSign: true, // 是否有医生签名 - isJavaTransformPdf: true, - htmlBase: Base64.encode(document.getElementById('printH5').innerHTML) - }) - } - // console.log(Base64.decode(Base64.encode(document.getElementById('printH5').innerHTML))) - } } } diff --git a/src/components/H5form/operation-plan.vue b/src/components/H5form/operation-plan.vue index 9808a6a..318218f 100644 --- a/src/components/H5form/operation-plan.vue +++ b/src/components/H5form/operation-plan.vue @@ -117,7 +117,7 @@
预期矫正度数 - 试戴 + 试戴
手术方式 @@ -303,11 +303,11 @@ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="日期" />
-
+
患者(代理人)签字: - +
@@ -348,11 +348,11 @@
日 期: - {{ formListValue.patientorDlrSignTime ? formListValue.patientorDlrSignTime : '-' }} + style="border-bottom:1px solid #ccc;font-size:15px;width: 100px;padding:0 16px;">{{ formListValue.patientOrDlrSignTime ? formListValue.patientOrDlrSignTime : '-' }}
@@ -363,9 +363,17 @@
-
- 保存人:{{ formListValue.createName ? formListValue.createName : '-' }} - 保存时间:{{ formListValue.createDate ? formListValue.createDate : '-' }} +
+
已CA签 +
+
未CA签 +
+
+ 保存人:{{ formListValue.createName ? formListValue.createName : '-' }} + 保存时间:{{ formListValue.createDate ? formListValue.createDate : '-' }} +
{ @@ -648,13 +659,17 @@ export default { }) } this.isGetFormValue = true + this.formListValue.patientGxCheck === '本人' && !this.formListValue.patientOrDlrZjh ? this.formListValue.patientOrDlrZjh = this.formListValue.patientIdNumber : '' + this.formListValue.zjSelect ? '' : this.formListValue.zjSelect = isIDNumber(this.formListValue.patientOrDlrZjh) ? '身份证号' : ( + isHuzhao(this.formListValue.patientOrDlrZjh) ? '护照号' : '' + ) } else { this.$message.error(res.msg) } }, // 试戴--是否显示患者签名 checkSd() { - this.rowShowPatientorDlrSign(this.formListValue.isShowPatientorDlrSign) + this.rowShowPatientorDlrSign(this.formListValue.isShowPatientOrDlrSign) }, // 行显示隐藏 rowShowPatientorDlrSign(flag) { @@ -662,7 +677,7 @@ export default { if (flag) { this.tableDataNew = this.tableData } else { - this.tableDataNew = tableData.filter(item => item.name !== 'patientorDlrSign') + this.tableDataNew = tableData.filter(item => item.name !== 'patientOrDlrSign') } }, // 获取术士项目列表 @@ -711,18 +726,36 @@ export default { flag ? this.autoFixed2(yghc) : '' this.formListValue[jzds] = this.formListValue[yghc] }, + // 患者关系选择 + hzgxSelectChange(e) { + console.log('this.formListValue.patientIdNumber', this.formListValue.patientIdNumber); + console.log(e) + e === '本人' ? this.formListValue.patientOrDlrZjh = this.formListValue.patientIdNumber : this.formListValue.patientOrDlrZjh = '' + }, + // -4:等待签到,-3:等待验光/等待谈话,-2:等待验光,-1:等待谈话 + async statusHandle() { + const { data: res } = await this.$http.post('/quguang/pda/updateOperaStatus', { + operaId: this.formListValue.operaId, + status: -1 + }) + if (res.code === 0) { + } else { + this.$message.error(res.msg) + } + }, // 保存表单 async saveAllForm(text) { - this.saveLoading = this.$loading({ - lock: true, - text: '保存中请稍等...', - spinner: 'el-icon-loading', - background: 'rgba(255, 255, 255, 0.7)' - }) + // this.saveLoading = this.$loading({ + // lock: true, + // text: '保存中请稍等...', + // spinner: 'el-icon-loading', + // background: 'rgba(255, 255, 255, 0.7)' + // }) // publicFile.js中调取--获取上次保存时间方法 this.getUpSaveTime('/quguang/opera/plan/getOperaPlanInfo', text) }, async saveForm(text) { + const userData = window.localStorage.getItem('qg-userData') ? JSON.parse(window.localStorage.getItem('qg-userData')) : '' // this.formListValue.doctorSign = '' 使用系统签名现注释掉 const formvalue = JSON.parse(JSON.stringify(this.formListValue)) Object.keys(formvalue).forEach((item) => { @@ -735,30 +768,37 @@ export default { formvalue ) if (res.code === 0) { + this.$message({ + message: '您已保存成功', + type: 'success' + }) this.saveEidtTitle = '编辑' - this.getSendCaStatus() - } else { - this.saveLoading.close() - this.$message.error(res.msg) - } - }, - // 患者关系选择 - hzgxSelectChange(e) { - console.log(e) - e === '本人' ? this.formListValue.patientOrDlrZjh = this.formListValue.patientIdNumber : this.formListValue.patientOrDlrZjh = '' - }, - // 是否开启了CA认证表单状态 - async getSendCaStatus() { - const { data: res } = await this.$http.get('/quguang/caSign/getSendCaStatus', { - params: { - name: this.archiveCaseCRFItem.formName - } - }) - if (res.code === 0) { - this.saveLoading.close() - res.data === 1 ? this.sendCaSign() : this.getInfo() + this.statusHandle() + + setTimeout(() => { + if (this.formListValue.isShowPatientOrDlrSign && this.caOpenStatus) { + this.sendCaSign() + } else if (!this.formListValue.isShowPatientOrDlrSign && this.caOpenStatus) { + // 不保存pdf直接走ca + // caOpenStatus true 说明已开启CA + this.operaFormDataCaSign({ + caSignData: JSON.stringify(this.formListValue), + doctorCode: userData.employeeId, + formFlag: '6', + formId: this.archiveCaseCRFItem.id, + formName: this.archiveCaseCRFItem.formName, + patientId: this.archiveCaseCRFItem.patientId, + patientName: this.archiveCaseCRFItem.patientName, + }, () => { + this.getInfo() + }) + } else { + this.getInfo() + } + }, 100); + } else { - this.saveLoading.close() + // this.saveLoading.close() this.$message.error(res.msg) } }, @@ -766,7 +806,7 @@ export default { sendCaSign() { if (this.formListValue.doctorSign) { this.formListValue.doctorSign = '' - this.formListValue.patientorDlrSign = '' + this.formListValue.patientOrDlrSign = '' this.loading = this.$loading({ lock: true, text: '发送CA签中请稍等...', @@ -883,17 +923,17 @@ export default { positions: patientSignObj1 }] }, { - signerType: this.formListValue.dlrHzGx === '家属' ? '4' : (this.formListValue.dlrHzGx === '见证人' ? '5' : ''), // 签名类型 3:患者; 4:家属; 5:见证人 - patientName: this.formListValue.patientName + this.formListValue.dlrHzGx, // 代理人姓名 + signerType: this.formListValue.patientGxCheck === '家属' ? '4' : (this.formListValue.patientGxCheck === '见证人' ? '5' : ''), // 签名类型 3:患者; 4:家属; 5:见证人 + patientName: this.formListValue.patientName + this.formListValue.patientGxCheck, // 代理人姓名 patientIdcard: this.formListValue.patientOrDlrZjh, // 代理人证件号 - description: this.formListValue.dlrHzGx, + description: this.formListValue.patientGxCheck, signFiles: [{ fileCode: this.patientCaUploadParams.fileCode, // 签署位置集合 positions: patientSignObj1 }] }] - this.signUsers = this.formListValue.dlrHzGx === '本人' ? signUsers1 : signUsers2 + this.signUsers = this.formListValue.patientGxCheck === '本人' ? signUsers1 : signUsers2 this.signFileByPad(customParams) }, // 刷新页面 @@ -910,7 +950,7 @@ export default { }, objectSpanMethod({ row, column, rowIndex, columnIndex }) { if ( - (row.nameClass === 'doctorSign' || row.nameClass === 'patientorDlrSign' || row.nameClass === 'bz') && + (row.nameClass === 'doctorSign' || row.nameClass === 'patientOrDlrSign' || row.nameClass === 'bz') && columnIndex === 1 ) { return { @@ -918,7 +958,7 @@ export default { colspan: 2 } } else if ( - (row.nameClass === 'doctorSign' || row.nameClass === 'patientorDlrSign' || row.nameClass === 'bz') && + (row.nameClass === 'doctorSign' || row.nameClass === 'patientOrDlrSign' || row.nameClass === 'bz') && columnIndex > 1 ) { // 偏移原因及解决方案 清除就是这俩属性设置为0 diff --git a/src/components/H5form/operation-record.vue b/src/components/H5form/operation-record.vue index 71b443a..2f253d0 100644 --- a/src/components/H5form/operation-record.vue +++ b/src/components/H5form/operation-record.vue @@ -370,15 +370,6 @@ °
- -
- SCC: - - - {{formListValue.sccOd}} - - ° -
+
矫正度数: -
+
帽厚度: 吸引环参数: @@ -701,7 +695,9 @@ operaOsType === 4 || operaOsType === 6 || operaOsType === 7 || - operaOsType === 9 + operaOsType === 9 || + operaOsType === 10 || + operaOsType === 99 " class="width-120" style="margin-bottom:8px;text-align: left;"> 瓣厚度: @@ -775,23 +771,14 @@ °
- -
- SCC: - - - {{formListValue.sccOs}} - - ° -
MMC: @@ -804,7 +791,8 @@
Tr: @@ -821,7 +809,8 @@
Ts: @@ -835,7 +824,7 @@ s
-
ADD: @@ -845,7 +834,8 @@ D
-
+
核黄素类型: @@ -853,7 +843,8 @@
-
+
渗透时间: @@ -862,7 +853,8 @@ min
-
+
渗透评估: @@ -871,7 +863,8 @@ 级
-
+
角膜厚度: @@ -895,7 +888,8 @@ μm
-
+
角膜厚度(照射后): @@ -905,7 +899,8 @@ μm
-
+
照射模式: @@ -913,7 +908,8 @@
-
+
照射直径: @@ -922,7 +918,8 @@ mm
-
+
辐照度: @@ -931,7 +928,8 @@ mW/cm
-
+
照射时间: @@ -945,12 +943,12 @@ s
-
+
总能量: - {{formListValue.znlOs}} + {{formListValue.znlOs}} J/cm
@@ -1044,7 +1042,8 @@ 技师签字: - {{ formListValue.jsName ? formListValue.jsName : '-' }} + {{ formListValue.jsName ? formListValue.jsName : '-' }} 日期:{{ @@ -1122,7 +1121,8 @@ --> 主刀签字: - {{ formListValue.zdName ? formListValue.zdName : '-' }} + {{ formListValue.zdName ? formListValue.zdName : '-' }}
@@ -1174,13 +1174,21 @@
-
- 保存人:{{ +
+
已CA签 +
+
未CA签 +
+
+ 保存人:{{ formListValue.createName ? formListValue.createName : "-" }} - 保存时间:{{ + 保存时间:{{ formListValue.createDate ? formListValue.createDate : "-" }} +
屈光电子病历检查信息 @@ -1206,6 +1214,7 @@ import intoTemplate from '@/components/H5form/intoTemplate' import intoMrz from '@/components/H5form/intoMrz' import blDataInfo from '@/components/H5form/blDataInfo' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' import { pinyin } from 'pinyin-pro' export default { @@ -1215,7 +1224,7 @@ export default { intoMrz, blDataInfo }, - mixins: [signGet, publicFile, operationRecord, htmlToPdfToBlob], + mixins: [signGet, publicFile, operationRecord, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -1315,9 +1324,6 @@ export default { yxlOd2: '', yxlOs1: '', yxlOs2: '', - // scc - sccOd: '', - sccOs: '', // mmc mmcOd: '', mmcOs: '', @@ -1454,6 +1460,7 @@ export default { }, methods: { init() { + this.getSendCaStatus() if (this.pageTitle === '表单设置') { this.setTableData() this.formListValue = this.formSetValue @@ -1465,13 +1472,6 @@ export default { document.title = `手术记录(${this.archiveCaseCRFItem.patientName})` } }, - // 点编辑按钮自动获取签名 - getSign() { - console.log('技师签字') - this.getSystomSign('', 'jsSignDate', 'jsCode', 'jsName') - // this.getSystomSign('jsSignOd', 'jsSignDateOd') - // this.getSystomSign('jsSignOs', 'jsSignDateOs') - }, // 签名 singHandle(text) { const value = { @@ -1576,9 +1576,8 @@ export default { } }) } - res.data.jsName || res.data.jsSignDate ? '' : this.getSign() - res.data.zdName || res.data.zdSignDate ? '' : this.getZdDoctorSign('', 'zdSignDate', 'zdCode', 'zdName') - + res.data.jsSign ? '' : this.getSystomSign('jsSign', 'jsSignDate', 'jsCode', 'jsName') + res.data.zdSign ? '' : this.getZdDoctorSign('zdSign', 'zdSignDate', 'zdCode', 'zdName') console.log(this.formListValue) } else { this.$message.error(res.msg) @@ -1707,14 +1706,13 @@ export default { }, // 保存表单 async saveAllForm() { - this.saveLoading = this.$loading({ - lock: true, - text: '保存中请稍等...', - spinner: 'el-icon-loading', - background: 'rgba(255, 255, 255, 0.7)' - }) - this.formListValue.jsSign = '' - this.formListValue.zdSign = '' + const userData = window.localStorage.getItem('qg-userData') ? JSON.parse(window.localStorage.getItem('qg-userData')) : '' + // this.saveLoading = this.$loading({ + // lock: true, + // text: '保存中请稍等...', + // spinner: 'el-icon-loading', + // background: 'rgba(255, 255, 255, 0.7)' + // }) const formvalue = JSON.parse(JSON.stringify(this.formListValue)) Object.keys(formvalue).forEach((item) => { if (Array.isArray(formvalue[item])) { @@ -1728,135 +1726,72 @@ export default { if (res.code === 0) { this.saveEidtTitle = '编辑' this.isSaveSeccess = true - // this.$message({ - // message: '您已保存成功', - // type: 'success' - // }) - this.getSendCaStatus(res.data) - } else { - this.saveLoading.close() - this.$message.error(res.msg) - } - }, - // 是否开启了CA认证表单状态 - async getSendCaStatus(resData) { - const { data: res } = await this.$http.get('/quguang/caSign/getSendCaStatus', { - params: { - name: '手术记录' - } - }) - if (res.code === 0) { - console.log('CA认证表单状态', res.data) - this.saveLoading.close() - res.data === 1 ? this.sendCaSign(resData) : this.$emit('closeDialog') - } else { - this.saveLoading.close() - this.$message.error(res.msg) - } - }, - sendCaSign(resData) { - this.pageTitle === '手术列表' ? this.$emit('closeDialog') : '' - if (this.formListValue.jsName && this.formListValue.zdName) { - this.loading = this.$loading({ - lock: true, - text: '发送CA签中请稍等...', - spinner: 'el-icon-loading', - background: 'rgba(255, 255, 255, 0.7)' + this.$message({ + message: '您已保存成功', + type: 'success' }) - this.formListValue.jsSign = '' - this.formListValue.zdSign = '' - const caParams = { - // 多人医生签名的url - signUrl: '/quguang/caSign/multiCaSign', - // 文件名称 - fileName: '手术记录', - // 表单标志位,1:屈光电子病历/屈光电子病历(复诊) 2:术后检查记录表,3:角膜交联病历/角膜交联病历(复诊),4:角膜交联术后检查记录单,5:复诊病历,6:手术计划,7:手术记录 - formFlag: 7, - patientIdNumber: this.archiveCaseCRFItem.patientIdNumber, - patientCentreId: this.userData.centreId, - patientName: this.archiveCaseCRFItem.patientName, - patientId: this.archiveCaseCRFItem.patientId, - // 表单id - formId: resData, - jsSign: { - // 签署位置集合 - position: [ - { - // 坐标签署X轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coX: '', // 0.154 - // 坐标签署Y轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coY: '', // 0.179 - // 关键字 签署位置类型为:1必填 - keyword: '技师签字:', - // 关键字偏移(左右),单位像素 签署位置类型为:1必填 - offsetX: '0.1', - // 关键字偏移(上下),单位像素 签署位置类型为:1必填 - offsetY: '0', - // 签署位置类型为:2必填 * 坐标签署页码,格式“A-B",A为起始页,B为结束页,如“1-5"表示从第1到第5页。“0-0"表示签所有页 - pageNo: '', // 1-1 - // 签名图片和时间戳分开时必填 * 1:签字位置(默认); * 6: 签署时间 - signatureType: '1', - // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效 * 1:附加;0:不附加 (默认) - timestamp: '1', - // 签署位置类型(1:关键字;2:坐标;3:签名域) - type: '1', - // 签字/盖章宽度 - width: '75', - // 签字/盖章高度 - height: '30' - } - ], - // 是否必填:是 医护人员编号,用户需要在系统中已导入、实名认证和采集了签字 - userId: this.formListValue.jsCode - }, - zdSign: { - // 签署位置集合 - position: [ - { - // 坐标签署X轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coX: '', // 0.642 - // 坐标签署Y轴(数值为0-1之间的小数,以左下角为原点0,右角顶点为1) * 签署位置类型为:2必填 - coY: '', // 0.179 - // 关键字 签署位置类型为:1必填 - keyword: '主刀签字:', - // 关键字偏移(左右),单位像素 签署位置类型为:1必填 - offsetX: '0.1', - // 关键字偏移(上下),单位像素 签署位置类型为:1必填 - offsetY: '0', - // 签署位置类型为:2必填 * 坐标签署页码,格式“A-B",A为起始页,B为结束页,如“1-5"表示从第1到第5页。“0-0"表示签所有页 - pageNo: '', // 1-1 - // 签名图片和时间戳分开时必填 * 1:签字位置(默认); * 6: 签署时间 - signatureType: '', - // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效 * 1:附加;0:不附加 (默认) - timestamp: '1', - // 签署位置类型(1:关键字;2:坐标;3:签名域) - type: '1', - // 签字/盖章宽度 - width: '75', - // 签字/盖章高度 - height: '30' - } - ], - // 是否必填:是 医护人员编号,用户需要在系统中已导入、实名认证和采集了签字 - userId: this.formListValue.zdCode + + setTimeout(() => { + // 不保存pdf直接走ca + // caOpenStatus true 说明已开启CA + if (this.caOpenStatus) { + // 不保存pdf直接走ca 多个人签名掉多次 + this.operaFormDataCaSign({ + caSignData: JSON.stringify(this.formListValue), + doctorCode: this.formListValue.jsCode, + formFlag: '7', + formId: res.data, + formName: '手术记录', + patientId: this.archiveCaseCRFItem.patientId, + patientName: this.archiveCaseCRFItem.patientName, + }, () => { + this.getInfo() + }) + + this.operaFormDataCaSign({ + caSignData: JSON.stringify(this.formListValue), + doctorCode: this.formListValue.zdCode, + formFlag: '7', + formId: res.data, + formName: '手术记录', + patientId: this.archiveCaseCRFItem.patientId, + patientName: this.archiveCaseCRFItem.patientName, + }, () => { + this.getInfo() + }) + this.$emit('closeDialog') } - } - this.exportPDF({ - paperSize: 'A4', // 纸张格式 - customOrientation: 'portrait', // 纸张方向 - header: '100', // 页眉 - customMargin: [25, 0, 0, 15], // 页边距 上 右 下 左 - customElementId: 'printH5', - isTransform: 'scale(0.85)', // 是否需要缩放 - // isHtml2canvas: true, - isCurrentPageLoad: false, // CA发送后端接口是否使用loading - isPdfLoad: true, - caParams: caParams, - isJavaTransformPdf: false, - isHaveDoctorSign: true // 是否有医生签名 - }) + + // 我转出正常-暂时不开 + // 无论是否ca先走保存pdf--> 保存后再判断ca是否开启--> 如开启则走数据签 + // jspdf转可选pdf + // const caParams = { + // // 文件名称 + // fileName: '手术记录', + // // 表单标志位 + // formFlag: '', + // // 表单id + // formId: this.archiveCaseCRFItem.id, + // } + // this.exportPDF({ + // paperSize: 'A4', // 纸张格式 + // customOrientation: 'portrait', // 纸张方向 + // header: '100', // 页眉 + // customMargin: [25, 20, 0, 20], // 页边距 上 右 下 左 + // customElementId: 'printH5', + // isTransform: 'scale(0.83)', // 是否需要缩放 + // isCurrentPageLoad: false, // CA发送后端接口是否使用loading + // isJavaTransformPdf: false, // 是否java转换pdf + // caParams: caParams, + // isDataSign: true, + // }) + }, 100) + } else { + // this.saveLoading.close() + this.$message.error(res.msg) } }, + // 给table每一行设置名字 returnName(obj) { // console.log(obj) diff --git a/src/components/H5form/operationed-check-record.vue b/src/components/H5form/operationed-check-record.vue index a210477..295de15 100644 --- a/src/components/H5form/operationed-check-record.vue +++ b/src/components/H5form/operationed-check-record.vue @@ -350,11 +350,11 @@
K2 - + / K1 - @ - + @ +
@@ -386,6 +386,84 @@ D
+ +
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
@@ -681,11 +759,11 @@
K2 - + / K1 - @ - + @ +
@@ -704,6 +782,82 @@
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
+ +
+
+ 3c/d: + + + 6c/d: + + +
+
+ 12c/d: + + + 18c/d: + + +
+
@@ -828,6 +982,8 @@ import h5formButton from '@/components/H5formOhter/h5formButton' import operaCheckLook from '@/components/H5form/operaCheckLook' import intoTemplate from '@/components/H5form/intoTemplate' import operaCheckLookPdf from '@/components/H5form/operaCheckLookPdf' +import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' export default { components: { imgEditor, @@ -837,7 +993,7 @@ export default { intoTemplate, operaCheckLookPdf }, - mixins: [operationedCheckRecordJS, base64Img, signGet, publicFile, refreshDate], + mixins: [operationedCheckRecordJS, base64Img, signGet, publicFile, refreshDate, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -1005,12 +1161,12 @@ export default { yyOs1: '', yyOs2: '', // 角膜地形图 - jmdxtK2Od: '', - jmdxtK1Od1: '', - jmdxtK1Od2: '', - jmdxtK2Os: '', - jmdxtK1Os1: '', - jmdxtK1Os2: '', + jmdxtOd1: '', + jmdxtOd2: '', + jmdxtOd3: '', + jmdxtOs1: '', + jmdxtOs2: '', + jmdxtOs3: '', jmdxtDeviceName: '', // 眼轴 yzOd: '', @@ -1268,7 +1424,7 @@ export default { }) if (res.code === 0) { this.pinJieOperaName = res.data.ssOuOperaName + '、' + res.data.ssOuOperaBieM + '、' + res.data.ssOdOperaName + '、' + res.data.ssOdOperaBieM + '、' + res.data.ssOsOperaName + '、' + res.data.ssOsOperaBieM - this.rowShow() + this.rowShow(res.data) this.$emit('load') if (this.archiveCaseCRFItem.id === res.data.formId) { res.data.ssOuOperaName ? this.setyyssfsList('ouList', res.data.ssOuOperaName) : '' @@ -1298,20 +1454,21 @@ export default { this.rowShow() }, // 行显示隐藏 - rowShow() { + rowShow(resdata) { + let isShowdbmgd = resdata ? JSON.parse(resdata.isShowdbmgd) : this.formListValue.isShowdbmgd let tableData = JSON.parse(JSON.stringify(this.tableData)) if (this.pinJieOperaName) { - if ((this.pinJieOperaName.includes('Presby MAX') || this.pinJieOperaName.includes('FS-LASIK+老视') || this.pinJieOperaName.includes('Smart+老视')) && this.formListValue.isShowdbmgd) { + if ((this.pinJieOperaName.includes('Presby MAX') || this.pinJieOperaName.includes('FS-LASIK+老视') || this.pinJieOperaName.includes('Smart+老视')) && isShowdbmgd) { this.tableDataNew = this.tableData - } else if ((this.pinJieOperaName.includes('Presby MAX') || this.pinJieOperaName.includes('FS-LASIK+老视') || this.pinJieOperaName.includes('Smart+老视')) && !this.formListValue.isShowdbmgd) { + } else if ((this.pinJieOperaName.includes('Presby MAX') || this.pinJieOperaName.includes('FS-LASIK+老视') || this.pinJieOperaName.includes('Smart+老视')) && !isShowdbmgd) { this.tableDataNew = tableData.filter(item => item.name !== 'dbmgdAn' && item.name !== 'dbmgdDi' && item.name !== 'dbmgdGao' && item.name !== 'dbmgdLiang') - } else if ((!this.pinJieOperaName.includes('Presby MAX') && !this.pinJieOperaName.includes('FS-LASIK+老视') && !this.pinJieOperaName.includes('Smart+老视')) && this.formListValue.isShowdbmgd) { + } else if ((!this.pinJieOperaName.includes('Presby MAX') && !this.pinJieOperaName.includes('FS-LASIK+老视') && !this.pinJieOperaName.includes('Smart+老视')) && isShowdbmgd) { this.tableDataNew = tableData.filter(item => item.name !== 'UCVA' && item.name !== 'BSCVA') } else { this.tableDataNew = tableData.filter(item => item.name !== 'UCVA' && item.name !== 'BSCVA' && item.name !== 'dbmgdAn' && item.name !== 'dbmgdDi' && item.name !== 'dbmgdGao' && item.name !== 'dbmgdLiang') } } else { - if (this.formListValue.isShowdbmgd) { + if (isShowdbmgd) { this.tableDataNew = tableData.filter(item => item.name !== 'UCVA' && item.name !== 'BSCVA') } else { this.tableDataNew = tableData.filter(item => item.name !== 'UCVA' && item.name !== 'BSCVA' && item.name !== 'dbmgdAn' && item.name !== 'dbmgdDi' && item.name !== 'dbmgdGao' && item.name !== 'dbmgdLiang') @@ -1454,12 +1611,45 @@ export default { type: 'success' }) this.getInfo() + // res.data:病历最新的记录Id + this.$refs.operaCheckLookPdf.init(res.data, 'savepdf') } else { this.$message.error(res.msg) } } }) }, + // 确认ca + sureCa() { + const userData = window.localStorage.getItem('qg-userData') ? JSON.parse(window.localStorage.getItem('qg-userData')) : '' + if (userData.realName !== this.formListValue.createName) { + return this.$message({ + message: `此病历是${this.formListValue.createName}医生的,您不能操作其他医生的患者病历哦!`, + type: 'warning' + }) + } + if ((this.formListValue.ssOuOperaBieM || this.formListValue.ssOdOperaBieM || this.formListValue.ssOsOperaBieM || this.formListValue.ssOuOperaName || this.formListValue.ssOdOperaName || this.formListValue.ssOsOperaName) && + (this.formListValue.zsOperaDayOd || this.formListValue.zsOperaDayOs) && this.formListValue.zd && this.formListValue.clyj || + (this.formListValue.zsTextOd || this.formListValue.zsTextOs)) { + // formFlag: 1:屈光电子病历/屈光电子病历(复诊) 2:术后检查记录表,3:角膜交联病历/角膜交联病历(复诊),4:角膜交联术后检查记录单,5:复诊病历 + // this.$refs.operaCheckLookPdf.init(this.formListValue.recordId, '2') + this.$confirmFun('CA确认将会把最新一次标准病历文书发送至ca签名,您是否确认继续此操作?', '您已取消CA确认').then(() => { + // this.$refs.blLookRefPdf.init(this.formListValue.recordId, 'sureCa') + + if (this.caOpenStatus) { + this.batchDataCa({ + doctorCode: userData.employeeId, + ids: [this.formListValue.formId], // 表单的formId + }, () => { + this.getInfo() + }) + } + + }) + } else { + this.$message.error('标准病历文书内容不完善,请补全后再进行CA确认吧!') + } + }, // 主诉拼接,走CA认证之前提前拼接,方便判断 zsSplit(index) { // 获取主诉勾选项 @@ -1492,24 +1682,6 @@ export default { this.zsTextOs = (dataObj.zsBsbcOs ? dataObj.zsBsbcOs : '') + (dataObj.zsWbsCheckOs === 'true' ? ',目前无不适' : zscheckTextOs.join('、')) } }, - // 确认ca - sureCa() { - const userData = window.localStorage.getItem('qg-userData') ? JSON.parse(window.localStorage.getItem('qg-userData')) : '' - if (userData.realName !== this.formListValue.createName) { - return this.$message({ - message: `此病历是${this.formListValue.createName}医生的,您不能操作其他医生的患者病历哦!`, - type: 'warning' - }) - } - if ((this.formListValue.ssOuOperaBieM || this.formListValue.ssOdOperaBieM || this.formListValue.ssOsOperaBieM || this.formListValue.ssOuOperaName || this.formListValue.ssOdOperaName || this.formListValue.ssOsOperaName) && - (this.formListValue.zsOperaDayOd || this.formListValue.zsOperaDayOs) && this.formListValue.zd && this.formListValue.clyj || - (this.formListValue.zsTextOd || this.formListValue.zsTextOs)) { - // formFlag: 1:屈光电子病历/屈光电子病历(复诊) 2:术后检查记录表,3:角膜交联病历/角膜交联病历(复诊),4:角膜交联术后检查记录单,5:复诊病历 - this.$refs.operaCheckLookPdf.init(this.formListValue.recordId, '2') - } else { - this.$message.error('标准病历文书内容不完善,请补全后再进行CA确认吧!') - } - }, returnName(obj) { // console.log(obj) // rowIndex 就是第几行的意思 diff --git a/src/components/H5form/payDemandNote.vue b/src/components/H5form/payDemandNote.vue index 3c2a093..c00ee42 100644 --- a/src/components/H5form/payDemandNote.vue +++ b/src/components/H5form/payDemandNote.vue @@ -221,12 +221,13 @@ import signGet from '@/mixins/signGet' import publicFile from '@/mixins/publicFile' import h5formButton from '@/components/H5formOhter/h5formButton' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' import { isIDNumber, isHuzhao } from '@/utils/validate' export default { components: { h5formButton }, - mixins: [signGet, publicFile, htmlToPdfToBlob], + mixins: [signGet, publicFile, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -261,7 +262,7 @@ export default { return { saveEidtTitle: '编辑', formListValue: { - formName: '医疗收费知情同意书', + formName: '特需医疗服务患者知情同意书', patientName: '', patientId: '', patientSex: '', @@ -520,7 +521,7 @@ export default { const caParams = { // 文件名称 fileName: this.archiveCaseCRFItem.formName, - // 表单标志位,11 医疗收费知情同意书 + // 表单标志位,11 特需医疗服务患者知情同意书 formFlag: 11, // 表单id formId: this.archiveCaseCRFItem.id, diff --git a/src/components/H5form/qg-dzbl.vue b/src/components/H5form/qg-dzbl.vue index c482e3e..3813dcf 100644 --- a/src/components/H5form/qg-dzbl.vue +++ b/src/components/H5form/qg-dzbl.vue @@ -842,11 +842,11 @@
K2 - + / K1 - @ - + @ +
ACD @@ -1287,11 +1287,11 @@
K2 - + / K1 - @ - + @ +
ACD @@ -1976,6 +1976,8 @@ import dzblLook from '@/components/H5form/dzblLook' import dzblLookPdf from '@/components/H5form/dzblLookPdf' import intoTemplate from '@/components/H5form/intoTemplate' import bldb from '@/components/H5formOhter/bldb' +import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' export default { components: { imgEditor, @@ -1986,7 +1988,7 @@ export default { bldb, intoTemplate }, - mixins: [qgdzbl, base64Img, signGet, publicFile, refreshDate, clearContent], + mixins: [qgdzbl, base64Img, signGet, publicFile, refreshDate, clearContent, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -2510,7 +2512,7 @@ export default { }, created() { // 获取ca开启状态 判断是否启用“确认CA”按钮 - this.getSendCaStatus(this.archiveCaseCRFItem.formName) + this.getSendCaStatus() this.getOperaList() }, mounted() { @@ -2557,7 +2559,7 @@ export default { } }) if (res.code === 0) { - this.rowShow() + this.rowShow(res.data) this.$emit('load') if (this.archiveCaseCRFItem.id === res.data.formId) { Object.keys(res.data).forEach((item) => { @@ -2689,14 +2691,16 @@ export default { // 是否显示对比敏感度 checkDbmgd() { console.log(this.formListValue.isShowdbmgd); - this.rowShow() + this.rowShow(this.formListValue) }, // 行显示隐藏 rowShow(data) { let tableData = JSON.parse(JSON.stringify(this.tableData)) - if (this.formListValue.isShowdbmgd) { + if (data.isShowdbmgd) { this.tableDataNew = this.tableData + console.log('行显示隐藏1'); } else { + console.log('行显示隐藏2'); this.tableDataNew = tableData.filter(item => item.name !== 'dbmgdAn' && item.name !== 'dbmgdDi' && item.name !== 'dbmgdGao' && item.name !== 'dbmgdLiang') } }, @@ -2881,10 +2885,12 @@ export default { // res.data:病历最新的记录Id this.blRecordid = res.data this.$message({ - message: '表单已保存', + message: '您已保存成功', type: 'success' }) this.getInfo() + // res.data:病历最新的记录Id + this.$refs.blLookRefPdf.init(res.data, 'savepdf') } else { this.$message.error(res.msg) } @@ -2901,7 +2907,18 @@ export default { if ((this.archiveCaseCRFItem.formName.includes('复诊') && this.formListValue.zsandBs && this.formListValue.zd && this.formListValue.clyj) || !this.archiveCaseCRFItem.formName.includes('复诊') && (this.formListValue.jsEyetypeRadio || this.formListValue.jsTimeInput) && this.formListValue.zd && this.formListValue.clyj) { this.$confirmFun('CA确认将会把最新一次标准病历文书发送至ca签名,您是否确认继续此操作?', '您已取消CA确认').then(() => { - this.$refs.blLookRefPdf.init(this.formListValue.recordId, '1') + // this.$refs.blLookRefPdf.init(this.formListValue.recordId, 'sureCa') + + // caOpenStatus true 说明已开启CA + if (this.caOpenStatus) { + this.batchDataCa({ + doctorCode: userData.employeeId, + ids: [this.formListValue.formId], // 表单的formId + }, () => { + this.getInfo() + }) + } + }) } else { this.$message.error('标准病历文书内容不完善,请补全后再进行CA确认吧!') diff --git a/src/components/H5form/shouquanBook.vue b/src/components/H5form/shouquanBook.vue index f1fcff9..8ebfa65 100644 --- a/src/components/H5form/shouquanBook.vue +++ b/src/components/H5form/shouquanBook.vue @@ -385,13 +385,14 @@ import publicFile from '@/mixins/publicFile' import h5formButton from '@/components/H5formOhter/h5formButton' import { isIDNumber, isHuzhao } from '@/utils/validate' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' import visitFile from '@/components/H5formOhter/visitFile' export default { components: { h5formButton, visitFile }, - mixins: [signGet, publicFile, htmlToPdfToBlob], + mixins: [signGet, publicFile, htmlToPdfToBlob, yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, diff --git a/src/components/H5form/talk-record.vue b/src/components/H5form/talk-record.vue index 8a87f56..d3c2347 100644 --- a/src/components/H5form/talk-record.vue +++ b/src/components/H5form/talk-record.vue @@ -28,7 +28,7 @@ margin: 0 0 30px 0; text-align: center; "> - 激光手术同意书 + 激光角膜屈光手术同意书

@@ -453,6 +453,7 @@ import publicFile from '@/mixins/publicFile' import h5formButton from '@/components/H5formOhter/h5formButton' // import recordFile from '@/page-subspecialty/views/modules/seeDoctor/archives/record-file' import htmlToPdfToBlob from '@/mixins/htmlToPdfToBlob' +import yiXinQianSign from '@/mixins/yiXinQianSign.js' import { isIDNumber, isHuzhao } from '@/utils/validate' import { Base64 } from 'js-base64' export default { @@ -461,7 +462,7 @@ export default { crfEditor // recordFile }, - mixins: [signGet, publicFile, htmlToPdfToBlob], + mixins: [signGet, publicFile, htmlToPdfToBlob,yiXinQianSign], props: { archiveCaseCRFItem: { type: Object, @@ -508,7 +509,7 @@ export default { // 表单id formId: '', // 表单名称 - formName: '激光手术同意书', + formName: '激光角膜屈光手术同意书', // 表单日期 formDate: '', // 就诊号 @@ -655,7 +656,7 @@ export default { } }, destroyed() { - console.log('激光手术同意书destroyed') + console.log('激光角膜屈光手术同意书destroyed') // this.$store.commit('clearSignDate', 'lhOperaRecord') // this.$parent.deleteErmUpdating(this.archiveCaseCRFItem.id) }, @@ -885,12 +886,24 @@ export default { message: '您已保存成功', type: 'success' }) + this.statusHandle() this.getSendCaStatus() // this.$store.commit('clearSignDate', 'lhOperaRecord') } else { this.$message.error(res.msg) } }, + // -4:等待签到,-3:等待验光/等待谈话,-2:等待验光,-1:等待谈话 + async statusHandle() { + const { data: res } = await this.$http.post('/quguang/pda/updateOperaStatus', { + operaId: this.formListValue.operaId, + status: -2 + }) + if (res.code === 0) { + } else { + this.$message.error(res.msg) + } + }, // 是否开启了CA认证表单状态 async getSendCaStatus() { const { data: res } = await this.$http.get('/quguang/caSign/getSendCaStatus', { diff --git a/src/components/hm-crf/index.vue b/src/components/hm-crf/index.vue index 3cbed3e..627a32c 100644 --- a/src/components/hm-crf/index.vue +++ b/src/components/hm-crf/index.vue @@ -177,19 +177,19 @@ export default { }, mounted() { // Cookies.set('qg-token', '9def6f4db676363e9f01990d56e62929') - this.$http.get(`/quguang/sys/table/dict/getList`, { - params: { - isCrf: 1 - } - }).then(({ data: res }) => { - if (res.code === 0) { - const data = res.data - window.localStorage.setItem('dictField', JSON.stringify(data)) - } - }) + // this.$http.get(`/quguang/sys/table/dict/getList`, { + // params: { + // isCrf: 1 + // } + // }).then(({ data: res }) => { + // if (res.code === 0) { + // const data = res.data + // window.localStorage.setItem('dictField', JSON.stringify(data)) + // } + // }) - this.$nextTick(() => { - }) + // this.$nextTick(() => { + // }) }, methods: { // 添加相关的事件,可用的事件参照文档=> https://github.com/tinymce/tinymce-vue => All available events diff --git a/src/components/item-select/display.vue b/src/components/item-select/display.vue index 4a23da2..298bf5d 100644 --- a/src/components/item-select/display.vue +++ b/src/components/item-select/display.vue @@ -124,8 +124,8 @@ export default { this.options_kpi = window.SITE_CONFIG['dict_colSearch'] } else { // 检索字典表 - const { data: res } = await this.$http.get('/quguang/sys/table/dict/getList', { params: { type: 1 }}) - this.options_kpi = res.data + // const { data: res } = await this.$http.get('/quguang/sys/table/dict/getList', { params: { type: 1 }}) + // this.options_kpi = res.data } } } diff --git a/src/components/item-select/index.vue b/src/components/item-select/index.vue index adbd063..261d828 100644 --- a/src/components/item-select/index.vue +++ b/src/components/item-select/index.vue @@ -237,9 +237,9 @@ export default { this.options_kpi = window.SITE_CONFIG['dict_colSearch'] } else { // 检索字典表 - this.$http.get('/quguang/sys/table/dict/getList', { params: { type: 1 }}).then(({ data: res }) => { - this.options_kpi = res.data - }) + // this.$http.get('/quguang/sys/table/dict/getList', { params: { type: 1 }}).then(({ data: res }) => { + // this.options_kpi = res.data + // }) } } } diff --git a/src/components/kpi-select/display.vue b/src/components/kpi-select/display.vue index 8e6638c..59c8604 100644 --- a/src/components/kpi-select/display.vue +++ b/src/components/kpi-select/display.vue @@ -57,8 +57,8 @@ export default { } else if (this.type === 2 && window.SITE_CONFIG.dict_colChart) { this.options_kpi = window.SITE_CONFIG.dict_colChart } else { - const { data: res } = await this.$http.get('/quguang/sys/table/dict/getList', { params: { type: this.type }}) - this.options_kpi = res.data + // const { data: res } = await this.$http.get('/quguang/sys/table/dict/getList', { params: { type: this.type }}) + // this.options_kpi = res.data } } } diff --git a/src/mixins/htmlToPdfToBlob.js b/src/mixins/htmlToPdfToBlob.js index be11b1a..9e3bf44 100644 --- a/src/mixins/htmlToPdfToBlob.js +++ b/src/mixins/htmlToPdfToBlob.js @@ -2,7 +2,6 @@ import('@/assets/fonts/SimHei-normal') import('@/assets/fonts/MicrosoftYaHeiBold-normal') // import('@/assets/fonts/MicrosoftYaHei-normal') import('@/assets/fonts/msyh-normal') - // import html2pdf from 'html2pdf.js' // import jsPDF from 'jspdf' // import html2canvas from 'html2canvas' @@ -13,10 +12,21 @@ export default { base64Flag: false, baseImg: '', loading: null, - patientCaUploadParams: {}, - signUsers: null } }, + mounted() { + setTimeout(() => { + if (this.$el.querySelectorAll) { + // 查找所有 el-input 和 el-select 组件的 input 标签 + const inputElements = this.$el.querySelectorAll('.el-input input, .el-select input, .el-checkbox .el-input .el-input__inner, .el-date-picker input, textarea'); + // console.log('inputElements', inputElements); + // 批量设置样式 + inputElements.forEach(input => { + input.style.fontFamily = 'msyh'; + }); + } + }, 1000); + }, methods: { // url转base64可用图片 convertImageToBase64(url, text) { @@ -56,6 +66,7 @@ export default { isHaveDoctorSign: true, // 是否有医生签名 有医生签字走医生签字接口,没有医生签字走调取患者平板签名接口 manyPatientSign: false, // 患者是否为多人签名 isJavaTransformPdf: true, // 是否java转换pdf + isDataSign: false, // 是否数据签 htmlBase: null, // 前端获取的HTML传给后端 marginStyle: '', ...customParam @@ -64,18 +75,14 @@ export default { const elementName = customParams.customElementId ? customParams.customElementId : 'printA5' // console.log('elementName', elementName) const element = document.getElementById(elementName) - console.log('element', element) + console.log('ELEMENT', element.innerHTML); customParams.isPdfLoad ? this.loading.close() : this.$emit('load') - console.log('customParam.isJavaTransformPdf',customParam.isJavaTransformPdf); if (customParam.isJavaTransformPdf) { this.$message('您提交的病历CA已异步处理,无需继续等待。') - console.log('后端转'); this.caSign('', customParam) } else { - console.log('前端转',this.isJavaTransformPdf); customParam.isHtml2canvas ? this.convertHtmlToImage(customParams, element) : this.jspdfFun(customParams, element) } - // const styles = window.getComputedStyle(element) }, // 转为可选的pdf @@ -113,7 +120,12 @@ export default { const pdfBase64Split = pdfBase64.split(',') console.log(pdfBase64Split) // substring(6) - customParams.isHaveDoctorSign ? this.caSign(pdfBase64Split[1], customParams) : this.padPatientSign(pdfBase64Split[1], customParams) + if (customParams.isDataSign) { + // 如果是数据签的其他表单走前端转pdf并上传 + this.uploadFormPdf(pdfBase64Split[1]) + } else { + customParams.isHaveDoctorSign ? this.caSign(pdfBase64Split[1], customParams) : this.padPatientSign(pdfBase64Split[1], customParams) + } // pdf.save(123 + '.pdf') }, margin: [15, 15], @@ -209,164 +221,6 @@ export default { } }) }, - // CA医生签名接口调取-单医生/quguang/caSign-多医生/quguang/caSign/multiCaSign - async caSign(base64, customParams, caBack) { - uni.postMessage({ - data: { - text: '开始CA签' - } - }) - console.log('customParams', customParams) - console.log('CA医生签名接口调取base64', base64) - // console.log('customParams.caParams.signUrl', customParams.caParams.signUrl) - const url = caBack ? (caBack.signUrl ? caBack.signUrl : '/quguang/caSign') : (customParams.caParams.signUrl ? customParams.caParams.signUrl : 'quguang/caSign') - const { data: res } = await this.$http.post(url, caBack || { - // 待签名文件(Base64/string) - fileData: base64 || '', - htmlBase: customParams.htmlBase ? customParams.htmlBase : '', - marginStyle: customParams.marginStyle || '', - // 类型名称,类型值包括:PDF、HTML,除PDF外的其他格式,系统自动转换成PDF格式然后电子签名 - fileType: 'PDF', - ...customParams.caParams, - // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效. 1:附加;0:不附加 (默认); - timestamp: '1' - }) - if (res.code === 0) { - // 成功 - // console.log('成功', customParams.isPadPatientSign) - // return - customParams.isPadPatientSign ? this.padPatientSign(base64, customParams) : '' - this.caRefresh ? this.caRefresh() : '' - customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') - uni.postMessage({ - data: { - text: 'CA保存成功' - } - }) - } else { - // this.$message.error(res.msg) - // console.log(JSON.parse(res.msg)) - const resParse = res.msg.includes('[') ? JSON.parse(res.msg) : null - console.log('resParse', resParse) - const text = resParse ? `${resParse[0].patientName}-${resParse[0].patientId}-${resParse[0].fileName}-CA签失败,${resParse[1]},请您重新提交此患者CA!` : res.msg - uni.postMessage({ - data: { - text: 'CA保存失败', - msg: text - } - }) - this.$confirmFun(text, '您已取消').then(() => { - // this.caSign('', '', resParse[0]) - }) - // // 自定义按钮 - // const h = this.$createElement - // const confirmButtonText = '定位患者' - // const cancelButtonText = '取消' - // const customButtonText = '重新提交' - // this.$confirm('这是一条消息', '提示', { - // confirmButtonText, - // cancelButtonText, - // // 使用message属性来自定义MessageBox的内容 - // message: h('p', null, [ - // h('span', null, `${resParse[0].patientName}患者CA签失败,${resParse[1]},您是否重新提交此患者CA签?`), - // h('el-button', { - // props: { - // size: 'small', - // type: 'warning' - // }, - // on: { - // click: () => { - // // 点击“重新提交”按钮的逻辑 - // this.caSign('', '', resParse[0]) - // } - // } - // }, customButtonText) - // ]) - // }).then((res) => { - // console.log(res) - // if (res === 'confirm') { - // console.log(444444444444) - // const currentPathName = this.$router.currentRoute.name - // console.log('currentPathName', currentPathName === 'surgicalManagement-operationList') - // if (currentPathName === 'surgicalManagement-operationList') { - // // this.dataForm.patientId = resParse[0].patientId - // } else { - // // this.$router.push({ - // // name: 'surgicalManagement-operationList', - // // params: { - // // patientId: resParse[0].patientId, - // // patientIdNumber: resParse[0].patientIdNumber - // // } - // // }) - // } - // } - // }).catch(() => { - - // }) - customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') - } - }, - // 患者CA平板无线签-上传代签名的文件接口给CA - async padPatientSign(base64, customParams) { - const { data: res } = await this.$http.post('/quguang/caSign/uploadCaSignBase', { - fileData: customParams.isHaveDoctorSign ? '' : base64, // 待签名文件(Base64/string) 有医生签:后端生成有签名的pdf,没有医生签:需传base64文件 - fileName: customParams.caParams.fileName, // 文件名称 - formFlag: customParams.caParams.formFlag, // 标志位,8:告知书,9:基因检测同意书,10:联合手术同意书 13:告知书/授权书 - formId: customParams.caParams.formId, // 表单ID - userId: this.userData.employeeId - }) - if (res.code === 0) { - this.patientCaUploadParams = res.data - // 成功 - customParams.manyPatientSign ? this.setPatientParamsInfo(customParams) : this.signFileByPad(customParams) - customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') - } else { - this.$message.error(res.msg) - customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') - } - }, - // 患者CA平板无线签-调取成功后可发送PDF文件到PAD - async signFileByPad(customParams) { - const url = process.env.NODE_ENV === 'development' ? '/customProxyCa/patient/api/v3.0/sign/signFileByPad' - : 'http://192.168.2.32:83/ca-server/patient/api/v3.0/sign/signFileByPad' - const signUsers = [{ - signerType: '3', // 签名类型 3:患者; 4:家属; 5:见证人 - patientName: this.formListValue.patientName, // 患者姓名 - patientIdcard: this.formListValue.patientIdNumber, // 患者身份证号 - description: '患者', - signFiles: [{ - fileCode: this.patientCaUploadParams.fileCode, - // 签署位置集合 - positions: customParams.patientSignPositionsParams - }] - }] - const { data: res } = await this.$http.post(`${url}?accessToken=${this.patientCaUploadParams.accessToken}`, { - transactionId: this.patientCaUploadParams.transactionId, - orderName: customParams.caParams.fileName, // 表单名称 - signMethod: 6, // 签署方法:6:智能指纹签名屏 一般都是6 8:普通平板电脑(非指纹屏) - createUserId: this.userData.employeeId, // 创建表单工号 - isVoiceRecord: 0, - callbackURL: 'http://192.168.2.32:83/quguang/caSign/patientCaSignCallBack', - redirectURL: '', - isCallbackSignatureImg: '', - imageFormat: 'JPG', - signUsers: customParams.manyPatientSign ? this.signUsers : signUsers, - // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效. 1:附加;0:不附加 (默认); - timestamp: '1' - }) - if (res.status === '0') { - this.callbackUpdataeOrderCode(customParams, res.data) - } else { - this.$message.error(res.msg) - } - }, - // 把返回的code传给后端 - async callbackUpdataeOrderCode(customParams, resData) { - const { data: res } = await this.$http.post('/quguang/caSign/updateOrderCode', { - formId: customParams.caParams.formId, - orderCode: resData.orderCode - }) - }, // formFlag: 1:屈光电子病历/屈光电子病历(复诊) 2:术后检查记录表,3:角膜交联病历/角膜交联病历(复诊),4:角膜交联术后检查记录单,5:复诊病历 uploadPdf(formData) { console.log('-----------') @@ -387,6 +241,30 @@ export default { this.$message.error(res.msg) } }) - } + }, + // html转pdf 后端接口 + async html2Pdf(customParams, callback) { + const { data: res } = await this.$http.post('/quguang/caSign/html2Pdf', { + htmlBase: customParams.htmlBase ? customParams.htmlBase : '', + marginStyle: customParams.marginStyle || '', + pageSize: customParams.paperSize ? customParams.paperSize : 'A5', // 页面大小:A4 + }) + if (res.code === 0) { + callback ? callback() : '' + } else { + this.$message.error(res.msg) + } + }, + // 前端转pdf后传给后端 + async uploadFormPdf(pdfBase) { + const { data: res } = await this.$http.post('/quguang/caSign/uploadFormPdf', { + pdfBase: pdfBase, + }) + if (res.code === 0) { + + } else { + this.$message.error(res.msg) + } + }, } } diff --git a/src/mixins/operationPlan.js b/src/mixins/operationPlan.js index dcb8ec6..8c23603 100644 --- a/src/mixins/operationPlan.js +++ b/src/mixins/operationPlan.js @@ -20,7 +20,7 @@ export default { // 医生签字 doctorSign: '', // 患者签字 - patientorDlrSign:'', + patientOrDlrSign:'', }, { name: '预留屈光度', nameClass: 'ylqgd', @@ -39,7 +39,7 @@ export default { // 医生签字 doctorSign: '', // 患者签字 - patientorDlrSign:'', + patientOrDlrSign:'', }, { name: '预期矫正度数', nameClass: 'yqjzds', @@ -58,7 +58,7 @@ export default { // 医生签字 doctorSign: '', // 患者签字 - patientorDlrSign:'', + patientOrDlrSign:'', }, { name: '手术方式', nameClass: 'ssfs', @@ -77,7 +77,7 @@ export default { // 医生签字 doctorSign: '', // 患者签字 - patientorDlrSign:'', + patientOrDlrSign:'', }, { name: '其他', nameClass: 'qt', @@ -96,7 +96,7 @@ export default { // 医生签字 doctorSign: '', // 患者签字 - patientorDlrSign:'', + patientOrDlrSign:'', }, { name: '备注', nameClass: 'bz', @@ -115,7 +115,7 @@ export default { // 医生签字 doctorSign: '', // 患者签字 - patientorDlrSign:'', + patientOrDlrSign:'', }], otherList: [{ name: 'Visumax' diff --git a/src/mixins/publicFile.js b/src/mixins/publicFile.js index 96ff511..b4391b4 100644 --- a/src/mixins/publicFile.js +++ b/src/mixins/publicFile.js @@ -13,8 +13,6 @@ export default { mrzYrEye: '', signText: '', dateText: '', - // ca开启状态 - caOpenStatus: false } }, methods: { @@ -248,43 +246,6 @@ export default { closeblInfoDrawer() { this.blDataVisible = false }, - // 是否开启了CA认证表单状态 - async getSendCaStatus() { - const { data: res } = await this.$http.get('/quguang/caSign/getSendCaStatus', { - params: { - name: this.archiveCaseCRFItem.formName - } - }) - if (res.code === 0) { - this.caOpenStatus = res.data !== 0 - } else { - this.$message.error(res.msg) - } - }, - // 取消ca - async cancelCa() { - const userData = window.localStorage.getItem('qg-userData') ? JSON.parse(window.localStorage.getItem('qg-userData')) : '' - if (userData.realName !== this.formListValue.createName) { - return this.$message({ - message: `此病历是${this.formListValue.createName}医生创建的,您不能操作其他医生的患者病历哦!`, - type: 'warning' - }) - } - const { data: res } = await this.$http.post('/quguang/caSign/cancelCa', { - formFlag: this.formFlag, - formId: this.archiveCaseCRFItem.id - }) - if (res.code === 0) { - this.$message({ - message: '取消提交成功', - type: 'success' - }) - } else { - this.$message.error(res.msg) - } - this.formListValue.isConfirm = 0 - this.saveEidtTitle = '编辑' - }, // 获取上次保存时间--防止同时编辑表单导致的表单覆盖情况 async getUpSaveTime(url, params) { const { data: res } = await this.$http.get(url, { diff --git a/src/mixins/signGet.js b/src/mixins/signGet.js index b4f5c5c..e35df4c 100644 --- a/src/mixins/signGet.js +++ b/src/mixins/signGet.js @@ -4,27 +4,26 @@ export default { } }, methods: { + // 获取授权签字-通过当前登录人的token判断当前人有没有被授权 - async getZdDoctorSign(zdSign, date, zdCode, zdName) { + async getZdDoctorSign(sign, date, code, name) { const loading = this.$loading({ lock: true, text: '获取中请稍等', spinner: 'el-icon-loading', background: 'rgba(255, 255, 255, 0.7)' }) - console.log('this.operaId',this.operaId); - console.log('this.archiveCaseCRFItem.operaId',this.archiveCaseCRFItem.operaId); + console.log('this.operaId', this.operaId); + console.log('this.archiveCaseCRFItem.operaId', this.archiveCaseCRFItem.operaId); const { data: res } = await this.$http.get('/quguang/sys/doctor/empower/getMainDoctorSign', { params: { operaPatientId: this.operaId ? this.operaId : this.archiveCaseCRFItem.operaId } }) if (res.code === 0) { + console.log('获取授权签字ca已开启'); loading.close() - date ? this.formListValue[date] = this.$moment().format('YYYY-MM-DD') : '' - this.formListValue[zdSign] = res.data.signImgBase - this.formListValue[zdCode] = res.data.employeeId - this.formListValue[zdName] = res.data.realName + this.getCaUserSignImg(sign, date, code, name, res.data) } else { this.$message.error(res.msg) loading.close() @@ -34,11 +33,24 @@ export default { getSystomSign(sign, date, code, name) { console.log(date) const userData = JSON.parse(window.localStorage.getItem('qg-userData')) - sign ? this.formListValue[sign] = userData.signImgBase : '' - name ? this.formListValue[name] = userData.realName : '' - code ? this.formListValue[code] = userData.employeeId : '' // 工号 - - date ? this.formListValue[date] = this.$moment().format('YYYY-MM-DD HH:mm') : '' + this.getCaUserSignImg(sign, date, code, name, userData) + }, + // 获取ca签名图片 + async getCaUserSignImg(sign, date, code, name, resData) { + console.log('8888888888'); + const { data: res } = await this.$http.get('/quguang/caSign/getCaUserSignImg', { + params: { + userId: resData.employeeId + } + }) + if (res.code === 0) { + date ? this.formListValue[date] = this.$moment().format('YYYY-MM-DD') : '' + sign ? this.formListValue[sign] = res.data.signImgBase : '' + code ? this.formListValue[code] = res.data.employeeId : '' + name ? this.formListValue[name] = res.data.realName : '' + } else { + this.$message.error(res.msg) + } }, // 手术记录获取系统签字--技师 getSystomSign1(beforeJsSign, beforeJsCode, beforeJsName, centerJsSign, centerJsCode, centerJsName, backJsSign, backJsCode, backJsName) { diff --git a/src/mixins/yiXinQianSign.js b/src/mixins/yiXinQianSign.js new file mode 100644 index 0000000..e3ca238 --- /dev/null +++ b/src/mixins/yiXinQianSign.js @@ -0,0 +1,194 @@ +export default { + data() { + return { + // ca开启状态 + caOpenStatus: false, + patientCaUploadParams: {}, + signUsers: null + } + }, + methods: { + // 是否开启了CA认证表单状态 + async getSendCaStatus(toParams, callback, operaTextFlag) { + const { data: res } = await this.$http.get('/quguang/caSign/getSendCaStatus', { + params: { + name: this.archiveCaseCRFItem.formName ? this.archiveCaseCRFItem.formName : this.formListValue.formName + } + }) + if (res.code === 0) { + this.caOpenStatus = res.data !== 0 + console.log('caOpenStatus', this.caOpenStatus); + } else { + this.$message.error(res.msg) + } + }, + + // --------------------文件签---------------------- + // CA医生签名接口调取-单医生/quguang/caSign-多医生/quguang/caSign/multiCaSign + async caSign(base64, customParams, caBack) { + uni.postMessage({ + data: { + text: '开始CA签' + } + }) + console.log('customParams', customParams) + console.log('CA医生签名接口调取base64', base64) + // console.log('customParams.caParams.signUrl', customParams.caParams.signUrl) + const url = caBack ? (caBack.signUrl ? caBack.signUrl : '/quguang/caSign') : (customParams.caParams.signUrl ? customParams.caParams.signUrl : 'quguang/caSign') + const { data: res } = await this.$http.post(url, caBack || { + // 待签名文件(Base64/string) + fileData: base64 || '', + htmlBase: customParams.htmlBase ? customParams.htmlBase : '', + marginStyle: customParams.marginStyle || '', + // 类型名称,类型值包括:PDF、HTML,除PDF外的其他格式,系统自动转换成PDF格式然后电子签名 + fileType: 'PDF', + ...customParams.caParams, + // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效. 1:附加;0:不附加 (默认); + timestamp: '1' + }) + if (res.code === 0) { + // 成功 + // console.log('成功', customParams.isPadPatientSign) + // return + customParams.isPadPatientSign ? this.padPatientSign(base64, customParams) : '' + this.caRefresh ? this.caRefresh() : '' + customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') + uni.postMessage({ + data: { + text: 'CA保存成功' + } + }) + } else { + // this.$message.error(res.msg) + // console.log(JSON.parse(res.msg)) + const resParse = res.msg.includes('[') ? JSON.parse(res.msg) : null + console.log('resParse', resParse) + const text = resParse ? `${resParse[0].patientName}-${resParse[0].patientId}-${resParse[0].fileName}-CA签失败,${resParse[1]},请您重新提交此患者CA!` : res.msg + uni.postMessage({ + data: { + text: 'CA保存失败', + msg: text + } + }) + this.$confirmFun(text, '您已取消').then(() => { + // this.caSign('', '', resParse[0]) + }) + customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') + } + }, + // 患者CA平板无线签-上传代签名的文件接口给CA + async padPatientSign(base64, customParams) { + const { data: res } = await this.$http.post('/quguang/caSign/uploadCaSignBase', { + fileData: customParams.isHaveDoctorSign ? '' : base64, // 待签名文件(Base64/string) 有医生签:后端生成有签名的pdf,没有医生签:需传base64文件 + fileName: customParams.caParams.fileName, // 文件名称 + formFlag: customParams.caParams.formFlag, // 标志位,8:告知书,9:基因检测同意书,10:联合手术同意书 13:告知书/授权书 + formId: customParams.caParams.formId, // 表单ID + userId: this.userData.employeeId + }) + if (res.code === 0) { + this.patientCaUploadParams = res.data + // 成功 + customParams.manyPatientSign ? this.setPatientParamsInfo(customParams) : this.signFileByPad(customParams) + customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') + } else { + this.$message.error(res.msg) + customParams.isCurrentPageLoad ? this.loading.close() : this.$emit('load') + } + }, + // 患者CA平板无线签-调取成功后可发送PDF文件到PAD + async signFileByPad(customParams) { + const url = process.env.NODE_ENV === 'development' ? '/customProxyCa/patient/api/v3.0/sign/signFileByPad' + : 'http://192.168.2.32:83/ca-server/patient/api/v3.0/sign/signFileByPad' + const signUsers = [{ + signerType: '3', // 签名类型 3:患者; 4:家属; 5:见证人 + patientName: this.formListValue.patientName, // 患者姓名 + patientIdcard: this.formListValue.patientIdNumber, // 患者身份证号 + description: '患者', + signFiles: [{ + fileCode: this.patientCaUploadParams.fileCode, + // 签署位置集合 + positions: customParams.patientSignPositionsParams + }] + }] + const { data: res } = await this.$http.post(`${url}?accessToken=${this.patientCaUploadParams.accessToken}`, { + transactionId: this.patientCaUploadParams.transactionId, + orderName: customParams.caParams.fileName, // 表单名称 + signMethod: 6, // 签署方法:6:智能指纹签名屏 一般都是6 8:普通平板电脑(非指纹屏) + createUserId: this.userData.employeeId, // 创建表单工号 + isVoiceRecord: 0, + callbackURL: 'http://192.168.2.32:83/quguang/caSign/patientCaSignCallBack', + redirectURL: '', + isCallbackSignatureImg: '', + imageFormat: 'JPG', + signUsers: customParams.manyPatientSign ? this.signUsers : signUsers, + // 是否附加签名时间,签名时间显示于签字/印章图片的下方,内层外层需要同时填入才可生效. 1:附加;0:不附加 (默认); + timestamp: '1' + }) + if (res.status === '0') { + this.callbackUpdataeOrderCode(customParams, res.data) + } else { + this.$message.error(res.msg) + } + }, + // 把返回的code传给后端 + async callbackUpdataeOrderCode(customParams, resData) { + const { data: res } = await this.$http.post('/quguang/caSign/updateOrderCode', { + formId: customParams.caParams.formId, + orderCode: resData.orderCode + }) + }, + + // --------------------数据签----------------------- + // CA门诊批量数据签 + async batchDataCa(params, callback) { + const { data: res } = await this.$http.post('/quguang/caSign/batchDataCa', params) + if (res.code === 0) { + this.$message({ + message: '此表单已CA成功', + type: 'success' + }) + callback ? callback() : '' + } else { + this.$message.error(res.msg) + } + }, + // CA其他表单批量数据签 + async operaFormDataCaSign(params, callback) { + const { data: res } = await this.$http.post('/quguang/caSign/operaFormDataCaSign', params) + if (res.code === 0) { + // this.$message({ + // message: '此表单已CA成功', + // type: 'success' + // }) + callback ? callback() : '' + } else { + this.$message.error(res.msg) + } + }, + // 取消ca + async cancelCa() { + console.log('取消ca'); + const userData = window.localStorage.getItem('qg-userData') ? JSON.parse(window.localStorage.getItem('qg-userData')) : '' + if (userData.realName !== this.formListValue.createName) { + return this.$message({ + message: `此病历是${this.formListValue.createName}医生创建的,您不能操作其他医生的患者病历哦!`, + type: 'warning' + }) + } + const { data: res } = await this.$http.post('/quguang/caSign/cancelCa', { + formFlag: this.formFlag, + formId: this.archiveCaseCRFItem.id + }) + if (res.code === 0) { + this.$message({ + message: '取消提交成功', + type: 'success' + }) + } else { + this.$message.error(res.msg) + } + this.formListValue.isConfirm = 0 + this.saveEidtTitle = '编辑' + }, + } +} \ No newline at end of file diff --git a/src/page-subspecialty/router/index.js b/src/page-subspecialty/router/index.js index 120d07d..f6af228 100644 --- a/src/page-subspecialty/router/index.js +++ b/src/page-subspecialty/router/index.js @@ -157,7 +157,7 @@ export function addDynamicRoute(routeParams, router) { const createRouter = () => new Router({ mode: 'history', - // base: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_HOUZHUI : '/', // 公司内部环境打开--浏览器基础路径 + base: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_HOUZHUI : '/', // 公司内部环境打开--浏览器基础路径 scrollBehavior: () => ({ y: 0 }), routes: pageRoutes.concat(moduleRoutes) }) @@ -228,9 +228,9 @@ router.beforeEach((to, from, next) => { return next({ name: 'login' }) }) // 获取【字段字典表】, 添加并全局变量保存 - http.get('/quguang/sys/table/dict/getList', { params: { type: 1 }}).then(({ data: res }) => { - window.SITE_CONFIG['dict_colSearch'] = res.data - }) + // http.get('/quguang/sys/table/dict/getList', { params: { type: 1 }}).then(({ data: res }) => { + // window.SITE_CONFIG['dict_colSearch'] = res.data + // }) } }) diff --git a/src/page-subspecialty/views/modules/seeDoctor/archives/index.vue b/src/page-subspecialty/views/modules/seeDoctor/archives/index.vue index fbd1f7b..518e6bb 100644 --- a/src/page-subspecialty/views/modules/seeDoctor/archives/index.vue +++ b/src/page-subspecialty/views/modules/seeDoctor/archives/index.vue @@ -114,7 +114,7 @@
- +
- - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - 取 消 - 确 定 - - - - - - - - -
- - - - diff --git a/src/page-subspecialty/views/modules/surgicalManagement/operationList/index.vue b/src/page-subspecialty/views/modules/surgicalManagement/operationList/index.vue index 0f9aad1..aaba668 100644 --- a/src/page-subspecialty/views/modules/surgicalManagement/operationList/index.vue +++ b/src/page-subspecialty/views/modules/surgicalManagement/operationList/index.vue @@ -4,76 +4,33 @@
- + - + - + - - + + - + - + @@ -83,15 +40,8 @@
- + - + - - + + @@ -140,20 +74,30 @@ - + - + - + - +
- - + + 取 消 @@ -249,12 +178,8 @@ 确 定
- +
- - diff --git a/src/page-subspecialty/views/modules/systemManagement/formSet/index copy.vue b/src/page-subspecialty/views/modules/systemManagement/formSet/index copy.vue deleted file mode 100644 index 028ebf4..0000000 --- a/src/page-subspecialty/views/modules/systemManagement/formSet/index copy.vue +++ /dev/null @@ -1,495 +0,0 @@ - - - - diff --git a/src/page-subspecialty/views/modules/systemManagement/formSet/index.vue b/src/page-subspecialty/views/modules/systemManagement/formSet/index.vue index 324dc25..566a35b 100644 --- a/src/page-subspecialty/views/modules/systemManagement/formSet/index.vue +++ b/src/page-subspecialty/views/modules/systemManagement/formSet/index.vue @@ -4,7 +4,7 @@ - + @@ -72,7 +72,7 @@ export default { display: flex; } .el-tabs--left .el-tabs__header.is-left { - width: 175px !important; + width: 240px !important; } .el-tabs--left .el-tabs__item.is-left { text-align: left; diff --git a/vue.config.js b/vue.config.js index 4ec29bc..afdb6e9 100644 --- a/vue.config.js +++ b/vue.config.js @@ -14,7 +14,7 @@ function resolve(dir) { module.exports = { parallel: false, publicPath: '/', // 其他正式环境 - // publicPath: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_HOUZHUI : '/', //公司内部环境 + publicPath: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_HOUZHUI : '/', //公司内部环境 assetsDir: 'static', chainWebpack: config => { const svgRule = config.module.rule('svg')