From 7a9672b8a41c9b0ba5b5f1912b7006596d3856d2 Mon Sep 17 00:00:00 2001
From: 18652063575 <liyongshun321>
Date: Mon, 7 Nov 2022 14:03:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
index 3ed6ced7..03be2c76 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
@@ -48,7 +48,7 @@ export default class BaseForm extends React.Component {
                 <span>{baseFormData.telephone}</span>
               </Tooltip>
             </Col>
-            <Col span={4} className="formItem borderR-none">离职时间:</Col>
+            <Col span={4} className="formItem borderR-none">合同到期日期:</Col>
             <Col span={4} className="formItem">{baseFormData.dimissionDate}</Col>
           </Row>
         </GroupCard>

From 5cb02fd0b441d0caa9b24e92fc0a91c94d59bd6e Mon Sep 17 00:00:00 2001
From: 18652063575 <liyongshun321>
Date: Mon, 7 Nov 2022 14:12:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F=E8=A1=A8=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/appConfig/index.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/appConfig/index.js b/pc4mobx/hrmSalary/pages/appConfig/index.js
index d7754d54..898308cb 100644
--- a/pc4mobx/hrmSalary/pages/appConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/appConfig/index.js
@@ -14,6 +14,7 @@ class AppConfig extends Component {
     super(props);
     this.state = {
       openAcctResultSum: "0",
+      displayPersonalInfo: "0",
       loading: false
     };
   }
@@ -45,7 +46,7 @@ class AppConfig extends Component {
   };
 
   render() {
-    const { openAcctResultSum, loading } = this.state;
+    const { openAcctResultSum,displayPersonalInfo, loading } = this.state;
     const btns = [<Button type="primary" loading={loading} onClick={this.appSettingSave}>保存</Button>];
     const items = [
       {
@@ -56,6 +57,15 @@ class AppConfig extends Component {
             this.setState({ openAcctResultSum });
           }
         })
+      },
+      {
+        com: CheckBox({
+          label: "是否显示脱敏表人员信息",
+          value: displayPersonalInfo,
+          onChange: (displayPersonalInfo) => {
+            this.setState({ displayPersonalInfo });
+          }
+        })
       }
     ];
     return (

From 8040e2fa27aa8ddd2fe605dd09ebd98ca889b0b4 Mon Sep 17 00:00:00 2001
From: 18652063575 <liyongshun321>
Date: Mon, 7 Nov 2022 14:23:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E8=84=B1?=
 =?UTF-8?q?=E6=95=8F=E8=A1=A8=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/appConfig/index.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/appConfig/index.js b/pc4mobx/hrmSalary/pages/appConfig/index.js
index a2b663c6..97054546 100644
--- a/pc4mobx/hrmSalary/pages/appConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/appConfig/index.js
@@ -14,7 +14,7 @@ class AppConfig extends Component {
     super(props);
     this.state = {
       openAcctResultSum: "0",
-      displayPersonalInfo: "0",
+      displayEmpInfoReport: "0",
       loading: false
     };
   }
@@ -26,27 +26,27 @@ class AppConfig extends Component {
   queryAppsetting = () => {
     API.queryAppsetting().then(({ status, data }) => {
       if (status) {
-        const { openAcctResultSum } = data;
-        this.setState({ openAcctResultSum });
+        const { openAcctResultSum, displayEmpInfoReport } = data;
+        this.setState({ openAcctResultSum, displayEmpInfoReport });
       }
     });
   };
   appSettingSave = () => {
-    const { openAcctResultSum } = this.state;
+    const { openAcctResultSum, displayEmpInfoReport } = this.state;
     this.setState({ loading: true });
-    API.appSettingSave({ openAcctResultSum }).then(({ status }) => {
+    API.appSettingSave({ openAcctResultSum, displayEmpInfoReport }).then(({ status, errormsg }) => {
       this.setState({ loading: false });
       if (status) {
         message.success("设置成功!");
         this.queryAppsetting();
       } else {
-        message.error("设置失败!");
+        message.error(errormsg || "设置失败!");
       }
     });
   };
 
   render() {
-    const { openAcctResultSum,displayPersonalInfo, loading } = this.state;
+    const { openAcctResultSum, displayEmpInfoReport, loading } = this.state;
     const btns = [<Button type="primary" loading={loading} onClick={this.appSettingSave}>保存</Button>];
     const items = [
       {
@@ -61,9 +61,9 @@ class AppConfig extends Component {
       {
         com: CheckBox({
           label: "是否显示脱敏表人员信息",
-          value: displayPersonalInfo,
-          onChange: (displayPersonalInfo) => {
-            this.setState({ displayPersonalInfo });
+          value: displayEmpInfoReport,
+          onChange: (displayEmpInfoReport) => {
+            this.setState({ displayEmpInfoReport });
           }
         })
       }