From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/mes/pro/feedback/data.ts | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index e2728f1..29b244a 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -1,4 +1,4 @@
-锘縤mport type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
import type { MesProTaskApi } from '#/api/mes/pro/task';
@@ -264,6 +264,7 @@
taskId: undefined,
unitMeasureName: undefined,
workstationId: undefined,
+ reportableQuantity: undefined,
});
},
},
@@ -298,6 +299,7 @@
routeId: task.routeId,
unitMeasureName: task.unitMeasureName,
workstationId: task.workstationId,
+ reportableQuantity: task.reportableQuantity,
});
// 宸ヨ壓璺嚎宸ュ簭鐨� checkFlag 鍐冲畾鏁伴噺鍖哄煙灞曠ず
if (task.routeId && task.processId) {
@@ -374,6 +376,20 @@
dependencies: {
triggerFields: ['itemCode'],
show: (values) => !!values.itemCode,
+ },
+ },
+ {
+ fieldName: 'reportableQuantity',
+ label: '鍙姤宸ユ暟閲�',
+ component: 'InputNumber',
+ componentProps: {
+ class: 'w-full',
+ disabled: true,
+ precision: 2,
+ },
+ dependencies: {
+ triggerFields: ['taskId'],
+ show: (values) => !!values.taskId && ['create', 'update'].includes(formType),
},
},
{
@@ -554,7 +570,7 @@
format: 'YYYY-MM-DD HH:mm:ss',
placeholder: '璇烽�夋嫨鎶ュ伐鏃堕棿',
showTime: true,
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
},
--
Gitblit v1.9.3