518合并代码

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -152,7 +152,7 @@
               >
                 <div style="display:flex;">
                   <el-input
-                   @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_unit,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
+                   @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_number,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     style="width:80px"
                     placeholder="请输入出库数量"
@@ -921,7 +921,7 @@ export default {
       return total
     },
     getSupplyCount(count,max_unit,min_number,index,total_count,max_unit_fisrt,min_unit_fisrt){
-     
+   
       var count_total = 0
       if(max_unit == max_unit_fisrt){
         count_total = count * min_number
@@ -930,7 +930,7 @@ export default {
       if(max_unit == min_unit_fisrt){
         count_total = count 
       }
-
+    
       if(count_total > total_count){
         this.$message.error("出库数量不能大于剩余库存")
         for(let i=0;i<this.recordInfo.recordData.length;i++){

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -165,7 +165,7 @@
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
-                    @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_unit,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
+                    @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_number,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                   ></el-input>
                   <el-select v-model="scope.row.count_unit" filterable placeholder="请选择单位" style="width:80px" :disabled="unitShow">
                     <el-option