From 2cc4331194fd32438ac9eaf211b85a90bfff6f5e Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 29 Sep 2025 18:39:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=20zhixing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/departmentProgress/index.js           |  9 ++++
 .../components/departmentProgressDetail.vue   | 52 +++++++++++++++----
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/api/departmentProgress/index.js b/src/api/departmentProgress/index.js
index b2f6624..dd7842d 100644
--- a/src/api/departmentProgress/index.js
+++ b/src/api/departmentProgress/index.js
@@ -27,6 +27,15 @@ function customParamsSerializer(params) {
     console.log("result",result, result.slice(0, -1))
   return result.slice(0, -1);
 }
+export function endIndex2(params, noloading = false) {
+  return request({
+    method: 'get',
+    url: '/api/ht/contract/end-index-v2',
+    params,
+    noloading,
+    paramsSerializer: customParamsSerializer
+  })
+}
 export function endIndex(params, noloading = false) {
   return request({
     method: 'get',
diff --git a/src/views/departmentProgress/components/departmentProgressDetail.vue b/src/views/departmentProgress/components/departmentProgressDetail.vue
index b8af1aa..9180970 100644
--- a/src/views/departmentProgress/components/departmentProgressDetail.vue
+++ b/src/views/departmentProgress/components/departmentProgressDetail.vue
@@ -37,10 +37,10 @@
             <!-- 已执行项目表格 -->
             <el-card class="table-container mb-4">
               <div class="section-title" style="display:flex;align-items:center;justify-content:space-between;">
-                <span>已执行项目（财务付款确认）</span>
+                <span>资金执行明细</span>
                 <el-button type="primary" size="mini" @click="exportEnd">导出</el-button>
               </div>
-              <xy-table ref="xyTable" :list="endList" :table-item="table" :height="300">
+              <xy-table ref="xyTable" :list="endList" :table-item="endTable" :height="300">
                 <template v-slot:status>
                   <el-table-column header-align="center" label="当前状态" width="120">
                     <template slot-scope="scope">
@@ -56,7 +56,7 @@
                     width="120"
                   >
                 <template slot-scope="scope">
-                      <el-button type="primary" size="small" @click="showContractDetail(scope.row)">详情</el-button>
+                      <el-button v-if="scope.row.contract_id" type="primary" size="small" @click="showContractDetail(scope.row)">详情</el-button>
                     </template>
                   </el-table-column>
                 </template>
@@ -112,6 +112,7 @@
 <script>
 import {
   endIndex,
+  endIndex2,
   partIndex
 } from '@/api/departmentProgress'
 // import detail from '../components/detail.vue'
@@ -140,6 +141,36 @@ export default {
       },
       endList: [],
       partList: [],
+      endTable:[{
+        prop: 'model_type_text',
+        label: '类型',
+        width: 120,
+        align: 'center'
+      },{
+        prop: 'name',
+        label: '关联名称',
+        width: 240,
+        align: 'center'
+      }, {
+        prop: 'use_money',
+        label: '使用金额',
+        width: 240
+      }, {
+        prop: 'admin_name',
+        label: '发起人',
+        width: 120,
+        align: 'center'
+      },{
+        prop: 'created_at',
+        label: '发起时间',
+        width: 180,
+        align: 'center'
+      },{
+        prop: 'status',
+        label: '状态',
+        width: 120,
+        align: 'center'
+      }],
       table: [{
         prop: 'name',
         label: '项目名称',
@@ -149,7 +180,8 @@ export default {
       }, {
         prop: 'department.name',
         label: '科室',
-        width: 240
+        width: 240,
+        align: 'left'
       }, {
         prop: 'admin.name',
         label: '经办人',
@@ -206,7 +238,7 @@ export default {
     },
     async getEndIndex(id) {
       
-      const res = await endIndex({
+      const res = await endIndex2({
         department_id: id,
         page: this.endSelect.page,
         page_size: this.endSelect.page_size
@@ -233,7 +265,7 @@ export default {
     showContractDetail(row) {
       this.isShowContractDetail = true
       this.$nextTick(() => {
-        this.$refs.contractDetailDrawer.getDetail(row.id)
+        this.$refs.contractDetailDrawer.getDetail(row.contract_id)
       })
     },
     getCompletionRate(dept) {
@@ -252,9 +284,11 @@ export default {
     },
     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')
+      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]=当前状态'
+      const export_fields = 'export_fields[model_type_text]=类型&export_fields[name]=关联名称&export_fields[use_money]=使用金额&export_fields[created_at]=发起时间&export_fields[funds_count_text]=状态&export_fields[admin_name]=发起人'
+
+      window.open(`${process.env.VUE_APP_BASE_API}/api/ht/contract/end-index-v2?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:''):''