From 91e0ed398778583ff7d51ae4f585a9a6af6855e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Fri, 13 Mar 2026 11:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=B7=A5=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=95=8C=E9=9D=A2=E6=97=A0=E6=8D=9F=E8=80=97=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=82=B9=E5=87=BB=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dailyReportNew/index.vue | 8 +++++++-
 src/views/mes/reportWork/index.vue     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue
index fca3e0a..f883a08 100644
--- a/src/views/mes/dailyReportNew/index.vue
+++ b/src/views/mes/dailyReportNew/index.vue
@@ -67,6 +67,7 @@
 					icon="el-icon-download"
 					size="mini"
 					@click="handleExportBP"
+          :loading="exportLoading"
 					v-hasPermi="['mes:dailyReportNew:exportBP']"
 				>白坯参考导出</el-button>
 			</el-col>
@@ -77,11 +78,12 @@
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
-		<el-table v-loading="loading" :data="prepareList"
+		<el-table v-loading="loading" :data="prepareList" id="exportTable"
 		 height="500"
 		  :summary-method="getSummaries"
 		  :header-cell-style="{'text-align':'center'}"
       :cell-style="{'text-align':'center'}"
+
 		>
       <el-table-column prop="factoryCode"  label="工厂" width="90"/>
       <el-table-column prop="workshopCode" label="车间编码" width="90"/>
@@ -155,6 +157,7 @@
 			:total="total"
 			:page.sync="queryParams.pageNum"
 			:limit.sync="queryParams.pageSize"
+      :page-sizes="[10, 50, 100, 500]"
 			@pagination="getList"
 		/>
 	</div>
@@ -163,12 +166,15 @@
 <script>
 import { getDailyReportNew,getWorkcenterList} from "@/api/mes/reportWork";
 import moment from 'moment';
+import FileSaver from 'file-saver'
+import * as XLSX from 'xlsx'
 export default {
 	name: "DailyReportNew",
 	data() {
 		return {
 			// 遮罩层
 			loading: true,
+      exportLoading: false,
 			// 选中数组
 			ids: [],
 			// 非单个禁用
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index b82f268..e28f39e 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -1411,7 +1411,7 @@ export default {
       //查询母工单报工记录列表
       getAllLevelConsumeList(this.queryParams).then((response) => {
         this.libConsumeTabs = response;
-        this.actProduct = this.libConsumeTabs[0].libList[0].quantityFeedback;
+        this.actProduct = this.libConsumeTabs?.[0]?.libList?.[0]?.quantityFeedback;
         this.openConsume = true;
         this.titleConsume = "工单报工物料损耗详情";
         this.queryParams.workorderCode = "";