From febc04ba93560daccd08186f678edb7e85fad6d0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 27 十月 2026 13:19:39 +0800
Subject: [PATCH] fix: 公出时间只显示到分钟、人员薪资新增查看明细、应收对账可选全部客户
---
src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js | 12 ++++++
src/views/financialManagement/receivable/reconciliation.vue | 3 +
src/views/personnelManagement/monthlyStatistics/index.vue | 86 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 99 insertions(+), 2 deletions(-)
diff --git a/src/views/financialManagement/receivable/reconciliation.vue b/src/views/financialManagement/receivable/reconciliation.vue
index 03400ef..05555bb 100644
--- a/src/views/financialManagement/receivable/reconciliation.vue
+++ b/src/views/financialManagement/receivable/reconciliation.vue
@@ -297,7 +297,8 @@
};
const getCustomerList = () => {
- listCustomer({ current: -1, size: -1, type: 0 }).then((res) => {
+ // 瀵硅处鍗曢渶瑕佽鐩栧叏閮ㄥ鎴凤細涓嶄紶 type锛岄伩鍏嶈蛋銆岀娴枫�嶏紙type=0 涓旈檺鏈汉棰嗙敤/鍏变韩锛夊彛寰勫鑷撮�変笉鍒板鎴�
+ listCustomer({ current: -1, size: -1 }).then((res) => {
if (res.code === 200) {
customerList.value = res.data?.records || [];
}
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
index e2f1e45..fc18cee 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js
@@ -248,10 +248,22 @@
const hit = field.options.find(o => String(o.value) === String(val));
return hit?.label || String(val);
}
+ if (field?.type === "datetimerange" && Array.isArray(val)) {
+ return val.map(formatMinuteTime).join(" 鑷� ");
+ }
if (Array.isArray(val)) return val.join(" 鑷� ");
return String(val);
}
+/** 鏃ユ湡鏃堕棿鍙睍绀哄埌鍒嗛挓锛堝幓鎺夌锛夛紝鍒楄〃/璇︽儏鐢� */
+function formatMinuteTime(v) {
+ const text = String(v ?? "").trim();
+ const m = text.match(/^(\d{4})[-/](\d{1,2})[-/](\d{1,2})[ T](\d{1,2}):(\d{2})(?::\d{2})?/);
+ if (!m) return text;
+ const pad = (n) => String(n).padStart(2, "0");
+ return `${m[1]}-${pad(m[2])}-${pad(m[3])} ${pad(m[4])}:${m[5]}`;
+}
+
/**
* 浠庤鏁版嵁 / formConfig 瑙f瀽濉姤瀛楁瀹氫箟涓� formPayload锛堜笌鏂板鎻愪氦缁撴瀯涓�鑷达級
*/
diff --git a/src/views/personnelManagement/monthlyStatistics/index.vue b/src/views/personnelManagement/monthlyStatistics/index.vue
index ff4395c..5af9c84 100644
--- a/src/views/personnelManagement/monthlyStatistics/index.vue
+++ b/src/views/personnelManagement/monthlyStatistics/index.vue
@@ -125,6 +125,58 @@
<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>
</template>
@@ -189,8 +241,13 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 240,
+ width: 320,
operation: [
+ {
+ name: "鏌ョ湅鏄庣粏",
+ type: "text",
+ clickFun: (row) => openDetail(row),
+ },
{
name: "缂栬緫",
type: "text",
@@ -256,6 +313,22 @@
? issueRecordRow.value.staffSalaryDetailList
: []
);
+
+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));
@@ -469,4 +542,15 @@
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