Merge tag 'Hotfix-zh-99' into develop

Finish Hotfix-zh-99

src/views/supply/reserve/components/reserve_form.vue

@@ -67,7 +67,7 @@
         <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <div v-if="scope.row.orderId || listItem">{{scope.row.customerNumber}}</div>
-            <el-select 
+            <el-select
               v-else
               v-model="scope.row.customerNumber"
               placeholder="选择经销商"
@@ -92,7 +92,7 @@
         <el-table-column align="center" label="物料编码" prop="materialCode" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <div v-if="scope.row.orderId || listItem">{{scope.row.materialCode}}</div>
-            <el-select 
+            <el-select
               v-else
               v-model="scope.row.materialCode"
               placeholder="选择产品"
@@ -125,7 +125,7 @@
         </el-table-column>
         <el-table-column align="center" label="订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="可用数量" prop="openNumber" 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="correspondId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.correspondId" placeholder="选择预留仓库" size="small" clearable @change="changeWarehouse(scope.$index)">
@@ -151,7 +151,7 @@
       </el-table>
       <div class="add" v-if="!listItem"><el-button type="text" icon="el-icon-plus" @click="addGoods">添加行</el-button></div>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
@@ -245,7 +245,9 @@
           <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="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        </el-table>
+          <el-table-column align="center" label="可预留数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+
+      </el-table>
         <div class="pagination clearfix" style="margin-top: 10px">
           <div class="fr">
             <el-pagination
@@ -259,7 +261,7 @@
           </div>
         </div>
       </div>
-      
+
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="submitAddGoods">确 定</el-button>
@@ -328,7 +330,7 @@ export default {
       },
       currentPage: 1,
       listTotal: 0,
-      
+
       dialogGoodsList: [],
       dialogSelection: [],
 
@@ -660,4 +662,4 @@ export default {
     border-top: none;
     height: 50px;
   }
-</style>
+</style>