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();