From 15bc21ecd546d5cac8f35495b7e94a86ffd80569 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, 10 Jan 2024 14:43:07 +0800
Subject: [PATCH] release/2.9.10.2312.02

---
 pc4mobx/hrmSalary/components/mobileTemplate/index.js | 8 ++++----
 pc4mobx/hrmSalary/components/pcTemplate/content.js   | 8 ++++----
 pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js | 8 ++++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/mobileTemplate/index.js b/pc4mobx/hrmSalary/components/mobileTemplate/index.js
index aeb0898e..7d2106ce 100644
--- a/pc4mobx/hrmSalary/components/mobileTemplate/index.js
+++ b/pc4mobx/hrmSalary/components/mobileTemplate/index.js
@@ -25,10 +25,10 @@ class Index extends Component {
               <div className="bill-info-header">
                 <div className="title">{theme || ""}</div>
                 <div className="time">{moment().format("YYYY-MM-DD HH:mm:ss")}</div>
-                {
-                  background &&
-                  <div className="img"><img src={`${background}`} alt="logo"/></div>
-                }
+                {/*{*/}
+                {/*  background &&*/}
+                {/*  <div className="img"><img src={`${background}`} alt="logo"/></div>*/}
+                {/*}*/}
               </div>
               {
                 !onlyOneGrup && tipPosi === "1" && tip &&
diff --git a/pc4mobx/hrmSalary/components/pcTemplate/content.js b/pc4mobx/hrmSalary/components/pcTemplate/content.js
index a294e2df..b4b63874 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/content.js
+++ b/pc4mobx/hrmSalary/components/pcTemplate/content.js
@@ -17,10 +17,10 @@ class Content extends Component {
             <div className="header-salary-date-time">{moment(sendTime).format("YYYY-MM-DD HH:mm:ss")}</div>
           </div>
           <div className="body">
-            {
-              background &&
-              <div className="comp-img"><img src={`${background}`} alt="logo"/></div>
-            }
+            {/*{*/}
+            {/*  background &&*/}
+            {/*  <div className="comp-img"><img src={`${background}`} alt="logo"/></div>*/}
+            {/*}*/}
             {
               !onlyOneGrup && tipPosi.toString() === "1" && tip &&
               <div className="corporate-culture-text" title={tip}>{tip}</div>
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index e1ff2757..564c2ef8 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -48,7 +48,11 @@ class SalaryItemForm extends Component {
             return { ...item, display: dataType === "number" };
           case "width":
           case "sortedIndex":
-            return { ...item, label: getLabel(item.lanId, item.label) };
+            return {
+              ...item,
+              label: getLabel(item.lanId, item.label),
+              display: ((!isLedger && key === "width") || key === "sortedIndex")
+            };
           case "useInEmployeeSalary":
             return {
               ...item,
@@ -169,7 +173,7 @@ class SalaryItemForm extends Component {
                                 <WeaInputNumber value={value} viewAttr={viewAttr} precision={0}
                                                 min={key === "width" ? 0 : -99999}
                                                 onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
-                                {key === "width" &&
+                                {key === "width" && display &&
                                   <span style={{ paddingLeft: 10, position: "absolute", marginTop: 4 }}>px</span>}
                               </React.Fragment>
                             </WeaFormItem> : null