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

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -430,7 +430,7 @@
                                      {{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : "" }}
                                 </div>
                                 </td>
-                                <td width="10">ml)</td>
+                                <td width="10"><span v-if="org_id==10157||org_id==9675">L)</span> <span v-else>ml)</span></td>
                                 <td width="50"><label-box :isChecked="record.prescription.mode_id != 5 && record.prescription.mode_id != 1 && record.prescription.mode_id != 2 ? true : false" showValue="其他"></label-box></td>
                                 <td width="50">
                                 <div class="under-line">&nbsp;
@@ -805,7 +805,7 @@
                               <td width="50">
                                   <div class="under-line">&nbsp;{{ record.assessment_after_dislysis.actual_displacement ? record.assessment_after_dislysis.actual_displacement : "" }}</div>
                               </td>
-                              <td width="20">ml</td>
+                              <td width="20"><span v-if="org_id==10157||org_id==9675">L)</span> <span v-else>ml)</span></td>
                               <td></td>
                           </tr>
                           </tbody>
@@ -1078,7 +1078,7 @@ export default {
       precaution_arr: [],
       intake_arr: [],
       nutrition_arr: [],
-
+      org_id:0,
       loading: false,
       orgname: "",
       org_template_info: {},
@@ -1105,6 +1105,7 @@ export default {
     };
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     //   this.orgname = "遂溪方济医院";

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -937,7 +937,8 @@ export default {
       arr:[],
       arrtwo:[],
       bloodAccess: [],
-      displaceLiquiPartOptions:[]
+      displaceLiquiPartOptions:[],
+      org_id:0,
     }
   },
   created() {

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -337,7 +337,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
-     
+      <template v-if="this.template_id == 61">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
       
 
     </div>
@@ -982,6 +990,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fiftynine" });
       }else if (this.template_id == 60) {
         this.$router.push({ path: "/dialysis/print/batch/sixty" });
+      }else if (this.template_id == 61) {
+        this.$router.push({ path: "/dialysis/print/batch/sixtyOne" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyOne.vue

@@ -720,7 +720,7 @@
                             : "/"
                         }}
                       </div>
-                      L
+                      <span v-if="org_id==10432||org_id==9675">ml</span> <span v-else>L</span>
                     </div>
                     <div
                       class="inline_block"
@@ -927,7 +927,7 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395">ml</span> 
+                      <span v-if="org_id == 10395||org_id==10432||org_id==9675">ml</span>
                       <span v-else>L</span>
                     </div>
                     <div class="inline_block" style="flex: 1">
@@ -1235,6 +1235,7 @@
                           SpO₂<br />(%)
                         </td>
                         <td width="50">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id==10432||org_id==9675">超滤率<br />(ml/h)</td>
                         <td
                           v-if="
                             prescription.mode_id == 2 ||
@@ -1339,6 +1340,14 @@
                               : ""
                           }}
                         </td>
+                        <td v-if="org_id==10432||org_id==9675"
+                        >
+                          {{
+                            monitor.ultrafiltration_rate
+                              ? monitor.ultrafiltration_rate
+                              : ""
+                          }}
+                        </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
                             {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
@@ -1418,7 +1427,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
-                        <!-- <td></td> -->
+                        <td v-if="org_id==10432||org_id==9675"></td>
                         <td></td>
                         <td
                           v-if="