From 6d5df8bf7ec6b35e4ccdfd4010e3add4af44e910 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 21:26:02 +0800
Subject: [PATCH] feat: 新增公出申请审批、安全驾驶舱及工资发放记录查看
---
src/views/personnelManagement/monthlyStatistics/index.vue | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/src/views/personnelManagement/monthlyStatistics/index.vue b/src/views/personnelManagement/monthlyStatistics/index.vue
index c4f5081..54a4918 100644
--- a/src/views/personnelManagement/monthlyStatistics/index.vue
+++ b/src/views/personnelManagement/monthlyStatistics/index.vue
@@ -108,15 +108,47 @@
<el-table-column prop="fundPersonal" label="鍏Н閲�(涓汉)" width="110" align="right" />
<el-table-column prop="salaryTax" label="涓◣" width="90" align="right" />
<el-table-column prop="grossSalary" label="搴斿彂宸ヨ祫" width="110" align="right">
- <template #default="{ row }">{{ formatMoney(row.grossSalary) }}</template>
+ <template #default="{ row }">{{ formatAmount(row.grossSalary) }}</template>
</el-table-column>
<el-table-column prop="deductSalary" label="鎵f鍚堣" width="100" align="right" />
<el-table-column prop="netSalary" label="瀹炲彂宸ヨ祫" width="110" align="right">
- <template #default="{ row }">{{ formatMoney(row.netSalary) }}</template>
+ <template #default="{ row }">{{ formatAmount(row.netSalary) }}</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="salaryDetailVisible = false">鍏抽棴</el-button>
+ </template>
+ </el-dialog>
+ <el-dialog v-model="issueRecordVisible" title="鍙戞斁璁板綍" width="820px" append-to-body>
+ <template v-if="issueRecordRow">
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="宸ヨ祫涓婚">{{ issueRecordRow.salaryTitle }}</el-descriptions-item>
+ <el-descriptions-item label="宸ヨ祫鏈堜唤">{{ issueRecordRow.salaryMonth }}</el-descriptions-item>
+ <el-descriptions-item label="宸ヨ祫鎬婚">{{ formatAmount(issueRecordRow.totalSalary) }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戞斁閾惰">{{ issueRecordRow.payBank || "-" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戞斁鏃堕棿">{{ issueRecordRow.payTime || "-" }}</el-descriptions-item>
+ <el-descriptions-item label="瀹℃牳浜�">{{ issueRecordRow.auditUserName || "-" }}</el-descriptions-item>
+ <el-descriptions-item label="澶囨敞" :span="2">{{ issueRecordRow.remark || "-" }}</el-descriptions-item>
+ </el-descriptions>
+ <div class="issue-record-title">鍙戞斁鏄庣粏锛坽{ issueRecordDetails.length }} 浜猴級</div>
+ <el-table :data="issueRecordDetails" border size="small" max-height="360">
+ <el-table-column prop="staffName" label="濮撳悕" width="90" />
+ <el-table-column prop="deptName" label="閮ㄩ棬" width="110" />
+ <el-table-column prop="postName" label="宀椾綅" width="110" />
+ <el-table-column label="搴斿彂宸ヨ祫" width="110" align="right">
+ <template #default="{ row }">{{ formatAmount(row.grossSalary) }}</template>
+ </el-table-column>
+ <el-table-column label="鎵f鍚堣" width="110" align="right">
+ <template #default="{ row }">{{ formatAmount(row.deductSalary) }}</template>
+ </el-table-column>
+ <el-table-column label="瀹炲彂宸ヨ祫" width="110" align="right">
+ <template #default="{ row }">{{ formatAmount(row.netSalary) }}</template>
+ </el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip />
+ </el-table>
+ </template>
+ <template #footer>
+ <el-button @click="issueRecordVisible = false">鍏抽棴</el-button>
</template>
</el-dialog>
</div>
@@ -175,6 +207,7 @@
},
{ label: "宸ヨ祫鎬婚", prop: "totalSalary", width: 120 },
{ label: "鏀粯閾惰", prop: "payBank", width: 120 },
+ { label: "鍙戞斁鏃堕棿", prop: "payTime", width: 160, formatData: (v) => v || "-" },
{ label: "瀹℃牳浜�", prop: "auditUserName", width: 110 },
{ label: "澶囨敞", prop: "remark", minWidth: 120 },
{
@@ -182,7 +215,7 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 180,
+ width: 240,
operation: [
{
name: "鏌ョ湅鏄庣粏",
@@ -211,6 +244,12 @@
type: "text",
disabled: (row) => Number(row?.status) !== 4,
clickFun: (row) => openIssue(row),
+ },
+ {
+ name: "鍙戞斁璁板綍",
+ type: "text",
+ disabled: (row) => Number(row?.status) !== 5,
+ clickFun: (row) => openIssueRecord(row),
},
],
},
@@ -242,10 +281,20 @@
const auditDiaRef = ref(null);
const salaryDetailVisible = ref(false);
const salaryDetailRow = ref({});
+const issueRecordVisible = ref(false);
+const issueRecordRow = ref(null);
-const formatMoney = (value) => {
- if (value === undefined || value === null || value === "") return "-";
- return Number(value).toFixed(2);
+const issueRecordDetails = computed(() =>
+ Array.isArray(issueRecordRow.value?.staffSalaryDetailList)
+ ? issueRecordRow.value.staffSalaryDetailList
+ : []
+);
+
+const formatAmount = (v) => (v == null || v === "" ? "-" : Number(v).toFixed(2));
+
+const openIssueRecord = (row) => {
+ issueRecordRow.value = row || null;
+ issueRecordVisible.value = true;
};
const openSalaryDetail = (row) => {
@@ -457,4 +506,9 @@
margin-bottom: 12px;
font-weight: 600;
}
+.issue-record-title {
+ margin: 16px 0 8px;
+ font-weight: 600;
+ font-size: 14px;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3