From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/stocktaking/plan/data.ts | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/wls/stocktaking/plan/data.ts b/src/views/wls/stocktaking/plan/data.ts
index cd3059b..9fd43c7 100644
--- a/src/views/wls/stocktaking/plan/data.ts
+++ b/src/views/wls/stocktaking/plan/data.ts
@@ -91,7 +91,7 @@
componentProps: {
placeholder: '璇烽�夋嫨寮�濮嬫椂闂�',
showTime: true,
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
dependencies: {
triggerFields: ['type'],
@@ -105,7 +105,7 @@
componentProps: {
placeholder: '璇烽�夋嫨缁撴潫鏃堕棿',
showTime: true,
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
dependencies: {
triggerFields: ['type'],
@@ -116,6 +116,7 @@
fieldName: 'blindFlag',
label: '鏄惁鐩茬洏',
component: 'Switch',
+ defaultValue: false,
componentProps: {
checkedChildren: '鏄�',
unCheckedChildren: '鍚�',
@@ -126,6 +127,7 @@
fieldName: 'frozen',
label: '鍐荤粨搴撳瓨',
component: 'Switch',
+ defaultValue: false,
componentProps: {
checkedChildren: '鏄�',
unCheckedChildren: '鍚�',
@@ -326,8 +328,8 @@
component: markRaw(StockTakingPlanConditionValueInput),
// 鏉′欢鍊兼帶浠跺唴閮ㄦ寜鏉′欢绫诲瀷鍒囨崲閫夋嫨鍣紝浠呴�夋嫨绫诲瀷鍚庡睍绀�
dependencies: {
- triggerFields: ['type'],
- if: (values) => values.type !== null,
+ triggerFields: ['type', 'valueCode'],
+ show: (values) => values.type != null,
componentProps: (values) => ({
type: values.type,
valueCode: values.valueCode,
--
Gitblit v1.9.3