diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index a101ac3..1b04fab 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -26,11 +26,11 @@ -
- AI诊断 +
+ AI诊断
+ @contextmenu.prevent="onContextmenu" ref="DivPic">
@@ -74,6 +74,12 @@
+
+
+ + + +
@@ -261,7 +267,8 @@ export default { // 裁图 dialogWinCutPic: false, cutPicParam: {}, - pictureFileType: '1' + pictureFileType: '1', + getPicing:false, //是否采图中 }; }, @@ -357,6 +364,9 @@ export default { this.checkPictures.forEach(e => { e.isPrintTrans = e.isPrint == "Y" ? true : false }); + + // 标记采图中，让滚动条滑到最右边…… + if(this.getPicing) this.setGetPicing() } }); }, @@ -409,6 +419,16 @@ export default { } }, + // 标记采图中，让滚动条滑到最右边…… + setGetPicing(){ + let obj = this.$refs['DivPic'] + console.log('obj',obj) + this.$nextTick(() => { + //obj.scrollTo({ left: obj.scrollWidth, behavior: 'smooth' }) + obj.scrollLeft = obj.scrollWidth + }) + }, + // 采图 btnGetPic() { if (!this.doctorCheck.RegisterCheckId) { @@ -442,6 +462,10 @@ export default { let lres = JSON.parse(res) console.log('this.$peisAPI.imageAcquisition', lres) if (lres.code > -1) { + // 标记采图中，让滚动条滑到最右边…… + this.getPicing = true + this.setGetPicing() + for (let i = 0; i < lres.data.length; i++) { let item = lres.data[i]; @@ -505,6 +529,10 @@ export default { return } + // 标记采图中，让滚动条滑到最右边…… + this.getPicing = true + this.setGetPicing() + // 设置图片打印或不打印 if (oprType == 'print' || oprType == 'unPrint') { let count = this.checkPictures.length diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index b08dde2..1ee7d92 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -362,6 +362,13 @@ export default { } else if (res.data.items.length > 1) { this.PatientRegisterList = res.data.items + if(Array.isArray(this.PatientRegisterList) && this.PatientRegisterList.length > 0){ + this.PatientRegisterList.forEach(e => { + e.groupPack = e.medicalPackageName||e.customerOrgGroupName + e.org = e.customerOrgParentName||e.customerOrgName + e.dept = e.customerOrgParentName == e.customerOrgName ? '':e.customerOrgName + }); + } this.dialogWin.PatientRegisterForChoose = true // 弹窗 this.dataTransOpts.plus.PatientRegisterForChoose++ } else { diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index 7490c92..495eccd 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -83,7 +83,6 @@ -
查询 diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index ce44378..d2308ad 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -2009,8 +2009,8 @@ export default { this.$message.warning({ showClose: true, message: fields[Object.keys(fields)[0]][0].message }); return false } - // 手机号必填时，再验证手机号是否合法 - if (this.rules['mobileTelephone']) { + // 手机号非必填时，如有填手机号，也要再验证手机号是否合法 + if (this.form['mobileTelephone']) { if (!isValidMobileNumber(this.form['mobileTelephone'])) { this.$message.warning({ showClose: true, message: '请填写正确的手机号！' }); return false @@ -2604,9 +2604,9 @@ export default { this.printing = true if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) { if (this.merge_lis_pacs_label == '1') { - this.guidePrintEasy('0008', isPreview, toOutShell) + this.lisPrint('0002', isPreview, toOutShell) .then(res => { - return this.lisPrint('0002', isPreview, toOutShell) + return this.guidePrintEasy('0008', isPreview, toOutShell) }) // .then(res => { // return this.pacsPrint('0004', isPreview, toOutShell) @@ -2621,12 +2621,12 @@ export default { this.printing = false }) } else { - this.guidePrintEasy('0008', isPreview, toOutShell) + this.lisPrint('0002', isPreview, toOutShell) .then(res => { - return this.lisPrint('0002', isPreview, toOutShell) + return this.pacsPrint('0004', isPreview, toOutShell) }) .then(res => { - return this.pacsPrint('0004', isPreview, toOutShell) + return this.guidePrintEasy('0008', isPreview, toOutShell) }) .then(res => { resolve(res) @@ -2640,9 +2640,9 @@ export default { } } else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('lis') > -1) { - this.guidePrintEasy('0008', isPreview, toOutShell) + this.lisPrint('0002', isPreview, toOutShell) .then(res => { - return this.lisPrint('0002', isPreview, toOutShell) + return this.guidePrintEasy('0008', isPreview, toOutShell) }) .then(res => { resolve(res) @@ -2654,9 +2654,9 @@ export default { this.printing = false }) } else if (this.LocalConfig.patientRegister.printGuideLabel.indexOf('patient') > -1 && this.LocalConfig.patientRegister.printGuideLabel.indexOf('pacs') > -1) { - this.guidePrintEasy('0008', isPreview, toOutShell) + this.pacsPrint('0004', isPreview, toOutShell) .then(res => { - return this.pacsPrint('0004', isPreview, toOutShell) + return this.guidePrintEasy('0008', isPreview, toOutShell) }) .then(res => { resolve(res) diff --git a/src/components/patientRegister/PatientRegisterForChoose.vue b/src/components/patientRegister/PatientRegisterForChoose.vue index f2117f6..e6f46e7 100644 --- a/src/components/patientRegister/PatientRegisterForChoose.vue +++ b/src/components/patientRegister/PatientRegisterForChoose.vue @@ -3,44 +3,17 @@
- - - - - - - + + + + + - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + - + - - + + - + - + - + - + - - +
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 01f633b..f1f4f94 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -1000,9 +1000,9 @@ export default { return new Promise((resolve, reject) => { // this.merge_lis_pacs_label == '1' 合并检验检查条码 if (this.merge_lis_pacs_label == '1') { - this.guidePrintPromise("0008", false, row) + this.lisPrint(row, "0002", false) .then((res) => { - return this.lisPrint(row, "0002", false); + return this.guidePrintPromise("0008", false, row); }) // .then((res) => { // return this.pacsPrint(row, "0004", false); @@ -1014,12 +1014,12 @@ export default { reject(err); }); } else { - this.guidePrintPromise("0008", false, row) + this.lisPrint(row, "0002", false) .then((res) => { - return this.lisPrint(row, "0002", false); + return this.pacsPrint(row, "0004", false); }) .then((res) => { - return this.pacsPrint(row, "0004", false); + return this.guidePrintPromise("0008", false, row); }) .then((res) => { resolve(res); @@ -1036,9 +1036,9 @@ export default { // 临时加 printGuidePacs(row) { return new Promise((resolve, reject) => { - this.guidePrintPromise("0008", false, row) + this.pacsPrint(row, "0004", false) .then((res) => { - return this.pacsPrint(row, "0004", false); + return this.guidePrintPromise("0008", false, row); }) .then((res) => { resolve(res); diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue index 9ea42e1..1d0eb56 100644 --- a/src/components/sumDoctorCheck/ButtonList.vue +++ b/src/components/sumDoctorCheck/ButtonList.vue @@ -20,10 +20,10 @@ v-show="checkPagePriv(pagePriv.privs, '导入迪安结果')">导入迪安结果 -
-
- AI诊断 +
+ +
+ AI诊断