Merge tag 'Hotfix-mo-21' into develop

Finish Hotfix-mo-21

src/views/supply/apply/components/apply_form.vue

@@ -58,11 +58,11 @@
     <div class="main-title">
       <div class="title">货品信息</div>
       <div>
-        <span style="font-size: 14px; margin-right: 10px">仓库</span>
+        <!-- <span style="font-size: 14px; margin-right: 10px">仓库</span>
         <el-select v-model="screenForm.warehouse" placeholder="请选择发货仓库" size="small" filterable clearable :disabled="goodsList.length > 0">
           <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
         </el-select>
-        <el-divider direction="vertical"></el-divider>
+        <el-divider direction="vertical"></el-divider> -->
         <el-button type="primary" size="small" icon="el-icon-plus" @click="openDialog">添加引用</el-button>
       </div>
     </div>
@@ -130,7 +130,7 @@
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="type" label="存货类别">
-              <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" :disabled="goodsList.length > 0">
+              <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%">
                 <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
@@ -152,24 +152,24 @@
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="80" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="数量" prop="qty" min-width="80" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="未申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="本次申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input v-model="scope.row.invoiceNum" size="small" type="number" :disabled="scope.row.selected"></el-input>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已申请未出货数量" prop="sendQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="未申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{stockFilter(scope.row, 1)}}
-            </template>
-          </el-table-column>
           <el-table-column align="center" label="对应库存数量" prop="stockCorrespond" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               {{stockFilter(scope.row, 2)}}
             </template>
           </el-table-column>
+          <el-table-column align="center" label="已申请未出货数量" prop="sendQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="center" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{stockFilter(scope.row, 1)}}
+            </template>
+          </el-table-column> -->
         </el-table>
         <div class="pagination clearfix" style="margin-top: 10px">
           <div class="fr">
@@ -439,6 +439,10 @@ export default {
       });
 
       for(let i=0; i<tableSelection.length; i++) {
+        if(tableSelection[i].invoiceNum < 1) {
+          this.$errorMsg('申请数量要大于0');
+          return;
+        }
         if(tableSelection[i].invoiceNum > tableSelection[i].refundableQty) {
           this.$errorMsg('申请数量不能大于未申请数量');
           return;