From b37c6f2735faf5c352a86305b91bbb9fd58bc284 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 15 May 2025 18:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=BF=9B=E5=B1=95=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=20=E8=B4=A2=E5=8A=A1=E4=BB=98=E6=AC=BE=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/paymentRegistration/fundLog.js        |  1 +
 src/views/away/index.vue                      | 32 ++++++++++--
 .../statisticalReport/budgetProgress.vue      | 51 +++++++++++++++++--
 3 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/src/api/paymentRegistration/fundLog.js b/src/api/paymentRegistration/fundLog.js
index 5dc315c..f8715e1 100644
--- a/src/api/paymentRegistration/fundLog.js
+++ b/src/api/paymentRegistration/fundLog.js
@@ -1,5 +1,6 @@
 import request from "@/utils/request";
 
+
 export function getFundLog(params,noloading = false){
   return request({
     method:'get',
diff --git a/src/views/away/index.vue b/src/views/away/index.vue
index ea0e568..c06440a 100644
--- a/src/views/away/index.vue
+++ b/src/views/away/index.vue
@@ -26,12 +26,12 @@
                 <Option v-for="item in departments" :key="item.id" :value="item.id">{{ item.name }}</Option>
               </Select>
             </div>
-            <!-- <div>
+            <div>
               <span>状态</span>
-              <Select v-model="select.financial_status" style="width:120px" clearable>
+              <Select multiple @on-change="changeStatus" v-model="financial_status_options" style="width:240px" clearable>
                 <Option v-for="item in financialStatusList" :key="item.id" :value="item.id">{{ item.name }}</Option>
               </Select>
-            </div> -->
+            </div>
 
             <div>
               <span>开始时间</span>
@@ -312,12 +312,16 @@ export default {
         left: 0,
       },
       departments: [],
+      financial_status_options:[1,3],
       financialStatusList:[{
         id:1,
         name:'待确认'
       },{
         id:2,
-        name:'已审核'
+        name:'已确认'
+      },{
+        id:3,
+        name:'部分确认'
       }],
       select: {
         keyword: '',
@@ -328,7 +332,7 @@ export default {
         page_size: 10,
         flow_link: [],
         department_id: '',
-        // financial_status:1
+        financial_status:'1,3'
       },
       total: 0,
       list: [],
@@ -439,6 +443,20 @@ export default {
             }
           ]
         },
+        {
+          label: "状态",
+          width: 160,
+          prop: "financial_status",
+          customFn:row => {
+            return (
+              this.financialStatusList.map(i=>{
+                if(i.id===row.financial_status){
+                  return (<span style="color: green;">{i.name}</span>)
+                }
+              })
+            )
+          }
+        },
         {
           label: "创建日期",
           width: 160,
@@ -461,6 +479,10 @@ export default {
     }
   },
   methods: {
+    changeStatus(e){
+      console.log("e",e)
+      this.select.financial_status = e?e.join(','):''
+    },
     showMulti() {
       console.log("this.$refs['xyTable'].getSelection()",this.$refs['xyTable'].getSelection())
       let selects = this.$refs['xyTable'].getSelection()
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 6da302e..f02b074 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -75,6 +75,7 @@
   } from "@/utils/mergeTableRow"
 import { getFundLog,getPlanActLinks } from "@/api/paymentRegistration/fundLog"
 import detail from "@/views/contract/components/detailContract";
+import { getToken } from '@/utils/auth'
   export default {
     components:{
       detail
@@ -198,6 +199,17 @@ import detail from "@/views/contract/components/detailContract";
                               }
                             }
                           }}>
+                  <Button style={this.fundLogs.length>0?'display:block':'display:none'} size="small" type="primary"
+                  on={{
+                    ['click']:async _ => {
+                      try {
+                        this.exportDetail(row.id)
+
+                      } catch (e) {
+                      }
+                    }
+                  }}
+                  >导出</Button>
                 <Table loading={this.isLoadingFundLogTable}
                        size="small"
                        data={this.fundLogs}
@@ -356,7 +368,7 @@ import detail from "@/views/contract/components/detailContract";
                          //   align: "left",
                          // },
                          {
-                           title: "创建信息",
+                           title: "创建时间",
                            key: "created_at",
                            width: 160,
                            render: (h, { row }) => h('span',this.$moment(row.created_at).format('YYYY-MM-DD'))
@@ -368,10 +380,23 @@ import detail from "@/views/contract/components/detailContract";
           }
         ],
         isLoadingFundLogTable: false,
-        fundLogs: []
+        fundLogs: [],
+        export_fields:{
+          'model_type_text':'支出类型',
+          'use_money':'支出金额',
+          'model.reason':'事由/备注',
+          'created_at':'创建时间'
+        }
+
+
       }
     },
-    methods: { //合并行
+    methods: {
+      exportDetail(id){
+        let export_fields = "export_fields[model_type_text]=支出类型&export_fields[use_money]=支出金额&export_fields[model.reason]=事由/备注&export_fields[created_at]=创建时间"
+        window.open(`${process.env.VUE_APP_BASE_API}/api/ht/plan/plan-act-links?token=${getToken()}&is_export=1&page=1&page_size=999&plan_id=${id}&${export_fields}`,"_blank")
+      },
+      //合并行
       objectSpanMethod({
         row,
         column,
@@ -529,6 +554,26 @@ import detail from "@/views/contract/components/detailContract";
         this.rateTotal = this.toper(this.updateMoneyTotal, this.moneyTotal, this.useMoneyTotal)
 
         console.log(res)
+      },
+      customParamsSerializer(params) {
+        let result = '';
+        for (let key in params) {
+          if (params.hasOwnProperty(key)) {
+            if (Array.isArray(params[key])) {
+              params[key].forEach((item,index) => {
+                if(item.key){
+                  result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`;
+
+                }else{
+                  result +=`${key}[${index}]=${item}&`
+                }
+              });
+            } else {
+              result += `${key}=${params[key]}&`;
+            }
+          }
+        }
+        return result.slice(0, -1);
       }
     },
     created() {