From b9b476d4b4f1bf9e08b58249fb42f7b07aa3a0fa Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 26 八月 2026 15:08:07 +0800
Subject: [PATCH] feat(mes): 添加工艺参数模板功能支持
---
src/api/mes/pro/route/process/index.ts | 1
src/views/mes/pro/route/data.ts | 14 +++++++
src/views/mes/pro/task/data.ts | 14 +++++++
src/router/guard.ts | 5 +-
src/api/mes/pro/task/index.ts | 1
src/store/auth.ts | 4 -
src/views/mes/pro/feedback/data.ts | 1
src/api/mes/pro/feedback/index.ts | 7 +++
src/views/mes/pro/feedback/modules/form.vue | 38 ++++++++++++++++++
9 files changed, 78 insertions(+), 7 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/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 12cfcb1..cb721a0 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -2,6 +2,7 @@
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 type { MesProTaskApi } from '#/api/mes/pro/task';
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
@@ -396,6 +397,19 @@
export function useTaskFormSchema(formApi?: VbenFormApi, workOrderQuantity?: Ref<number | undefined>, feedbackRole?: Ref<string | 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: '宸ヤ綔绔�',
component: markRaw(MdWorkstationSelect),
--
Gitblit v1.9.3