From 06f3df285a24234e60883cd5ae73c6153abf4155 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 26 八月 2026 15:46:38 +0800
Subject: [PATCH] feat(mes): 添加生产任务进度显示和工艺参数模板功能
---
src/api/mes/pro/workorder/process/index.ts | 1
src/views/mes/pro/task/data.ts | 12 ++++++
src/views/mes/pro/task/index.vue | 44 ++++++----------------
src/views/mes/pro/task/modules/schedule-form.vue | 1
src/views/mes/pro/task/modules/task-list.vue | 28 +++++++++++++
5 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/src/api/mes/pro/workorder/process/index.ts b/src/api/mes/pro/workorder/process/index.ts
index cc3630b..e49e863 100644
--- a/src/api/mes/pro/workorder/process/index.ts
+++ b/src/api/mes/pro/workorder/process/index.ts
@@ -19,6 +19,7 @@
processId?: number; // 宸ュ簭缂栧彿
processCode?: string; // 宸ュ簭缂栫爜
processName?: string; // 宸ュ簭鍚嶇О
+ paramTemplateId?: number; // 宸ヨ壓鍙傛暟妯℃澘缂栧彿
sort?: number; // 搴忓彿
nextProcessId?: number; // 涓嬩竴閬撳伐搴忕紪鍙�
nextProcessName?: string; // 涓嬩竴閬撳伐搴忓悕绉�
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index cb721a0..ca1ed94 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -166,6 +166,12 @@
width: 100,
},
{
+ field: 'progressPercent',
+ title: '瀹屾垚杩涘害',
+ width: 150,
+ slots: { default: 'progressPercent' },
+ },
+ {
field: 'clientCode',
title: '瀹㈡埛缂栫爜',
width: 120,
@@ -348,6 +354,12 @@
width: 120,
},
{
+ field: 'paramTemplateId',
+ title: '宸ヨ壓鍙傛暟妯℃澘',
+ minWidth: 140,
+ formatter: ({ cellValue }) => cellValue ? `妯℃澘 #${cellValue}` : '鏈厤缃�',
+ },
+ {
field: 'quantity',
title: '鎺掍骇鏁伴噺',
width: 100,
diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index 79377f1..e8e5b06 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -11,17 +11,16 @@
MesProWorkOrderTypeEnum,
} from '@vben/constants';
-import { Button, Card, message, Tabs } from 'ant-design-vue';
+import { Button, Card, Progress, Tabs } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { getGanttTaskList, previewAutoGenerate, autoGenerateTasks } from '#/api/mes/pro/task';
+import { getGanttTaskList } from '#/api/mes/pro/task';
import { getWorkOrderPage } from '#/api/mes/pro/workorder';
import ArchiveDetail from '#/views/mes/pd/archive/modules/detail.vue';
import { GanttChart } from './components';
import { useGridColumns, useGridFormSchema } from './data';
import ScheduleForm from './modules/schedule-form.vue';
-import SchedulePreview from '../workorder-center/modules/schedule-preview.vue';
const router = useRouter();
const ganttTasks = ref<any[]>([]); // 鐢樼壒鍥鹃瑙堟暟鎹�
@@ -35,10 +34,6 @@
destroyOnClose: true,
});
-const [SchedulePreviewModal, schedulePreviewModalApi] = useVbenModal({
- connectedComponent: SchedulePreview,
- destroyOnClose: true,
-});
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
@@ -65,28 +60,6 @@
}
/** 涓�閿帓浜ч瑙� */
-async function handleAutoSchedulePreview(row: MesProWorkOrderApi.WorkOrder) {
- try {
- const preview = await previewAutoGenerate({ workOrderId: row.id! });
- schedulePreviewModalApi
- .setData({ workOrder: row, preview })
- .open();
- } catch {
- message.error('鑾峰彇鎺掍骇棰勮澶辫触');
- }
-}
-
-/** 涓�閿帓浜ф墽琛� */
-async function handleAutoSchedule(row: MesProWorkOrderApi.WorkOrder) {
- try {
- const result = await autoGenerateTasks({ workOrderId: row.id! });
- message.success(`鎺掍骇鎴愬姛锛岀敓鎴� ${result.taskIds?.length || 0} 涓换鍔);
- handleRefresh();
- } catch {
- message.error('鎺掍骇澶辫触');
- }
-}
-
/** 鎵撳紑褰掓。璇︽儏 */
function handleArchive(row: MesProWorkOrderApi.WorkOrder) {
archiveProductCode.value = row.productCode || '';
@@ -151,10 +124,11 @@
<template>
<Page auto-content-height>
<ScheduleModal @success="handleRefresh" />
- <SchedulePreviewModal @success="handleRefresh" />
-
<!-- 鎺掍骇鐢樼壒鍥鹃瑙� -->
<Card title="鎺掍骇鐢樼壒鍥�" class="mb-4">
+ <template #extra>
+ <span class="text-xs text-gray-400">灞曠ず宸茬‘璁よ嚜鍒惰鍗曠殑浠诲姟璁″垝</span>
+ </template>
<GanttChart :height="350" :readonly="true" :tasks="ganttTasks" />
</Card>
@@ -186,11 +160,17 @@
{{ row.code }}
</Button>
</template>
+ <template #progressPercent="{ row }">
+ <Progress
+ :percent="Math.min(100, Math.round((row.quantity ? ((row.quantityProduced || 0) / row.quantity) * 100 : 0)))"
+ size="small"
+ />
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
{
- label: '鎺掍骇',
+ label: '鎺掍骇缁存姢',
type: 'link',
auth: ['mes:pro-task:create'],
ifShow: row.status === MesProWorkOrderStatusEnum.CONFIRMED,
diff --git a/src/views/mes/pro/task/modules/schedule-form.vue b/src/views/mes/pro/task/modules/schedule-form.vue
index c14e0bd..f459bfb 100644
--- a/src/views/mes/pro/task/modules/schedule-form.vue
+++ b/src/views/mes/pro/task/modules/schedule-form.vue
@@ -132,6 +132,7 @@
v-for="rp in routeProcessList"
:key="rp.processId"
:title="rp.processName"
+ :description="rp.paramTemplateId ? `鍙傛暟妯℃澘 #${rp.paramTemplateId}` : '鏈厤缃弬鏁版ā鏉�'"
/>
</Steps>
<template v-for="(rp, index) in routeProcessList" :key="rp.processId">
diff --git a/src/views/mes/pro/task/modules/task-list.vue b/src/views/mes/pro/task/modules/task-list.vue
index ef34471..da4a1f6 100644
--- a/src/views/mes/pro/task/modules/task-list.vue
+++ b/src/views/mes/pro/task/modules/task-list.vue
@@ -14,6 +14,7 @@
import { useTaskGridColumns } from '../data';
import TaskForm from './task-form.vue';
+import QuickFeedbackForm from '../../workorder-center/modules/quick-feedback.vue';
const props = defineProps<{
colorCode?: string;
@@ -29,6 +30,11 @@
const [TaskFormModal, taskFormModalApi] = useVbenModal({
connectedComponent: TaskForm,
+ destroyOnClose: true,
+});
+
+const [QuickFeedbackModal, quickFeedbackModalApi] = useVbenModal({
+ connectedComponent: QuickFeedbackForm,
destroyOnClose: true,
});
@@ -54,6 +60,18 @@
/** 缂栬緫浠诲姟 */
function handleEdit(row: MesProTaskApi.Task) {
taskFormModalApi.setData({ id: row.id }).open();
+}
+
+/** 蹇�熸姤宸� */
+function handleQuickFeedback(row: MesProTaskApi.Task) {
+ quickFeedbackModalApi
+ .setData({
+ taskId: row.id,
+ taskCode: row.code,
+ taskQuantity: row.quantity,
+ taskProducedQuantity: row.producedQuantity,
+ })
+ .open();
}
/** 鍒犻櫎浠诲姟 */
@@ -107,7 +125,7 @@
// 宸ュ簭姝ラ鍒囨崲鏃堕噸鏂板姞杞藉綋鍓嶅伐搴忕殑浠诲姟
watch(
- () => props.processId,
+ () => [props.workOrderId, props.routeId, props.processId],
() => handleRefresh(),
);
@@ -117,6 +135,7 @@
<template>
<div>
<TaskFormModal @success="handleRefresh" />
+ <QuickFeedbackModal @success="handleRefresh" />
<Grid table-title="鐢熶骇浠诲姟">
<template v-if="editable" #toolbar-tools>
<TableAction
@@ -141,6 +160,13 @@
<TableAction
:actions="[
{
+ label: '鎶ュ伐',
+ type: 'link',
+ auth: ['mes:pro-feedback:create'],
+ ifShow: (row.quantity ?? 0) > (row.producedQuantity ?? 0),
+ onClick: handleQuickFeedback.bind(null, row),
+ },
+ {
label: $t('common.edit'),
type: 'link',
icon: ACTION_ICON.EDIT,
--
Gitblit v1.9.3