From f984f80ff5d6c36af7860a17d762fe92731e28bd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:04 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
src/views/mes/pro/route/data.ts | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/views/mes/pro/route/data.ts b/src/views/mes/pro/route/data.ts
index 0444b0e..d43419a 100644
--- a/src/views/mes/pro/route/data.ts
+++ b/src/views/mes/pro/route/data.ts
@@ -226,6 +226,7 @@
componentProps: {
products,
},
+ help: '閰嶆瘮琛ㄧず姣忎骇鍑� 1 涓富浜у嚭鏃剁殑闄勫甫鏁伴噺锛氫富浜у嚭鍥哄畾涓� 1锛岃仈浜у搧鎸夊疄闄呮瘮渚嬪～鍐欙紙濡� 1 鍙颁富浜у搧闄勫甫 2 涓崐鎴愬搧鍒欏～ 2锛夛紱鎶ュ伐鏃舵寜銆屾湰娆℃姤宸ユ暟閲� 脳 閰嶆瘮銆嶇敓鎴愬悇浜у嚭鏁伴噺',
formItemClass: 'col-span-2',
},
{
@@ -238,6 +239,7 @@
placeholder: '璇烽�夋嫨',
},
rules: z.number().default(3),
+ dependencies: { triggerFields: [''], show: () => false },
},
{
fieldName: 'colorCode',
@@ -328,23 +330,18 @@
return outputs
.map((output) => {
const name = output.itemName ?? output.itemCode ?? output.itemId;
- return output.productId == null
- ? `${name}锛堥�氱敤锛塦
- : `${name}锛�${output.productName ?? output.productId}锛塦;
+ const ratio = output.quantity ?? 1;
+ const text = `${name} 脳 ${ratio}`;
+ const product =
+ output.productId == null
+ ? '閫氱敤'
+ : (output.productName ?? output.productId);
+ return `${output.mainFlag ? '鈽�' : ''}${text}锛�${product}锛塦;
})
.join('銆�');
},
},
{ field: 'nextProcessName', title: '涓嬩竴閬撳伐搴�', width: 140 },
- {
- field: 'linkType',
- title: '涓庝笅涓�閬撳伐搴忓叧绯�',
- width: 160,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.MES_PRO_LINK_TYPE },
- },
- },
{
field: 'keyFlag',
title: '鍏抽敭宸ュ簭',
--
Gitblit v1.9.3