新分支

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -604,59 +604,6 @@
           </tbody>
         </table>
 
-        <table class="print-table" border="1">
-          <tr>
-            <td>时间</td>
-            <td width='430'>临时医嘱</td>
-            <td>医生签名</td>
-            <td>执行护士</td>
-            <td>执行时间</td>
-            <td>核对护士</td>
-          </tr>
-          <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
-            <td style="height:30px;line-height:30px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-            <td class="parent" style="text-align:left;padding-left: 20px !important;">
-              <span v-if="advice.parent_id > 0">&nbsp;&nbsp;&nbsp;</span>
-              <span>{{ advice.advice_name }}</span>
-              <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-              <span v-if="advice.prescribing_number">
-                &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}
-              </span>
-              <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
-              <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
-              <span v-if="advice.parent_id == 0">
-                {{ advice.execution_frequency }}
-              </span>
-              <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
-            </td>
-            <td>
-              <span v-if="setAdminUserES(advice.advice_doctor) == ''">
-                {{ getAdminUser(advice.advice_doctor) }}
-              </span>
-              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
-              </span>
-            </td>
-            <td>
-              <span v-if="setAdminUserES(advice.execution_staff) == ''">
-                {{ getAdminUser(advice.execution_staff) }}
-              </span>
-              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
-              </span>
-            </td>
-            <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
-            <td>
-              <span v-if="setAdminUserES(advice.checker) == ''">
-                {{ getAdminUser(advice.checker) }}
-              </span>
-              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset />
-              </span>
-            </td>
-          </tr>
-        </table>
-
         <table class="print-table" border="1">
           <tbody>
             <tr>
@@ -738,6 +685,61 @@
           </tbody>
         </table>
 
+        <table class="print-table" border="1">
+          <tr>
+            <td>时间</td>
+            <td width='430'>临时医嘱</td>
+            <td>医生签名</td>
+            <td>执行护士</td>
+            <td>执行时间</td>
+            <td>核对护士</td>
+          </tr>
+          <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index">
+            <td style="height:30px;line-height:30px">{{ getTime(advice.start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td class="parent" style="text-align:left;padding-left: 20px !important;">
+              <span v-if="advice.parent_id > 0">&nbsp;&nbsp;&nbsp;</span>
+              <span>{{ advice.advice_name }}</span>
+              <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
+              <span v-if="advice.prescribing_number">
+                &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}
+              </span>
+              <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+              <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
+              <span v-if="advice.parent_id == 0">
+                {{ advice.execution_frequency }}
+              </span>
+              <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
+            </td>
+            <td>
+              <span v-if="setAdminUserES(advice.advice_doctor) == ''">
+                {{ getAdminUser(advice.advice_doctor) }}
+              </span>
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt srcset />
+              </span>
+            </td>
+            <td>
+              <span v-if="setAdminUserES(advice.execution_staff) == ''">
+                {{ getAdminUser(advice.execution_staff) }}
+              </span>
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
+              </span>
+            </td>
+            <td>{{ getTime(advice.execution_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+            <td>
+              <span v-if="setAdminUserES(advice.checker) == ''">
+                {{ getAdminUser(advice.checker) }}
+              </span>
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset />
+              </span>
+            </td>
+          </tr>
+        </table>
+
+     
+
         <table class="print-table" border="1">
           <tbody>
             <tr>
@@ -902,11 +904,16 @@
                         <label-box :isChecked="afterdialysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
                       </td>
                       <td width="10">(</td>
-                      <td width="35">科室</td>
-                      <td width="100">
+                      <td width="35">医生签名:</td>
+                      <td width="120">
                         <div class="under-line">
                           &nbsp;
-                          <span v-if="afterdialysis.patient_gose == 3">{{ afterdialysis.inpatient_department }}</span>
+                          <!-- <span v-if="afterdialysis.patient_gose == 3">
+                            {{ afterdialysis.inpatient_department }}
+                          </span> -->
+                          <span v-if="setAdminUserES(dialysisPrescription == null ? 0 : dialysisPrescription.creater) == ''">
+                            {{ getAdminUser(dialysisPrescription == null ? 0 : dialysisPrescription.creater) }}</span>
+                          <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisPrescription == null ? 0 : dialysisPrescription.creater)" alt="" srcset="" v-else />
                         </div>
                       </td>
                       <td width="70">护士签名:</td>

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