From 3091232181dee5b3c6b1c400b55b50bd5c4fca6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 21 Jul 2023 10:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E5=B7=A5=E8=B5=84=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E5=8F=91=E6=94=BE=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/payroll/stepForm/salaryItemSettings.js      | 11 +++++++----
 .../payroll/templatePreview/computerTemplate/index.js |  7 ++++---
 .../payroll/templatePreview/phoneTemplate/index.js    |  3 ++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
index 1b70707f..0e5803e5 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@@ -245,7 +245,7 @@ class SalaryItemSettings extends Component {
     }, () => document.getElementById("salaryItemInput") && document.getElementById("salaryItemInput").focus());
   };
   handleChangeSalaryItemShowName = (item, field, name) => {
-    const { groupId } = item, { salaryItemId } = field, { dataList, itemShowNamesetting } = this.state;
+    const { groupId } = item, { salaryItemId, originName } = field, { dataList, itemShowNamesetting } = this.state;
     this.setState({
       dataList: _.map(dataList, item => {
         if (item.groupId === groupId) {
@@ -261,7 +261,10 @@ class SalaryItemSettings extends Component {
         }
         return { ...item };
       }),
-      itemShowNamesetting: _.unionBy([{ salaryItemId, salaryItemShowName: name }], itemShowNamesetting, "salaryItemId")
+      itemShowNamesetting: _.unionBy([{
+        salaryItemId,
+        salaryItemShowName: originName === name ? "" : name
+      }], itemShowNamesetting, "salaryItemId")
     }, () => {
       this.props.onChangeSalaryItem(this.state.dataList);
       this.props.onChangeSalaryItemShowNamesetting(this.state.itemShowNamesetting);
@@ -308,7 +311,7 @@ class SalaryItemSettings extends Component {
                                title={
                                  (item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ?
                                    `${filed.salaryItemShowName}(${filed.originName})` :
-                                   filed.salaryItemShowName
+                                   filed.name
                                }
                           >
                             {
@@ -328,7 +331,7 @@ class SalaryItemSettings extends Component {
                                   {
                                     (item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ?
                                       `${filed.salaryItemShowName}(${filed.originName})` :
-                                      filed.salaryItemShowName
+                                      filed.name
                                   }
                                 </div>
                             }
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
index 6f2e68c2..50e76732 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js
@@ -49,7 +49,7 @@ export default class ComputerTemplate extends React.Component {
   }
 
 
-  renderTableTr = (data) => {
+  renderTableTr = (data, groupId) => {
     const tables = [];
     const len = data.length;
     const rowNum = 3;
@@ -61,8 +61,9 @@ export default class ComputerTemplate extends React.Component {
       iLen = iLen > len ? len : iLen;
       tables.push("<tr class='descriptions-row'>");
       for (let i = j * rowNum; i < iLen; i++) {
+        const key = (!this.props.isPreview && groupId !== "111111111111111111") ? data[i].salaryItemShowName : data[i].name;
         const value = data[i].salaryItemValue || "-";
-        tables.push("<th class=\"descriptions-item-label\">" + data[i].name + "</th>" + "<td class=\"descriptions-item-content\">" + value + "</td>");
+        tables.push("<th class=\"descriptions-item-label\">" + key + "</th>" + "<td class=\"descriptions-item-content\">" + value + "</td>");
       }
       tables.push("</tr>");
     }
@@ -98,7 +99,7 @@ export default class ComputerTemplate extends React.Component {
                 <div className="descript-title">{group.groupName}</div>
                 <div className="descriptions-view">
                   <table
-                    dangerouslySetInnerHTML={{ __html: this.renderTableTr(group.items).join(",").replace(/,/g, "") }}/>
+                    dangerouslySetInnerHTML={{ __html: this.renderTableTr(group.items, group.groupId).join(",").replace(/,/g, "") }}/>
                 </div>
               </div>;
             })
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
index 0f85d51d..50670de2 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/phoneTemplate/index.js
@@ -83,7 +83,8 @@ export default class PhoneTemplate extends React.Component {
                     {
                       _.map(group.items, item => {
                         return <tr className="descriptions-row">
-                          <th className="descriptions-item-label">{item.name}</th>
+                          <th
+                            className="descriptions-item-label">{(!this.props.isPreview && group.groupId !== "111111111111111111") ? item.salaryItemShowName : item.name}</th>
                           <td className="descriptions-item-content">{item.salaryItemValue || "-"}</td>
                         </tr>;
                       })