Bläddra i källkod

fix:收款管理页面审核通过校验修改

ly 9 månader sedan
förälder
incheckning
fb34864cb3
1 ändrade filer med 4 tillägg och 4 borttagningar
  1. 4 4
      src/views/business/financial/collection/form.vue

+ 4 - 4
src/views/business/financial/collection/form.vue

@@ -7,7 +7,7 @@
           <span class="title-label"><el-icon>
               <Document />
             </el-icon>
-            款信息</span>
+            款信息</span>
 
           <el-button v-if="editStatus" type="primary" size="small" icon="Finished" @click="submitForm">保存</el-button>
           <el-button v-show="form.status == 1 && auth.hasPermi('business:collection:return')" type="warning" size="small" icon="Finished" @click="returnZero"
@@ -564,7 +564,7 @@
       .confirm("是否确认退回")
       .then(function () {
         form.value.status = 0;
-        setCollectionZero(form.value.id)
+        return setCollectionZero(form.value.id)
       })
       .then(() => {
         visible.value = false;
@@ -736,7 +736,7 @@
         }
       }
     } else {
-      const countAmount = res.data.map((item) => item.arriveAmount).reduce((total, number) => {
+      const countAmount = res.data.map((item) => item.status === 1&&item.arriveAmount).reduce((total, number) => {
         return total + number;
       });
       const amount = countAmount + form.value.arriveAmount;
@@ -753,7 +753,7 @@
             countAmount += match.arriveAmount;
           }
         }
-        if (item.amount < match.add(item.arriveAmount, countAmount)) {
+        if (item.amount < match.add(item.arriveAmount)) {
           proxy.$modal.msgError("当前的" + item.taskTypeName + "收款申请总金额超过当前服务金额,不可提交,请联系财务人员。");
           return false;
         }