From c3d72e9fae9ed89bd606578492ccb95a91f849d8 Mon Sep 17 00:00:00 2001
From: 18652063575 <liyongshun321>
Date: Mon, 24 Oct 2022 09:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6-?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=BC=B4=E7=BA=B3=E9=9C=80=E8=A6=81=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=89=8D=E8=83=BD=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/ruleConfig/index.js    | 18 +++++++++---------
 .../standingBook/index.js                      |  1 -
 .../standingBookDetail/index.js                |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
index 301fe673..860480b6 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@@ -184,7 +184,7 @@ class Index extends Component {
                     progressVisible: false,
                     progress: 100
                   });
-                  message.success("加密成功");
+                  message.success("保存成功");
                 } else if(progress_statue === "in_progress" && this.timer){
                   this.setState({
                     progress: 10 * number
@@ -197,7 +197,7 @@ class Index extends Component {
                     progressVisible: false,
                     progress: 100
                   });
-                  message.error(errormsg || "加密失败!");
+                  message.error(errormsg || "保存失败!");
                 }
               });
             }, 1000);
@@ -252,13 +252,13 @@ class Index extends Component {
               <Button type="primary" onClick={() => this.handleSave("EMPLOYEE")} loading={loading.employee}>保存</Button>
             </div>
           } showGroup center items={importItems}/>
-        {/*<WeaSearchGroup*/}
-        {/*  title={*/}
-        {/*    <div className="titleWrapper">*/}
-        {/*      <span>加密规则</span>*/}
-        {/*      <Button type="primary" onClick={() => this.handleSave("ENCRYTION")} loading={loading.encry}>保存</Button>*/}
-        {/*    </div>*/}
-        {/*  } showGroup center items={enctryItems}/>*/}
+        <WeaSearchGroup
+          title={
+            <div className="titleWrapper">
+              <span>加密规则</span>
+              <Button type="primary" onClick={() => this.handleSave("ENCRYTION")} loading={loading.encry}>保存</Button>
+            </div>
+          } showGroup center items={enctryItems}/>
         {
           this.state.progressVisible &&
           <ProgressModal
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index bbb547ad..2c0a7610 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -313,7 +313,6 @@ export default class StandingBook extends React.Component {
   handleOk = (formVal) => {
     const { save } = this.props.standingBookStore;
     const { billMonth, ...extra } = formVal;
-    console.log("extra:", extra);
     const payload = {
       billMonth: moment(billMonth).format("YYYY-MM"),
       ...extra
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
index 360c972a..1155cb22 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/index.js
@@ -17,7 +17,7 @@ class StandingBookDetail extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedKey: "",
+      selectedKey: "1",
       tabList: [],
       remarks: "",
       billMonth: ""