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/purchase/return/data.ts | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/erp/purchase/return/data.ts b/src/views/erp/purchase/return/data.ts
index fdbcf2e..f7d9012 100644
--- a/src/views/erp/purchase/return/data.ts
+++ b/src/views/erp/purchase/return/data.ts
@@ -8,7 +8,7 @@
import { z } from '#/adapter/form';
import { getAccountSimpleList } from '#/api/erp/finance/account';
import { getProductSimpleList } from '#/api/erp/product/product';
-import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
+import { getSupplierSimpleList } from '#/api/srm/supplier';
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',
},
@@ -131,11 +131,11 @@
},
{
fieldName: 'discountedPrice',
- label: '浼樻儬鍚庨噾棰�',
+ label: '浼樻儬鍚庡惈绋庨噾棰�',
component: 'InputNumber',
componentProps: {
class: '!w-full',
- placeholder: '浼樻儬鍚庨噾棰�',
+ placeholder: '浼樻儬鍚庡惈绋庨噾棰�',
precision: 2,
formatter: erpPriceInputFormatter,
disabled: true,
@@ -256,17 +256,10 @@
},
{
field: 'productPrice',
- title: '浜у搧鍗曚环',
+ title: '鍚◣鍗曚环(鍏�)',
fixed: 'right',
minWidth: 120,
slots: { default: 'productPrice' },
- },
- {
- field: 'totalProductPrice',
- fixed: 'right',
- title: '浜у搧閲戦',
- minWidth: 120,
- formatter: 'formatAmount2',
},
{
fixed: 'right',
@@ -276,16 +269,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',
},
@@ -590,7 +590,7 @@
},
{
field: 'totalProductPrice',
- title: '閲戦鍚堣',
+ title: '涓嶅惈绋庨噾棰濆悎璁�',
formatter: 'formatAmount2',
minWidth: 120,
},
--
Gitblit v1.9.3