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/request/data.ts |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index 58f9035..69c620b 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -4,7 +4,7 @@
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-import { getSupplierSimpleList } from '#/api/erp/purchase/supplier';
+import { getSupplierSimpleList } from '#/api/srm/supplier';
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
@@ -48,7 +48,7 @@
         placeholder: '閫夋嫨鐢宠鏃堕棿',
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
         disabled: formType === 'detail',
       },
       rules: 'required',
@@ -163,21 +163,14 @@
       title: '鍏ュ簱鏁伴噺',
       minWidth: 100,
       fixed: 'right',
-      formatter: 'formatAmount6',
+      formatter: 'formatAmount3',
     },
     {
       field: 'productPrice',
-      title: '鍗曚环锛堝弬鑰冧环锛�',
+      title: '鍚◣鍗曚环(鍏�)',
       minWidth: 120,
       fixed: 'right',
       slots: { default: 'productPrice' },
-    },
-    {
-      field: 'totalPrice',
-      title: '棰勪及閲戦',
-      minWidth: 120,
-      fixed: 'right',
-      formatter: 'formatAmount2',
     },
     {
       field: 'taxPercent',
@@ -185,6 +178,26 @@
       minWidth: 100,
       fixed: 'right',
       slots: { default: 'taxPercent' },
+    },
+    {
+      field: 'totalPrice',
+      title: '涓嶅惈绋庨噾棰�(鍏�)',
+      minWidth: 120,
+      fixed: 'right',
+      formatter: 'formatAmount2',
+    },
+    {
+      field: 'taxPrice',
+      title: '绋庨(鍏�)',
+      minWidth: 120,
+      fixed: 'right',
+      formatter: 'formatAmount2',
+    },
+    {
+      title: '鍚◣鍚堣(鍏�)',
+      minWidth: 120,
+      fixed: 'right',
+      slots: { default: 'totalTaxInclusivePrice' },
     },
     {
       field: 'demandTime',
@@ -271,8 +284,8 @@
         options: [
           { label: '鏈彁浜�', value: 0 },
           { label: '瀹℃壒涓�', value: 10 },
-          { label: '瀹℃牳閫氳繃', value: 20 },
-          { label: '瀹℃牳涓嶉�氳繃', value: 30 },
+          { label: '瀹℃壒閫氳繃', value: 20 },
+          { label: '瀹℃壒涓嶉�氳繃', value: 30 },
           { label: '宸插彇娑�', value: 40 },
         ],
         placeholder: '璇烽�夋嫨鐘舵��',
@@ -339,7 +352,7 @@
     },
     {
       field: 'totalPrice',
-      title: '棰勪及閲戦',
+      title: '鍚◣閲戦',
       formatter: 'formatAmount2',
       minWidth: 120,
     },

--
Gitblit v1.9.3