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/batch_print/batch_print_order.vue

@@ -1052,6 +1052,9 @@
                           <td width="60">置换量<br />L</td>
                           <td width="60">静脉压<br />mmHg</td>
                           <td width="60">跨膜压<br />mmHg</td>
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">血温</td>
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">血容量</td>
+                          <td width="60" v-if="org_id == 9987 || org_id == 9918 || org_id == 0">ktv</td>
                           <td>备注</td>
                         </tr>
                         <!-- </thead>
@@ -1150,6 +1153,15 @@
                                 : ""
                             }}
                           </td>
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">
+                            {{ monitor_record.blood_temperature?monitor_record.blood_temperature:"/" }}
+                          </td>
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">
+                            {{ monitor_record.accumulated_blood_volume?monitor_record.accumulated_blood_volume:"/" }}
+                          </td>
+                          <td v-if="org_id == 9987 || org_id == 9918 || org_id == 0">
+                            &nbsp;{{monitor_record.ktv?monitor_record.ktv:"/"}}
+                          </td>
                           <td>
                             {{ monitor_record.symptom }}
                             &nbsp;{{ monitor_record.dispose }} &nbsp;{{

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -1140,9 +1140,9 @@
           <el-table-column
             prop="heparin"
             align="center"
-            label="血温监测1"
+            label="血温监测"
             width="140"
-            v-if="isShow('血温监测')"
+            v-if="isShow('血温监测1')"
           >
             <template slot-scope="scope">
               {{ scope.row.blood_temperature_one?scope.row.blood_temperature_one:"/" }}

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -601,7 +601,10 @@
               <td width="60">置换量<br />L</td>
               <td width="60">静脉压<br />mmHg</td>
               <td width="60">跨膜压<br />mmHg</td>
-              <td width="60" v-if="org_id == 9987">ktv</td>
+              <td width="60" v-if="org_id == 9918 || org_id == 0">血温</td>
+              <td width="60" v-if="org_id == 9918 || org_id == 0">血容量</td>
+              <td width="60" v-if="org_id == 9987 || org_id == 9918 || org_id == 0">ktv</td>
+              
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
             <td width="80">透析液温度<br/>℃</td>
             <td width="60">置换率<br/>ml/min</td> -->
@@ -654,8 +657,14 @@
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
             <td>&nbsp;{{monitor.dialysate_temperature}}</td>
             <td>&nbsp;{{monitor.replacement_rate}}</td> -->
-              <td v-if="org_id == 9987">
-                &nbsp;{{monitor.ktv?monitor.ktv:""}}
+            <td width="60" v-if="org_id == 9918 || org_id == 0">
+              {{ monitor.blood_temperature?monitor.blood_temperature:"/" }}
+            </td>
+            <td width="60" v-if="org_id == 9918 || org_id == 0">
+              {{ monitor.accumulated_blood_volume?monitor.accumulated_blood_volume:"/" }}
+            </td>
+              <td v-if="org_id == 9987 || org_id == 9918 || org_id == 0">
+                &nbsp;{{monitor.ktv?monitor.ktv:"/"}}
               </td>
               <td>
                 &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -57,17 +57,17 @@
       </div>
     </div>
 
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 10217">
+    <div class="app-container" style="" v-if="org_id == 10188 || org_id == 10217">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>
     </div>
     <!-- 新发票 -->
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id ==0 ">
-      <div class='dialysisPage'>
+    <!-- <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id ==0 ">
+      <div class='dialysisPage'> -->
 <!--        <printseventeen :paramsObj="invoiceParams"></printseventeen>-->
-      </div>
-    </div>
+      <!-- </div>
+    </div> -->
 
     <!-- <div class="app-container" style="" v-if="org_id == 0">
       <div class='dialysisPage'>

src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div id='invoice-print'>
-    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 90%;margin: 0 auto;font-size: 17px;">
+    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 90%;margin: 0 auto;font-size: 17px;page-break-after: always;">
       <div v-if="org_id==10188" style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城响水燕舞血液透析中心收据</div>
       <div v-if="org_id==10217" style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">大丰燕舞血液透析中心</div>
       <div style="display: flex; margin: 15px 0 5px 0;">