From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突
---
src/views/product/dutyrecord/index.vue | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/views/product/dutyrecord/index.vue b/src/views/product/dutyrecord/index.vue
index 2201bc5..7a6db51 100644
--- a/src/views/product/dutyrecord/index.vue
+++ b/src/views/product/dutyrecord/index.vue
@@ -1022,7 +1022,6 @@
salarySummaryList() {
let r = JSON.parse(JSON.stringify(this.salarySummaryListRes))
const Heji = this.getHeji_tab4(r)
- console.log(Heji)
Heji.forEach((e) => {
const idx = r.findLastIndex((x) => e.staffId === x.staffId)
r = [...r.slice(0, idx + 1), e, ...r.slice(idx + 1)]
--
Gitblit v1.9.3