From 3ce715a4e66955eac86dcd2f5c8afcfdf8becb6d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 29 十月 2026 16:46:47 +0800
Subject: [PATCH] Merge origin/dev_项目管理 into dev_项目管理

---
 src/views/personnelManagement/monthlyStatistics/index.vue |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 102 insertions(+), 1 deletions(-)

diff --git a/src/views/personnelManagement/monthlyStatistics/index.vue b/src/views/personnelManagement/monthlyStatistics/index.vue
index f581070..54a4918 100644
--- a/src/views/personnelManagement/monthlyStatistics/index.vue
+++ b/src/views/personnelManagement/monthlyStatistics/index.vue
@@ -93,6 +93,64 @@
       @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>
+          <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>
 </template>
 
@@ -149,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 },
   {
@@ -156,8 +215,13 @@
     label: "鎿嶄綔",
     align: "center",
     fixed: "right",
-    width: 180,
+    width: 240,
     operation: [
+      {
+        name: "鏌ョ湅鏄庣粏",
+        type: "text",
+        clickFun: (row) => openSalaryDetail(row),
+      },
       {
         name: "缂栬緫",
         type: "text",
@@ -180,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),
       },
     ],
   },
@@ -209,6 +279,28 @@
 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);
+
+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) => {
+  salaryDetailRow.value = row || {};
+  salaryDetailVisible.value = true;
+};
 
 const issueBankOptions = computed(() => {
   const options = Array.isArray(bankSetting.value?.options) ? bankSetting.value.options : [];
@@ -410,4 +502,13 @@
 .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;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3