From 27664dc81bcdecc272293eb79eb71c239e32f385 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 9 Feb 2026 15:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/productionManagement/reworkOrder.js   | 18 +++++++++++++++
 .../productionManagement/sameFurnaceQuery.js  |  2 +-
 .../productionManagement/reworkOrder.vue      | 22 ++++++++++++++++---
 .../productionManagement/sameFurnaceQuery.vue |  4 ++--
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/api/productionManagement/reworkOrder.js b/src/api/productionManagement/reworkOrder.js
index 6f1f23f..59759e3 100644
--- a/src/api/productionManagement/reworkOrder.js
+++ b/src/api/productionManagement/reworkOrder.js
@@ -19,4 +19,22 @@ export const receiveOrder = (params) => {
     method: 'post',
     data: params,
   });
+};
+
+//订单接收
+export const getReceiveOrder = (params) => {
+  return request({
+    url: '/blade-desk/ReworkProcess/receiveOrder',
+    method: 'get',
+    params: params,
+  });
+};
+
+// 订单完成 
+export const completeOrder = (params) => {
+  return request({
+    url: '/blade-desk/ReworkProcess/completeOrder',
+    method: 'post',
+    data: params,
+  });
 };
\ No newline at end of file
diff --git a/src/api/productionManagement/sameFurnaceQuery.js b/src/api/productionManagement/sameFurnaceQuery.js
index 5acb571..240357a 100644
--- a/src/api/productionManagement/sameFurnaceQuery.js
+++ b/src/api/productionManagement/sameFurnaceQuery.js
@@ -2,7 +2,7 @@ import request from '@/axios';
 //列表接口
 export const getList = (current, size, params) => {
   return request({
-    url: '/blade-desk/deductionPreserve/orderDeclarePage',
+    url: '/blade-desk/workProcess/queryData',
     method: 'get',
     params: {
       ...params,
diff --git a/src/views/productionManagement/reworkOrder.vue b/src/views/productionManagement/reworkOrder.vue
index fb588ac..60d3467 100644
--- a/src/views/productionManagement/reworkOrder.vue
+++ b/src/views/productionManagement/reworkOrder.vue
@@ -33,7 +33,7 @@
   </basic-container>
 </template>
 <script>
-import { getList } from '@/api/productionManagement/reworkOrder';
+import { getList, getReceiveOrder, completeOrder } from '@/api/productionManagement/reworkOrder';
 import updateMakeQty from './components/updateMakeQty.vue';
 export default {
   components: { updateMakeQty },
@@ -249,14 +249,30 @@ export default {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => {});
+      }).then(() => {
+        getReceiveOrder(row).then(res => {
+          this.$message({
+            message: '接收成功',
+            type: 'success',
+          });
+          this.onLoad(this.page.this.query);
+        });
+      });
     },
     finishData(row) {
       this.$confirm('确定完成此工单?', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => {});
+      }).then(() => {
+        completeOrder(row).then(() => {
+          this.$message({
+            message: '接收成功',
+            type: 'success',
+          });
+          this.onLoad(this.page.this.query);
+        });
+      });
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
diff --git a/src/views/productionManagement/sameFurnaceQuery.vue b/src/views/productionManagement/sameFurnaceQuery.vue
index 861d2bf..0384780 100644
--- a/src/views/productionManagement/sameFurnaceQuery.vue
+++ b/src/views/productionManagement/sameFurnaceQuery.vue
@@ -135,14 +135,14 @@ export default {
           },
           {
             label: '绑定时间',
-            prop: 'createTime',
+            prop: 'bindTime',
             search: true,
             sortable: true,
             overHidden: true,
           },
           {
             label: '绑定人员',
-            prop: 'createMan.userName',
+            prop: 'createMan',
             search: false,
             sortable: true,
             overHidden: true,