Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

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 || ''
 

src/main.js

@@ -112,15 +112,11 @@ window.addEventListener('resize', onResize);
 
 function onResize() {
     let LocalConfig = JSON.parse(window.localStorage.getItem("LocalConfig")) || null
-    try {
-      if(LocalConfig.normal.displayTab){
+      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 })
       }
-    } catch (error) {
-      console.log('window.localStorage.getItem("LocalConfig")', error)
-    }
     store.commit('setData', { key: 'window.pageWidth', value: window.innerWidth })
 }
 onResize();