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

src/xt_pages/dialysis/batch_print/new_doctor_advice.vue

@@ -13,7 +13,7 @@
       </div>
       <div class="app-container">
         <div id="print_content">
-          <div
+          <div style="page-break-after: always;"
             v-for="(record, index) in records"
             :key="index"
             class="print_page_main_content"

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -335,7 +335,7 @@
         name ="IUF"
       }
       if(val == 8){
-        name ="IUF"
+        name ="HFHD"
       }
       if(val == 9){
         name ="HFHD+HP"

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -560,7 +560,7 @@
         name ="IUF"
       }
       if(val == 8){
-        name ="IUF"
+        name ="HFHD"
       }
       if(val == 9){
         name ="HFHD+HP"
@@ -643,6 +643,21 @@
       if(val == 39){
         name = "HF16"
       }
+      if(val == 40){
+        name = "HD(无肝素)"
+      }
+      if(val == 41){
+        name = "HDF17H"
+      }
+      if(val == 42){
+        name = "HD."
+      }
+      if(val == 43){
+        name = "HD(2)"
+      }
+      if(val == 44){
+        name = "导管溶栓"
+      }
       return name
       },
       exportList(){

src/xt_pages/user/patientInfo.vue

@@ -1,9 +1,11 @@
 
 <template>
   <div class="patient-container">
-  <patient-sidebar :id="patientID"></patient-sidebar>
+  <patient-sidebar :id="patientID" v-if="org_id!=0&&org_id!=10702"></patient-sidebar>
+  <PatientSidebar_ord :id="patientID" v-if="org_id==0 || org_id==10702"></PatientSidebar_ord>
    <!-- <PatientSidebar_new :id="patientID"></PatientSidebar_new> -->
   <patient-detail :is-edit='true' :class='panelClass' v-on:tran-patient-info="patientInfo=$event"></patient-detail>
+
   </div>
 </template>
 

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