From 79d1f42a12cc1c65f35e47a3c7fc4a812d71e38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 16 Nov 2022 17:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E5=88=87=E6=8D=A2=E4=B8=8A=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8=E5=8F=AF=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/calculateDetail/index.less | 5 +----
 pc4mobx/hrmSalary/stores/ledger.js                 | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.less b/pc4mobx/hrmSalary/pages/calculateDetail/index.less
index 8a60c910..c0d7ed3b 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.less
@@ -63,10 +63,7 @@
   overflow-y: scroll;
 
   .salaryBarWrapper {
-    height: 47px;
-    line-height: 47px;
-    padding-left: 10px;
-    padding-right: 10px;
+    padding: 10px;
 
     .warningspan {
       float: right;
diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js
index 7043d5c0..d0fa1604 100644
--- a/pc4mobx/hrmSalary/stores/ledger.js
+++ b/pc4mobx/hrmSalary/stores/ledger.js
@@ -551,6 +551,7 @@ export class LedgerStore {
         let result = { ...item };
         if (result.items) {
           result.items = result.items.map((i, index) => ({
+            canDelete: i.canDelete,
             salaryItemId: i.salaryItemId,
             sortedIndex: index + 1,
             formulaId: i.formulaId,