Merge branch 'dev' of http://gogs.langye.net:3000/langye/cz-hjjc-ht

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 (
+                    <div>
+                      {' '}
+                      [{item.plan.year}] {(item.plan && item.plan.pid_info) ? item.plan.pid_info.name : ''} - {item.plan.name} <br /> [使用金额]{' '}
+                      {item.use_money}元{' '}
+                    </div>
+                  )
+                })
+              }
+            }
+          }
         },
         {
           label: '款项类型',