Browse Source

518合并代码

XMLWAN 2 years ago
parent
commit
973189637c

+ 3 - 3
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue View File

152
               >
152
               >
153
                 <div style="display:flex;">
153
                 <div style="display:flex;">
154
                   <el-input
154
                   <el-input
155
-                   @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)"
155
+                   @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)"
156
                     oninput="value=value.replace(/\D|^0/g,'')"
156
                     oninput="value=value.replace(/\D|^0/g,'')"
157
                     style="width:80px"
157
                     style="width:80px"
158
                     placeholder="请输入出库数量"
158
                     placeholder="请输入出库数量"
921
       return total
921
       return total
922
     },
922
     },
923
     getSupplyCount(count,max_unit,min_number,index,total_count,max_unit_fisrt,min_unit_fisrt){
923
     getSupplyCount(count,max_unit,min_number,index,total_count,max_unit_fisrt,min_unit_fisrt){
924
-     
924
+   
925
       var count_total = 0
925
       var count_total = 0
926
       if(max_unit == max_unit_fisrt){
926
       if(max_unit == max_unit_fisrt){
927
         count_total = count * min_number
927
         count_total = count * min_number
930
       if(max_unit == min_unit_fisrt){
930
       if(max_unit == min_unit_fisrt){
931
         count_total = count 
931
         count_total = count 
932
       }
932
       }
933
-
933
+    
934
       if(count_total > total_count){
934
       if(count_total > total_count){
935
         this.$message.error("出库数量不能大于剩余库存")
935
         this.$message.error("出库数量不能大于剩余库存")
936
         for(let i=0;i<this.recordInfo.recordData.length;i++){
936
         for(let i=0;i<this.recordInfo.recordData.length;i++){

+ 1 - 1
src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue View File

165
                     placeholder="请输入出库数量"
165
                     placeholder="请输入出库数量"
166
                     type="number"
166
                     type="number"
167
                     v-model="scope.row.count"
167
                     v-model="scope.row.count"
168
-                    @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)"
168
+                    @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)"
169
                   ></el-input>
169
                   ></el-input>
170
                   <el-select v-model="scope.row.count_unit" filterable placeholder="请选择单位" style="width:80px" :disabled="unitShow">
170
                   <el-select v-model="scope.row.count_unit" filterable placeholder="请选择单位" style="width:80px" :disabled="unitShow">
171
                     <el-option
171
                     <el-option