Explorar o código

【修改】bug

莫绍宝 %!s(int64=3) %!d(string=hai) anos
pai
achega
d1f26fd65a

+ 6 - 2
src/views/supply/apply/components/apply_examine.vue

@@ -226,10 +226,14 @@ export default {
     // 提交审批
     clickSubmitForm() {
       for(let i=0; i<this.goodsList.length; i++) {
-        if(this.goodsList[i].approvalNumber > this.goodsList[i].invoiceNum) {
-          this.$errorMsg('审批数量不可大于申请数量');
+        if(this.goodsList[i].approvalNumber === '') {
+          this.$errorMsg('请填写审批数量');
           return;
         }
+        // if(this.goodsList[i].approvalNumber > this.goodsList[i].invoiceNum) {
+        //   this.$errorMsg('审批数量不可大于申请数量');
+        //   return;
+        // }
       }
 
       this.formLoading = true;

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

@@ -281,14 +281,14 @@ export default {
     // 提交审批
     clickSubmitForm(val) {
       for(let i=0; i<this.goodsList.length; i++) {
-        if(!this.goodsList[i].approvalNumber) {
+        if(this.goodsList[i].approvalNumber === '') {
           this.$errorMsg('请填写审批数量');
           return;
         }
-        if(this.goodsList[i].approvalNumber > this.goodsList[i].invoiceNum) {
-          this.$errorMsg('审批数量不可大于申请数量');
-          return;
-        }
+        // if(this.goodsList[i].approvalNumber > this.goodsList[i].invoiceNum) {
+        //   this.$errorMsg('审批数量不可大于申请数量');
+        //   return;
+        // }
       }
 
       this.$confirm('此操作将审批订单, 是否继续?', '提示', {

+ 9 - 5
src/views/supply/apply/components/engin_form.vue

@@ -296,14 +296,18 @@ export default {
   filters: {
     orderTypeFilter(val) {
       const MAP = {
-        TRADE: '商用',
-        HOME: '家用',
+        HOME: '家用单',
+        TRADE: '商用单',
         RETAIL: '零售单',
         RETAIL_POLICY: '销售政策单',
-        PERMU_HOME: '置换家用',
-        PERMU_TRADE: '置换商用',
-        PERMU_RETAIL: '置换零售',
+        PERMU_HOME: '置换家用',
+        PERMU_TRADE: '置换商用',
+        PERMU_RETAIL: '置换零售',
         PERMU_RETAIL_POLICY: '置换销售政策单',
+        REQUISITION_HOME: '调拨家用单',
+        REQUISITION_TRADE: '调拨商用单',
+        REQUISITION_RETAIL: '调拨零售单',
+        REQUISITION_RETAIL_POLICY: '调拨销售政策单',
       }
       return MAP[val];
     },

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

@@ -516,7 +516,7 @@ export default {
           }
         }
         newGoodsList.forEach(item => {
-          item.invoiceNum = item.refundableQty;
+          item.invoiceNum = '-' + item.refundableQty;
         });
 
         this.tableGoodsList = newGoodsList;