From c69af876655527743762614dfdbb3af5e21f0fb8 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 12 八月 2025 15:16:02 +0800
Subject: [PATCH] 排产工单页面状态、操作按钮调整

---
 src/views/mes/MesProductionWorkOrderListView.vue |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/views/mes/MesProductionWorkOrderListView.vue b/src/views/mes/MesProductionWorkOrderListView.vue
index 17bf9dc..e7fd391 100644
--- a/src/views/mes/MesProductionWorkOrderListView.vue
+++ b/src/views/mes/MesProductionWorkOrderListView.vue
@@ -83,9 +83,19 @@
 
           <span slot="action" slot-scope="text, record">
             <a @click="handleDetail(record)">璇︽儏</a>
-          <span v-if="record.workOrderStatus === 'PUBLISHED'">
+          <span v-if="record.workOrderStatus === 'PUBLISHED' || record.workOrderStatus === 'EXECUTING'">
             <a-divider type="vertical" />
             <a @click="handleRePublish(record)">閲嶅彂甯�</a>
+          </span>
+            <span v-if="record.workOrderStatus === 'PUBLISHED'">
+            <a-divider type="vertical" />
+            <a-popconfirm title="纭畾寮�濮嬫墽琛屽悧?" @confirm="() => handleExecute(record.id)">
+                <a>鎵ц</a>
+            </a-popconfirm>
+          </span>
+          <span v-if="record.workOrderStatus === 'EXECUTING'">
+            <a-divider type="vertical" />
+            <a @click="handleWorkReport(record)">鎶ュ伐</a>
           </span>
           <span v-if="record.workOrderStatus === 'NEW'">
             <a-divider type="vertical" />
@@ -195,6 +205,7 @@
     <MesMaterialTransferDetailList ref="MesMaterialTransferDetailList"></MesMaterialTransferDetailList>
     <MesProductionWorkOrderScheduleModal ref="MesProductionWorkOrderScheduleModal"></MesProductionWorkOrderScheduleModal>
     <MesProductionWorkOrderRepublishModal ref="MesProductionWorkOrderRepublishModal" @ok="modalFormOk"></MesProductionWorkOrderRepublishModal>
+    <MesProductionWorkOrderReportModal ref="MesProductionWorkOrderReportModal" @ok="modalFormOk"></MesProductionWorkOrderReportModal>
   </a-card>
 </template>
 
@@ -213,6 +224,7 @@
 import MesMaterialTransferDetailList from '@views/mes/MesMaterialTransferDetailList.vue'
 import MesProductionWorkOrderScheduleModal from '@views/mes/modules/MesProductionWorkOrderScheduleModal.vue'
 import MesProductionWorkOrderRepublishModal from '@views/mes/modules/MesProductionWorkOrderRepublishModal.vue'
+import MesProductionWorkOrderReportModal from '@views/mes/modules/MesProductionWorkOrderReportModal.vue'
 
 export default {
   name: 'MesProductionWorkOrderList',
@@ -223,7 +235,8 @@
     MesMaterialUnloadingList,
     MesMaterialTransferDetailList,
     MesProductionWorkOrderScheduleModal,
-    MesProductionWorkOrderRepublishModal
+    MesProductionWorkOrderRepublishModal,
+    MesProductionWorkOrderReportModal,
   },
   data() {
     return {
@@ -274,7 +287,7 @@
           dataIndex: 'planQuantity'
         },
         {
-          title: '浜х嚎(鍐椾綑)',
+          title: '浜х嚎',
           align: 'center',
           dataIndex: 'factoryId_dictText'
         },
@@ -284,7 +297,7 @@
           dataIndex: 'groupId_dictText'
         },
         {
-          title: '鐝(鍐椾綑)',
+          title: '鐝',
           align: 'center',
           dataIndex: 'shiftId_dictText'
         },
@@ -674,7 +687,8 @@
         queryOrderById:'/mesproductionwork/mesProductionOrder/queryById',
         queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
         queryTransferDetailBy:'/mes/mesMaterialTransferDetail/queryTransferDetailBy',
-        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish'
+        publish: '/mesproductionworkorder/mesProductionWorkOrder/publish',
+        execute: '/mesproductionworkorder/mesProductionWorkOrder/execute',
       },
       dictOptions: {},
       superFieldList: []
@@ -702,9 +716,22 @@
         }
       })
     },
+    handleExecute(id) {
+      getAction(this.url.execute, { id: id }).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.loadData()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     handleRePublish(record) {
       this.$refs.MesProductionWorkOrderRepublishModal.add(record)
     },
+    handleWorkReport(record) {
+      this.$refs.MesProductionWorkOrderReportModal.add(record)
+    },
     async handleTransferDetail(row){
       console.log('row---->',row)
       const transferDetailResult = await getAction(this.url.queryTransferDetailBy,{'requestId':row.id})

--
Gitblit v1.9.3