From 7a74c11a6bb50c51384d2cb0a86552753711dd18 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 15:04:44 +0800
Subject: [PATCH] feat(人员薪资): 查看明细升级为全字段明细并带实发合计

---
 src/views/personnelManagement/monthlyStatistics/index.vue |  120 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 81 insertions(+), 39 deletions(-)

diff --git a/src/views/personnelManagement/monthlyStatistics/index.vue b/src/views/personnelManagement/monthlyStatistics/index.vue
index 54a4918..5af9c84 100644
--- a/src/views/personnelManagement/monthlyStatistics/index.vue
+++ b/src/views/personnelManagement/monthlyStatistics/index.vue
@@ -93,32 +93,6 @@
       @close="auditDialogVisible = false"
       @success="handleAuditSuccess"
     />
-    <el-dialog v-model="salaryDetailVisible" title="浜哄憳宸ヨ祫鏄庣粏" width="1100px">
-      <div class="salary-detail-title">
-        {{ salaryDetailRow.salaryTitle || "-" }}锛坽{ salaryDetailRow.salaryMonth || "-" }}锛�
-      </div>
-      <el-table :data="salaryDetailRow.staffSalaryDetailList || []" border style="width: 100%">
-        <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 prop="basicSalary" label="鍩烘湰宸ヨ祫" width="100" align="right" />
-        <el-table-column prop="pieceSalary" label="璁′欢宸ヨ祫" width="100" align="right" />
-        <el-table-column prop="otherIncome" label="鍏朵粬鏀跺叆" width="100" align="right" />
-        <el-table-column prop="socialPersonal" label="绀句繚(涓汉)" width="100" align="right" />
-        <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 }">{{ 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 }">{{ 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>
@@ -149,6 +123,58 @@
       </template>
       <template #footer>
         <el-button @click="issueRecordVisible = false">鍏抽棴</el-button>
+      </template>
+    </el-dialog>
+    <el-dialog
+      v-model="detailDialogVisible"
+      :title="`${detailRow.salaryTitle || '宸ヨ祫琛�'} - 浜哄憳鏄庣粏`"
+      width="90%"
+      append-to-body
+    >
+      <el-descriptions :column="4" border size="small">
+        <el-descriptions-item label="宸ヨ祫鏈堜唤">
+          {{ detailRow.salaryMonth || "-" }}
+        </el-descriptions-item>
+        <el-descriptions-item label="鐘舵��">
+          {{ statusName(detailRow.status) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="宸ヨ祫鎬婚">
+          {{ formatAmount(detailRow.totalSalary) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="瀹℃牳浜�">
+          {{ detailRow.auditUserName || "-" }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-table
+        :data="detailRow.staffSalaryDetailList || []"
+        border
+        size="small"
+        max-height="460"
+        style="margin-top: 12px"
+      >
+        <el-table-column type="index" label="搴忓彿" width="60" align="center" />
+        <el-table-column prop="staffName" label="濮撳悕" width="100" />
+        <el-table-column prop="deptName" label="閮ㄩ棬" width="110" />
+        <el-table-column prop="postName" label="宀椾綅" width="100" />
+        <el-table-column prop="basicSalary" label="鍩烘湰宸ヨ祫" width="100" align="right" />
+        <el-table-column prop="pieceSalary" label="璁′欢宸ヨ祫" width="100" align="right" />
+        <el-table-column prop="hourlySalary" label="璁℃椂宸ヨ祫" width="100" align="right" />
+        <el-table-column prop="otherIncome" label="鍏朵粬鏀跺叆" width="100" align="right" />
+        <el-table-column prop="socialPersonal" label="绀句繚涓汉" width="100" align="right" />
+        <el-table-column prop="fundPersonal" label="鍏Н閲戜釜浜�" width="120" align="right" />
+        <el-table-column prop="otherDeduct" label="鍏朵粬鏀嚭" width="100" align="right" />
+        <el-table-column prop="socialSupplementAmount" label="绀句繚琛ョ即" width="100" align="right" />
+        <el-table-column prop="salaryTax" label="宸ヨ祫涓◣" width="100" align="right" />
+        <el-table-column prop="grossSalary" label="搴斿彂宸ヨ祫" width="100" align="right" />
+        <el-table-column prop="deductSalary" label="搴旀墸宸ヨ祫" width="100" align="right" />
+        <el-table-column prop="netSalary" label="瀹炲彂宸ヨ祫" width="100" align="right" />
+        <el-table-column prop="remark" label="澶囨敞" min-width="160" show-overflow-tooltip />
+      </el-table>
+      <div class="detail-total">
+        瀹炲彂鍚堣锛�<span>楼 {{ detailTotal }}</span>
+      </div>
+      <template #footer>
+        <el-button @click="detailDialogVisible = false">鍏抽棴</el-button>
       </template>
     </el-dialog>
   </div>
@@ -215,12 +241,12 @@
     label: "鎿嶄綔",
     align: "center",
     fixed: "right",
-    width: 240,
+    width: 320,
     operation: [
       {
         name: "鏌ョ湅鏄庣粏",
         type: "text",
-        clickFun: (row) => openSalaryDetail(row),
+        clickFun: (row) => openDetail(row),
       },
       {
         name: "缂栬緫",
@@ -279,8 +305,6 @@
 const auditDialogVisible = ref(false);
 const auditRow = ref(null);
 const auditDiaRef = ref(null);
-const salaryDetailVisible = ref(false);
-const salaryDetailRow = ref({});
 const issueRecordVisible = ref(false);
 const issueRecordRow = ref(null);
 
@@ -290,16 +314,27 @@
     : []
 );
 
+const detailDialogVisible = ref(false);
+const detailRow = ref({});
+
+const detailTotal = computed(() => {
+  const list = Array.isArray(detailRow.value?.staffSalaryDetailList)
+    ? detailRow.value.staffSalaryDetailList
+    : [];
+  const sum = list.reduce((acc, item) => acc + Number(item?.netSalary || 0), 0);
+  return sum.toFixed(2);
+});
+
+const openDetail = (row) => {
+  detailRow.value = row || {};
+  detailDialogVisible.value = true;
+};
+
 const formatAmount = (v) => (v == null || v === "" ? "-" : Number(v).toFixed(2));
 
 const openIssueRecord = (row) => {
   issueRecordRow.value = row || null;
   issueRecordVisible.value = true;
-};
-
-const openSalaryDetail = (row) => {
-  salaryDetailRow.value = row || {};
-  salaryDetailVisible.value = true;
 };
 
 const issueBankOptions = computed(() => {
@@ -502,13 +537,20 @@
 .table_list {
   margin-top: 20px;
 }
-.salary-detail-title {
-  margin-bottom: 12px;
-  font-weight: 600;
-}
 .issue-record-title {
   margin: 16px 0 8px;
   font-weight: 600;
   font-size: 14px;
 }
+.detail-total {
+  margin-top: 12px;
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+}
+.detail-total span {
+  color: #f56c6c;
+  font-weight: 700;
+  font-size: 16px;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3