From 972d6f829aeb7be97765a8d8bab8c5d8f7224787 Mon Sep 17 00:00:00 2001
From: bonus <1203338439@qq.com>
Date: Fri, 28 Nov 2025 15:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=9D=83=E9=99=90=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/cost/component/applyDetail.vue   |  5 ++--
 .../material/cost/component/applyHome.vue     | 30 +++++++++++++++++++
 src/views/material/cost/costApplyList.vue     | 10 ++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/views/material/cost/component/applyDetail.vue b/src/views/material/cost/component/applyDetail.vue
index 41136be7..73668a69 100644
--- a/src/views/material/cost/component/applyDetail.vue
+++ b/src/views/material/cost/component/applyDetail.vue
@@ -673,7 +673,8 @@ export default {
                         repairList: this.repairList,
                         scrapList: this.scrapList,
                         loseList: this.loseList,
-                        reductionList: this.reducList
+                        reductionList: this.reducList,
+                        settlementType: this.rowData[0].settlementType || ''
                     }
                     console.log('2222222222222', params)
                     submitCosts(params).then(response => {
@@ -681,7 +682,7 @@ export default {
                             type: 'success',
                             message: '提交成功'
                         })
-                        this.$emit('goBackPage')
+                        this.$emit('isReset')
                     })
                 })
                 .catch(() => {})
diff --git a/src/views/material/cost/component/applyHome.vue b/src/views/material/cost/component/applyHome.vue
index e7c7292a..4174300c 100644
--- a/src/views/material/cost/component/applyHome.vue
+++ b/src/views/material/cost/component/applyHome.vue
@@ -53,6 +53,17 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
+            
+            <el-form-item prop="settlementType">
+                <el-select v-model="queryParams.settlementType" placeholder="请选择结算类型" clearable filterable>
+                    <el-option
+                        v-for="(item, index) in settlementTypeList"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                </el-select>
+            </el-form-item>
             <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>
@@ -83,6 +94,15 @@
                     <span v-else style="color: #909399">无待结费用</span>
                 </template>
             </el-table-column>
+            <el-table-column label="结算类型" align="center" prop="sltStatus" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.settlementType == 1" effect="plain">工器具</el-tag>
+                    <el-tag type="warning" v-if="scope.row.settlementType == 2" effect="plain">安全工器具</el-tag>
+                    <el-tag v-if="!scope.row.settlementType || scope.row.settlementType == 0" effect="plain">
+                        总费用
+                    </el-tag>
+                </template>
+            </el-table-column>
             <el-table-column label="结算状态" align="center" prop="sltStatus" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.cost_status" :value="scope.row.sltStatus" />
@@ -375,12 +395,18 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 sltStatus: '',
+                settlementType: '',
                 isCommit: '',
                 unitId: null,
                 projectId: null,
                 agreementId: [],
                 agreementCode: ''
             },
+            settlementTypeList: [
+                { label: '总费用', value: '' },
+                { label: '工器具', value: '1' },
+                { label: '安全工器具', value: '2' },
+            ],
             openPrint: false,
             // 协议书内容
             agreementContent: {
@@ -520,6 +546,7 @@ export default {
                 pageSize: this.queryParams.pageSize,
                 projectId: this.queryParams.projectId,
                 sltStatus: this.queryParams.sltStatus,
+                settlementType: this.queryParams.settlementType,
                 agreementCode: this.queryParams.agreementCode,
                 // ...this.queryParams,
                 unitIds: this.unitIds
@@ -543,6 +570,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 sltStatus: '',
+                settlementType: '',
                 isCommit: '',
                 unitId: null,
                 projectId: null,
@@ -555,6 +583,7 @@ export default {
         //结算申请
         handleApply(row) {
             console.log('🚀 handleApply 被调用，传入数据:', row)
+            row.settlementType = this.queryParams.settlementType
             let arr = []
             arr.push(row)
             console.log('🚀 准备发送的数据:', arr)
@@ -580,6 +609,7 @@ export default {
             this.multiple = !selection.length
         },
         async openPrintDialog(row) {
+            row.settlementType = this.queryParams.settlementType
             this.openPrint = true
             try {
                 const res = await getSltInfo([row])
diff --git a/src/views/material/cost/costApplyList.vue b/src/views/material/cost/costApplyList.vue
index 13fe021d..ed3c1668 100644
--- a/src/views/material/cost/costApplyList.vue
+++ b/src/views/material/cost/costApplyList.vue
@@ -6,12 +6,14 @@
             :pageContent="pageContent"
             @goBack="goBack"
         />
-        <keep-alive>
+        <keep-alive include="ApplyHome">
             <component
+                ref="componentRef"
                 :is="isShowComponent"
                 :row="rowData"
                 @goDetail="goDetail"
                 @goBackPage="goBack"
+                @isReset="isReset"
             />
         </keep-alive>
     </div>
@@ -48,6 +50,12 @@ export default {
         goBack() {
             this.isShowComponent = 'ApplyHome'
         },
+        isReset() {
+            this.isShowComponent = "ApplyHome"
+            this.$nextTick(() => {
+                this.$refs.componentRef.getList()
+            })
+        }
     },
 }
 </script>