From f984f80ff5d6c36af7860a17d762fe92731e28bd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:04 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
src/views/mes/pro/workorder-center/index.vue | 43 +++++++------------------------------------
1 files changed, 7 insertions(+), 36 deletions(-)
diff --git a/src/views/mes/pro/workorder-center/index.vue b/src/views/mes/pro/workorder-center/index.vue
index 99ada7d..ae7cde6 100644
--- a/src/views/mes/pro/workorder-center/index.vue
+++ b/src/views/mes/pro/workorder-center/index.vue
@@ -16,12 +16,12 @@
getWorkOrderProgress,
checkAndAutoFinishWorkOrder,
} from '#/api/mes/pro/workorder';
-import { previewAutoGenerate, autoGenerateTasks } from '#/api/mes/pro/task';
+
import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
import { useGridColumns, useGridFormSchema, useTaskGridColumns } from './data';
import QuickFeedbackForm from './modules/quick-feedback.vue';
-import SchedulePreviewModal from './modules/schedule-preview.vue';
+import AutoSchedule from '../task/modules/auto-schedule.vue';
defineOptions({ name: 'WorkorderCenter' });
const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
@@ -38,7 +38,7 @@
});
const [SchedulePreviewModalWrap, schedulePreviewModalApi] = useVbenModal({
- connectedComponent: SchedulePreviewModal,
+ connectedComponent: AutoSchedule,
destroyOnClose: true,
});
@@ -107,27 +107,8 @@
.open();
}
-/** 涓�閿帓浜ч瑙� */
-async function handleSchedulePreview(row: MesProWorkOrderApi.WorkOrder) {
- try {
- const preview = await previewAutoGenerate({ workOrderId: row.id! });
- schedulePreviewModalApi
- .setData({ workOrder: row, preview })
- .open();
- } catch {
- message.error('鑾峰彇鎺掍骇棰勮澶辫触');
- }
-}
-
-/** 鎵ц涓�閿帓浜� */
-async function handleScheduleExecute(row: MesProWorkOrderApi.WorkOrder) {
- try {
- const result = await autoGenerateTasks({ workOrderId: row.id! });
- message.success(`鎺掍骇鎴愬姛锛岀敓鎴� ${result.taskIds?.length || 0} 涓换鍔);
- handleRefresh();
- } catch {
- message.error('鎺掍骇澶辫触');
- }
+function handleSchedulePreview(row: MesProWorkOrderApi.WorkOrder) {
+ schedulePreviewModalApi.setData({ workOrderIds: [row.id!] }).open();
}
const [Grid, gridApi] = useVbenVxeGrid({
@@ -193,21 +174,11 @@
<TableAction
:actions="[
{
- label: '鎺掍骇棰勮',
- type: 'link',
- auth: ['mes:pro-task:create'],
- ifShow: row.quantityScheduled < row.quantity,
- onClick: handleSchedulePreview.bind(null, row),
- },
- {
label: '涓�閿帓浜�',
type: 'link',
auth: ['mes:pro-task:create'],
- ifShow: row.quantityScheduled < row.quantity,
- popConfirm: {
- title: '纭涓�閿帓浜э紵灏嗘寜鐓у伐鑹鸿矾绾胯嚜鍔ㄧ敓鎴愪换鍔°��',
- confirm: handleScheduleExecute.bind(null, row),
- },
+ ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED && row.type === MesProWorkOrderTypeEnum.SELF && (row.quantity ?? 0) > 0 && (row.quantityProduced ?? 0) < (row.quantity ?? 0),
+ onClick: handleSchedulePreview.bind(null, row),
},
{
label: '褰掓。',
--
Gitblit v1.9.3