From fb4db4ae9b6a7f113ba049f6789e6916c0dcc276 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 12 十月 2026 09:15:08 +0800
Subject: [PATCH] feat(mes): 新增业务码支持并优化追溯查询功能
---
src/views/mes/pro/batch/data.ts | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/pro/batch/data.ts b/src/views/mes/pro/batch/data.ts
index 9e0803c..408d018 100644
--- a/src/views/mes/pro/batch/data.ts
+++ b/src/views/mes/pro/batch/data.ts
@@ -18,12 +18,16 @@
export interface PalletOption {
label: string;
value: number;
+ itemId?: number;
+ itemName?: string;
+ itemCode?: string;
}
/** 鏂板/淇敼鐨勮〃鍗� */
export function useFormSchema(
formType: FormType,
palletOptions: PalletOption[] = [],
+ onPalletChange?: (ids: number[]) => void,
): VbenFormSchema[] {
const disabled = formType === 'detail';
return [
@@ -132,6 +136,18 @@
rules: 'selectRequired',
},
{
+ fieldName: 'itemId', component: 'Input',
+ dependencies: { triggerFields: [''], show: () => false },
+ },
+ {
+ fieldName: 'itemName', label: '鍝佺鍚嶇О', component: 'Input',
+ componentProps: { disabled: true, placeholder: '閫夋嫨鎵樼洏鍚庤嚜鍔ㄥ甫鍏�' },
+ },
+ {
+ fieldName: 'itemCode', label: '鍝佺缂栫爜', component: 'Input',
+ componentProps: { disabled: true, placeholder: '閫夋嫨鎵樼洏鍚庤嚜鍔ㄥ甫鍏�' },
+ },
+ {
fieldName: 'palletIds',
label: '缁戝畾鎵樼洏',
component: 'Select',
@@ -139,17 +155,25 @@
allowClear: true,
disabled,
maxTagCount: 3,
+ dropdownMatchSelectWidth: false,
+ dropdownStyle: { minWidth: '360px', maxWidth: 'calc(100vw - 32px)' },
mode: 'multiple',
optionFilterProp: 'label',
options: palletOptions,
- placeholder: '璇烽�夋嫨鎵樼洏锛堝彲涓嶉�夛級',
+ onChange: onPalletChange,
+ placeholder: '璇烽�夋嫨鐩稿悓鍝佺鐨勬墭鐩�',
showSearch: true,
},
dependencies: {
- triggerFields: [''],
+ triggerFields: ['itemId'],
show: () => formType !== 'detail',
+ componentProps: (values) => ({
+ options: palletOptions.map(option => ({ ...option,
+ disabled: !option.itemId || (!!values.itemId && option.itemId !== values.itemId),
+ })),
+ }),
},
- help: '缁戝畾鍚庢壒娆$洿鎺ヨ繘鍏ョ敓浜т腑锛氭墭鐩樼敓鎴愭寮忔墭鐩樼爜锛屾墭鐩樹笅鏈綍鎵规鐨勮鐮佽嚜鍔ㄧ骇鑱斿綍鍏ユ湰鎵规锛堣鐮佸搧绉嶉』涓�鑷达級锛涚紪杈戞椂浠呴渶鍕鹃�夋柊澧炴墭鐩橈紝宸茬粦瀹氱殑涓嶅彲瑙g粦',
+ help: '鍙兘缁戝畾鐩稿悓鍝佺鐨勬墭鐩橈紝鍝佺淇℃伅鑷姩甯﹀叆锛涚己灏戝搧绉嶇殑鎵樼洏璇峰厛瑁呰銆傜粦瀹氬悗鎵规鐩存帴杩涘叆鐢熶骇涓細鎵樼洏鐢熸垚姝e紡鎵樼洏鐮侊紝鎵樼洏涓嬫湭褰曟壒娆$殑琚嬬爜鑷姩绾ц仈褰曞叆鏈壒娆★紙琚嬬爜鍝佺椤讳竴鑷达級锛涚紪杈戞椂浠呴渶鍕鹃�夋柊澧炴墭鐩橈紝宸茬粦瀹氱殑涓嶅彲瑙g粦',
},
{
fieldName: 'remark',
@@ -168,6 +192,7 @@
/** 鍒楄〃鐨勬悳绱㈣〃鍗� */
export function useGridFormSchema(): VbenFormSchema[] {
return [
+ { fieldName: 'businessCode', label: '涓氬姟鐮�', component: 'Input', componentProps: { allowClear: true, placeholder: '璇疯緭鍏ヤ綔涓氭壂鐮佷笟鍔$爜' } },
{
fieldName: 'code',
label: '鎵规鍙�',
@@ -237,6 +262,7 @@
/** 鍒楄〃鐨勫瓧娈� */
export function useGridColumns(): VxeTableGridOptions<MesProBatchApi.Batch>['columns'] {
return [
+ { field: 'businessCode', title: '涓氬姟鐮侊紙浣滀笟鎵爜锛�', minWidth: 210 },
{
field: 'code',
title: '鎵规鍙�',
@@ -244,6 +270,8 @@
minWidth: 200,
slots: { default: 'code' },
},
+ { field: 'itemName', title: '鍝佺鍚嶇О', minWidth: 150 },
+ { field: 'itemCode', title: '鍝佺缂栫爜', minWidth: 150 },
{
field: 'lineName',
title: '鍔犲伐鍗曚綅',
--
Gitblit v1.9.3