From 5294297fbc78c58882dfcd80dd86bae95b83c04c Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 19 May 2025 08:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../return/receive/component/addReturn1.vue   | 12 ++++--
 .../csotSettlement/component/monthRecord.vue  | 37 ++++++++++++++++++-
 .../cost/csotSettlement/costApplyList.vue     |  3 ++
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/views/claimAndreturn/return/receive/component/addReturn1.vue b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
index a2891a8..314f2d4 100644
--- a/src/views/claimAndreturn/return/receive/component/addReturn1.vue
+++ b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
@@ -178,7 +178,7 @@
                     <span>{{ row.manageType == '0' ? '编码退料' : '数量退料' }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="退料数量" align="center" prop="num" min-width="130">
+            <el-table-column label="退料数量" align="center" prop="num1" min-width="130">
                 <template slot-scope="{ row }">
                     <span v-if="row.manageType == 1">{{
                         Number(row.maintenanceNum || 0) + Number(row.passNum || 0)
@@ -949,9 +949,15 @@ export default {
                     // );
 
                     this.queryParams.leaseApplyDetails.forEach((item) => {
-                        if (item.num) {
-                            item.backNum = item.num
+                        console.log("jjjjjjjjjj",item)
+
+                        if (item.manageType == 1) {
+                            item.num1 = Number(item.maintenanceNum || 0) + Number(item.passNum || 0);
+
+                        } else {
+                            item.num1 = item.numList && item.numList.length > 0 ? item.numList.length : 0;
                         }
+                        item.backNum = item.num1
                         if (item.manageType == 0) {
                             item.backNum = item.numList.length
                             if (item.passMaCodeDtoList) {
diff --git a/src/views/cost/csotSettlement/component/monthRecord.vue b/src/views/cost/csotSettlement/component/monthRecord.vue
index 3e5b792..ebc75df 100644
--- a/src/views/cost/csotSettlement/component/monthRecord.vue
+++ b/src/views/cost/csotSettlement/component/monthRecord.vue
@@ -135,7 +135,7 @@
                     </el-col>
                 </el-row>
 
-                <el-table border :data="monthDetails" max-height="600">
+                <el-table border :data="monthDetails" max-height="500" show-summary :summary-method="getSummaries">
                     <el-table-column
                         label="序号"
                         align="center"
@@ -188,6 +188,11 @@
                         label="本月暂记金额(元)"
                         align="center"
                     />
+                    <el-table-column
+                        prop="remark"
+                        label="备注"
+                        align="center"
+                    />
                 </el-table>
             </el-dialog>
         </el-dialog>
@@ -244,6 +249,36 @@ export default {
         this.getMonthRecordList()
     },
     methods: {
+        getSummaries(param) {
+            const { columns, data } = param;
+            const sums = [];
+            const columnsToSum = ['costs', 'realCosts']; // 定义需要求和的列
+
+            columns.forEach((column, index) => {
+                if (index === 0) {
+                    sums[index] = ''; // 第一列留空
+                    return;
+                }
+                if (index === 1) {
+                    sums[index] = '合计'; // 第二列显示合计
+                    return;
+                }
+                if (columnsToSum.includes(column.property)) {
+                    const values = data.map(item => Number(item[column.property]));
+                    sums[index] = values.reduce((prev, curr) => {
+                        const value = Number(curr);
+                        if (!isNaN(value)) {
+                            return prev + curr;
+                        }
+                        return prev;
+                    }, 0);
+                    sums[index] = sums[index].toFixed(2);
+                } else {
+                    sums[index] = '';
+                }
+            });
+            return sums;
+        },
         /** 获取月结记录列表数据 */
         async getMonthRecordList() {
             this.monthRecordParams.agreementId = this.agreementId
diff --git a/src/views/cost/csotSettlement/costApplyList.vue b/src/views/cost/csotSettlement/costApplyList.vue
index 70bf512..b668773 100644
--- a/src/views/cost/csotSettlement/costApplyList.vue
+++ b/src/views/cost/csotSettlement/costApplyList.vue
@@ -52,6 +52,9 @@
                 <el-form-item>
                     <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
                     <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                    <el-button type="primary" plain size="mini" @click="handleBatchExport"
+                        >批量导出结算表</el-button
+                    >
                     <el-button type="primary" plain size="mini" @click="handleBatchExport"
                         >批量导出月结明细表</el-button
                     >