diff --git a/src/views/away/index.vue b/src/views/away/index.vue
index a8a2dea..17b2606 100644
--- a/src/views/away/index.vue
+++ b/src/views/away/index.vue
@@ -386,7 +386,7 @@ export default {
return (
{
- ((this.$moment().diff(this.$moment(row.end_date),"days") <= 30) || (row.FLOWSTATUS.expense.getStatus() > 1)) ?
+ ((this.$moment().diff(this.$moment(row.end_date),"days") <= 30) || (row.FLOWSTATUS.expense.getStatus() === 1)) ?
({ this.flowStatus.get(row.FLOWSTATUS.expense.getStatus()) || '待申请' }) :
(超时未办理)
}
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index 02f0e75..e7ae065 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -350,18 +350,9 @@ export default {
async toOutPay(row) {
let payments = [];
const actNumsTotal = () => {
- let total = 0;
- payments.reduce((pre,cur) => {
- return Number(cur.act_money) ? ++pre : pre;
+ return payments.reduce((pre,cur) => {
+ return pre + (!!Number(cur.act_money) ? Number(cur.act_money) : 0);
},0);
- return total;
- };
- const totalMoney = () => {
- let total = 0.0;
- payments.map((item) => {
- total += Number(item.act_money);
- });
- return total.toFixed(2);
};
let contract;
if (row.contract_id) {
@@ -384,7 +375,8 @@ export default {
out_pay_id: row?.id,
"xiangxishuoming": row?.remark,
"yifujine": actNumsTotal(),
- "xiangmuzonge": totalMoney(),
+ "xiangmuzonge": contract.money,
+ "zhifucishu": contract?.sign_plan?.length,
"cishu": payments.length,
"amt": row?.apply_money,
"liezhiqudao": contract?.plans.map(i => i.name)?.toString(),