From 1c1af9b0fc10778ae5ac13cc68fd4030affbcfe1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:59:53 +0800
Subject: [PATCH] feat(wm): 新增SN码管理和设备入库功能

---
 src/views/wls/stocktaking/task/index.vue |   75 +++++++++++++++++++++++++++++++------
 1 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/src/views/wls/stocktaking/task/index.vue b/src/views/wls/stocktaking/task/index.vue
index c38699d..30c46cc 100644
--- a/src/views/wls/stocktaking/task/index.vue
+++ b/src/views/wls/stocktaking/task/index.vue
@@ -3,6 +3,7 @@
 import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
 
 import { ref } from 'vue';
+import { useRouter } from 'vue-router';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { MesWmStockTakingTaskStatusEnum } from '@vben/constants';
@@ -15,7 +16,9 @@
   cancelStockTaking,
   deleteStockTaking,
   exportStockTaking,
+  getStockTakingApproveProcessList,
   getStockTakingPage,
+  submitStockTakingApproval,
 } from '#/api/mes/wm/stocktaking/task';
 import {
   importStockTakingQuantity,
@@ -23,11 +26,19 @@
 } from '#/api/wls/stocktaking/task/line';
 import { $t } from '#/locales';
 
+import ProcessSelectModal from '#/views/wls/components/process-select-modal.vue';
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
+const router = useRouter();
+
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const [ProcessModal, processModalApi] = useVbenModal({
+  connectedComponent: ProcessSelectModal,
   destroyOnClose: true,
 });
 
@@ -51,14 +62,46 @@
   formModalApi.setData({ formType: 'update', id: row.id }).open();
 }
 
-/** 鎻愪氦鐩樼偣浠诲姟 */
+/** 寮�濮嬬洏鐐� */
 function handleSubmit(row: MesWmStockTakingTaskApi.StockTakingTask) {
   formModalApi.setData({ formType: 'submit', id: row.id }).open();
 }
 
-/** 鎵ц鐩樼偣 */
-function handleExecute(row: MesWmStockTakingTaskApi.StockTakingTask) {
-  formModalApi.setData({ formType: 'execute', id: row.id }).open();
+/** 鎻愪氦缁撴灉瀹℃壒 - 鍏堣幏鍙栨祦绋嬪垪琛� */
+async function handleSubmitApproval(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  const hideLoading = message.loading({
+    content: '鑾峰彇瀹℃壒娴佺▼...',
+    duration: 0,
+  });
+  try {
+    const processList = await getStockTakingApproveProcessList();
+    hideLoading();
+    if (!processList || processList.length === 0) {
+      message.warning('鏆傛棤鍙敤瀹℃壒娴佺▼锛岃鍏堥厤缃� BPM 娴佺▼');
+      return;
+    }
+    processModalApi
+      .setData({
+        id: row.id,
+        processList,
+        submitFn: submitStockTakingApproval,
+      })
+      .open();
+  } catch {
+    hideLoading();
+  }
+}
+
+/** 鏌ョ湅瀹℃壒璇︽儏 */
+function handleProcessDetail(row: MesWmStockTakingTaskApi.StockTakingTask) {
+  if (!row.processInstanceId) {
+    message.warning('璇ヤ换鍔″皻鏈彁浜ょ粨鏋滃鎵�');
+    return;
+  }
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: { id: row.processInstanceId },
+  });
 }
 
 /** 鍙栨秷鐩樼偣浠诲姟 */
@@ -159,6 +202,7 @@
 
 <template>
   <Page auto-content-height><FormModal @success="handleRefresh" />
+    <ProcessModal @success="handleRefresh" />
 
     <Grid table-title="鐩樼偣浠诲姟鍒楄〃">
       <template #toolbar-tools>
@@ -205,7 +249,7 @@
               onClick: handleEdit.bind(null, row),
             },
             {
-              label: '鎻愪氦',
+              label: '寮�濮嬬洏鐐�',
               type: 'link',
               auth: ['mes:wm-stock-taking-task:update'],
               ifShow: row.status === StatusEnum.PREPARE,
@@ -224,13 +268,6 @@
               },
             },
             {
-              label: '鎵ц鐩樼偣',
-              type: 'link',
-              auth: ['mes:wm-stock-taking-task:update'],
-              ifShow: row.status === StatusEnum.APPROVING,
-              onClick: handleExecute.bind(null, row),
-            },
-            {
               label: '瀵煎叆瀹炵洏鏁�',
               type: 'link',
               icon: ACTION_ICON.UPLOAD,
@@ -239,6 +276,20 @@
               onClick: handleImport.bind(null, row),
             },
             {
+              label: '鎻愪氦缁撴灉瀹℃壒',
+              type: 'link',
+              auth: ['mes:wm-stock-taking-task:update'],
+              ifShow: row.status === StatusEnum.APPROVING,
+              onClick: handleSubmitApproval.bind(null, row),
+            },
+            {
+              label: '鏌ョ湅瀹℃壒',
+              type: 'link',
+              auth: ['mes:wm-stock-taking-task:query'],
+              ifShow: row.status === StatusEnum.APPROVING,
+              onClick: handleProcessDetail.bind(null, row),
+            },
+            {
               label: '鍙栨秷',
               type: 'link',
               danger: true,

--
Gitblit v1.9.3