Merge branch 'feature/2.19.1.2501.01-PC端Token验证' into custom/新美光(0401)

# Conflicts:
#	pc4mobx/hrmSalary/components/captchaModal/index.js
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js

pc4mobx/hrmSalary/apis/payroll.js

@@ -210,8 +210,13 @@ export const checkMobileCode = (params, header = {}) => {
   return postFetch("/api/bs/hrmsalary/salaryBill/checkMobileCode", params, header);
 };
 //工资单-验证方式
-export const payrollCheckType = params => {
+export const payrollCheckType = async header => {
-  return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/payrollCheckType", "GET", params);
+  const res = await fetch(`/api/bs/hrmsalary/salaryBill/payrollCheckType`, {
+    method: "GET",
+    mode: "cors",
+    headers: { "Content-Type": "application/json", ...header }
+  });
+  return await res.json();
 };
 //工资单-反馈验证
 export const feedBackSalaryBill = async params => {

pc4mobx/hrmSalary/components/captchaModal/index.js

@@ -36,7 +36,7 @@ class Index extends Component {
 
   handleSendCaptcha = () => {
     this.setState({ loading: true });
-    sendMobileCode({ id: this.props.id }).then(({ status, data }) => {
+    sendMobileCode({ id: this.props.id }, this.props.salaryBillToken).then(({ status, data }) => {
       if (status) {
         this.timeRef = setInterval(() => {
           const { time } = this.state;
@@ -61,14 +61,15 @@ class Index extends Component {
       f.showErrors();
       return;
     }
-    checkMobileCode({ id: this.props.id, mobileCode: this.state.captcha }).then(({ status, errormsg }) => {
+    checkMobileCode({ id: this.props.id, mobileCode: this.state.captcha }, this.props.salaryBillToken)
-      if (status) {
+      .then(({ status, errormsg }) => {
-        this.props.onCancel();
+        if (status) {
-        this.props.onConfirm();
+          this.props.onCancel();
-      } else {
+          this.props.onConfirm();
-        message.error(errormsg);
+        } else {
-      }
+          message.error(errormsg);
-    });
+        }
+      });
   };
 
   render() {

pc4mobx/hrmSalary/pages/mobilePayroll/checkSecondaryVerifyDialog.js

@@ -0,0 +1,105 @@
+/*
+  * pc端工资单查看启用二次验证弹框
+  * @Author:    黎永顺
+  * @Date:      2025/4/15
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { Button, message } from "antd";
+import * as API from "../../apis/mySalaryBenefits";
+import FormInfo from "../../components/FormInfo";
+import LoginVerifyPC from "./loginVerifyPC";
+import SecondarypwdVerifyPC from "./secondarypwdVerifyPC";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const form = new WeaForm();
+
+class CheckSecondaryVerifyDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false, conditions: [], notSetting: false, loginVerify: false, secondaryVerify: false
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.initForm();
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) form.resetForm();
+  }
+
+  initForm = () => {
+    const { salaryBillToken } = this.props;
+    API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, salaryBillToken)
+      .then(({ conditions, notSetting }) => {
+        this.setState({ conditions: [{ title: "", items: conditions }], notSetting }, () => {
+          form.initFormFields(this.state.conditions);
+        });
+      });
+  };
+  save = () => {
+    const { salaryBillToken } = this.props;
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        const payload = { ...form.getFormParams() };
+        API.doSecondAuth({ ...payload, mouldCode: "HRM", itemCode: "SALARY" }, salaryBillToken)
+          .then(({ status, checkStatus, checkMsg }) => {
+            if (status && checkStatus === "1") {
+              message.success(checkMsg);
+              this.props.onCancel(this.props.onSuccess);
+            } else {
+              message.error(checkMsg);
+            }
+          });
+      } else {
+        f.showErrors();
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+
+  render() {
+    const {
+      conditions, loading, notSetting, loginVerify, secondaryVerify
+    } = this.state, { salaryBillToken } = this.props;
+    const itemRender = {
+      authCode: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}/>
+          {
+            notSetting && <div style={{ clear: "both", paddingTop: 10 }}>
+              {getLabel("111", "您还未设置二次验证密码，点击")}
+              <a href="javascript:void(0);"
+                 onClick={() => this.setState({ loginVerify: true })}>{getLabel("30747", "设置")}</a>
+            </div>
+          }
+        </React.Fragment>);
+      }
+    };
+    return (
+      <WeaDialog
+        {...this.props} style={{ width: 550, height: notSetting ? 80 + 26 : 80 }} initLoadCss
+        title={getLabel(111, "身份验证")} buttons={[
+        <Button type="primary" onClick={this.save} loading={loading}>{getLabel(111, "确认")}</Button>
+      ]}>
+        <div className="form-dialog-layout">
+          <FormInfo className="form-dialog-layout" center={false} itemRender={itemRender}
+                    form={form} formFields={conditions}/>
+        </div>
+        {/*登录密码验证弹框*/}
+        <LoginVerifyPC salaryBillToken={salaryBillToken} visible={loginVerify}
+                       onCancel={() => this.setState({ loginVerify: false })}
+                       onSetPwdSet={() => this.setState({ secondaryVerify: true })}/>
+        {/*二次密码设置*/}
+        <SecondarypwdVerifyPC salaryBillToken={salaryBillToken} visible={secondaryVerify}
+                              onCancel={() => this.setState({ secondaryVerify: false })}
+                              onSuccess={this.initForm}/>
+      </WeaDialog>
+    );
+  }
+}
+
+export default CheckSecondaryVerifyDialog;
+

pc4mobx/hrmSalary/pages/mobilePayroll/index.js

@@ -16,18 +16,22 @@ import MobileTemplate from "../../components/mobileTemplate";
 import SecondaryVerify from "./secondaryVerify";
 import LoginVerify from "./loginVerify";
 import SecondarypwdVerify from "./secondarypwdVerify";
+import CheckSecondaryVerifyDialog from "./checkSecondaryVerifyDialog";
 import "../mySalary/index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
-@inject("mySalaryStore") @observer
+@inject("mySalaryStore")
+@observer
 export default class MobilePayroll extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       visible: false, captchaVisible: false, loginVisible: false, pwdSetVisible: false,
       mySalaryBillData: { employeeInformation: {}, salaryTemplate: [] },
-      salaryBillToken: {}
+      salaryBillToken: {},
+      // 统一二次验证
+      checkSecVerify: false
     };
     this.id = "";
   }
@@ -37,14 +41,37 @@ export default class MobilePayroll extends React.Component {
     this.id = getQueryString("id");
     const { mySalaryStore: { init, setMySalaryBill } } = this.props;
     setMySalaryBill({});
-    const { data, status } = await payrollCheckType();
+    //统一调用token
-    if (status && data === "PWD") {
+    type !== "phone" && await this.initPC();
-      type !== "phone" ? init(false, () => this.getMySalaryBill(this.id)) : await this.initMobile();
+    type === "phone" && await this.initMobile();
-    } else {
-      this.setState({ captchaVisible: true });
-    }
   }
 
+  initPC = async () => {
+    const { mySalaryStore: { setInitEmVerify } } = this.props;
+    const params = this.getUrlkey();
+    const { data } = await salaryBillGetToken({
+      id: _.pick(params, ["id"]).id,
+      recipient: _.pick(params, ["recipient"]).recipient,
+      salaryCode: _.pick(params, ["salaryCode"]).salaryCode
+    });
+    this.setState({ salaryBillToken: data }, () => {
+      payrollCheckType(this.state.salaryBillToken).then(({ data, status }) => {
+        if (status && data === "PWD") {
+          API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
+            .then(({ status, isNeedSecondAuth }) => {
+              if (status && isNeedSecondAuth) {
+                this.setState({ checkSecVerify: true });
+              } else {
+                this.getMySalaryBill(getQueryString("id"));
+                setInitEmVerify();
+              }
+            });
+        } else {
+          this.setState({ captchaVisible: true });
+        }
+      });
+    });
+  };
   initMobile = async () => {
     const { mySalaryStore: { setInitEmVerify } } = this.props;
     if (window.em) {
@@ -65,15 +92,21 @@ export default class MobilePayroll extends React.Component {
         salaryCode: _.pick(params, ["salaryCode"]).salaryCode
       });
       this.setState({ salaryBillToken: data }, () => {
-        API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
+        payrollCheckType(this.state.salaryBillToken).then(({ data, status }) => {
-          .then(({ status, isNeedSecondAuth }) => {
+          if (status && data === "PWD") {
-            if (status && isNeedSecondAuth) {
+            API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
-              this.setState({ visible: true });
+              .then(({ status, isNeedSecondAuth }) => {
-            } else {
+                if (status && isNeedSecondAuth) {
-              this.getMySalaryBill(getQueryString("id"));
+                  this.setState({ visible: true });
-              setInitEmVerify();
+                } else {
-            }
+                  this.getMySalaryBill(getQueryString("id"));
-          });
+                  setInitEmVerify();
+                }
+              });
+          } else {
+            this.setState({ captchaVisible: true });
+          }
+        });
       });
     }
   };
@@ -138,7 +171,7 @@ export default class MobilePayroll extends React.Component {
 
   render() {
     const { mySalaryStore: { setInitEmVerify } } = this.props, {
-      captchaVisible, visible, loginVisible, pwdSetVisible
+      captchaVisible, visible, loginVisible, pwdSetVisible, checkSecVerify
     } = this.state;
     const type = getQueryString("type");
     if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return <React.Fragment>
@@ -152,11 +185,18 @@ export default class MobilePayroll extends React.Component {
                                     onSetPwdSet={() => this.setState({ loginVisible: false, pwdSetVisible: true })}/>}
       {pwdSetVisible && <SecondarypwdVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
                                             onSuccess={() => this.setState({ pwdSetVisible: false }, () => this.initMobile())}/>}
+      {/*统一外部调用token*/}
+      <CheckSecondaryVerifyDialog visible={checkSecVerify} salaryBillToken={this.state.salaryBillToken}
+                                  onCancel={(callback) => this.setState({ checkSecVerify: false }, () => callback && callback())}
+                                  onSuccess={() => {
+                                    this.getMySalaryBill(getQueryString("id"));
+                                    setInitEmVerify();
+                                  }}/>
       {/*发送验证码*/}
       {
         captchaVisible &&
         <CaptchaModal
-          visible={captchaVisible} id={getQueryString("id")}
+          visible={captchaVisible} id={getQueryString("id")}  salaryBillToken={this.state.salaryBillToken}
           onCancel={() => this.setState({ captchaVisible: false })}
           onConfirm={() => {
             setInitEmVerify();
@@ -200,4 +240,4 @@ export default class MobilePayroll extends React.Component {
       </Authority>}
     </React.Fragment>);
   }
-}
+}

pc4mobx/hrmSalary/pages/mobilePayroll/index.less

@@ -168,3 +168,13 @@
   position: relative;
   border-left: 1px solid #ddd;
 }
+
+.secondarypwd-form {
+  .wea-form-cell-wrapper {
+    & > div:last-child {
+      .ant-col-16 {
+        width: 37.5% !important;
+      }
+    }
+  }
+}

pc4mobx/hrmSalary/pages/mobilePayroll/loginVerifyPC.js

@@ -0,0 +1,72 @@
+/*
+  * 二次验证
+  * 登录密码验证
+  * @Author:    黎永顺
+  * @Date:      2025/4/23
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { WeaForm } from "comsMobx";
+import { Button } from "antd";
+import FormInfo from "../../components/FormInfo";
+import { loginCondition } from "./pwdCondtion";
+import { RSAEcrypt } from "../../util/RSAUtil";
+import * as API from "../../apis/mySalaryBenefits";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class LoginVerifyPC extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { loading: false };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      form.initFormFields(loginCondition);
+    } else {
+      form.resetForm();
+    }
+  }
+
+  save = async () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        RSAEcrypt("1", { ...form.getFormParams() }, this.props.salaryBillToken)
+          .then(RSAParam => {
+            API.checkPassword({ ...RSAParam }).then(({ result }) => {
+              if (result) {
+                this.props.onCancel();
+                this.props.onSetPwdSet();
+              } else {
+                form.showError("password", getLabel(504343, "登录密码错误"));
+              }
+            });
+          });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
+  render() {
+    const { loading } = this.state;
+    return (
+      <WeaDialog
+        {...this.props}
+        style={{ width: 550, height: _.reduce(loginCondition, (pre, cur) => (pre += cur.items.length), 0) * 47 + 33 }}
+        initLoadCss title={getLabel(111, "请先输入登录密码")} buttons={[
+        <Button type="primary" onClick={this.save} loading={loading}>{getLabel(111, "下一步")}</Button>
+      ]}>
+        <FormInfo className="form-dialog-layout" center={false} itemRender={{}} form={form}
+                  formFields={loginCondition}/>
+      </WeaDialog>
+    );
+  }
+}
+
+export default LoginVerifyPC;

pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerifyPC.js

@@ -0,0 +1,96 @@
+/*
+  *  二次验证密码设置
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/17
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { Button, message } from "antd";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import FormInfo from "../../components/FormInfo";
+import { secondarypwdCondition } from "./conditions";
+import * as API from "../../apis/mySalaryBenefits";
+import { RSAEcrypt } from "../../util/RSAUtil";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SecondarypwdVerifyPC extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      src: (window.ecologyContentPath || "") + "/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4",
+      num: 0
+    };
+  }
+
+  componentDidMount() {
+    form.initFormFields(secondarypwdCondition);
+  }
+
+  componentWillUnmount() {
+    form.resetForm();
+  }
+
+  save = async () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        const { secondaryPwd1, secondaryPwd2, validatecode } = form.getFormParams();
+        if (secondaryPwd1 !== secondaryPwd2) {
+          form.showError("secondaryPwd2", getLabel(504376, "密码确认不正确！"));
+          return;
+        }
+        RSAEcrypt("1", { secondaryPwd1, secondaryPwd2 }).then(RSAParam => {
+          API.saveSecondaryPwd({ ...RSAParam, validatecode }, this.props.salaryBillToken)
+            .then(({ sign, message: msg }) => {
+              if (sign === "1") {
+                message.success(msg);
+                this.props.onCancel();
+                this.props.onSuccess();
+              } else {
+                form.showError("validatecode", msg);
+                this.setState({ num: this.state.num + 1 }, () => {
+                  this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
+                });
+              }
+            });
+        });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
+  render() {
+    const itemRender = {
+      validatecode: (field, textAreaProps, form, formParams) => {
+        return (<React.Fragment>
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}/>
+          <img
+            style={{ height: 30, cursor: "pointer", position: "absolute", left: "118%" }}
+            src={this.state.src}
+            onClick={() => {
+              this.setState({ num: this.state.num + 1 }, () => {
+                this.setState({ src: `${window.ecologyContentPath || ""}/weaver/weaver.file.MakeValidateCode?notneedvalidate=1&isView=1&validatetype=0&validatenum=4&seriesnum_=${this.state.num}` });
+              });
+            }} alt=""/>
+        </React.Fragment>);
+      }
+    };
+    return (<WeaDialog
+      {...this.props} style={{
+      width: 550, height: _.reduce(secondarypwdCondition, (pre, cur) => (pre += cur.items.length), 0) * 47 + 33
+    }} initLoadCss title={getLabel(111, "二次验证密码设置")} buttons={[
+      <Button type="primary" onClick={this.save}>{getLabel(111, "保存")}</Button>
+    ]}>
+      <FormInfo className="form-dialog-layout secondarypwd-form" center={false} itemRender={itemRender} form={form}
+                formFields={secondarypwdCondition}/>
+    </WeaDialog>);
+  }
+}
+
+export default SecondarypwdVerifyPC;