From 61c40efe2b4d7898deeedbaf6d0dc78e7bf11338 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 10 Dec 2025 14:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/cost/component/reportHome.vue | 12 ++++++++++--
 src/views/material/stquery/deviceUsingRecord.vue |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/material/cost/component/reportHome.vue b/src/views/material/cost/component/reportHome.vue
index d3ff40e0..3a870f82 100644
--- a/src/views/material/cost/component/reportHome.vue
+++ b/src/views/material/cost/component/reportHome.vue
@@ -130,6 +130,8 @@
                 </el-button>
               </template>
             </el-table-column>
+          <el-table-column label="工程状态" align="center" prop="proStatus" :show-overflow-tooltip="true"/>
+          <el-table-column label="竣工日期" align="center" prop="actualEndDate" :show-overflow-tooltip="true"/>
 
         </el-table>
 
@@ -916,6 +918,7 @@ export default {
                 // 定义Excel列配置
                 const columns = [
                     { key: 'index', title: '序号' },
+                    { key: 'impUnitName', title: '分公司' },
                     { key: 'agreementCode', title: '协议号' },
                     { key: 'unitName', title: '结算单位' },
                     { key: 'projectName', title: '结算工程' },
@@ -925,7 +928,9 @@ export default {
                     { key: 'repairCost', title: '维修费用' },
                     { key: 'loseCost', title: '丢失费用' },
                     { key: 'scrapCost', title: '报废费用' },
-                    { key: 'costs', title: '合计费用（元）' }
+                    { key: 'costs', title: '合计费用（元）' },
+                    { key: 'proStatus', title: '工程状态' },
+                    { key: 'actualEndDate', title: '竣工日期' }
                 ];
 
                 // 准备Excel数据
@@ -965,6 +970,7 @@ export default {
                 // 设置列宽
                 const columnWidths = [
                     { wch: 8 },   // 序号
+                    { wch: 15 },  // 分公司
                     { wch: 20 },  // 协议号
                     { wch: 15 },  // 结算单位
                     { wch: 20 },  // 结算工程
@@ -974,7 +980,9 @@ export default {
                     { wch: 12 },  // 维修费用
                     { wch: 12 },  // 丢失费用
                     { wch: 12 },  // 报废费用
-                    { wch: 15 }   // 合计费用
+                    { wch: 15 },   // 合计费用
+                    { wch: 12 },  // 工程状态
+                    { wch: 12 }   // 竣工日期
                 ];
                 worksheet['!cols'] = columnWidths;
 
diff --git a/src/views/material/stquery/deviceUsingRecord.vue b/src/views/material/stquery/deviceUsingRecord.vue
index 1cd2d984..93691b39 100644
--- a/src/views/material/stquery/deviceUsingRecord.vue
+++ b/src/views/material/stquery/deviceUsingRecord.vue
@@ -139,6 +139,8 @@
           <el-table-column label="在用总价值（元）" align="center" prop="usPrice"></el-table-column>
           <!-- <el-table-column label="投入总价值（元）" align="center" prop="totalPrice" />-->
           <el-table-column label="协议状态" align="center" prop="isSltName" :show-overflow-tooltip="true"/>
+         <el-table-column label="工程状态" align="center" prop="proStatus" :show-overflow-tooltip="true"/>
+         <el-table-column label="竣工日期" align="center" prop="actualEndDate" :show-overflow-tooltip="true"/>
       </el-table>
       <pagination
           v-show="total > 0"