From 4551b6bd8170002138a6215a779468cc9579f0ea Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 26 Sep 2023 22:36:18 +0800
Subject: [PATCH] =?UTF-8?q?MES=E6=8A=A5=E5=B7=A5=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index bd2b6f2..b30c04a 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -48,7 +48,7 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<!-- <el-col :span="1.5">
+			<el-col :span="1.5">
 				<el-button
 					type="primary"
 					plain
@@ -79,7 +79,7 @@
 					@click="handleDelete"
 					v-hasPermi="['mes:reportWork:remove']"
 				>删除</el-button>
-			</el-col> -->
+			</el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -95,7 +95,7 @@
 
 		<el-table v-loading="loading" :data="reportWorkList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection"  align="center" />
-			<el-table-column label="报工单编号" align="center" prop="reportCode" width="100">
+			<el-table-column label="报工单编号" align="center" prop="reportCode" width="120">
 			  <template slot-scope="scope">
           <el-button
             type="text"
@@ -303,7 +303,7 @@
       <ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume>
 			<div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
-        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-else>确定</el-button>
         <el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
diff --git a/src/views/mes/reportWork/reportWorkConsume.vue b/src/views/mes/reportWork/reportWorkConsume.vue
index 1c123ac..7365a4f 100644
--- a/src/views/mes/reportWork/reportWorkConsume.vue
+++ b/src/views/mes/reportWork/reportWorkConsume.vue
@@ -48,7 +48,6 @@
 
 		<el-table v-loading="loading" :data="reportWorkConsumeList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="id" align="center" prop="recordId" />
 			<el-table-column label="工单编码" align="center" prop="workorderCode" width="200"/>
 			<el-table-column label="物料编号" align="center" prop="materialCode" width="200"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="200"/>