Browse Source

Finish Hotfix-mo-97

莫绍宝 3 năm trước cách đây
mục cha
commit
1c6232a95c

+ 1 - 1
src/views/supply/apply/components/engin_detail.vue

@@ -127,7 +127,7 @@
         <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="invoiceNum" 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="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
       </el-table>

+ 4 - 4
src/views/supply/apply/components/engin_examine.vue

@@ -127,7 +127,7 @@
         <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="invoiceNum" 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="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.approvalNumber" size="small" type="number"></el-input>
@@ -206,7 +206,7 @@ export default {
       imageURL: this.$imageUrl,
       detailData: {},
       userName: JSON.parse(localStorage.getItem("supply_user")).nickName,
-
+      goodsList: [],
       examineForm: {
         remark: '',
       },
@@ -245,7 +245,7 @@ export default {
         this.detailData = res.data;
 
         res.data.orders.forEach(item => {
-          item.approvalNumber = item.invoiceNum;
+          item.approvalNumber = item.refundableQty;
         });
         this.goodsList = res.data.orders;
       })
@@ -285,7 +285,7 @@ export default {
           this.$errorMsg('请填写审批数量');
           return;
         }
-        // if(this.goodsList[i].approvalNumber > this.goodsList[i].invoiceNum) {
+        // if(this.goodsList[i].approvalNumber > this.goodsList[i].refundableQty) {
         //   this.$errorMsg('审批数量不可大于申请数量');
         //   return;
         // }