Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/template/printThree.vue

@@ -31,7 +31,7 @@
               <div style="margin-bottom: 10px;display:flex;">自费药品签名：<span class="under_line"></span></div>
               <!-- <div style="margin-bottom: 10px;display:flex;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div> -->
               <div style="margin-bottom: 10px;display:flex;">联系方式：<span class="under_line">{{item.patient.phone}}</span></div>
-              <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.pre_time) ? getTime(item.pre_time).split(' ')[0] : ''}}</span></div>
+              <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.record_date) ? getTime(item.record_date).split(' ')[0] : ''}}</span></div>
               <!-- <div>地址：{{item.patient.home_address}}</div> -->
               <!-- <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div> -->
           </div>

src/xt_pages/hospitalStation/treatTemplate/printTwo.vue

@@ -29,7 +29,7 @@
             <div style="margin-bottom: 10px;display:flex;">自费药品签名：<span class="under_line"></span></div>
             <!-- <div style="margin-bottom: 10px;display:flex;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div> -->
             <div style="margin-bottom: 10px;display:flex;">联系方式：<span class="under_line">{{item.patient.phone}}</span></div>
-            <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.pre_time) ? getTime(item.pre_time).split(' ')[0] : ''}}</span></div>
+            <div style="margin-bottom: 10px;display:flex;">开具日期：<span class="under_line">{{getTime(item.record_date) ? getTime(item.record_date).split(' ')[0] : ''}}</span></div>
             <!-- <div>地址：{{item.patient.home_address}}</div> -->
             <!-- <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div> -->
         </div>

src/xt_pages/outpatientDoctorStation/template/printFive.vue

@@ -9,9 +9,9 @@
               <div><span style="font-size:20px;font-weight:bold;">No</span><div class="underLine" style="width:120px;"></div></div>
               <div style="display:flex;">
                   <div style="display: flex;flex-direction: column-reverse;">开具日期</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
-                  <div class="underLine" style="width:60px;">{{getTime(item.ctime)?getTime(item.ctime).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.record_date)?getTime(item.record_date).split(' ')[0].slice(0,4):""}}</div><div style="display: flex;flex-direction: column-reverse;">年</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.record_date)?getTime(item.record_date).split(' ')[0].slice(5,7):""}}</div><div style="display: flex;flex-direction: column-reverse;">月</div>
+                  <div class="underLine" style="width:60px;">{{getTime(item.record_date)?getTime(item.record_date).split(' ')[0].slice(8,11):""}}</div><div style="display: flex;flex-direction: column-reverse;">日</div>
               </div>
           </div>
           <div class="basicCell">

src/xt_permission.js

@@ -12,21 +12,20 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
-
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)