From 487008281c7ba87712a1647d09899383e12fa759 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 29 七月 2026 15:37:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/sale/out/data.ts | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/src/views/erp/sale/out/data.ts b/src/views/erp/sale/out/data.ts
index 6fcc4a9..298eed3 100644
--- a/src/views/erp/sale/out/data.ts
+++ b/src/views/erp/sale/out/data.ts
@@ -1,14 +1,14 @@
import type { VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import { DICT_TYPE } from '..\..\..\..\packages\constants\src';
-import { getDictOptions } from '..\..\..\..\packages\effects\hooks\src';
-import { erpNumberFormatter, erpPriceInputFormatter } from '..\..\..\..\packages\utils\src';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { erpNumberFormatter, erpPriceInputFormatter } from '@vben/utils';
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';
@@ -45,7 +45,7 @@
placeholder: '閫夋嫨鍑哄簱鏃堕棿',
showTime: true,
format: 'YYYY-MM-DD HH:mm:ss',
- valueFormat: 'x',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
},
@@ -69,7 +69,7 @@
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
showSearch: true,
- api: getCustomerSimpleList,
+ api: getCrmCustomerSimpleList,
fieldNames: {
label: 'name',
value: 'id',
@@ -104,23 +104,13 @@
formItemClass: 'col-span-2',
},
{
- fieldName: 'fileUrl',
+ fieldName: 'blobIds',
label: '闄勪欢',
component: 'FileUpload',
componentProps: {
- maxNumber: 1,
- maxSize: 10,
- accept: [
- 'pdf',
- 'doc',
- 'docx',
- 'xls',
- 'xlsx',
- 'txt',
- 'jpg',
- 'jpeg',
- 'png',
- ],
+ valueKey: 'id',
+ maxNumber: 10,
+ multiple: true,
showDescription: formType !== 'detail',
disabled: formType === 'detail',
},
@@ -350,11 +340,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 +365,7 @@
placeholder: '璇烽�夋嫨瀹㈡埛',
allowClear: true,
showSearch: true,
- api: getCustomerSimpleList,
+ api: getCrmCustomerSimpleList,
fieldNames: {
label: 'name',
value: 'id',
@@ -554,7 +545,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 +566,8 @@
}
/** 鍒楄〃鐨勫瓧娈� */
+
+/** 鍒楄〃鐨勫瓧娈� */
export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
return [
{
--
Gitblit v1.9.3