Browse Source

fix:首款管理收款校验修改

ly 9 months ago
parent
commit
cc274c3627

+ 1 - 26
src/views/business/financial/collection/form.vue

@@ -588,11 +588,6 @@
     // 应收款金额  和明细比较 如果大于应收内容 提示 当前的合同提过的收款申请总金额超过当前合同金额,不可提交,如有需要请跟财务人员联系
     const res = await getCollectionDetail(form.value.contractId);
     if (res.data == null || res.data.length == 0) {
-      const amount = form.value.arriveAmount;
-      if (amount > form.value.contractAmount) {
-        proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额,不可提交,请联系财务人员。");
-        return false;
-      }
       for (let i = 0; i < form.value.details.length; i++) {
         let item = form.value.details[i];
         const Amount = (Number(item.countAmount) || 0)*1000 - (Number(item.reviewAmount) || 0)*1000;
@@ -602,14 +597,6 @@
         }
       }
     } else {
-      const countAmount = res.data.map((item) => item.status === 1&&item.arriveAmount).reduce((total, number) => {
-        return total + number;
-      });
-      const amount = countAmount + form.value.arriveAmount;
-      if (amount > form.value.contractAmount) {
-        proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额,不可提交,请联系财务人员。");
-        return false;
-      }
       for (let i = 0; i < form.value.details.length; i++) {
         let item = form.value.details[i];
         let countAmount = 0;
@@ -732,11 +719,7 @@
     if(form.value.verifyStatus === 1){
       const res = await getCollectionDetail(form.value.contractId);
       if (res.data == null || res.data.length == 0) {
-        const amount = form.value.arriveAmount;
-        if (amount > form.value.contractAmount) {
-          proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额,不可提交,请联系财务人员。");
-          return false;
-        }
+
         for (let i = 0; i < form.value.details.length; i++) {
           let item = form.value.details[i];
           const Amount = (Number(item.countAmount) || 0)*1000 - (Number(item.reviewAmount) || 0)*1000;
@@ -746,14 +729,6 @@
           }
         }
       } else {
-        const countAmount = res.data.map((item) => item.status === 1&&item.arriveAmount).reduce((total, number) => {
-          return total + number;
-        });
-        const amount = countAmount + form.value.arriveAmount;
-        if (amount > form.value.contractAmount) {
-          proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额,不可提交,请联系财务人员。");
-          return false;
-        }
         for (let i = 0; i < form.value.details.length; i++) {
           let item = form.value.details[i];
           let countAmount = 0;

+ 0 - 5
src/views/business/financial/contract/form.vue

@@ -476,11 +476,6 @@
     // 应收款金额  和明细比较 如果大于应收内容 提示 当前的合同提过的收款申请总金额超过当前合同金额,不可提交,如有需要请跟财务人员联系
     const res = await getCollectionDetail(form.value.contractId);
     if (res.data == null || res.data.length == 0) {
-      const amount = form.value.arriveAmount;
-      if (amount > form.value.contractAmount) {
-        proxy.$modal.msgError("当前的合同提过的收款申请总金额超过当前合同金额,不可提交,请联系财务人员。");
-        return false;
-      }
       for (let i = 0; i < form.value.details.length; i++) {
         let item = form.value.details[i];
         if (item.arriveAmount != null && item.amount < item.arriveAmount) {