From c1b698e7cb6be3d065b57d30d112db273534ac6a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 15:58:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩
---
src/views/wls/batch/data.ts | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/wls/batch/data.ts b/src/views/wls/batch/data.ts
index 27164e8..fa3516c 100644
--- a/src/views/wls/batch/data.ts
+++ b/src/views/wls/batch/data.ts
@@ -11,9 +11,9 @@
import { DictTag } from '#/components/dict-tag';
import { getRangePickerDefaultProps } from '#/utils';
-import { MdClientSelect } from '#/views/mes/md/client/components';
-import { MdItemSelect } from '#/views/mes/md/item/components';
-import { MdVendorSelect } from '#/views/mes/md/vendor/components';
+import CrmCustomerSelect from '#/components/crm-customer-select.vue';
+import { MdmItemSelect } from '#/views/basicData/mdm/components';
+import { SrmSupplierSelect } from '#/views/srm/supplier/components';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
import { ProTaskSelect } from '#/views/mes/pro/task/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
@@ -34,7 +34,7 @@
{
fieldName: 'itemId',
label: '浜у搧鐗╂枡',
- component: markRaw(MdItemSelect),
+ component: markRaw(MdmItemSelect),
componentProps: {
placeholder: '璇烽�夋嫨浜у搧鐗╂枡',
},
@@ -42,7 +42,7 @@
{
fieldName: 'vendorId',
label: '渚涘簲鍟�',
- component: markRaw(MdVendorSelect),
+ component: markRaw(SrmSupplierSelect),
componentProps: {
placeholder: '璇烽�夋嫨渚涘簲鍟�',
},
@@ -50,7 +50,7 @@
{
fieldName: 'clientId',
label: '瀹㈡埛',
- component: markRaw(MdClientSelect),
+ component: markRaw(CrmCustomerSelect),
componentProps: {
placeholder: '璇烽�夋嫨瀹㈡埛',
},
--
Gitblit v1.9.3