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/barcode/data.ts | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/wls/barcode/data.ts b/src/views/wls/barcode/data.ts
index abd401c..c34a07b 100644
--- a/src/views/wls/barcode/data.ts
+++ b/src/views/wls/barcode/data.ts
@@ -11,9 +11,9 @@
CommonStatusEnum,
DICT_TYPE,
MesProWorkOrderStatusEnum,
-} from '../../../packages/constants/src';
-import { getDictOptions } from '../../../packages/effects/hooks/src';
-import { formatDateTime } from '../../../packages/utils/src';
+} from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { formatDateTime } from '@vben/utils';
import { z } from '#/adapter/form';
import { generateBarcodeContent } from '#/api/mes/wm/barcode';
@@ -33,7 +33,7 @@
import { UserSelect } from '#/views/system/user/components';
import { WmMaterialStockSelect } from '../materialstock/components';
-import { WmPackageSelect } from '../packages/components';
+import { WmPackageSelect } from '#/views/wls/packages/components';
import {
WmWarehouseAreaSelect,
WmWarehouseLocationSelect,
@@ -609,6 +609,7 @@
/** 閰嶇疆鍒楄〃鐨勫瓧娈� */
export function useConfigGridColumns(
onAutoGenerateChange: (
+ newVal: number | boolean,
row: MesWmBarcodeConfigApi.BarcodeConfig,
) => Promise<boolean>,
): VxeTableGridOptions<MesWmBarcodeConfigApi.BarcodeConfig>['columns'] {
--
Gitblit v1.9.3