From a182ec80562e3ce9959124a660ae4ae56150e85e Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 24 Sep 2025 18:01:37 +0800
Subject: [PATCH 1/3] dev

---
 .../components/departmentProgressDetail.vue   | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/departmentProgress/components/departmentProgressDetail.vue b/src/views/departmentProgress/components/departmentProgressDetail.vue
index d761aad..b8af1aa 100644
--- a/src/views/departmentProgress/components/departmentProgressDetail.vue
+++ b/src/views/departmentProgress/components/departmentProgressDetail.vue
@@ -36,7 +36,9 @@
 
             <!-- 已执行项目表格 -->
             <el-card class="table-container mb-4">
-              <div class="section-title">已执行项目（财务付款确认）
+              <div class="section-title" style="display:flex;align-items:center;justify-content:space-between;">
+                <span>已执行项目（财务付款确认）</span>
+                <el-button type="primary" size="mini" @click="exportEnd">导出</el-button>
               </div>
               <xy-table ref="xyTable" :list="endList" :table-item="table" :height="300">
                 <template v-slot:status>
@@ -66,7 +68,9 @@
 
             <!-- 未执行完项目表格 -->
             <el-card class="table-container">
-              <div class="section-title">未执行完项目（流程中/预算流转中）
+              <div class="section-title" style="display:flex;align-items:center;justify-content:space-between;">
+                <span>未执行完项目（流程中/预算流转中）</span>
+                <el-button type="primary" size="mini" @click="exportPart">导出</el-button>
               </div>
               <xy-table ref="xyTable" :list="partList" :table-item="table" :height="300">
                 <template v-slot:status>
@@ -112,6 +116,7 @@ import {
 } from '@/api/departmentProgress'
 // import detail from '../components/detail.vue'
 import ContractDetailDrawer from '@/components/contractIntegration/index.vue'
+import { getToken } from '@/utils/auth'
 export default {
   name: 'DepartmentProgressDetail',
   components: {
@@ -170,6 +175,7 @@ export default {
       }, {
         prop: 'status',
         label: '当前状态',
+        export:'funds_count_text',
         width: 120
       }]
     }
@@ -199,13 +205,16 @@ export default {
       this.getEndIndex(this.row.plan_department_id)
     },
     async getEndIndex(id) {
+      
       const res = await endIndex({
         department_id: id,
         page: this.endSelect.page,
         page_size: this.endSelect.page_size
       })
-      this.endList = res.list.data
-      this.endTotal = res.list.total
+        this.endList = res.list.data
+        this.endTotal = res.list.total
+      
+      
     },
     async getPartIndex(id) {
       const res = await partIndex({
@@ -240,6 +249,18 @@ export default {
       } else {
         return (num / 10000).toFixed(2) + '万元' // 除以1万并保留两位小数
       }
+    },
+    exportEnd() {
+      const name = this.row?(this.row.plan_department?this.row.plan_department.name:''):''
+      const file_name = name+'已执行项目(财务付款确认)'
+      const export_fields = 'export_fields[name]=项目名称&export_fields[department.name]=科室&export_fields[admin.name]=经办人&export_fields[money]=预算金额&export_fields[funds_count]=发起支付笔数&export_fields[contract_plan_act_sum]=已确认付款金额&export_fields[funds_count_text]=当前状态'
+      window.open(`${process.env.VUE_APP_BASE_API}/api/ht/contract/end-index?token=${getToken()}&is_export=1&page=1&page_size=999&department_id=${this.row.plan_department_id}&${export_fields}&file_name=${file_name}`, '_blank')
+    },
+    exportPart() {
+      const name = this.row?(this.row.plan_department?this.row.plan_department.name:''):''
+      const file_name = name+'未执行完项目'
+      const export_fields = 'export_fields[name]=项目名称&export_fields[department.name]=科室&export_fields[admin.name]=经办人&export_fields[money]=预算金额&export_fields[funds_count]=发起支付笔数&export_fields[contract_plan_act_sum]=已确认付款金额&export_fields[funds_count_text]=当前状态'
+      window.open(`${process.env.VUE_APP_BASE_API}/api/ht/contract/part-index?token=${getToken()}&is_export=1&page=1&page_size=999&department_id=${this.row.plan_department_id}&${export_fields}&file_name=${file_name}`, '_blank')
     }
   }
 }
@@ -346,4 +367,4 @@ export default {
   .detail-table {
     font-size: 14px;
   }
-</style>
+</style>
\ No newline at end of file

From 09d27a20ed60f205dd4494f53c988834bb665bfe Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 25 Sep 2025 11:07:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=20=E8=B5=84=E9=87=91=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/paymentRegistrationList.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index 653ff00..27b394a 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -348,6 +348,25 @@ export default {
               }
             }
           }
+        },{
+          label: '已纳入资金执行率金额',
+          width: 320,
+          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: '款项类型',

From 92fa19aae1cd407d87a34aa3ad377161101f258c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 29 Sep 2025 09:11:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/finance/paymentRegistrationList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index 27b394a..7d54058 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -350,7 +350,7 @@ export default {
           }
         },{
           label: '已纳入资金执行率金额',
-          width: 320,
+          width: 300,
           align: 'left',
           customFn: (row) => {
             {