From 9f3c8d745d7c889d93fca554f8ae7925b425c92a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sun, 28 Apr 2024 11:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=B7=A5+=E5=88=87=E7=BA=BF?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/reportWork.js          | 10 ++++++----
 src/views/mes/reportWork/index.vue | 10 +++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index a895802..dca7815 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -183,9 +183,10 @@ export function getMesListEquip(query) {
 	});
 }
 //报工按钮
-export function reportSap(workorderCode) {
+export function reportSap(workorderCode,machineCode) {
 	const data = {
-		workorderCode
+		workorderCode,
+		machineCode
 	}
 	return request({
 		url: '/mes/reportWork/reportSap',
@@ -194,9 +195,10 @@ export function reportSap(workorderCode) {
 	});
 }
 //报工撤销按钮
-export function reportSapCancel(workorderCode) {
+export function reportSapCancel(workorderCode,machineCode) {
 	const data = {
-		workorderCode
+		workorderCode,
+    machineCode
 	}
 	return request({
 		url: '/mes/reportWork/reportSapCancel',
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index fa07943..29a54c7 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -1141,11 +1141,12 @@ export default {
       }
 
       const code = sr.workorderCode;
+      const machineCode = sr.machineCode;
       let _this = this;
       this.$modal
-        .confirm('是否确认工单"' + code + '"的数据项向sap报工？')
+        .confirm('是否确认线体'+machineCode+',工单' + code + '的数据项向sap报工？')
         .then(function () {
-          reportSap(code).then((response) => {
+          reportSap(code,machineCode).then((response) => {
             if (response != null && response.code == 200) {
               _this.$modal.msgSuccess("报工成功");
             }
@@ -1161,11 +1162,12 @@ export default {
       this.loading = true;
       let sr = this.selectRow[0];
       const code = sr.workorderCode;
+      const machineCode = sr.machineCode;
       let _this = this;
       this.$modal
         .confirm('是否确认工单"' + code + '"的数据项撤销sap报工？')
         .then(function () {
-          reportSapCancel(code).then((response) => {
+          reportSapCancel(code,machineCode).then((response) => {
             if (response != null && response.code == 200) {
               _this.$modal.msgSuccess("报工撤销成功");
             }
@@ -1191,6 +1193,7 @@ export default {
       }
 
       this.queryParams.workorderCode = sr.workorderCode;
+      this.queryParams.machineCode = sr.machineCode;
 
       //查询工单报工记录列表
       getAllLevelReportList(this.queryParams).then((response) => {
@@ -1298,6 +1301,7 @@ export default {
       }
 
       this.queryParams.workorderCode = sr.workorderCode;
+      this.queryParams.machineCode = sr.machineCode;
       //查询母工单报工记录列表
       getAllLevelConsumeList(this.queryParams).then((response) => {
         this.libConsumeTabs = response;