Browse Source

新分支

28169 9 months ago
parent
commit
7dbbb65845

+ 1 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -5304,7 +5304,7 @@ mu
5304 5304
       'dialysisPrescription.prescription_water':function(){
5305 5305
         if(this.$store.getters.xt_user.template_info.org_id==10598){
5306 5306
            
5307
-          if(this.dialysisPrescription.mode_id == 3){
5307
+          if(this.dialysisPrescription.mode_id == 2 || this.dialysisPrescription.mode_id == 3){
5308 5308
              this.dialysisPrescription.target_ultrafiltration = parseFloat(this.dialysisPrescription.prescription_water)  + 0.3
5309 5309
           }else{
5310 5310
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){

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

@@ -961,9 +961,7 @@
961 961
             align="center"
962 962
             label="Kt/V"
963 963
             width="140"
964
-            v-if="
965
-              isShow('KT/V') &&
966
-              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598 || org_id ==10517)
964
+            v-if="isShow('KT/V')
967 965
             "
968 966
           >
969 967
             <template slot-scope="scope">

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

@@ -47,7 +47,7 @@
47 47
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
48 48
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
49 49
         
50
-          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">Kt/V</th>
50
+          <th v-if="isShow('KT/V')" width="92px">Kt/V</th>
51 51
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
52 52
 
53 53
           <th v-if="isShow('处理')" width="92px">处理</th>
@@ -102,7 +102,7 @@
102 102
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
103 103
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
104 104
           
105
-          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598 || org_id ==10517)">{{ monitor.ktv?monitor.ktv:""}}</td>
105
+          <td v-if="isShow('KT/V')">{{ monitor.ktv?monitor.ktv:""}}</td>
106 106
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
107 107
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
108 108
           </td>

+ 5 - 0
src/xt_pages/dialysis/details/index.vue View File

@@ -536,6 +536,11 @@
536 536
                     血流量:{{ main_collection.prescription.blood_flow_volume }} ml/min
537 537
                   </span>
538 538
                 </div>
539
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
540
+                  <div style="">透析时长:
541
+                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分 </span></span>
542
+                  </div>
543
+                </div>
539 544
               </div>
540 545
             </div>
541 546
 

+ 6 - 0
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -378,6 +378,7 @@
378 378
                   </div>
379 379
 
380 380
                 </div>
381
+                
381 382
                 <div class="printCell" style="display:flex;">
382 383
                   <span style="display: block;width: 45%;">
383 384
                     床号:{{ main_collection.number.number }}
@@ -639,6 +640,11 @@
639 640
                     血流量:{{ main_collection.prescription.blood_flow_volume }} ml/min
640 641
                   </span>
641 642
                 </div>
643
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
644
+                  <div style="">透析时长:
645
+                   <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分</span></span>
646
+                  </div>
647
+                </div>
642 648
               </div>
643 649
             </div>
644 650
           </div>

+ 2 - 2
src/xt_pages/stock/drugs/components/drugQuery.vue View File

@@ -207,12 +207,12 @@
207 207
                     @click="handleBatch(scope.row)"
208 208
                     >批次
209 209
                     </el-button>
210
-                    <!-- <el-button
210
+                    <el-button
211 211
                       size="small"
212 212
                       type="primary"
213 213
                       @click="handleCheckBatch(scope.row)"
214 214
                       >自查
215
-                    </el-button> -->
215
+                    </el-button>
216 216
                 </template>
217 217
 
218 218
                  

+ 2 - 2
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -456,7 +456,7 @@
456 456
 
457 457
            
458 458
           </el-table-column>
459
-          <!-- <el-table-column label="自查自检" align="center">
459
+          <el-table-column label="自查自检" align="center">
460 460
             <template slot-scope="scope">
461 461
               <span style="color: #589ff8" @click="getDrugPatientName(scope.row)"
462 462
                 >自查</span
@@ -464,7 +464,7 @@
464 464
             </template>
465 465
 
466 466
            
467
-          </el-table-column> -->
467
+          </el-table-column>
468 468
         </el-table>
469 469
       </div>
470 470
     </div>

+ 28 - 2
src/xt_pages/stock/drugs/newDrugInventory.vue View File

@@ -74,7 +74,7 @@
74 74
 
75 75
             <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
76 76
             <template slot-scope="scope">
77
-                <el-input style="width:100px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
77
+                <el-input style="width:100px" v-model="scope.row.last_stock_max_number" @input="getSupplyCount(scope.row.warehousing_count,scope.row.max_unit,scope.row.last_stock_max_number,scope.row.max_unit,scope.row.last_stock_min_number,scope.row.min_unit,scope.row.XtBaseDrug.min_number,scope.row.XtBaseDrug.max_unit,scope.row.XtBaseDrug.min_unit)"></el-input>{{scope.row.max_unit}}
78 78
                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:100px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
79 79
                 </template> 
80 80
             </el-table-column>
@@ -193,6 +193,31 @@ export default {
193 193
         }
194 194
     },
195 195
     methods:{
196
+        getSupplyCount(warehousing_count,max_unit,last_stock_max_number,max_unit_one,last_stock_min_number,min_unit_one,base_min_number,base_max_unit,base_min_unit){
197
+          
198
+          var total_one  = 0
199
+          var total_two =0
200
+
201
+          if(max_unit == base_max_unit && base_max_unit!=base_min_unit){
202
+             total_one = warehousing_count *base_min_number
203
+          }
204
+
205
+          if(max_unit == base_min_unit && base_max_unit!=base_min_unit){
206
+            total_one = warehousing_count 
207
+          }
208
+          if(max_unit == base_min_unit && base_max_unit==base_min_unit){
209
+            total_one = warehousing_count 
210
+          }
211
+
212
+          total_two = last_stock_max_number * base_min_number + last_stock_min_number 
213
+         
214
+          console.log("total_one",total_one)
215
+          console.log("total_two",total_two)
216
+          if(total_two > total_one){
217
+            this.$message.error("盘点后数量大于该批次入库数量!")
218
+          }
219
+          
220
+        },   
196 221
         changeNumber(val){
197 222
           this.form.warehouse_info_id = val
198 223
           this.getDrugWarehouseInfoTotal(val)
@@ -830,7 +855,8 @@ export default {
830 855
             this.tableData = list
831 856
         }
832 857
       }) 
833
-    }
858
+    },
859
+    
834 860
     },
835 861
     created(){
836 862
       this.unitList =  this.getDataConfig('hemodialysis','units')

+ 9 - 1
src/xt_pages/stock/newInventory.vue View File

@@ -71,7 +71,7 @@
71 71
 
72 72
              <el-table-column prop="name" label="盘点后数量" width="120"  align="center">
73 73
                 <template slot-scope="scope">
74
-                  <el-input style="width:80px" v-model="scope.row.last_stock_count"></el-input>
74
+                  <el-input style="width:80px" v-model="scope.row.last_stock_count"  @input="getSupplyCount(scope.row.warehousing_count,scope.row.last_stock_count)"></el-input>
75 75
                  </template> 
76 76
               </el-table-column>
77 77
 
@@ -469,6 +469,14 @@ export default {
469 469
        }  
470 470
      })    
471 471
     },
472
+    getSupplyCount(val1,val2){
473
+      // console.log("val2",val2)
474
+      // console.log("val1",val1)
475
+      if(val2 >val1){
476
+        console.log("JINLAAAA")
477
+         this.$message.error("盘点后数量大于该批次入库数量!")
478
+      }
479
+    }
472 480
     
473 481
    },
474 482