新分支

src/xt_pages/dialysis/hisLongSignPrint.vue

@@ -16,7 +16,7 @@
                         
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-
+                        <div v-if="org_id == 0 || org_id==10340">身份证:{{item.patient.id_card_no}}</div>  
                         <div>
                             <div>医嘱内容:{{ it.advice_name }} 
                             </div>  

src/xt_pages/dialysis/longSignPrint.vue

@@ -15,7 +15,7 @@
                        
                         <div v-if="org_id!=10278">分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-
+                        <div v-if="org_id == 0 || org_id==10340">身份证:{{item.patient.id_card_no}}</div>  
                         <div>
                             <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1548,11 +1548,11 @@ export default {
           name = ""
        }
 
-       if(this.org_id == 9671 || this.org_id == 10340){
+       if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 
-       if(this.org_id != 9671 && this.org_id != 10340){
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0){
         this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name,excution_way:this.excution_way} });
        }
 

src/xt_pages/dialysis/signPrint.vue

@@ -15,7 +15,7 @@
                        
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
-
+                        <div v-if="org_id == 0 || org_id==10340">身份证:{{item.patient.id_card_no}}</div>  
                         <div>
                             <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">

src/xt_permission.js

@@ -12,19 +12,19 @@ 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))