From b74d628be8ff57a22e4e4a5a164e755a509820ec Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 07 七月 2026 16:50:18 +0800
Subject: [PATCH] 银川 1.员工管理页面开发、联调 2.薪资发放页面开发联调 3.薪酬管理页面开发联调 4.添加请假扣薪管理页面开发联调
---
src/views/hrm/salary/payment/data.ts | 61 +++++-------------------------
1 files changed, 10 insertions(+), 51 deletions(-)
diff --git a/src/views/hrm/salary/payment/data.ts b/src/views/hrm/salary/payment/data.ts
index c93e181..b9e1873 100644
--- a/src/views/hrm/salary/payment/data.ts
+++ b/src/views/hrm/salary/payment/data.ts
@@ -2,12 +2,8 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { HrmSalaryPaymentApi } from '#/api/hrm/salary/payment';
-import { DICT_TYPE } from '#/packages/constants/src';
import { getDictOptions } from '#/packages/effects/hooks/src';
-
-import { getDeptList } from '#/api/system/dept';
-import { getEmployeeSimpleList } from '#/api/hrm/employee';
-import { handleTree } from '#/packages/utils/src';
+import { DICT_TYPE } from '#/packages/constants/src';
/** 鍒楄〃鐨勬悳绱㈣〃鍗� */
export function useGridFormSchema(): VbenFormSchema[] {
@@ -26,44 +22,14 @@
},
},
{
- fieldName: 'userId',
- label: '鍛樺伐',
- component: 'ApiSelect',
- componentProps: {
- api: getEmployeeSimpleList,
- labelField: 'name',
- valueField: 'id',
- allowClear: true,
- placeholder: '璇烽�夋嫨鍛樺伐',
- },
- },
- {
- fieldName: 'deptId',
- label: '閮ㄩ棬',
- component: 'ApiTreeSelect',
- componentProps: {
- api: async () => {
- const data = await getDeptList();
- return handleTree(data);
- },
- labelField: 'name',
- valueField: 'id',
- childrenField: 'children',
- allowClear: true,
- placeholder: '璇烽�夋嫨閮ㄩ棬',
- treeDefaultExpandAll: true,
- },
- },
- {
fieldName: 'status',
label: '鍙戞斁鐘舵��',
component: 'Select',
componentProps: {
allowClear: true,
options: [
- { label: '寰呭彂鏀�', value: 10 },
- { label: '宸插彂鏀�', value: 20 },
- { label: '宸叉挙閿�', value: 30 },
+ { label: '寰呭彂鏀�', value: 0 },
+ { label: '宸插彂鏀�', value: 10 },
],
placeholder: '璇烽�夋嫨鍙戞斁鐘舵��',
},
@@ -74,12 +40,10 @@
/** 鍒楄〃鐨勫瓧娈� */
export function useGridColumns(): VxeTableGridOptions<HrmSalaryPaymentApi.SalaryPayment>['columns'] {
return [
- { type: 'checkbox', width: 50 },
{ field: 'no', title: '鍙戞斁鍗曞彿', minWidth: 140 },
{ field: 'period', title: '鍙戞斁鍛ㄦ湡', width: 100 },
- { field: 'userName', title: '鍛樺伐濮撳悕', minWidth: 100 },
- { field: 'deptName', title: '閮ㄩ棬', minWidth: 120 },
- { field: 'actualSalary', title: '瀹炲彂宸ヨ祫', width: 100, formatter: 'formatAmount2' },
+ { field: 'totalAmount', title: '鍙戞斁鎬婚噾棰�', width: 120, formatter: 'formatAmount2' },
+ { field: 'totalCount', title: '鍙戞斁浜烘暟', width: 100 },
{
field: 'paymentMethod',
title: '鍙戞斁鏂瑰紡',
@@ -90,15 +54,12 @@
},
},
{ field: 'paymentTime', title: '鍙戞斁鏃堕棿', width: 160 },
- { field: 'paymentNo', title: '鍙戞斁娴佹按鍙�', minWidth: 140 },
{
field: 'status',
- title: '鍙戞斁鐘舵��',
+ title: '鐘舵��',
width: 100,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.HRM_SALARY_STATUS },
- },
+ fixed: 'right',
+ slots: { default: 'status' },
},
{
field: 'createTime',
@@ -108,11 +69,9 @@
},
{
title: '鎿嶄綔',
- width: 150,
+ width: 180,
fixed: 'right',
- slots: {
- default: 'actions',
- },
+ slots: { default: 'actions' },
},
];
}
\ No newline at end of file
--
Gitblit v1.9.3