From 873a223490f278619c33e0fbaaf16767b2eb784a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 6 Nov 2024 11:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue    | 7 ++++---
 src/views/quality/qcTableXJ/index.vue | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 938ef45..6a2bbc1 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -451,7 +451,9 @@
             
 						<el-table-column label="单位" width="50" align="center" prop="unit" />
 						<el-table-column label="反冲标识" align="center" prop="recoil" />
-            <el-table-column label="sap项目编码" align="center" prop="rspos" />
+            <el-table-column label="订单数量" width="80" align="left" prop="quantitySplit" />
+            <el-table-column label="Bom用量" width="100" align="left" prop="quantitySplitBom" />
+            <el-table-column label="sap项目编码" width="100" align="center" prop="rspos" />
 						<el-table-column label="仓库" width="150" align="center" prop="warehouseCode">
 							<template slot-scope="scope">
 								<el-select v-model="scope.row.warehouseCode" placeholder="请选择仓库" width="50%"
@@ -462,8 +464,7 @@
 								</el-select>
 							</template>
 						</el-table-column>
-            <el-table-column label="订单数量" width="110" align="left" prop="quantitySplit" />
-            <el-table-column label="Bom用量" width="110" align="left" prop="quantitySplitBom" />
+            
             <el-table-column label="报工单编号" align="center" prop="reportCode" width="90" :show-overflow-tooltip="true"/>
 						<el-table-column label="创建时间" align="center" prop="createTime" width="130" :show-overflow-tooltip="true"/>
             <el-table-column label="工单编码" width="80" align="left" prop="workorderCode"
diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue
index 7aecdf3..30d6086 100644
--- a/src/views/quality/qcTableXJ/index.vue
+++ b/src/views/quality/qcTableXJ/index.vue
@@ -55,7 +55,7 @@
 					size="mini"
 					@click="handleExport"
 					v-hasPermi="['mes:prepare:export']"
-				>导出</el-button>
+				>导出明细</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
@@ -72,7 +72,7 @@
 			</el-table-column>
 			<el-table-column prop="workorderCodeSap" label="订单编码" width="100" align="center"/>
 			<el-table-column prop="equipmentName" label="线体名称" width="100" align="center"/>
-			<el-table-column prop="incomeBatchNo" label="批次" width="300" align="center"/>
+			<el-table-column prop="incomeBatchNo" label="已检批次" width="300" align="center"/>
 			<el-table-column prop="incomeTimeStr" label="生产日期" width="100" align="center"/>
 			<el-table-column prop="materialName" label="产品名称"align="center"/>
 			<el-table-column prop="materialCode" label="产品编码" width="150" align="center"