Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

src/views/modules/common/material-component.vue

@@ -81,13 +81,8 @@
               this.options.push({...item,
                 label: item.materialName,
                 value: item.materialId,
-                // materialId: item.materialId,
-                // cateId: item.cateId,
-                // categoryName: item.categoryName,
-                // specifications: item.specifications,
-                specification: item.specifications
-                // unitName: item.unitName,
-                // lockCnt: item.lockCnt
+                specification: item.specifications,
+                cntLimit: item.cnt - item.lockCnt
               })
             })
           } else {

src/views/modules/warehouse/stock-order-outbound.vue

@@ -45,16 +45,11 @@
                   <el-input v-model="item.specifications" :disabled="true" placeholder="规格"></el-input>
                 </el-form-item>
               </el-col>
-  <!--            <el-col :span="8" style="padding-left: 20px">-->
-  <!--              <el-form-item label="批次号" prop="batchNumber">-->
-  <!--                <el-input v-model="item.batchNumber" placeholder="请填写出库物品（零件）批次"></el-input>-->
-  <!--              </el-form-item>-->
-  <!--            </el-col>-->
             </el-row>
             <el-row class="my-row">
               <el-col :span="8">
                 <el-form-item label="数量" prop="cnt">
-                  <el-input-number v-model="item.cnt" :min="0" :max="Number(item.lockCnt)"></el-input-number>
+                  <el-input-number v-model="item.cnt" :min="0" :max="item.cntLimit"></el-input-number>
                 </el-form-item>
               </el-col>
               <el-col :span="16" style="padding-left: 20px">