Finish Hotfix-mo-37

src/views/supply/engin/components/commerce_form.vue

@@ -448,7 +448,9 @@ export default {
             let hasItem = findElem(list, 'adminUserId', item.serviceId);
             if(hasItem < 0) {
               let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
-              list.push(obj);
+              if(obj) {
+                list.push(obj);
+              }
             }
           }
         })

src/views/supply/engin/components/home_form.vue

@@ -561,7 +561,9 @@ export default {
             let hasItem = findElem(list, 'adminUserId', item.serviceId);
             if(hasItem < 0) {
               let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
-              list.push(obj);
+              if(obj) {
+                list.push(obj);
+              }
             }
           }
         })

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

@@ -117,12 +117,14 @@
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <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="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.reservedNum" size="small"></el-input>
           </template>
         </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="correspondId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/supply/retail/components/retail_form.vue

@@ -374,7 +374,9 @@ export default {
             let hasItem = findElem(list, 'adminUserId', item.serviceId);
             if(hasItem < 0) {
               let obj = this.salesmanList.find(o => o.adminUserId == item.serviceId);
-              list.push(obj);
+              if(obj) {
+                list.push(obj);
+              }
             }
           }
         })