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/template/DialysisPrintOrderThirtyOne.vue

@@ -351,6 +351,11 @@
           <div class="inline_block under_line" style="width:100px;text-align: center;">
             {{ receiverTreatmentAccess.precaution ? receiverTreatmentAccess.precaution : '' }}
           </div> -->
+          换药护士
+          <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
+            <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.change_nurse)}}</span>
+            <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.change_nurse)" alt="" srcset="" v-else>
+          </div>
         </div>
         <div class="row">
           上机医生
@@ -521,7 +526,7 @@
                       <td width="60" style="text-align:left;border:none;">
                         <div>
                           <span class="under_line" style="width:50px;display:inline-block">
-                            {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}
+                            {{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "/" }}
                           </span>L
                         </div>
                       </td>
@@ -582,7 +587,7 @@
                       <td width="70" style="text-align:left;border:none;">
                         <div>
                           <span class="under_line" style="width:50px;display:inline-block">
-                            {{ afterdialysis.is_eat == 1 && afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '' }}
+                            {{ afterdialysis.is_eat == 1 && afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '/' }}
                           </span>g
                         </div>
                       </td>

src/xt_pages/user/components/PatientForm.vue

@@ -1186,7 +1186,7 @@ const defaultForm = {
   response_result: "",
   remind_cycle: 0,
   record_date: "",
-  patient_type:"1",
+  patient_type:1,
   tell_phone: "",
   first_treatment_date: "",
   dialysis_age: "",

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