新分支

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

       'dialysisPrescription.prescription_water':function(){
         if(this.$store.getters.xt_user.template_info.org_id==10598){
            
-          if(this.dialysisPrescription.mode_id == 3){
+          if(this.dialysisPrescription.mode_id == 2 || this.dialysisPrescription.mode_id == 3){
              this.dialysisPrescription.target_ultrafiltration = parseFloat(this.dialysisPrescription.prescription_water)  + 0.3
           }else{
             if(this.dialysisPrescription.prescription_water > this.dialysisPrescription.target_ultrafiltration){

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

             align="center"
             label="Kt/V"
             width="140"
-            v-if="
-              isShow('KT/V') &&
-              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598 || org_id ==10517)
+            v-if="isShow('KT/V')
             "
           >
             <template slot-scope="scope">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
           <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
         
-          <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)" width="92px">Kt/V</th>
+          <th v-if="isShow('KT/V')" width="92px">Kt/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
           <th v-if="isShow('处理')" width="92px">处理</th>
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
           
-          <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>
+          <td v-if="isShow('KT/V')">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
           </td>

src/xt_pages/dialysis/details/index.vue

                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
                 </div>
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                  <div style="">透析时长:
+                   <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>
+                  </div>
+                </div>
               </div>
             </div>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                   </div>
 
                 </div>
+                
                 <div class="printCell" style="display:flex;">
                   <span style="display: block;width: 45%;">
                     床号：{{ main_collection.number.number }}
                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
                 </div>
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                  <div style="">透析时长:
+                   <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>
+                  </div>
+                </div>
               </div>
             </div>
           </div>

src/xt_pages/stock/drugs/components/drugQuery.vue

                     @click="handleBatch(scope.row)"
                     >批次
                     </el-button>
-                    <!-- <el-button
+                    <el-button
                       size="small"
                       type="primary"
                       @click="handleCheckBatch(scope.row)"
                       >自查
-                    </el-button> -->
+                    </el-button>
                 </template>
 
                  

src/xt_pages/stock/drugs/drugStockOutOrder.vue

 
            
           </el-table-column>
-          <!-- <el-table-column label="自查自检" align="center">
+          <el-table-column label="自查自检" align="center">
             <template slot-scope="scope">
               <span style="color: #589ff8" @click="getDrugPatientName(scope.row)"
                 >自查</span
             </template>
 
            
-          </el-table-column> -->
+          </el-table-column>
         </el-table>
       </div>
     </div>

src/xt_pages/stock/drugs/newDrugInventory.vue

 
             <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
             <template slot-scope="scope">
-                <el-input style="width:100px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
+                <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}}
                 <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> 
                 </template> 
             </el-table-column>
         }
     },
     methods:{
+        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){
+          
+          var total_one  = 0
+          var total_two =0
+
+          if(max_unit == base_max_unit && base_max_unit!=base_min_unit){
+             total_one = warehousing_count *base_min_number
+          }
+
+          if(max_unit == base_min_unit && base_max_unit!=base_min_unit){
+            total_one = warehousing_count 
+          }
+          if(max_unit == base_min_unit && base_max_unit==base_min_unit){
+            total_one = warehousing_count 
+          }
+
+          total_two = last_stock_max_number * base_min_number + last_stock_min_number 
+         
+          console.log("total_one",total_one)
+          console.log("total_two",total_two)
+          if(total_two > total_one){
+            this.$message.error("盘点后数量大于该批次入库数量!")
+          }
+          
+        },   
         changeNumber(val){
           this.form.warehouse_info_id = val
           this.getDrugWarehouseInfoTotal(val)
             this.tableData = list
         }
       }) 
-    }
+    },
+    
     },
     created(){
       this.unitList =  this.getDataConfig('hemodialysis','units')

src/xt_pages/stock/newInventory.vue

 
              <el-table-column prop="name" label="盘点后数量" width="120"  align="center">
                 <template slot-scope="scope">
-                  <el-input style="width:80px" v-model="scope.row.last_stock_count"></el-input>
+                  <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>
                  </template> 
               </el-table-column>
 
        }  
      })    
     },
+    getSupplyCount(val1,val2){
+      // console.log("val2",val2)
+      // console.log("val1",val1)
+      if(val2 >val1){
+        console.log("JINLAAAA")
+         this.$message.error("盘点后数量大于该批次入库数量!")
+      }
+    }
     
    },