From cec91d13116154243b444fd950e59f628b355981 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 18 八月 2026 11:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/stocktaking/plan/data.ts | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/wls/stocktaking/plan/data.ts b/src/views/wls/stocktaking/plan/data.ts
index cfbc882..263e3fa 100644
--- a/src/views/wls/stocktaking/plan/data.ts
+++ b/src/views/wls/stocktaking/plan/data.ts
@@ -1,4 +1,4 @@
-import type { NumberDictDataType } from '../../../../packages/effects/hooks/src';
+import type { NumberDictDataType } from '@vben/hooks';
import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
@@ -12,8 +12,8 @@
DICT_TYPE,
MesAutoCodeRuleCode,
WlsStockTakingTypeEnum,
-} from '../../../../packages/constants/src';
-import { getDictOptions } from '../../../../packages/effects/hooks/src';
+} from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
import { Button } from 'ant-design-vue';
@@ -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'],
@@ -326,8 +326,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