From c17426e454771071981fe480baab25abfc744d53 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sat, 2 Dec 2023 01:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 5aaa098..140df50 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -479,7 +479,8 @@
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
-			    <el-button type="primary" @click="submitReport">确 定</el-button>
+			    <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+			    <el-button type="primary" @click="submitReport" v-else>确 定</el-button>
         		<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
@@ -522,7 +523,9 @@
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitConsume">确 定</el-button>
+			
+			    <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+				<el-button type="primary" @click="submitConsume" v-else>确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
@@ -919,7 +922,13 @@ export default {
 		},
 		/** 报工按钮操作 */
 		handleReport(row) {
+
 			let sr = this.selectRow[0];
+            if(sr.uploadStatus =='sap报工成功'){
+				this.$modal.msgError(`上报sap已完成,不能重复报工`);
+				return
+			}
+
 			const code = sr.workorderCode;
 			this.$modal.confirm('是否确认工单"' + code + '"的数据项向sap报工？').then(function() {
 				return reportSap(code);
@@ -932,6 +941,13 @@ export default {
 		handleReportHz(row) {
 			this.reset();
 			let sr = this.selectRow[0];
+
+            if(sr.uploadStatus =='sap报工成功'){
+				this.optType = 'view'
+			}else{
+				this.optType = ''
+			}
+
 			this.queryParams.workorderCode = sr.workorderCode;
 			//查询母工单报工记录列表
 			this.queryParams.parentOrder = '0';
@@ -947,6 +963,7 @@ export default {
 				this.sOrderTableList = response;
 				this.openReport = true;
 				this.titleReport = "工单报工详情";
+
 			});
 		},
 		handleEdit(index, row) {
@@ -976,6 +993,13 @@ export default {
 		handleConsumeHz(row) {
 			this.reset();
 			let sr = this.selectRow[0];
+
+            if(sr.uploadStatus =='sap报工成功'){
+				this.optType = 'view'
+			}else{
+				this.optType = ''
+			}
+
 			this.queryParams.workorderCode = sr.workorderCode;
 			//查询母工单报工记录列表
 			this.queryParams.parentOrder = '0';