莫绍宝 пре 3 година
родитељ
комит
fc35752117

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

@@ -121,7 +121,7 @@
           </el-table-column>
           <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip v-if="detailData.type !== 2"></el-table-column>
           <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>

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

@@ -84,7 +84,7 @@
           </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="refundableQty" min-width="100" show-overflow-tooltip> </el-table-column>
+        <el-table-column align="center" label="未申请数量" prop="canApply" min-width="100" show-overflow-tooltip> </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
@@ -160,7 +160,7 @@
           <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="canApply" 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">
@@ -432,7 +432,7 @@ export default {
           this.$errorMsg('申请数量要大于0');
           return;
         }
-        // if(tableSelection[i].invoiceNum > tableSelection[i].refundableQty) {
+        // if(tableSelection[i].invoiceNum > tableSelection[i].canApply) {
         //   this.$errorMsg('申请数量不能大于未申请数量');
         //   return;
         // }
@@ -461,7 +461,7 @@ export default {
               this.$errorMsg('请输入申请数量');
               return;
             }
-            // if(this.goodsList[i].invoiceNum > this.goodsList[i].refundableQty) {
+            // if(this.goodsList[i].invoiceNum > this.goodsList[i].canApply) {
             //   this.$errorMsg('申请数量不能大于未申请数量');
             //   return;
             // }