新分支

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3410,9 +3410,11 @@
 
                     <div class="inline_block" style="flex: 1" v-if="predialysis.catheter != ''">
                       换药护士：
+
                       <div
                         class="under_line"
                         style="width: 90px; text-align: center"
+                        v-if="org_id==10644"
                       >
                         <span
                           style="height: 30px; display: inline-block"
@@ -3446,6 +3448,44 @@
                           v-else
                         />
                       </div>
+
+                      <div
+                        class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="org_id!=10644"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 35px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.puncture_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
                     </div>
                   </div>
 

src/xt_pages/management/components/UserForm.vue

@@ -846,7 +846,7 @@
                   机表(床单元、床旁桌)消毒
                 </td>
                 <td
-                  :colspan="6"
+                  :colspan="7"
                   style="text-align:center;font-size:15px"
                 >
                   液路消毒
@@ -905,6 +905,9 @@
                 <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒时长/min
                 </td>
+                <td style="text-align:center;min-width:40px;font-size:15px">
+                  结束消毒时间
+                </td>
                 <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒状态
                 </td>
@@ -959,6 +962,10 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.long_time }}
                 </td>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  {{ getTimesTwo(item.disinfec_endtime) }}
+                </td>
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.disinfection_status }}
                 </td>

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387 && orgId!=0">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387 && orgId!=0  && orgId!=10697">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 0 || orgId ==10387">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 0 || orgId ==10387 || orgId == 10697">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

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