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.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/eleFaPiao/settleDetail.vue

@@ -443,7 +443,7 @@ export default {
         "admin_user_id":this.$store.getters.xt_user.user.id,
       }
       var that = this;
-      axios.get('http://127.0.0.1:9532/api/bwfapiao/query',{params:params}).then(function(response) {
+      axios.get('http://127.0.0.1:9532/api/fapiao/query',{params:params}).then(function(response) {
         if (response.data.state == 0) {
           that.$message.error(response.data.data.msg);
           return false