Merge branch 'feature/v2-应用配置-1107' into develop

pc4mobx/hrmSalary/pages/appConfig/index.js

@@ -14,6 +14,7 @@ class AppConfig extends Component {
     super(props);
     this.state = {
       openAcctResultSum: "0",
+      displayEmpInfoReport: "0",
       loading: false
     };
   }
@@ -25,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, loading } = this.state;
+    const { openAcctResultSum, displayEmpInfoReport, 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: displayEmpInfoReport,
+          onChange: (displayEmpInfoReport) => {
+            this.setState({ displayEmpInfoReport });
+          }
+        })
       }
     ];
     return (

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>