From 09e6d1cfe124615cbea97140c17630c7b86a0796 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 16:57:49 +0800
Subject: [PATCH] feat(mes): 统一工作台报工记录与报工页面的提交批次号校验逻辑

---
 src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue |   74 +++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 8620c70..2f7092e 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -3,12 +3,14 @@
 import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
 
 import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
 
 import {
   DICT_TYPE,
   MesProFeedbackStatusEnum,
 } from '@vben/constants';
 import { useVbenModal } from '@vben/common-ui';
+import { useAccess } from '@vben/access';
 
 import { Button, message, Popconfirm, Space } from 'ant-design-vue';
 
@@ -30,6 +32,7 @@
 
 const props = defineProps<{
   taskId?: number;
+  task?: Record<string, any>;
   /** 澶栭儴瑙﹀彂鍒锋柊 */
   refreshKey?: number;
 }>();
@@ -41,8 +44,20 @@
   destroyOnClose: true,
 });
 
+const { hasAccessByCodes } = useAccess();
+const router = useRouter();
+
 const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
-const approvingRow = ref<MesProFeedbackApi.Feedback>();
+const batchActionType = ref<'submit' | 'approve'>('approve');
+const actionRow = ref<MesProFeedbackApi.Feedback>();
+
+/** 鎵ц鎻愪氦锛堝惈鎵规灞炴�э級 */
+async function doSubmit(row: MesProFeedbackApi.Feedback, batchFields?: Record<string, unknown>) {
+  await submitFeedback({ id: row.id!, ...batchFields });
+  message.success('鎶ュ伐鍗曞凡鎻愪氦');
+  refreshGrid();
+  emit('reported');
+}
 
 /** 鎵ц瀹℃壒锛堝惈鎵规灞炴�э級 */
 async function doApprove(row: MesProFeedbackApi.Feedback, batchFields?: Record<string, unknown>) {
@@ -74,10 +89,23 @@
 
 /** 鎻愪氦锛堜粎鑽夌锛� */
 async function handleSubmit(row: MesProFeedbackApi.Feedback) {
-  await submitFeedback(row.id!);
-  message.success('鎶ュ伐鍗曞凡鎻愪氦');
-  refreshGrid();
-  emit('reported');
+  if (props.task?.feedbackApprove) {
+    await doSubmit(row);
+    return;
+  }
+
+  try {
+    const checkResult = await getBatchRequirements(row.id!);
+    if (checkResult?.needBatchInput) {
+      batchActionType.value = 'submit';
+      actionRow.value = row;
+      batchDialogRef.value?.open({ checkResult });
+    } else {
+      await doSubmit(row);
+    }
+  } catch {
+    await doSubmit(row);
+  }
 }
 
 /** 瀹℃壒閫氳繃锛堜粎瀹℃壒涓級 */
@@ -85,7 +113,8 @@
   try {
     const checkResult = await getBatchRequirements(row.id!);
     if (checkResult?.needBatchInput) {
-      approvingRow.value = row;
+      batchActionType.value = 'approve';
+      actionRow.value = row;
       batchDialogRef.value?.open({ checkResult });
     } else {
       await doApprove(row);
@@ -97,8 +126,12 @@
 
 /** 鎵规寮圭獥纭鍥炶皟 */
 function handleBatchConfirm(batchData: Record<string, unknown>) {
-  if (approvingRow.value) {
-    doApprove(approvingRow.value, batchData);
+  if (actionRow.value) {
+    if (batchActionType.value === 'approve') {
+      doApprove(actionRow.value, batchData);
+    } else if (batchActionType.value === 'submit') {
+      doSubmit(actionRow.value, batchData);
+    }
   }
 }
 
@@ -108,6 +141,15 @@
   message.success('鎶ュ伐鍗曞凡椹冲洖');
   refreshGrid();
   emit('reported');
+}
+
+/** 鏌ョ湅瀹℃壒璇︽儏 */
+function handleViewProcess(row: MesProFeedbackApi.Feedback) {
+  if (!row.processInstanceId) {
+    message.warning('璇ユ姤宸ュ皻鏈彁浜ゅ鎵�');
+    return;
+  }
+  router.push({ path: '/bpm/process-instance/detail', query: { id: row.processInstanceId } });
 }
 
 /** 鐘舵�佸父閲忎緵妯℃澘浣跨敤 */
@@ -274,9 +316,18 @@
                 鍒犻櫎
               </Button>
             </Popconfirm>
-            <!-- 瀹℃壒涓細瀹℃壒閫氳繃銆侀┏鍥� -->
-            <Popconfirm
+            <!-- 瀹℃壒涓細鏌ョ湅瀹℃壒 -->
+            <Button
               v-if="row.status === STATUS_APPROVING"
+              type="link"
+              size="small"
+              @click="handleViewProcess(row)"
+            >
+              鏌ョ湅瀹℃壒
+            </Button>
+            <!-- 
+            <Popconfirm
+              v-if="row.status === STATUS_APPROVING && hasAccessByCodes(['mes:pro-feedback:approve'])"
               title="纭瀹℃壒閫氳繃璇ユ姤宸ュ崟锛�"
               @confirm="handleApprove(row)"
             >
@@ -285,7 +336,7 @@
               </Button>
             </Popconfirm>
             <Popconfirm
-              v-if="row.status === STATUS_APPROVING"
+              v-if="row.status === STATUS_APPROVING && hasAccessByCodes(['mes:pro-feedback:approve'])"
               title="纭椹冲洖璇ユ姤宸ュ崟锛�"
               @confirm="handleReject(row)"
             >
@@ -293,6 +344,7 @@
                 椹冲洖
               </Button>
             </Popconfirm>
+            -->
           </Space>
         </template>
       </Grid>

--
Gitblit v1.9.3