6.27

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -111,8 +111,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

@@ -87,7 +87,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -98,7 +98,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 ">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"

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

@@ -231,6 +231,7 @@
                 template_id == 47 ||
                 template_id == 48 ||
                 template_id == 51 ||
+                template_id == 53 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -282,7 +283,8 @@
               template_id != 46 &&
               template_id != 47 &&
               template_id != 48 &&
-               template_id != 51 &&
+              template_id != 51 &&
+              template_id != 53 &&
               org_id!= 10210 &&
               org_id != 9555
             "
@@ -328,6 +330,7 @@
                 template_id == 44 ||
                 template_id == 46 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -370,6 +373,7 @@
               template_id != 43 &&
               template_id != 44 &&
               template_id != 46 &&
+              template_id != 53 &&
               template_id != 48 &&
               template_id != 47
             "
@@ -426,6 +430,7 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -448,6 +453,7 @@
               template_id != 26 &&
               template_id != 29 &&
               template_id != 48 &&
+              template_id != 53 &&
               template_id != 47
             "
           >
@@ -487,6 +493,7 @@
                 template_id == 20 ||
                 template_id == 26 ||
                 template_id == 29 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >
@@ -513,6 +520,7 @@
               template_id != 26 &&
               template_id != 29 &&
               template_id != 43 &&
+              template_id != 53 &&
               template_id != 48
             "
           >
@@ -986,6 +994,7 @@
                 template_id == 44 ||
                 template_id == 46 ||
                 template_id == 48 ||
+                template_id == 53 ||
                 template_id == 47)
             "
           >
@@ -1022,6 +1031,7 @@
               template_id != 44 &&
               template_id != 46 &&
               template_id != 48 &&
+              template_id != 53 &&
               template_id != 47
             "
           >
@@ -1065,6 +1075,7 @@
                 template_id == 47 ||
                 template_id == 48 ||
                 template_id == 51 ||
+                template_id == 53 ||
                 org_id == 10210 ||
                 org_id == 9555)
             "
@@ -1109,7 +1120,7 @@
               template_id != 47 &&
               template_id != 51 &&
               template_id == 48 &&
-             
+              template_id == 53 &&
               org_id !=  10210 &&
               org_id != 9555
             "
@@ -1144,7 +1155,8 @@
               template_id != 29 &&
               template_id != 46 &&
               template_id != 47 &&
-              template_id != 48 
+              template_id != 48 &&
+              template_id != 53
             "
           >
             <el-form-item label="置换率(L/h)：">
@@ -1163,6 +1175,7 @@
                 template_id == 29 ||
                 template_id == 46 ||
                 template_id == 47 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >
@@ -1187,6 +1200,7 @@
               template_id != 29 &&
               template_id != 43 &&
               template_id != 46 &&
+              template_id != 53 &&
               template_id != 48
             "
           >
@@ -1208,6 +1222,7 @@
                 template_id == 26 ||
                 template_id == 29 ||
                 template_id == 46 ||
+                template_id == 53 ||
                 template_id == 48)
             "
           >

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,17 +14,17 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48) " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47 || template_id == 48 || template_id == 53) " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47 && template_id != 48 && template_id != 53" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48)" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53)" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -195,7 +195,7 @@
                     filterable
                     placeholder="请选择单位"
                     style="width: 80px"
-                    @change="changeUnit(scope.row)"
+                    @change="changeUnit(scope.row,scope.$index)"
                   >
                     <el-option
                       v-for="(option, index) in unitList"
@@ -252,9 +252,7 @@
 
           <el-table-column label="总价(元)" align="center" width="80">
             <template slot-scope="scope">
-              {{
-                calculate(scope.row.last_price * scope.row.warehousing_count)
-              }}
+              {{ calculate(scope.row.last_price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
 
@@ -684,6 +682,7 @@ export default {
       tempObj["dealer"] = "";
       tempObj["last_price"] = "";
       tempObj["count_unit"] = "";
+      tempObj["min_number"] = "";
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -964,6 +963,7 @@ export default {
           this.recordInfo.recordData[i].max_unit = val.max_unit;
           this.recordInfo.recordData[i].min_unit = val.min_unit;
           this.recordInfo.recordData[i].count_unit = val.max_unit;
+          this.recordInfo.recordData[i].min_number = val.min_number
           if (val.dealer == 0) {
             this.recordInfo.recordData[i].dealer = "";
           } else {
@@ -972,8 +972,18 @@ export default {
         }
       }
     },
-    changeUnit(val){
-     console.log("val3232323232",val)
+    changeUnit(val,index){
+    // console.log("val3232323232",val)
+    //  for(let i=0;i<this.recordInfo.recordData.length;i++){
+    //    if(i == index){
+    //      if(this.recordInfo.recordData[i].max_unit == this.recordInfo.recordData[i].count_unit){
+           
+    //      }
+    //      if(this.recordInfo.recordData[i].min_unit == this.recordInfo.recordData[i].count_unit){
+
+    //      }
+    //    }
+    //  }
     }
   },
   created() {
@@ -1017,6 +1027,7 @@ export default {
     tempObj["dealer"] = "";
     tempObj["number"] = "";
     tempObj["count_unit"] = "";
+    tempObj["min_number"] = "";
     this.recordInfo.recordData.push(tempObj);
 
     this.GetConfigInfo();

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -570,6 +570,7 @@ export default {
       tempObj["total_count"] = 0;
       tempObj["max_unit_fisrt"] = 0;
       tempObj["min_unit_fisrt"] = 0;
+      tempObj["total_price"] = 0;
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function (index, row) {
@@ -664,60 +665,42 @@ export default {
             return;
           }
           for (let i = 0; i < this.recordInfo.recordData.length; i++) {
-            this.recordInfo.recordData[i].price =
-              this.recordInfo.recordData[i].price.toString();
+            this.recordInfo.recordData[i].total_price = (this.recordInfo.recordData[i].count * this.recordInfo.recordData[i].price).toString()
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString();
 
             for (let j = 0; j < this.manufacturerList.length; j++) {
-              if (
-                this.recordInfo.recordData[i].manufacturer ==
-                this.manufacturerList[j].manufacturer_name
-              ) {
-                this.recordInfo.recordData[i].manufacturer =
-                  this.manufacturerList[j].id;
+              if (this.recordInfo.recordData[i].manufacturer ==  this.manufacturerList[j].manufacturer_name) {
+                this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id;
               }
             }
             if (this.recordInfo.recordData[i].dealer == "") {
-              this.recordInfo.recordData[i].dealer = 0;
+                this.recordInfo.recordData[i].dealer = 0;
             }
             for (let z = 0; z < this.dealerList.length; z++) {
-              if (
-                this.recordInfo.recordData[i].dealer ==
-                this.dealerList[z].dealer_name
-              ) {
+              if (this.recordInfo.recordData[i].dealer ==this.dealerList[z].dealer_name) {
                 this.recordInfo.recordData[i].dealer = this.dealerList[z].id;
               }
             }
 
             for (let y = 0; y < this.numberList.length; y++) {
-              if (
-                this.recordInfo.recordData[i].batch_number ==
-                this.numberList[y].id
-              ) {
-                this.recordInfo.recordData[i].batch_number =
-                  this.numberList[y].batch_number;
-                this.recordInfo.recordData[i].warehouse_info_id =
-                  this.numberList[y].id;
+              if (this.recordInfo.recordData[i].batch_number ==this.numberList[y].id) {
+                this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number;
+                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id;
               }
             }
             for (let s = 0; s < this.doctorList.length; s++) {
-              if (
-                this.recordInfo.recordData[i].admin_user_id ==
-                this.doctorList[s].user_name
-              ) {
-                this.recordInfo.recordData[i].admin_user_id =
-                  this.doctorList[s].admin_user_id;
+              if (this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name) {
+                 this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id;
               }
             }
 
-            this.recordInfo.recordData[i].last_price =
-              this.recordInfo.recordData[i].last_price.toString();
-            this.recordInfo.recordData[i].stock_count =
-              this.recordInfo.recordData[i].stock_count.toString();
+            this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString();
+            this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString();
           }
           const params = {
             stockOut: this.recordInfo.recordData,
           };
-
+          console.log("param22222222",params)
           const loading = this.$loading({
             lock: true,
             text: "Loading",
@@ -917,7 +900,6 @@ export default {
     },
     changeUnit(val, index) {
       console.log("vla33232233232323232", val);
-
       this.getDrugBatchNumber(val.drug_id);
       for (let i = 0; i < this.recordInfo.recordData.length; i++) {
         if (this.recordInfo.recordData[i].drug_id == val.drug_id) {
@@ -926,16 +908,12 @@ export default {
             this.recordInfo.recordData[i].price = val.retail_price;
           }
           if (this.recordInfo.recordData[i].max_unit == val.min_unit) {
-            this.recordInfo.recordData[i].price =
-              this.recordInfo.recordData[i].min_price;
+            this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].min_price;
           }
         }
         for (let j = 0; j < this.numberList.length; j++) {
-          if (
-            this.recordInfo.recordData[i].batch_number == this.numberList[j].id
-          ) {
-            this.recordInfo.recordData[i].batch_number =
-              this.numberList[j].batch_number;
+          if (this.recordInfo.recordData[i].batch_number == this.numberList[j].id) {
+            this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number;
           }
         }
       }
@@ -1094,6 +1072,7 @@ export default {
     tempObj["total_count"] = 0;
     tempObj["max_unit_fisrt"] = 0;
     tempObj["min_unit_fisrt"] = 0;
+    tempObj["total_price"] = 0;
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=10210">
+        <div v-if="orgId!=9675 && orgId!=10210">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 10210">
+      <div v-if="orgId == 9675 || orgId == 10210">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -127,10 +127,11 @@
              <td>{{(getTime(item.product_date))}}</td>
              <td>{{(getTime(item.expire_date))}}</td>
             </tr>
+
              <tr>
                <td style="line-height:50px">合计</td>
                <td colspan="7"></td>
-               <td>{{getTotalPrince(it.xt_drug_warehouse_out_info).toFixed(2)}}</td>
+               <td>{{getTotalPrice(it.xt_drug_warehouse_out_info)}}</td>
              </tr>
             </tbody>
           </table>
@@ -405,9 +406,10 @@
             var manufacturerList = response.data.data.manufacturerList
            
             this.manufactureList = manufacturerList
-            console.log("nfo32323223323223232323",info)
+            
             this.tableList = info
             this.tableData = response.data.data.drug_warhouse_out
+            console.log("nfo32323223323223232323",this.tableData)
             this.loading = false
           }
         })

src/xt_pages/stock/stockPrint.vue

@@ -49,7 +49,7 @@
                                    <td v-if="end_time == ''">
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
                                         <span>
-                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
+                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info)}}
                                         </span>
                                       </span>
                                       <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
@@ -64,11 +64,11 @@
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
                                      </span>
                                      <span v-else>
-                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
+                                       {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id)}}
                                      </span>
                                    </td>
                                    <td v-if="end_time!=''">
-                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}
+                                    {{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id)  }}
                                    </td>
                                 </tr>
                             </tbody>