From f50e3220c87fbed0544c6429f6362f5a1185a240 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 18 Jan 2024 16:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=BC=84=E5=A5=BD=E7=9C=8B?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index b4c0068b..b6463af9 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -184,10 +184,17 @@
 			<el-table-column label="排产数量" align="center" prop="quantity" width="100"/>
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="累计报工数量" align="center" prop="quantityFeedback" width="100"/>
-			<el-table-column label="累计用人数" align="center" prop="useMan" width="100"/>
+			<el-table-column label="用人数" align="center" prop="useMan" width="100"/>
 			<el-table-column label="累计工时" align="center" prop="workTime" />
 			<el-table-column label="生产时间" align="center" prop="productDate" width="100"/>
-			<el-table-column label="SAP报工状态" align="center" prop="uploadStatus" width="150"/>
+			<el-table-column label="SAP报工状态" align="center" prop="uploadStatus" width="150">
+						<template slot-scope="scope">
+					<dict-tag
+						:options="dict.type.report_sap_status"
+						:value="scope.row.uploadStatus"
+					/>
+				</template>
+			</el-table-column>	
 			<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150"/>
 			<el-table-column label="SAP报工信息" align="center" prop="uploadMsg" width="150" :show-overflow-tooltip="true"/>
 		</el-table>
@@ -648,7 +655,7 @@ import moment from 'moment';
 import { getlistCK } from '@/api/wms/outorder'
 export default {
 	name: "ReportWork",
-	dicts: ['report_type'],
+	dicts: ['report_type','report_sap_status'],
 	components: {ReportWorkConsume,ItemSelectUser,ItemSelectWorkOrder,ItemSelectEquip},
 	data() {
 		return {
@@ -968,7 +975,7 @@ export default {
       this.reset();
       let sr = this.selectRow[0];
 
-      if(sr.uploadStatus =='sap报工成功'){
+      if(sr.uploadStatus =='1'){
         this.optType = 'view'
       }else{
         this.optType = ''
@@ -1005,7 +1012,7 @@ export default {
 			this.reset();
 			this.optType = "edit";
             let sr = this.selectRow[0];
-            if(sr.uploadStatus =='sap报工成功'){
+            if(sr.uploadStatus =='1'){
 				this.$modal.msgError(`上传sap成功,不允许修改`);
 				return
 			}
@@ -1041,7 +1048,7 @@ export default {
 		handleDelete(row) {
 
             let sr = this.selectRow[0];
-            if(sr.uploadStatus =='sap报工成功'){
+            if(sr.uploadStatus =='1'){
 				this.$modal.msgError(`上传sap成功,不允许删除`);
 				return
 			}
@@ -1058,7 +1065,7 @@ export default {
 		handleReport(row) {
             this.loading = true;
 			let sr = this.selectRow[0];
-            if(sr.uploadStatus =='sap报工成功'){
+            if(sr.uploadStatus =='1'){
 				this.$modal.msgError(`上报sap已完成,不能重复报工`);
 				return
 			}
@@ -1103,7 +1110,7 @@ export default {
 			this.reset();
 			let sr = row;
 
-            if(sr.uploadStatus =='sap报工成功'){
+            if(sr.uploadStatus =='1'){
 				this.optType = 'view'
 			}else{
 				this.optType = ''
@@ -1172,7 +1179,6 @@ export default {
     },
 		/** 报工损耗按钮操作 */
 		handleConsumeHz(row) {
-			debugger
 			this.reset();
 			let sr = this.selectRow[0];
 			this.queryParams.workorderCode = sr.workorderCode;