release/2.9.10.2312.02

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 &&

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>

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