From bbd568b342311e215c083db395860685b54a6758 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 7 Feb 2025 09:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=98=E6=88=BF=E5=92=8C=E6=88=90=E5=9E=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=B0=8F=E6=97=B6=E4=BA=A7=E9=87=8F=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/reportWork.js            | 12 ++++++++
 src/views/mes/productTrace/index.vue |  2 +-
 src/views/mes/reportWork/index.vue   | 46 +++++++++++++---------------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 6f688b2..4eb5b73 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -398,3 +398,15 @@ export function getmonthProductionSut(query) {
     params: query
   });
 }
+
+// 最终报工按钮
+export function updateReportWorkW3(workorderCode) {
+	const data = {
+		workorderCode
+	}
+	return request({
+		url: '/mes/reportWork/updateReportWorkW3',
+		method: 'post',
+		data: data
+	});
+}
\ No newline at end of file
diff --git a/src/views/mes/productTrace/index.vue b/src/views/mes/productTrace/index.vue
index b36a5b6..f107f3f 100644
--- a/src/views/mes/productTrace/index.vue
+++ b/src/views/mes/productTrace/index.vue
@@ -14,7 +14,7 @@
             </el-form-item>
             <el-form-item label="产品编号" prop="productCode">
                 <el-input
-                        v-model="queryParams.materialCode"
+                        v-model="queryParams.productCode"
                         placeholder="请输入产品编号"
                         clearable
                         @keyup.enter.native="handleQuery"
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 791f988..2338db8 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -61,19 +61,8 @@
 					@click="handleUpdate"
 					v-hasPermi="['mes:reportWork:edit']"
 				>修改</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['mes:reportWork:remove']"
-				>删除</el-button>
-			</el-col>
-			-->
+			</el-col>-->
+			
 			<el-col :span="1.5">
 				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
 					@click="handleReportHz" v-hasPermi="['mes:reportWork:report']">报工信息维护</el-button>
@@ -103,6 +92,18 @@
 					@click="showPrint">打印预览
 				</el-button>
 			</el-col>
+
+      <el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-s-flag"
+					size="mini"
+					:disabled="single"
+					@click="handleW3"
+					v-hasPermi="['mes:reportWork:report']"
+				>最终报工</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 		<el-table v-loading="loading" :ref="tableIndex" :data="reportWorkList"
@@ -691,7 +692,8 @@ import {
   submitReportPS,
   submitReportPSSAP,
   getCKList,
-  getPutInOrderList,preReportRow
+  getPutInOrderList,preReportRow,
+  updateReportWorkW3
 } from "@/api/mes/reportWork";
 import {
   getConsumeList,
@@ -1180,22 +1182,16 @@ export default {
       });
     },
     /** 删除按钮操作 */
-    handleDelete(row) {
-      let sr = this.selectRow[0];
-      if (sr.uploadStatus == "1") {
-        this.$modal.msgError(`上传sap成功,不允许删除`);
-        return;
-      }
-
-      const ids = row.id || this.ids;
+    handleW3(row) {
+      const workorderCode = this.selectRow[0].workorderCode;
       this.$modal
-        .confirm('是否确认删除报工报表编号为"' + ids + '"的数据项？')
+        .confirm('是否确认工单号为"' + workorderCode + '"的数据项已最终报工？')
         .then(function () {
-          return delReportWork(ids);
+          return updateReportWorkW3(workorderCode);
         })
         .then(() => {
           this.getList();
-          this.$modal.msgSuccess("删除成功");
+          this.$modal.msgSuccess("修改成功");
         })
         .catch(() => {});
     },