From 44266ab0adf7b14aabc28017dec34bdc4fbc96da Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:53:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新高电力' into dev_新疆_新高电力
---
src/views/mes/pro/route/data.ts | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/views/mes/pro/route/data.ts b/src/views/mes/pro/route/data.ts
index 71199db..5fb905a 100644
--- a/src/views/mes/pro/route/data.ts
+++ b/src/views/mes/pro/route/data.ts
@@ -220,6 +220,17 @@
rules: 'selectRequired',
},
{
+ fieldName: 'outputItemIds',
+ label: '鏈伐搴忎骇鍑�',
+ component: markRaw(MdItemSelect),
+ componentProps: {
+ multiple: true,
+ productIds,
+ placeholder: '鍙暀绌猴紱褰㈡垚鍗婃垚鍝佹椂閫夋嫨锛屾湯閬撳伐搴忛�夋嫨鍏ㄩ儴鎴愬搧',
+ },
+ formItemClass: 'col-span-2',
+ },
+ {
fieldName: 'linkType',
label: '涓庝笅閬撳伐搴忓叧绯�',
component: 'Select',
@@ -256,15 +267,14 @@
rules: z.boolean().default(false),
},
{
- fieldName: 'outputItemIds',
- label: '浜у嚭浜у搧',
- component: markRaw(MdItemSelect),
+ fieldName: 'backflushFlag',
+ label: '鎶ュ伐鑷姩鎵ｆ枡',
+ component: 'Switch',
componentProps: {
- multiple: true,
- productIds,
- placeholder: '涓棿宸ュ簭閫夊崐鎴愬搧锛屾湯閬撳伐搴忛�夊叏閮ㄦ垚鍝�',
+ checkedChildren: '鑷姩',
+ unCheckedChildren: '鎵嬪姩',
},
- formItemClass: 'col-span-2',
+ rules: z.boolean().default(false),
},
{
fieldName: 'prepareTime',
@@ -308,6 +318,7 @@
{ field: 'sort', title: '搴忓彿', width: 70, align: 'center', fixed: 'left' },
{ field: 'processCode', title: '宸ュ簭缂栫爜', width: 140, fixed: 'left' },
{ field: 'processName', title: '宸ュ簭鍚嶇О', width: 140, fixed: 'left' },
+ { field: 'outputItemNames', title: '鏈伐搴忎骇鍑�', minWidth: 190 },
{ field: 'nextProcessName', title: '涓嬩竴閬撳伐搴�', width: 140 },
{
field: 'linkType',
@@ -336,9 +347,17 @@
props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
},
},
+ {
+ field: 'backflushFlag',
+ title: '鑷姩鎵ｆ枡',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+ },
+ },
{ field: 'prepareTime', title: '鍑嗗鏃堕棿(鍒�)', width: 110 },
{ field: 'waitTime', title: '绛夊緟鏃堕棿(鍒�)', width: 110 },
- { field: 'outputItemNames', title: '浜у嚭浜у搧', minWidth: 180 },
{
field: 'colorCode',
title: '鐢樼壒鍥鹃鑹�',
@@ -358,14 +377,14 @@
/** 宸ヨ壓璺嚎浜у搧鍒楄〃瀛楁 */
export function useRouteProductGridColumns(): VxeTableGridOptions<MesProRouteProductApi.RouteProduct>['columns'] {
return [
- { field: 'itemCode', title: '浜у搧鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: '浜у搧鐗╂枡鍚嶇О', width: 150 },
+ { field: 'itemCode', title: '浜у嚭缂栫爜', width: 150 },
+ { field: 'itemName', title: '浜у嚭鍚嶇О', width: 150 },
{ field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
{ field: 'unitName', title: '鍗曚綅', width: 80 },
{ field: 'quantity', title: '鐢熶骇鏁伴噺', width: 100 },
- { field: 'warehouseName', title: '鎶ュ伐浠撳簱', width: 130 },
- { field: 'locationName', title: '搴撳尯', width: 120 },
- { field: 'areaName', title: '搴撲綅', width: 120 },
+ { field: 'warehouseName', title: '鎶ュ伐鍏ュ簱浠�', width: 140 },
+ { field: 'locationName', title: '鍏ュ簱搴撳尯', width: 120 },
+ { field: 'areaName', title: '鍏ュ簱搴撲綅', width: 120 },
{
field: 'productionTime',
title: '鐢熶骇鐢ㄦ椂',
@@ -385,8 +404,8 @@
/** 宸ヨ壓璺嚎浜у搧 BOM 鍒楄〃瀛楁 */
export function useRouteProductBomGridColumns(): VxeTableGridOptions<MesProRouteProductBomApi.RouteProductBom>['columns'] {
return [
- { field: 'itemCode', title: 'BOM 鐗╂枡缂栫爜', width: 150 },
- { field: 'itemName', title: 'BOM 鐗╂枡鍚嶇О', width: 150 },
+ { field: 'itemCode', title: '鎶曟枡缂栫爜', width: 150 },
+ { field: 'itemName', title: '鎶曟枡鍚嶇О', width: 150 },
{ field: 'specification', title: '瑙勬牸鍨嬪彿', width: 150 },
{ field: 'unitName', title: '鍗曚綅', width: 80 },
{ field: 'quantity', title: '鐢ㄦ枡姣斾緥', width: 100 },
--
Gitblit v1.9.3