Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

@@ -298,9 +298,10 @@
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          <span> {{
-                            record.prescription.displace_liqui_value
-                              ? record.prescription.displace_liqui_value
+                          <span> 
+                            {{
+                            record.prescription.replacement_total
+                              ? record.prescription.replacement_total
                               : "/"
                           }}
                           </span>
@@ -402,7 +403,8 @@
                       <div class="inline_block" style="flex: 1">
                         上次透后体重:
                         <div class="under_line" style="width: 50px; text-align: center">
-                          {{record.lastafterweight.weight_after ? record.lastafterweight.weight_after:"未称重"}}
+                          <span v-if="record.lastafterweight.weight_after>0"> {{record.lastafterweight.weight_after ? record.lastafterweight.weight_after:"未称重"}}</span>
+                          <span v-if="record.lastafterweight.weight_after<=0"> {{record.assessment_after_dislysis.last_after_weight ? record.assessment_after_dislysis.last_after_weight:"未称重"}}</span>
                         </div>
                         kg
                       </div>
@@ -426,10 +428,17 @@
                       <div class="inline_block" style="flex: 1">
                         体重增加:
                         <div class="under_line" style="width: 70px; text-align: center">
-                          {{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
-                            ? parseFloat(record.assessment_before_dislysis.weight_before 
+                          <span v-if="record.lastafterweight.weight_after>0">{{ record.assessment_before_dislysis.weight_before > 0 && record.lastafterweight.weight_after > 0 
+                            ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
                             - record.lastafterweight.weight_after).toFixed(2): "/" 
                           }}
+                          </span> 
+
+                          <span v-if="record.lastafterweight.weight_after<=0">{{ record.assessment_before_dislysis.weight_before > 0 && record.assessment_after_dislysis.last_after_weight > 0 
+                            ? parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight
+                            - record.assessment_after_dislysis.last_after_weight).toFixed(2): "/" 
+                          }}
+                          </span> 
                         </div>
                         kg
                       </div>
@@ -1226,8 +1235,8 @@
                     <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     > 
-                      <div class="inline_block" style="flex: 1">
-                        穿刺护士：
+                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.puncture_nurse>0">
+                        上机护士：
                         <div class="under_line"
                           style="width: 80px; text-align: center"
                         >
@@ -1254,6 +1263,35 @@
                           />
                         </div>
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.change_nurse>0">
+                        上机护士：
+                        <div class="under_line"
+                          style="width: 80px; text-align: center"
+                        >
+                          <span style="display: inline-block"
+                            v-if=" setAdminUserES(
+                                record.dialysis_order,'change_nurse'
+                              ) == ''
+                            "
+                          >
+                            {{ getAdminUser(record.dialysis_order, "change_nurse")
+                              ? getAdminUser(record.dialysis_order,"change_nurse"): "/"
+                              }}
+                          </span>
+                          <img
+                            style="height: 30px"
+                            :src="
+                              setAdminUserES(
+                                record.dialysis_order,'change_nurse'
+                                )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                        </div>
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         治疗护士：
                         <div class="under_line"

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -270,10 +270,16 @@
                       <div class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        <span> {{
+                        <span> 
+                          <!-- {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"
+                        }} -->
+                        {{
+                          prescription.replacement_total
+                            ? prescription.replacement_total
+                            : "/"
                         }}
                         </span>
                       </div>
@@ -374,7 +380,9 @@
                     <div class="inline_block" style="flex: 1">
                       上次透后体重：
                       <div class="under_line" style="width: 50px; text-align: center">
-                        {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}
+                        <!-- {{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}} -->
+                        <span v-if="lastafterdialysis.weight_after>0">{{lastafterdialysis.weight_after?lastafterdialysis.weight_after:"未称重"}}</span> 
+                        <span v-if="lastafterdialysis.weight_after<=0">{{afterdialysis.last_after_weight?afterdialysis.last_after_weight:"未称重"}}</span> 
                       </div>
                       kg
                     </div>
@@ -397,7 +405,9 @@
                       体重增加：
                       <div class="under_line" style="width: 70px; text-align: center">
                         <span>
-                          {{ (predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2)}}
+                          <!-- {{ (predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2)}} -->
+                          <span v-if="lastafterdialysis.weight_after>0">{{ (predialysis.weight_before - predialysis.additional_weight - lastafterdialysis.weight_after).toFixed(2)}}</span> 
+                          <span v-if="lastafterdialysis.weight_after<=0">{{ (predialysis.weight_before - predialysis.additional_weight -afterdialysis.last_after_weight).toFixed(2)}}</span> 
                         </span>
                       </div>
                       kg
@@ -1081,9 +1091,10 @@
                   >
 
                     <div class="inline_block" style="flex: 1">
-                      穿刺护士：
+                      上机护士：
                       <div  class="under_line"
                         style="width: 90px; text-align: center"
+                         v-if="dialysisOrder.puncture_nurse>0"
                       >
                         <span
                           style="height: 30px; display: inline-block"
@@ -1117,6 +1128,43 @@
                           v-else
                         />
                       </div>
+
+                      <div  class="under_line"
+                        style="width: 90px; text-align: center"
+                        v-if="dialysisOrder.change_nurse>0"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.change_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
                     </div>
 
                     <div class="inline_block" style="flex: 1">

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -74,13 +74,13 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0">
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0 && $store.getters.xt_user.template_info.org_id!=10721">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0">
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0 && $store.getters.xt_user.template_info.org_id!=10721">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
@@ -249,13 +249,13 @@
         <template slot-scope="scope">{{ scope.row.price }}元</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0">
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0 && $store.getters.xt_user.template_info.org_id!=10721">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0">
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0  && $store.getters.xt_user.template_info.org_id!=10721">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</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))