From 173855b299e89930b5ea2ff9a9295fde9d0f55b5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:51:43 +0800
Subject: [PATCH] feat: 同步质检、生产、销售、财务与人事前端功能
---
src/views/hrm/salary/payment/modules/detail.vue | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/views/hrm/salary/payment/modules/detail.vue b/src/views/hrm/salary/payment/modules/detail.vue
index cb65405..0d25e98 100644
--- a/src/views/hrm/salary/payment/modules/detail.vue
+++ b/src/views/hrm/salary/payment/modules/detail.vue
@@ -5,11 +5,9 @@
import { useVbenModal } from '#/packages/effects/common-ui/src';
-import { message, Table, Tag, InputNumber, Alert } from 'ant-design-vue';
+import { Alert, Button, message, Table, Tag } from 'ant-design-vue';
-import { ACTION_ICON, TableAction } from '#/adapter/vxe-table';
import { getSalaryPaymentDetailList, paySalaryDetail } from '#/api/hrm/salary/payment';
-import { $t } from '#/locales';
const emit = defineEmits(['success']);
@@ -23,21 +21,22 @@
const isPaid = computed(() => status.value === 10);
+// 鍒楀鍚堣蹇呴』涓� scroll.x锛�1400锛変竴鑷达紝鍚﹀垯琛ㄦ牸鎷変几鍚� fixed 鍒楀亸绉讳細绠楅敊锛岀珫绾垮涓嶄笂
const columns = [
- { title: '鍛樺伐濮撳悕', dataIndex: 'userName', width: 100, fixed: 'left' },
- { title: '閮ㄩ棬', dataIndex: 'deptName', width: 120 },
- { title: '鍩烘湰宸ヨ祫', dataIndex: 'baseSalary', width: 100 },
- { title: '缁╂晥宸ヨ祫', dataIndex: 'performanceSalary', width: 100 },
- { title: '绀句繚鎵f', dataIndex: 'socialSecurityDeduction', width: 100 },
- { title: '鍏Н閲戞墸娆�', dataIndex: 'housingFundDeduction', width: 100 },
- { title: '涓◣鎵f', dataIndex: 'taxDeduction', width: 100 },
- { title: '璇峰亣鎵f', dataIndex: 'leaveDeduction', width: 100 },
- { title: '鍙戞斁鏃堕棿', dataIndex: 'paymentTime', width: 160 },
- { title: '瀹炲彂宸ヨ祫', dataIndex: 'actualSalary', width: 100, fixed: 'right' },
+ { title: '鍛樺伐濮撳悕', dataIndex: 'userName', width: 110, fixed: 'left' },
+ { title: '閮ㄩ棬', dataIndex: 'deptName', width: 140 },
+ { title: '鍩烘湰宸ヨ祫', dataIndex: 'baseSalary', width: 120 },
+ { title: '缁╂晥宸ヨ祫', dataIndex: 'performanceSalary', width: 120 },
+ { title: '绀句繚鎵f', dataIndex: 'socialSecurityDeduction', width: 120 },
+ { title: '鍏Н閲戞墸娆�', dataIndex: 'housingFundDeduction', width: 130 },
+ { title: '涓◣鎵f', dataIndex: 'taxDeduction', width: 120 },
+ { title: '璇峰亣鎵f', dataIndex: 'leaveDeduction', width: 120 },
+ { title: '鍙戞斁鏃堕棿', dataIndex: 'paymentTime', width: 200 },
+ { title: '瀹炲彂宸ヨ祫', dataIndex: 'actualSalary', width: 130, fixed: 'right' },
{
title: '鐘舵��',
dataIndex: 'status',
- width: 80,
+ width: 90,
fixed: 'right',
key: 'status',
},
@@ -98,7 +97,7 @@
</script>
<template>
- <Modal :title="`${period} - 钖祫鍙戞斁鏄庣粏`" class="w-[1100px]" :footer="null">
+ <Modal :title="`${period} - 钖祫鍙戞斁鏄庣粏`" class="w-[1424px]" :footer="null">
<Alert
v-if="!isPaid"
message="鍕鹃�夐渶瑕佸彂鏀剧殑鍛樺伐鏄庣粏锛岀偣鍑绘壒閲忓彂鏀炬寜閽繘琛屽彂鏀�"
@@ -108,9 +107,9 @@
/>
<div v-if="!isPaid" class="mb-3">
- <a-button type="primary" :loading="payLoading" :disabled="selectedIds.length === 0" @click="handleBatchPay">
+ <Button type="primary" :loading="payLoading" :disabled="selectedIds.length === 0" @click="handleBatchPay">
鎵归噺鍙戞斁 (宸查�� {{ selectedIds.length }} 鏉�)
- </a-button>
+ </Button>
</div>
<Table
@@ -118,7 +117,7 @@
:data-source="detailList"
:loading="loading"
:pagination="false"
- :scroll="{ x: 1200, y: 400 }"
+ :scroll="{ x: 1400, y: 460 }"
:row-selection="!isPaid ? { selectedRowKeys: selectedIds, onChange: onSelectChange } : undefined"
size="small"
row-key="id"
--
Gitblit v1.9.3