From 5a90852489e1bf91d386746d75cfa0066c271228 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 26 八月 2026 17:15:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/api/mes/pro/route/process/index.ts | 1
src/views/mes/pro/task/data.ts | 29 +++++++
src/router/guard.ts | 5
src/api/mes/pro/task/index.ts | 1
src/views/mes/pro/feedback/modules/form.vue | 38 +++++++++
src/views/mes/pro/task/modules/task-list.vue | 28 ++++++
src/api/mes/pro/workorder/process/index.ts | 1
src/views/mes/pro/route/data.ts | 14 +++
src/views/mes/pro/task/index.vue | 44 +++--------
src/views/mes/pro/task/modules/schedule-form.vue | 1
src/store/auth.ts | 4
src/views/mes/pro/feedback/data.ts | 1
src/views/mes/pro/workorder/index.vue | 15 ++-
src/api/mes/pro/feedback/index.ts | 7 +
14 files changed, 144 insertions(+), 45 deletions(-)
diff --git a/src/api/mes/pro/feedback/index.ts b/src/api/mes/pro/feedback/index.ts
index 934eba8..4ac3351 100644
--- a/src/api/mes/pro/feedback/index.ts
+++ b/src/api/mes/pro/feedback/index.ts
@@ -64,6 +64,12 @@
createTime?: number; // 鍒涘缓鏃堕棿
processInstanceId?: string; // BPM 娴佺▼瀹炰緥缂栧彿
processDefinitionKey?: string; // BPM 娴佺▼瀹氫箟 Key
+ paramValues?: ParamValue[];
+ }
+
+ export interface ParamValue {
+ detailId: number;
+ value?: string;
}
/** MES 鐢熶骇鎶ュ伐鍒嗛〉鏌ヨ鍙傛暟 */
@@ -163,6 +169,7 @@
/** 蹇�熸姤宸ヨ姹� */
export interface QuickCreateReq {
taskId: number;
+ paramValues?: MesProFeedbackApi.ParamValue[];
feedbackQuantity: number;
qualifiedQuantity?: number;
unqualifiedQuantity?: number;
diff --git a/src/api/mes/pro/route/process/index.ts b/src/api/mes/pro/route/process/index.ts
index c207284..a08056f 100644
--- a/src/api/mes/pro/route/process/index.ts
+++ b/src/api/mes/pro/route/process/index.ts
@@ -15,6 +15,7 @@
id?: number;
routeId?: number;
processId?: number;
+ paramTemplateId?: number;
processCode?: string;
processName?: string;
sort?: number;
diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index a059e1c..c45f7b6 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -29,6 +29,7 @@
workstationName?: string; // 宸ヤ綔绔欏悕绉�
routeId?: number; // 宸ヨ壓璺嚎缂栧彿
processId?: number; // 宸ュ簭缂栧彿
+ paramTemplateId?: number; // 宸ヨ壓鍙傛暟妯℃澘缂栧彿
processName?: string; // 宸ュ簭鍚嶇О
itemId?: number; // 浜у搧鐗╂枡缂栧彿
itemCode?: string; // 浜у搧缂栫爜
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/router/guard.ts b/src/router/guard.ts
index 8b88c83..88a80ee 100644
--- a/src/router/guard.ts
+++ b/src/router/guard.ts
@@ -60,8 +60,7 @@
if (to.path === LOGIN_PATH && accessStore.accessToken) {
return decodeURIComponent(
(to.query?.redirect as string) ||
- userStore.userInfo?.homePath ||
- preferences.app.defaultHomePath,
+ '/analytics',
);
}
return true;
@@ -132,7 +131,7 @@
userStore.setUserRoles(userRoles);
const redirectPath = (from.query.redirect ??
(to.path === preferences.app.defaultHomePath
- ? userInfo?.homePath || preferences.app.defaultHomePath
+ ? '/analytics'
: to.fullPath)) as string;
return {
diff --git a/src/store/auth.ts b/src/store/auth.ts
index 7d09f0e..3643cf0 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -86,9 +86,7 @@
// oxlint-disable-next-line no-unused-expressions
onSuccess
? await onSuccess?.()
- : await router.push(
- userInfo.homePath || preferences.app.defaultHomePath,
- );
+ : await router.push('/analytics');
}
if (userInfo?.nickname) {
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index 8e2580a..036cae3 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -18,6 +18,7 @@
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getWorkOrderParamRecordPage } from '#/api/mes/pro/workorderparamrecord';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 92bc22f..6857a99 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -11,7 +11,7 @@
import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
import { useUserStore } from '@vben/stores';
-import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
+import { Button, Input, message, Popconfirm, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
@@ -26,6 +26,7 @@
} from '#/api/mes/pro/feedback';
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
import { getWorkOrder } from '#/api/mes/pro/workorder';
+import { getWorkOrderParamRecordPage } from '#/api/mes/pro/workorderparamrecord';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
@@ -40,6 +41,7 @@
const userStore = useUserStore();
const subTabsName = ref('itemConsume');
const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜� submit 鏃惰烦杩囨湭鍙樻洿鐨勪繚瀛樿姹�
+const paramDetails = ref<Array<{ id: number; paramName?: string; paramCode?: string; unitMeasureName?: string; paramValue?: string }>>([]);
const isEditable = computed(() =>
['create', 'submit', 'update'].includes(formType.value),
@@ -105,6 +107,7 @@
/** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+ syncParamValues(data);
alignQuantity(data);
return data;
}
@@ -145,6 +148,27 @@
const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
const batchActionType = ref<'submit' | 'approve'>('');
+
+async function loadParamDetails(taskId?: number) {
+ paramDetails.value = [];
+ if (!taskId) return;
+ const page = await getWorkOrderParamRecordPage({ taskId, pageNo: 1, pageSize: 1 });
+ const record = page.list?.[0];
+ paramDetails.value = (record?.details ?? []).map((detail) => ({
+ id: detail.id!,
+ paramCode: detail.paramCode,
+ paramName: detail.paramName,
+ unitMeasureName: detail.unitMeasureName,
+ paramValue: detail.paramValue,
+ }));
+}
+
+function syncParamValues(data: MesProFeedbackApi.Feedback) {
+ data.paramValues = paramDetails.value.map((detail) => ({
+ detailId: detail.id,
+ value: detail.paramValue,
+ }));
+}
/** 鎵ц鎻愪氦锛堝惈鎵规灞炴�э級 */
async function doSubmit(batchFields?: Record<string, unknown>) {
@@ -336,6 +360,7 @@
modalApi.lock();
try {
formData.value = await getFeedback(data.id);
+ await loadParamDetails(formData.value.taskId);
const checkFlag = await resolveCheckFlag(
formData.value.routeId,
formData.value.processId,
@@ -354,6 +379,17 @@
<template>
<Modal :title="getTitle" class="w-3/5">
<Form class="mx-4" />
+ <div v-if="paramDetails.length" class="mx-4 mt-4 rounded border border-gray-200 p-4">
+ <div class="mb-3 font-medium">宸ヨ壓鍙傛暟</div>
+ <div class="grid grid-cols-2 gap-3">
+ <div v-for="detail in paramDetails" :key="detail.id" class="flex items-center gap-2">
+ <span class="w-40 text-right text-sm text-gray-600">
+ {{ detail.paramName || detail.paramCode }}{{ detail.unitMeasureName ? `锛�${detail.unitMeasureName}锛塦 : '' }}
+ </span>
+ <Input v-model:value="detail.paramValue" :disabled="!isEditable" placeholder="璇疯緭鍏ュ弬鏁板��" />
+ </div>
+ </div>
+ </div>
<Tabs
v-if="showSubTabs"
v-model:active-key="subTabsName"
diff --git a/src/views/mes/pro/route/data.ts b/src/views/mes/pro/route/data.ts
index 0ad7caa..3ec634c 100644
--- a/src/views/mes/pro/route/data.ts
+++ b/src/views/mes/pro/route/data.ts
@@ -18,6 +18,7 @@
import { z } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
+import { getTemplatePage } from '#/api/mes/pro/processdesign/template';
import {
MdItemSelect,
MdProductBomSelect,
@@ -216,6 +217,19 @@
rules: 'selectRequired',
},
{
+ fieldName: 'paramTemplateId',
+ label: '宸ヨ壓鍙傛暟妯℃澘',
+ component: 'ApiSelect',
+ componentProps: {
+ api: () => getTemplatePage({ pageNo: 1, pageSize: 100 }),
+ labelField: 'templateName',
+ valueField: 'id',
+ resultField: 'list',
+ allowClear: true,
+ placeholder: '璇烽�夋嫨宸ヨ壓鍙傛暟妯℃澘',
+ },
+ },
+ {
fieldName: 'linkType',
label: '涓庝笅閬撳伐搴忓叧绯�',
component: 'Select',
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index 0098d65..7dae255 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -1,6 +1,8 @@
import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import { z } from '#/adapter/form';
+import { getSimpleUserListByRoleCode } from '#/api/system/user';
+import { getTemplatePage } from '#/api/mes/pro/processdesign/template';
import { getUserListByWorkstationId } from '#/api/mes/md/workstation/worker';
import type { MesProTaskApi } from '#/api/mes/pro/task';
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
@@ -163,6 +165,12 @@
field: 'quantityProduced',
title: '宸茬敓浜ф暟閲�',
width: 100,
+ },
+ {
+ field: 'progressPercent',
+ title: '瀹屾垚杩涘害',
+ width: 150,
+ slots: { default: 'progressPercent' },
},
{
field: 'clientCode',
@@ -347,6 +355,12 @@
width: 120,
},
{
+ field: 'paramTemplateId',
+ title: '宸ヨ壓鍙傛暟妯℃澘',
+ minWidth: 140,
+ formatter: ({ cellValue }) => cellValue ? `妯℃澘 #${cellValue}` : '鏈厤缃�',
+ },
+ {
field: 'quantity',
title: '鎺掍骇鏁伴噺',
width: 100,
@@ -395,6 +409,19 @@
/** 鐢熶骇浠诲姟鏂板/淇敼鐨勮〃鍗� */
export function useTaskFormSchema(formApi?: VbenFormApi, workOrderQuantity?: Ref<number | undefined>): VbenFormSchema[] {
return [
+ {
+ fieldName: 'paramTemplateId',
+ label: '宸ヨ壓鍙傛暟妯℃澘',
+ component: 'ApiSelect',
+ componentProps: {
+ api: () => getTemplatePage({ pageNo: 1, pageSize: 100 }),
+ labelField: 'templateName',
+ valueField: 'id',
+ resultField: 'list',
+ allowClear: true,
+ placeholder: '璇烽�夋嫨宸ヨ壓鍙傛暟妯℃澘',
+ },
+ },
{
fieldName: 'workstationId',
label: '宸ヤ綔绔�',
@@ -507,7 +534,7 @@
async function recalcDuration(formApi?: VbenFormApi) {
if (!formApi) return;
const values = await formApi.getValues();
-
+
if (values.workstationId) {
try {
const users = await getUserListByWorkstationId({ workstationId: values.workstationId });
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,
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 05d1c44..6c3ef86 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -32,7 +32,8 @@
destroyOnClose: true,
});
- const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
+ const archiveVisible = ref(false);
+ const archiveProductCode = ref('');
// const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
/** 鍒锋柊琛ㄦ牸 */
@@ -100,6 +101,12 @@
await cancelWorkOrder(row.id!);
message.success("璁㈠崟宸插彇娑�");
handleRefresh();
+ }
+
+ /** 鎵撳紑褰掓。璇︽儏 */
+ function handleArchive(row: MesProWorkOrderApi.WorkOrder) {
+ archiveProductCode.value = row.productCode || '';
+ archiveVisible.value = true;
}
/** 鏌ョ湅璁㈠崟鏉＄爜 */
@@ -237,7 +244,7 @@
},
},
{
- label: $t('common.create'),
+ label: '鏂板瀛愯鍗�',
type: 'link',
auth: ['mes:pro-work-order:create'],
ifShow:
@@ -274,13 +281,13 @@
{
label: '褰掓。',
type: 'link',
- onClick: () => archiveDetailRef.value?.open(row.productCode),
+ onClick: handleArchive.bind(null, row),
},
]" />
</template>
</Grid>
<!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
- <ArchiveDetail ref="archiveDetailRef" />
+ <ArchiveDetail :visible="archiveVisible" :product-code="archiveProductCode" @update:visible="archiveVisible = $event" />
</Page>
</template>
--
Gitblit v1.9.3