From f10cf167372f2d8c4c0e14f42f361d7ab96d8347 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 七月 2026 13:59:00 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/erp/sale/out/data.ts | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/erp/sale/out/data.ts b/src/views/erp/sale/out/data.ts
index ffef251..82dcfe5 100644
--- a/src/views/erp/sale/out/data.ts
+++ b/src/views/erp/sale/out/data.ts
@@ -7,8 +7,8 @@
import { z } from '#/adapter/form';
import { getAccountSimpleList } from '#/api/erp/finance/account';
-import { getProductSimpleList } from '#/api/erp/product/product';
-import { getCustomerSimpleList } from '#/api/erp/sale/customer';
+import { getItemPage } from '#/api/mdm/item';
+import { getCustomerSimpleList as getCrmCustomerSimpleList } from '#/api/crm/customer';
import { getWarehouseSimpleList } from '#/api/erp/stock/warehouse';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
@@ -69,7 +69,7 @@
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
showSearch: true,
- api: getCustomerSimpleList,
+ api: getCrmCustomerSimpleList,
fieldNames: {
label: 'name',
value: 'id',
@@ -350,11 +350,12 @@
placeholder: '璇烽�夋嫨浜у搧',
allowClear: true,
showSearch: true,
- api: getProductSimpleList,
- fieldNames: {
- label: 'name',
- value: 'id',
+ api: async () => {
+ const res = await getItemPage({ pageNo: 1, pageSize: 100, status: 0 });
+ return res.list || [];
},
+ labelField: 'name',
+ valueField: 'id',
},
},
{
@@ -374,7 +375,7 @@
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
showSearch: true,
- api: getCustomerSimpleList,
+ api: getCrmCustomerSimpleList,
fieldNames: {
label: 'name',
value: 'id',
@@ -554,7 +555,10 @@
placeholder: '璇烽�夋嫨浜у搧',
allowClear: true,
showSearch: true,
- api: getProductSimpleList,
+ api: async () => {
+ const res = await getItemPage({ pageNo: 1, pageSize: 100, status: 0 });
+ return res.list || [];
+ },
labelField: 'name',
valueField: 'id',
},
@@ -572,6 +576,8 @@
}
/** 鍒楄〃鐨勫瓧娈� */
+
+/** 鍒楄〃鐨勫瓧娈� */
export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
return [
{
--
Gitblit v1.9.3