From fa42bcb7396e06e335bbbff67f5898b98f8d9aa0 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 24 七月 2026 17:09:28 +0800
Subject: [PATCH] refactor(mes): 移除工单模块中的BOM相关功能
---
src/views/mes/workbench/index.vue | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/workbench/index.vue b/src/views/mes/workbench/index.vue
index 2d9072b..15c283a 100644
--- a/src/views/mes/workbench/index.vue
+++ b/src/views/mes/workbench/index.vue
@@ -2,12 +2,19 @@
import type { MesMdWorkstationApi } from '#/api/mes/md/workstation';
import type { PendingTask, WorkbenchTabItem, WorkbenchTabKey } from './types';
-import { computed, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
+import { confirm } from '@vben/common-ui';
+import { MesProWorkRecordTypeEnum } from '@vben/constants';
import { IconifyIcon } from '@vben/icons';
-import { Button } from 'ant-design-vue';
+import { Button, message } from 'ant-design-vue';
+import {
+ clockInWorkRecord,
+ clockOutWorkRecord,
+ getMyWorkRecord,
+} from '#/api/mes/pro/workrecord';
import { getPendingFeedbackPage } from '#/api/mes/pro/task';
import { router } from '#/router';
@@ -51,6 +58,43 @@
function handleWorkstationSelect(ws: MesMdWorkstationApi.Workstation) {
workstation.value = ws;
}
+
+// --- 涓婂伐/涓嬪伐 ---
+const isClockIn = ref(false);
+
+async function loadClockStatus() {
+ const record = await getMyWorkRecord();
+ isClockIn.value = record?.type === MesProWorkRecordTypeEnum.CLOCK_IN;
+}
+
+/** 涓婂伐锛氶粯璁や娇鐢ㄥ綋鍓嶉�変腑鐨勫伐浣滅珯锛屽脊绐楃‘璁� */
+async function handleClockIn() {
+ if (!workstationId.value) return;
+ try {
+ await confirm(
+ `纭涓婂伐鍒板綋鍓嶅伐浣滅珯銆�${workstation.value?.code} - ${workstation.value?.name}銆嶏紵`,
+ );
+ } catch {
+ return;
+ }
+ await clockInWorkRecord(workstationId.value);
+ message.success('涓婂伐鎴愬姛');
+ isClockIn.value = true;
+}
+
+/** 涓嬪伐 */
+async function handleClockOut() {
+ try {
+ await confirm('纭涓嬪伐褰撳墠宸ヤ綔绔欙紵');
+ } catch {
+ return;
+ }
+ await clockOutWorkRecord();
+ message.success('涓嬪伐鎴愬姛');
+ isClockIn.value = false;
+}
+
+onMounted(loadClockStatus);
// --- 浠诲姟鍒楄〃 ---
const taskList = ref<PendingTask[]>([]);
@@ -159,7 +203,10 @@
<!-- 宸ヤ綔绔欓�夋嫨闈㈡澘 -->
<WorkstationPanel
:workstation="workstation"
+ :is-clock-in="isClockIn"
@change="openWorkstationSelect"
+ @clock-in="handleClockIn"
+ @clock-out="handleClockOut"
/>
<!-- 宸ュ崟鍒楄〃 -->
@@ -167,7 +214,6 @@
:list="taskList"
:selected-id="selectedTask?.id"
:loading="taskLoading"
- :process-name="workstation?.processName"
@select="handleSelectTask"
/>
</aside>
@@ -181,8 +227,8 @@
<main class="workbench-main">
<div class="workbench-main__head">
<span class="workbench-main__tab-title">{{ activeTabLabel }}</span>
- <span v-if="selectedTask?.workOrderCode" class="workbench-main__context">
- 宸ュ崟 {{ selectedTask.workOrderCode }}
+ <span v-if="selectedTask?.code" class="workbench-main__context">
+ 宸ュ崟 {{ selectedTask.code }}
</span>
</div>
<div class="workbench-main__body">
@@ -204,16 +250,25 @@
/>
<RecordParamTab
v-else-if="activeTab === 'record-param'"
- :work-order-id="selectedTask?.workOrderId"
+ :task-id="selectedTask?.id"
+ :work-order-id="selectedTask?.id"
:workstation-id="workstationId"
/>
<ProductIssueTab
v-else-if="activeTab === 'product-issue'"
+ :task-id="selectedTask?.id"
+ :task-code="selectedTask?.code"
+ :task-name="selectedTask?.name"
+ :work-order-id="selectedTask?.workOrderId"
:workstation-id="workstationId"
:workstation-name="workstationName"
/>
<ReturnIssueTab
v-else-if="activeTab === 'return-issue'"
+ :task-id="selectedTask?.id"
+ :task-code="selectedTask?.code"
+ :task-name="selectedTask?.name"
+ :work-order-id="selectedTask?.workOrderId"
:workstation-id="workstationId"
:workstation-name="workstationName"
/>
--
Gitblit v1.9.3