From 04ca2a80ace11e57a0e9a57c50e74ad89976d4c2 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Wed, 4 Feb 2026 11:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E8=AE=A2=E5=8D=95=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   | 13 ++++++
 .../components/closedDialog.vue               |  2 +-
 .../productionMonitoring.vue                  | 10 ++---
 .../productionManagement/reworkOrder.vue      | 45 ++++++++++++++-----
 4 files changed, 53 insertions(+), 17 deletions(-)
 create mode 100644 src/api/productionManagement/reworkOrder.js

diff --git a/src/api/productionManagement/reworkOrder.js b/src/api/productionManagement/reworkOrder.js
new file mode 100644
index 0000000..ecd5e6b
--- /dev/null
+++ b/src/api/productionManagement/reworkOrder.js
@@ -0,0 +1,13 @@
+import request from '@/axios';
+//列表接口
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/ReworkProcess/loadReworkOrder',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
\ No newline at end of file
diff --git a/src/views/productionManagement/components/closedDialog.vue b/src/views/productionManagement/components/closedDialog.vue
index a6f5d4b..1a345cd 100644
--- a/src/views/productionManagement/components/closedDialog.vue
+++ b/src/views/productionManagement/components/closedDialog.vue
@@ -70,7 +70,7 @@ export default {
           this.loadingBtn = true;
           let query = {
             idArr: this.itemData.map(item => item.woId),
-            status: 0,
+            status: 21,
             memo: this.closeForm.memo,
           };
           updateStatus(query).then(res => {
diff --git a/src/views/productionManagement/productionMonitoring.vue b/src/views/productionManagement/productionMonitoring.vue
index 56cc7b5..a53d342 100644
--- a/src/views/productionManagement/productionMonitoring.vue
+++ b/src/views/productionManagement/productionMonitoring.vue
@@ -221,7 +221,7 @@ export default {
 
           {
             label: '当前工序',
-            prop: 'wpId',
+            prop: 'ppsName',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -445,7 +445,7 @@ export default {
           },
           {
             label: '调度员',
-            prop: 'dispatcher',
+            prop: 'dispatcherName',
             search: true,
             sortable: true,
             overHidden: true,
@@ -470,7 +470,7 @@ export default {
             search: true,
             width: 200,
             searchSpan: 8,
-            type: 'datetimerange',
+            type: 'date',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             startPlaceholder: '开始日期',
@@ -485,7 +485,7 @@ export default {
             sortable: true,
             overHidden: true,
             searchLabelWidth: 100,
-            type: 'datetimerange',
+            type: 'date',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             startPlaceholder: '时间日期开始',
@@ -503,7 +503,7 @@ export default {
             searchSpan: 8,
             width: 200,
             searchLabelWidth: 100,
-            type: 'datetimerange',
+            type: 'date',
             format: 'YYYY-MM-DD HH:mm:ss',
             valueFormat: 'YYYY-MM-DD HH:mm:ss',
             startPlaceholder: '开始日期',
diff --git a/src/views/productionManagement/reworkOrder.vue b/src/views/productionManagement/reworkOrder.vue
index 3d89df9..0e091ad 100644
--- a/src/views/productionManagement/reworkOrder.vue
+++ b/src/views/productionManagement/reworkOrder.vue
@@ -24,6 +24,7 @@
   </basic-container>
 </template>
 <script>
+import { getList } from '@/api/productionManagement/reworkOrder';
 export default {
   data() {
     return {
@@ -235,19 +236,41 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {});
+    },
+     currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    searchReset() {
+      this.query = {};
+      this.treeDeptId = '';
+      this.onLoad(this.page, this.query);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
     },
     onLoad() {
-      //   this.loading = true;
-      //   getList(
-      //     page.currentPage,
-      //     page.pageSize,
-      //     Object.assign(params, this.query, { yieldType: '1' })
-      //   ).then(res => {
-      //     this.data = res.data.data.records;
-      //     this.loading = false;
-      //     this.page.total = res.data.data.total;
-      //     this.selectionClear();
-      //   });
+        this.loading = true;
+        getList(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(params, this.query)
+        ).then(res => {
+          this.data = res.data.data.records;
+          this.loading = false;
+          this.page.total = res.data.data.total;
+          this.selectionClear();
+        });
     },
   },
 };