diff --git a/src/views/departmentProgress/components/departmentProgressDetail.vue b/src/views/departmentProgress/components/departmentProgressDetail.vue index a166f13..b8af1aa 100644 --- a/src/views/departmentProgress/components/departmentProgressDetail.vue +++ b/src/views/departmentProgress/components/departmentProgressDetail.vue @@ -367,4 +367,4 @@ export default { .detail-table { font-size: 14px; } - + \ No newline at end of file diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue index 7d3eceb..4f843c4 100644 --- a/src/views/finance/paymentRegistrationList.vue +++ b/src/views/finance/paymentRegistrationList.vue @@ -334,6 +334,25 @@ export default { .toFixed(2) .replace(/(\d)(?=(\d{3})+\.)/g, '$1,'):'' } + },{ + label: '已纳入资金执行率金额', + width: 300, + align: 'left', + customFn: (row) => { + { + if (row.plan_act_links && row.plan_act_links.length > 0) { + return row.plan_act_links.map((item) => { + return ( +
+ {' '} + [{item.plan.year}] {(item.plan && item.plan.pid_info) ? item.plan.pid_info.name : ''} - {item.plan.name}
[使用金额]{' '} + {item.use_money}元{' '} +
+ ) + }) + } + } + } }, { label: '款项类型',