From 64a8cd04229f7b903913fc3dc7ef4aef267ac3bc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 17:36:14 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' into dev_南通_苏珩
---
src/views/mes/process-design/route/data.ts | 66 +++++++++++++--------------------
1 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/src/views/mes/process-design/route/data.ts b/src/views/mes/process-design/route/data.ts
index 5471982..21f962f 100644
--- a/src/views/mes/process-design/route/data.ts
+++ b/src/views/mes/process-design/route/data.ts
@@ -108,6 +108,16 @@
},
},
{
+ fieldName: "productKeyword",
+ label: "浜у搧",
+ component: "Input",
+ componentProps: {
+ allowClear: true,
+ maxLength: 100,
+ placeholder: "杈撳叆浜у搧鍚嶇О鎴栫紪鐮�",
+ },
+ },
+ {
fieldName: "status",
label: "鐘舵��",
component: "Select",
@@ -154,7 +164,7 @@
field: "createTime",
title: "鍒涘缓鏃堕棿",
width: 180,
- formatter: 'formatDate',
+ formatter: "formatDateTime",
},
{
title: "鎿嶄綔",
@@ -205,7 +215,7 @@
fieldName: "yieldRate",
label: "宸ュ簭鏀剁巼",
component: "InputNumber",
- help: "浜у嚭閲� 梅 鎶曞叆閲忋�傚～鍐� 0.98 琛ㄧず 98%锛�1 琛ㄧず鏃犳崯鑰楋紱鏈～鍐欐寜 100% 鍙備笌鎺掍骇璁＄畻銆�",
+ help: "浜у嚭閲� 梅 鎶曞叆閲忋�傚～鍐� 0.98 琛ㄧず 98%锛屾湭濉啓鎸� 100% 鍙備笌鎺掍骇璁＄畻銆�",
componentProps: {
class: "!w-full",
min: 0.0001,
@@ -220,21 +230,12 @@
fieldName: "linkType",
label: "涓庝笅閬撳伐搴忓叧绯�",
component: "Select",
- help: () =>
- h(
- "div",
- {
- style:
- "white-space: pre-line; max-width: 320px; line-height: 1.6;",
- },
- "0=寮�濮�-寮�濮�(SS)锛氭湰宸ュ簭寮�濮嬪悗锛屼笅閬撳伐搴忔墠鑳藉紑濮嬶紙鍙噸鍙犲苟琛屽紑宸ワ級\n1=缁撴潫-缁撴潫(FF)锛氫笅閬撳伐搴忓繀椤荤瓑鍒版湰宸ュ簭缁撴潫鎵嶈兘缁撴潫锛堝苟琛屼絾鍚屾瀹屽伐锛塡n2=寮�濮�-缁撴潫(SF)锛氭湰宸ュ簭寮�濮嬪悗锛屼笅閬撳伐搴忔墠鑳界粨鏉焅n3=缁撴潫-寮�濮�(FS)锛氭湰宸ュ簭缁撴潫鍚庯紝涓嬮亾宸ュ簭鎵嶈兘寮�濮嬶紙榛樿鍊硷級",
- ),
componentProps: {
allowClear: true,
options: getDictOptions(DICT_TYPE.MES_PRO_LINK_TYPE, "number"),
placeholder: "璇烽�夋嫨",
},
- rules: z.number().optional(),
+ rules: z.number().default(3),
},
{
fieldName: "colorCode",
@@ -425,11 +426,8 @@
];
}
-/** 宸ヨ壓璺嚎浜у搧琛ㄥ崟锛沵ultiple = true锛堟柊澧炴ā寮忥級鏃朵骇鍝佸彲澶氶�夛紝涓�娆℃�х粦瀹氬涓� */
-export function useRouteProductFormSchema(
- onItemChange?: (item: any) => void,
- multiple = false,
-): VbenFormSchema[] {
+/** 宸ヨ壓璺嚎浜у搧琛ㄥ崟 */
+export function useRouteProductFormSchema(onItemChange?: (item: any) => void): VbenFormSchema[] {
return [
{
fieldName: "id",
@@ -441,29 +439,17 @@
component: "Input",
dependencies: { triggerFields: [""], show: () => false },
},
- // 鏂板锛堝閫夛級锛氫竴娆＄粦瀹氬涓骇鍝侊紱缂栬緫锛堝崟閫夛級锛歝hange 鍥炲～缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅
- multiple
- ? {
- fieldName: "itemIds",
- label: "浜у搧锛堝彲澶氶�夛級",
- component: markRaw(MdItemSelect),
- componentProps: {
- multiple: true,
- placeholder: "璇烽�夋嫨瑕佺粦瀹氱殑浜у搧锛堝彲澶氶�夛級",
- },
- formItemClass: "col-span-2",
- rules: "selectRequired",
- }
- : {
- fieldName: "itemId",
- label: "浜у搧",
- component: markRaw(MdItemSelect),
- componentProps: {
- onChange: onItemChange,
- },
- formItemClass: "col-span-2",
- rules: "selectRequired",
- },
+ // 浜у搧鐗╂枡锛氫娇鐢ㄤ笟鍔¤嚜瀹氫箟閫夋嫨鍣紝change 鍥炲～缂栫爜/鍚嶇О/瑙勬牸/鍗曚綅
+ {
+ fieldName: "itemId",
+ label: "浜у搧",
+ component: markRaw(MdItemSelect),
+ componentProps: {
+ onChange: onItemChange,
+ },
+ formItemClass: "col-span-2",
+ rules: "selectRequired",
+ },
{
fieldName: "quantity",
label: "鐢熶骇鏁伴噺",
--
Gitblit v1.9.3