Browse Source

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

yq1 1 month ago
parent
commit
524596bbb0

+ 12 - 0
src/xt_pages/dialysis/batch_print/batch_print_order.vue View File

1052
                           <td width="60">置换量<br />L</td>
1052
                           <td width="60">置换量<br />L</td>
1053
                           <td width="60">静脉压<br />mmHg</td>
1053
                           <td width="60">静脉压<br />mmHg</td>
1054
                           <td width="60">跨膜压<br />mmHg</td>
1054
                           <td width="60">跨膜压<br />mmHg</td>
1055
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">血温</td>
1056
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">血容量</td>
1057
+                          <td width="60" v-if="org_id == 9987 || org_id == 9918 || org_id == 0">ktv</td>
1055
                           <td>备注</td>
1058
                           <td>备注</td>
1056
                         </tr>
1059
                         </tr>
1057
                         <!-- </thead>
1060
                         <!-- </thead>
1150
                                 : ""
1153
                                 : ""
1151
                             }}
1154
                             }}
1152
                           </td>
1155
                           </td>
1156
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">
1157
+                            {{ monitor_record.blood_temperature?monitor_record.blood_temperature:"/" }}
1158
+                          </td>
1159
+                          <td width="60" v-if="org_id == 9918 || org_id == 0">
1160
+                            {{ monitor_record.accumulated_blood_volume?monitor_record.accumulated_blood_volume:"/" }}
1161
+                          </td>
1162
+                          <td v-if="org_id == 9987 || org_id == 9918 || org_id == 0">
1163
+                            &nbsp;{{monitor_record.ktv?monitor_record.ktv:"/"}}
1164
+                          </td>
1153
                           <td>
1165
                           <td>
1154
                             {{ monitor_record.symptom }}
1166
                             {{ monitor_record.symptom }}
1155
                             &nbsp;{{ monitor_record.dispose }} &nbsp;{{
1167
                             &nbsp;{{ monitor_record.dispose }} &nbsp;{{

+ 2 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

1140
           <el-table-column
1140
           <el-table-column
1141
             prop="heparin"
1141
             prop="heparin"
1142
             align="center"
1142
             align="center"
1143
-            label="血温监测1"
1143
+            label="血温监测"
1144
             width="140"
1144
             width="140"
1145
-            v-if="isShow('血温监测')"
1145
+            v-if="isShow('血温监测1')"
1146
           >
1146
           >
1147
             <template slot-scope="scope">
1147
             <template slot-scope="scope">
1148
               {{ scope.row.blood_temperature_one?scope.row.blood_temperature_one:"/" }}
1148
               {{ scope.row.blood_temperature_one?scope.row.blood_temperature_one:"/" }}

+ 12 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue View File

601
               <td width="60">置换量<br />L</td>
601
               <td width="60">置换量<br />L</td>
602
               <td width="60">静脉压<br />mmHg</td>
602
               <td width="60">静脉压<br />mmHg</td>
603
               <td width="60">跨膜压<br />mmHg</td>
603
               <td width="60">跨膜压<br />mmHg</td>
604
-              <td width="60" v-if="org_id == 9987">ktv</td>
604
+              <td width="60" v-if="org_id == 9918 || org_id == 0">血温</td>
605
+              <td width="60" v-if="org_id == 9918 || org_id == 0">血容量</td>
606
+              <td width="60" v-if="org_id == 9987 || org_id == 9918 || org_id == 0">ktv</td>
607
+              
605
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
608
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
606
             <td width="80">透析液温度<br/>℃</td>
609
             <td width="80">透析液温度<br/>℃</td>
607
             <td width="60">置换率<br/>ml/min</td> -->
610
             <td width="60">置换率<br/>ml/min</td> -->
654
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
657
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
655
             <td>&nbsp;{{monitor.dialysate_temperature}}</td>
658
             <td>&nbsp;{{monitor.dialysate_temperature}}</td>
656
             <td>&nbsp;{{monitor.replacement_rate}}</td> -->
659
             <td>&nbsp;{{monitor.replacement_rate}}</td> -->
657
-              <td v-if="org_id == 9987">
658
-                &nbsp;{{monitor.ktv?monitor.ktv:""}}
660
+            <td width="60" v-if="org_id == 9918 || org_id == 0">
661
+              {{ monitor.blood_temperature?monitor.blood_temperature:"/" }}
662
+            </td>
663
+            <td width="60" v-if="org_id == 9918 || org_id == 0">
664
+              {{ monitor.accumulated_blood_volume?monitor.accumulated_blood_volume:"/" }}
665
+            </td>
666
+              <td v-if="org_id == 9987 || org_id == 9918 || org_id == 0">
667
+                &nbsp;{{monitor.ktv?monitor.ktv:"/"}}
659
               </td>
668
               </td>
660
               <td>
669
               <td>
661
                 &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
670
                 &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}

+ 1 - 1
src/xt_pages/eleFaPiao/settleDetail.vue View File

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