From baddb052ccd4a91ef1881ba663e6a4e55b05f4fb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 15:51:55 +0800
Subject: [PATCH] feat(hrm): 社保公积金方案表单加「适用部门」与默认缴费基数,修比例输入精度
---
src/views/erp/sale/out/data.ts | 76 ++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/src/views/erp/sale/out/data.ts b/src/views/erp/sale/out/data.ts
index 6fcc4a9..3fe36bc 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',
},
@@ -159,11 +149,11 @@
},
{
fieldName: 'discountedPrice',
- label: '浼樻儬鍚庨噾棰�',
+ label: '浼樻儬鍚庡惈绋庨噾棰�',
component: 'InputNumber',
componentProps: {
class: '!w-full',
- placeholder: '浼樻儬鍚庨噾棰�',
+ placeholder: '浼樻儬鍚庡惈绋庨噾棰�',
precision: 2,
formatter: erpPriceInputFormatter,
disabled: true,
@@ -287,17 +277,10 @@
},
{
field: 'productPrice',
- title: '浜у搧鍗曚环',
+ title: '鍚◣鍗曚环(鍏�)',
fixed: 'right',
minWidth: 120,
slots: { default: 'productPrice' },
- },
- {
- field: 'totalProductPrice',
- fixed: 'right',
- title: '浜у搧閲戦',
- minWidth: 120,
- formatter: 'formatAmount2',
},
{
fixed: 'right',
@@ -307,16 +290,23 @@
slots: { default: 'taxPercent' },
},
{
+ field: 'totalProductPrice',
+ fixed: 'right',
+ title: '涓嶅惈绋庨噾棰�(鍏�)',
+ minWidth: 120,
+ formatter: 'formatAmount2',
+ },
+ {
fixed: 'right',
field: 'taxPrice',
- title: '绋庨',
+ title: '绋庨(鍏�)',
minWidth: 120,
formatter: 'formatAmount2',
},
{
field: 'totalPrice',
fixed: 'right',
- title: '鍚堣閲戦',
+ title: '鍚◣鍚堣(鍏�)',
minWidth: 120,
formatter: 'formatAmount2',
},
@@ -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',
},
@@ -570,6 +564,8 @@
},
];
}
+
+/** 鍒楄〃鐨勫瓧娈� */
/** 鍒楄〃鐨勫瓧娈� */
export function useOrderGridColumns(): VxeTableGridOptions['columns'] {
@@ -621,7 +617,7 @@
},
{
field: 'totalProductPrice',
- title: '閲戦鍚堣',
+ title: '涓嶅惈绋庨噾棰濆悎璁�',
formatter: 'formatAmount2',
minWidth: 120,
},
--
Gitblit v1.9.3