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/order/data.ts |   38 +++++++++++++++++++++-----------------
 1 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/views/erp/sale/order/data.ts b/src/views/erp/sale/order/data.ts
index b61597e..7986c84 100644
--- a/src/views/erp/sale/order/data.ts
+++ b/src/views/erp/sale/order/data.ts
@@ -7,7 +7,7 @@
 import { getAccountSimpleList } from '#/api/erp/finance/account';
 import { getItemPage } from '#/api/mdm/item';
 import { getSimpleUserList } from '#/api/system/user';
-import { getRangePickerDefaultProps } from '#/utils';
+import { getRangePickerDefaultProps, withoutFixedColumns } from '#/utils';
 import CrmCustomerSelect from '#/components/crm-customer-select.vue';
 
 import { markRaw } from 'vue';
@@ -156,11 +156,11 @@
     },
     {
       fieldName: 'totalPrice',
-      label: '浼樻儬鍚庨噾棰�',
+      label: '浼樻儬鍚庡惈绋庨噾棰�',
       component: 'InputNumber',
       componentProps: {
         class: '!w-full',
-        placeholder: '浼樻儬鍚庨噾棰�',
+        placeholder: '浼樻儬鍚庡惈绋庨噾棰�',
         precision: 2,
         formatter: erpPriceInputFormatter,
         disabled: true,
@@ -197,7 +197,7 @@
             return z
               .number()
               .min(0, '璁㈤噾涓嶈兘灏忎簬0')
-              .max(values.totalPrice, '鏀跺彇璁㈤噾涓嶈兘澶т簬浼樻儬鍚庨噾棰�');
+              .max(values.totalPrice, '鏀跺彇璁㈤噾涓嶈兘澶т簬浼樻儬鍚庡惈绋庨噾棰�');
           }
           return z.number().min(0, '璁㈤噾涓嶈兘灏忎簬0').optional();
         },
@@ -211,7 +211,7 @@
 export function useFormItemColumns(
   disabled: boolean,
 ): VxeTableGridOptions['columns'] {
-  return [
+  const columns: VxeTableGridOptions['columns'] = [
     { type: 'seq', title: '搴忓彿', minWidth: 50, fixed: 'left' },
     {
       field: 'productId',
@@ -270,17 +270,10 @@
     },
     {
       field: 'productPrice',
-      title: '浜у搧鍗曚环',
+      title: '鍚◣鍗曚环(鍏�)',
       minWidth: 120,
       fixed: 'right',
       slots: { default: 'productPrice' },
-    },
-    {
-      field: 'totalProductPrice',
-      title: '閲戦',
-      minWidth: 120,
-      fixed: 'right',
-      formatter: 'formatAmount2',
     },
     {
       field: 'taxPercent',
@@ -290,15 +283,22 @@
       slots: { default: 'taxPercent' },
     },
     {
+      field: 'totalProductPrice',
+      title: '涓嶅惈绋庨噾棰�(鍏�)',
+      minWidth: 120,
+      fixed: 'right',
+      formatter: 'formatAmount2',
+    },
+    {
       field: 'taxPrice',
-      title: '绋庨',
+      title: '绋庨(鍏�)',
       minWidth: 120,
       fixed: 'right',
       formatter: 'formatAmount2',
     },
     {
       field: 'totalPrice',
-      title: '绋庨鍚堣',
+      title: '鍚◣鍚堣(鍏�)',
       minWidth: 120,
       fixed: 'right',
       formatter: 'formatAmount2',
@@ -311,6 +311,8 @@
       visible: !disabled,
     },
   ];
+  // 鏌ョ湅瀹℃壒鏄庣粏锛堝彧璇伙級鏃跺彇娑堝浐瀹氬垪锛岄伩鍏嶇獎寮圭獥閲屾尋鎺変骇鍝佸悕绉般�佸崟浣嶃�佸娉ㄧ瓑鍒�
+  return disabled ? withoutFixedColumns(columns) : columns;
 }
 
 /** 鍒楄〃鐨勬悳绱㈣〃鍗� */
@@ -378,8 +380,10 @@
       component: 'Select',
       componentProps: {
         options: [
-          { label: '鏈鏍�', value: 10 },
+          { label: '鏈彁浜�', value: 0 },
+          { label: '瀹℃壒涓�', value: 15 },
           { label: '宸插鏍�', value: 20 },
+          { label: '宸查┏鍥�', value: 35 },
           { label: '宸蹭綔搴�', value: 30 },
         ],
         placeholder: '璇烽�夋嫨鐘舵��',
@@ -478,7 +482,7 @@
     },
     {
       field: 'totalProductPrice',
-      title: '閲戦鍚堣',
+      title: '涓嶅惈绋庨噾棰濆悎璁�',
       formatter: 'formatAmount2',
       minWidth: 120,
     },

--
Gitblit v1.9.3