From 87f79bf221eca0ac7a46fb6c8aa433ab3b8ffd3c Mon Sep 17 00:00:00 2001 From: luobinjie Date: Wed, 24 Dec 2025 09:24:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main.js b/src/main.js index 6347787..551241f 100644 --- a/src/main.js +++ b/src/main.js @@ -111,16 +111,7 @@ new Vue({ window.addEventListener('resize', onResize); function onResize() { - let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig")) || null - try { - if(LocalConfig.normal.displayTab){ - store.commit('setData', { key: 'window.pageHeight', value: window.innerHeight-36 }) - }else{ - store.commit('setData', { key: 'window.pageHeight', value: window.innerHeight }) - } - } catch (error) { - console.log('window.localStorage.getItem("LocalConfig")', error) - } + store.commit('setData', { key: 'window.pageHeight', value: window.innerHeight }) store.commit('setData', { key: 'window.pageWidth', value: window.innerWidth }) } onResize(); From a81d6dbbd80ea13193ea7717acbdf6495d145ca5 Mon Sep 17 00:00:00 2001 From: luobinjie Date: Wed, 24 Dec 2025 09:44:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/LocalConfig.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/common/LocalConfig.vue b/src/components/common/LocalConfig.vue index 95bfdeb..dfcd084 100644 --- a/src/components/common/LocalConfig.vue +++ b/src/components/common/LocalConfig.vue @@ -12,11 +12,11 @@ - + @@ -253,7 +253,7 @@ export default { maxResultCount: 100, //分页时单页记录数 PatientRegisterEdit: 'standard', //standard/qztl 人员登记组件版本 PatientRegisterEditHeight: 0, // 相较与标准版,选组合项目组件,减少高度 - displayTab:false // 是否显示标签页 + // displayTab:false // 是否显示标签页 }, patientRegister: { edit: 'standard', //standard/qztl 人员登记组件版本 From 1c0bd666bc9c7b36e7c75e444b969ad5dc81f731 Mon Sep 17 00:00:00 2001 From: luobinjie Date: Wed, 24 Dec 2025 10:25:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/LocalConfig.vue | 6 +++--- src/components/report/BtnReport.vue | 2 +- src/main.js | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/common/LocalConfig.vue b/src/components/common/LocalConfig.vue index dfcd084..95bfdeb 100644 --- a/src/components/common/LocalConfig.vue +++ b/src/components/common/LocalConfig.vue @@ -12,11 +12,11 @@ - + @@ -253,7 +253,7 @@ export default { maxResultCount: 100, //分页时单页记录数 PatientRegisterEdit: 'standard', //standard/qztl 人员登记组件版本 PatientRegisterEditHeight: 0, // 相较与标准版,选组合项目组件,减少高度 - // displayTab:false // 是否显示标签页 + displayTab:false // 是否显示标签页 }, patientRegister: { edit: 'standard', //standard/qztl 人员登记组件版本 diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue index 893587e..f6c98db 100644 --- a/src/components/report/BtnReport.vue +++ b/src/components/report/BtnReport.vue @@ -671,7 +671,7 @@ export default { try { if (e.completeFlag == '3') { toOutShell.BusinessCode = e.patientRegisterId - toOutShell.ExportDirectory = `${path}\\${e.patientRegisterNo}_${e.patientName}.pdf` + toOutShell.ExportDirectory = `${path}\\${e.patientName}_${e.patientRegisterNo}.pdf` toOutShell.customerOrgName = e.customerOrgName || '' // 增加单位名称参数 toOutShell.departmentName = e.departmentName || '' diff --git a/src/main.js b/src/main.js index 551241f..78ac49c 100644 --- a/src/main.js +++ b/src/main.js @@ -111,7 +111,12 @@ new Vue({ window.addEventListener('resize', onResize); function onResize() { - store.commit('setData', { key: 'window.pageHeight', value: window.innerHeight }) + let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig")) || null + if(LocalConfig && LocalConfig.normal.displayTab){ + store.commit('setData', { key: 'window.pageHeight', value: window.innerHeight-36 }) + }else{ + store.commit('setData', { key: 'window.pageHeight', value: window.innerHeight }) + } store.commit('setData', { key: 'window.pageWidth', value: window.innerWidth }) } onResize();