feature/2.19.1.2501.01-PC端Token验证

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

pc4mobx/hrmSalary/apis/payroll.js

@@ -202,12 +202,21 @@ export const salaryBillSendSum = (params) => {
   return postFetch("/api/bs/hrmsalary/salaryBill/send/sum", params);
 };
 //工资单发放-发送短信验证码
-export const sendMobileCode = (params) => {
-  return postFetch("/api/bs/hrmsalary/salaryBill/sendMobileCode", params);
+export const sendMobileCode = (params, header = {}) => {
+  return postFetch("/api/bs/hrmsalary/salaryBill/sendMobileCode", params, header);
+};
+//工资单发放-发送短信验证码
+export const checkMobileCode = (params, header = {}) => {
+  return postFetch("/api/bs/hrmsalary/salaryBill/checkMobileCode", params, header);
 };
 //工资单-验证方式
-export const payrollCheckType = params => {
-  return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/payrollCheckType", "GET", params);
+export const payrollCheckType = async header => {
+  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

@@ -6,35 +6,36 @@
  */
 import React, { Component } from "react";
 import { WeaDialog, WeaError, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
-import { sendMobileCode } from "../../apis/payroll";
-import { Button } from "antd";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { checkMobileCode, sendMobileCode } from "../../apis/payroll";
+import { getQueryString } from "../../util/url";
+import FormInfo from "../FormInfo";
+import { captchaCondition } from "../../pages/mobilePayroll/pwdCondtion";
+import MobileModal from "../../pages/mobilePayroll/mobileModal";
+import { Button, message } from "antd";
 import "./index.less";
 
+const form = new WeaForm();
 const { getLabel } = WeaLocaleProvider;
 
 class Index extends Component {
   constructor(props) {
     super(props);
-    this.state = {
-      captcha: "",
-      time: 60
-    };
+    this.state = { captcha: "", time: 60 };
     this.timeRef = null;
   }
 
+  componentDidMount() {
+    form.initFormFields(captchaCondition);
+  }
+
   componentWillUnmount() {
     clearInterval(this.timeRef);
-  }
-
-  componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible && !nextProps.visible) {
-      clearInterval(this.timeRef);
-      this.setState({ captcha: "", time: 60 });
-    }
+    this.setState({ captcha: "", time: 60 });
   }
 
   handleSendCaptcha = () => {
-    sendMobileCode({ id: this.props.id }).then(({ status, data }) => {
+    sendMobileCode({ id: this.props.id }, this.props.salaryBillToken).then(({ status }) => {
       if (status) {
         this.timeRef = setInterval(() => {
           const { time } = this.state;
@@ -48,44 +49,74 @@ class Index extends Component {
       }
     });
   };
-  handleConfirm = () => {
-    if (!this.state.captcha) {
+  handleConfirm = async () => {
+    const type = getQueryString("type"), f = await form.validateForm();
+    if (!this.state.captcha && type !== "phone") {
       this.refs.weaError.showError();
-      // return
+      return;
+    } else if (!f.isValid && type === "phone") {
+      f.showErrors();
+      return;
     }
-    this.props.onCancel();
-    this.props.onConfirm();
+    checkMobileCode({ id: this.props.id, mobileCode: this.state.captcha }, this.props.salaryBillToken)
+      .then(({ status, errormsg }) => {
+        if (status) {
+          this.props.onCancel();
+          this.props.onConfirm();
+        } else {
+          message.error(errormsg);
+        }
+      });
   };
 
   render() {
-    const { captcha, time } = this.state;
-    return (
-      <WeaDialog
-        initLoadCss {...this.props} style={{ width: 550 }}
-        className="captchaWrapper" title={getLabel(111, "验证码验证")}
-        buttons={[
-          <Button type="primary" onClick={this.handleConfirm}>{getLabel(826, "确定")}</Button>
-        ]}
-      >
-        <WeaSearchGroup needTigger={false} title="" showGroup>
-          <WeaFormItem
-            label={getLabel(111, "验证码")}
-            labelCol={{ span: 8 }}
-            wrapperCol={{ span: 16 }}
-          >
-            <WeaError tipPosition="bottom" ref="weaError" error={getLabel(826, "验证码未填写")}>
-              <div className="captchaInputBox">
-                <WeaInput value={captcha} onChange={captcha => this.setState({ captcha })}/>
-                <Button type="primary" onClick={this.handleSendCaptcha} disabled={time !== 60}>
-                  {
-                    time === 60 ? getLabel(111, "发送验证码") : `${time}S`
-                  }
-                </Button>
-              </div>
-            </WeaError>
-          </WeaFormItem>
-        </WeaSearchGroup>
-      </WeaDialog>
+    const { captcha, time } = this.state, type = getQueryString("type");
+    const itemRender = {
+      mobileCode: (field, textAreaProps, form, formParams) => {
+        return (<div className="captchaInputBox">
+          <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}
+                     onChange={() => this.setState({ captcha: form.getFormParams().mobileCode })}/>
+          <Button type="primary" onClick={this.handleSendCaptcha} disabled={time !== 60}>
+            {
+              time === 60 ? getLabel(111, "发送验证码") : `${time}S`
+            }
+          </Button>
+        </div>);
+      }
+    };
+    return (<React.Fragment>
+        {
+          type === "phone" ? <MobileModal title={getLabel(111, "验证码验证")} onConfirm={this.handleConfirm}>
+              <FormInfo center={false} itemRender={itemRender} form={form} formFields={captchaCondition}/>
+            </MobileModal> :
+            <WeaDialog
+              initLoadCss {...this.props} style={{ width: 550 }}
+              className="captchaWrapper" title={getLabel(111, "验证码验证")}
+              buttons={[
+                <Button type="primary" onClick={this.handleConfirm}>{getLabel(826, "确定")}</Button>
+              ]}
+            >
+              <WeaSearchGroup needTigger={false} title="" showGroup>
+                <WeaFormItem
+                  label={getLabel(111, "验证码")}
+                  labelCol={{ span: 8 }}
+                  wrapperCol={{ span: 16 }}
+                >
+                  <WeaError tipPosition="bottom" ref="weaError" error={getLabel(111, "验证码未填写")}>
+                    <div className="captchaInputBox">
+                      <WeaInput value={captcha} onChange={captcha => this.setState({ captcha })}/>
+                      <Button type="primary" onClick={this.handleSendCaptcha} disabled={time !== 60}>
+                        {
+                          time === 60 ? getLabel(111, "发送验证码") : `${time}S`
+                        }
+                      </Button>
+                    </div>
+                  </WeaError>
+                </WeaFormItem>
+              </WeaSearchGroup>
+            </WeaDialog>
+        }
+      </React.Fragment>
     );
   }
 }

pc4mobx/hrmSalary/components/captchaModal/index.less

@@ -5,25 +5,25 @@
     .wea-form-item-wrapper {
       .wea-error {
         width: 100%;
-
-        .captchaInputBox {
-          display: flex;
-          align-items: center;
-
-          .wea-input-normal {
-            flex: 1;
-          }
-
-          button {
-            padding: 8px 10px;
-            border-radius: 0;
-            min-width: 80px;
-            text-align: center;
-            height: 30px;
-            line-height: 15px;
-          }
-        }
       }
     }
   }
 }
+
+.captchaInputBox {
+  display: flex;
+  align-items: center;
+
+  .wea-input-normal {
+    flex: 1;
+  }
+
+  button {
+    padding: 8px 10px;
+    border-radius: 0;
+    min-width: 80px;
+    text-align: center;
+    height: 30px;
+    line-height: 15px;
+  }
+}

pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js

@@ -166,7 +166,7 @@ class SalaryDetails extends Component {
       this.postMessageToChild({
         dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRow,
         columns: _.map(columns, (it, idx) => ({
-          dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true,
+          dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true, showSee: false,
           width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : (it.width || it.oldWidth),
           fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
           ellipsis: true

pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js

@@ -5,9 +5,9 @@
  * Date: 2023/3/7
  */
 import React, { Component } from "react";
-import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTable, WeaTop } from "ecCom";
-import { Button } from "antd";
+import { WeaInputSearch, WeaLocaleProvider, WeaSlideModal, WeaTop } from "ecCom";
 import { viewAttendQuote } from "../../../../apis/attendance";
+import { Button, Spin } from "antd";
 import "./index.less";
 
 const { getLabel } = WeaLocaleProvider;
@@ -16,11 +16,31 @@ class AttendanceDataViewSlide extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      loading: { query: false }, keyword: "", dataSource: [], columns: [],
-      pageInfo: { current: 1, pageSize: 10, total: 0 }
+      loading: { query: false }, keyword: "", dataSource: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
     };
   }
 
+  componentDidMount() {
+    window.addEventListener("message", this.handleReceive, false);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener("message", this.handleReceive, false);
+  }
+
+  handleReceive = async ({ data }) => {
+    const { type, payload: { id, params } = {} } = data;
+    if (type === "turn") {
+      switch (id) {
+        case "PAGEINFO":
+          this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.viewAttendQuote());
+          break;
+        default:
+          break;
+      }
+    }
+  };
+
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) {
       document.querySelector(".attendanceRefWrapper").classList.add("zIndex0-attendance");
@@ -33,19 +53,29 @@ class AttendanceDataViewSlide extends Component {
 
   viewAttendQuote = (extraPayload = {}, props) => {
     const { loading, pageInfo, keyword } = this.state;
-    const { attendQuoteId } = props;
+    const { attendQuoteId } = props || this.props;
     this.setState({ loading: { ...loading, query: true } });
     viewAttendQuote({ ...pageInfo, attendQuoteId, keyword, ...extraPayload }).then(({ status, data }) => {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
         const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
-          columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : null }))
-        });
+          pageInfo: { ...pageInfo, current, pageSize, total }, dataSource
+        }, () => this.postMessageToChild({
+          pageInfo: this.state.pageInfo, dataSource, showRowSelection: false, unitTableType: "attendanceView",
+          columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : false }))
+        }));
       }
     }).catch(() => this.setState({ loading: { ...loading, query: false } }));
   };
+  postMessageToChild = (payload = {}) => {
+    const i18n = {
+      "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条")
+    };
+    const childFrameObj = document.getElementById("attendanceViewTable");
+    childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+  };
   handleExportAttendQuote = () => {
     if (!this.handleDebounce) {
       this.handleDebounce = _.debounce(() => {
@@ -60,24 +90,7 @@ class AttendanceDataViewSlide extends Component {
 
   render() {
     const { showOperateBtn, salaryYearMonth, ...extra } = this.props;
-    const { columns, dataSource, loading, pageInfo, keyword } = this.state;
-    const pagination = {
-      ...pageInfo,
-      showTotal: (total) => `共 ${total} 条`,
-      pageSizeOptions: ["10", "20", "50", "100"],
-      showSizeChanger: true,
-      showQuickJumper: true,
-      onShowSizeChange: (current, pageSize) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current, pageSize }
-        }, () => this.viewAttendQuote({}, this.props));
-      },
-      onChange: (current) => {
-        this.setState({
-          pageInfo: { ...pageInfo, current }
-        }, () => this.viewAttendQuote({}, this.props));
-      }
-    };
+    const { loading, keyword } = this.state;
     const btns = [
       <Button type="primary" onClick={this.handleExportAttendQuote}>{getLabel(81272, "导出全部")}</Button>,
       <WeaInputSearch
@@ -100,9 +113,16 @@ class AttendanceDataViewSlide extends Component {
                            <div>{getLabel(543376, "考勤周期")}：{salaryYearMonth}</div>
                            <div></div>
                          </div>
-                         <WeaTable
-                           columns={columns} dataSource={dataSource} bordered pagination={pagination}
-                           loading={loading.query} scroll={{ x: 1200, y: `calc(100vh - 240px)` }}/>
+                         <div style={{ height: `calc(100% - 40px)` }}>
+                           <Spin spinning={loading.query}>
+                             <iframe
+                               style={{ border: 0, width: "100%", height: "100%" }}
+                               // src="http://localhost:7607/#/unitTable"
+                               src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/unitTable"
+                               id="attendanceViewTable"
+                             />
+                           </Spin>
+                         </div>
                        </div>
                      }
       />

pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/index.less

@@ -54,8 +54,8 @@
       margin-bottom: 8px;
     }
 
-    .wea-new-table {
-      background: #FFF;
+    .ant-spin-nested-loading, .ant-spin-container {
+      height: 100%;
     }
   }
 

pc4mobx/hrmSalary/pages/declare/components/declareQuery/index.js

@@ -17,7 +17,7 @@ class Index extends Component {
     return (
       <div className="salary-btn-flex">
         <div className="mounth-range">
-          <span className="label">{getLabel(543549, "薪资所属月：")}</span>
+          <span className="label">{getLabel(111, "税款所属期：")}</span>
           <MonthRangePicker dateRange={dateRange} viewAttr={2}
                             onChange={v => this.props.onChange({ dateRange: v })}/>
         </div>

pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js

@@ -8,7 +8,7 @@ import React, { Component } from "react";
 import { WeaLocaleProvider, WeaTable } from "ecCom";
 import { Dropdown, Menu, message, Modal } from "antd";
 import { getDeclareList, withDrawTaxDeclaration } from "../../../../apis/declare";
-import { sysConfCodeRule } from "../../../../apis/ruleconfig";
+import { sysConfCodeRule, sysinfo } from "../../../../apis/ruleconfig";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -35,18 +35,19 @@ class Index extends Component {
       if (status && data === "1") this.setState({ showWithDrawBtn: data === "1" });
     });
   };
-  getDeclareList = (props) => {
-    const { pageInfo } = this.state;
-    const { queryParams } = props;
+  getDeclareList = async (props) => {
+    const { data: sysData } = await sysinfo();
+    const { pageInfo } = this.state, { queryParams } = props;
     const { dateRange, ...extra } = queryParams;
-    const [fromSalaryMonthStr, endSalaryMonthStr] = dateRange || [];
-    const params = { fromSalaryMonthStr, endSalaryMonthStr, ...extra };
+    const [fromSalaryMonth, endSalaryMonth] = dateRange || [];
+    const params = { fromSalaryMonth: fromSalaryMonth + "-01", endSalaryMonth: endSalaryMonth + "-01", ...extra };
     const payload = { ...pageInfo, ...params };
     this.setState({ loading: true });
     getDeclareList(payload).then(({ status, data }) => {
       this.setState({ loading: false });
       if (status) {
-        const { columns, list: dataSource, pageNum, pageSize, total } = data;
+        let { columns, list: dataSource, pageNum, pageSize, total } = data;
+        sysData["TAX_DECLARATION_DATE_TYPE"] === "1" && (columns = _.filter(columns, o => o.dataIndex !== "salaryMonth"));
         this.setState({
           dataSource, pageInfo: { ...pageInfo, pageNum, pageSize, total },
           columns: _.map(columns, o => {

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,17 +41,37 @@ export default class MobilePayroll extends React.Component {
     this.id = getQueryString("id");
     const { mySalaryStore: { init, setMySalaryBill } } = this.props;
     setMySalaryBill({});
-    if (type !== "phone") {
-      const { data, status } = await payrollCheckType();
-      if (status && data === "PWD") {
-        init(false, () => this.getMySalaryBill(this.id));
-      } else {
-        this.setState({ captchaVisible: true });
-      }
-    }
+    //统一调用token
+    type !== "phone" && await this.initPC();
     type === "phone" && await this.initMobile();
   }
 
+  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) {
@@ -68,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)
-          .then(({ status, isNeedSecondAuth }) => {
-            if (status && isNeedSecondAuth) {
-              this.setState({ visible: true });
-            } else {
-              this.getMySalaryBill(getQueryString("id"));
-              setInitEmVerify();
-            }
-          });
+        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({ visible: true });
+                } else {
+                  this.getMySalaryBill(getQueryString("id"));
+                  setInitEmVerify();
+                }
+              });
+          } else {
+            this.setState({ captchaVisible: true });
+          }
+        });
       });
     }
   };
@@ -141,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>
@@ -155,12 +185,24 @@ 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();
+                                  }}/>
       {/*发送验证码*/}
-      <CaptchaModal
-        visible={captchaVisible} id={getQueryString("id")}
-        onCancel={() => this.setState({ captchaVisible: false })}
-        onConfirm={() => this.props.mySalaryStore.setInitEmVerify()}
-      />
+      {
+        captchaVisible && <CaptchaModal
+          visible={captchaVisible} id={getQueryString("id")} salaryBillToken={this.state.salaryBillToken}
+          onCancel={() => this.setState({ captchaVisible: false })}
+          onConfirm={() => {
+            setInitEmVerify();
+            this.getMySalaryBill(getQueryString("id"));
+          }}
+        />
+      }
     </React.Fragment>;
     const {
       salaryTemplate, salaryGroups, employeeInformation, sendTime, confirmStatus, showAck, showFeedback

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/pwdCondtion.js

@@ -1,6 +1,25 @@
 import { WeaLocaleProvider } from "ecCom";
 
 const { getLabel } = WeaLocaleProvider;
+export const captchaCondition = [
+  {
+    items: [
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["mobileCode"],
+        fieldcol: 18,
+        label: getLabel(111, "验证码"),
+        labelcol: 6,
+        detailtype: 1,
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
 export const loginCondition = [
   {
     items: [

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;

pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js

@@ -14,6 +14,8 @@ import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../a
 import CaptchaModal from "../../components/captchaModal";
 import "./index.less";
 
+const isIPhone = new RegExp("\\biPhone\\b|\\biPod\\b", "i").test(window.navigator.userAgent);
+const isEm = window.navigator.userAgent.indexOf("E-Mobile7") >= 0;
 const { getLabel } = WeaLocaleProvider;
 
 @inject("mySalaryStore")
@@ -123,7 +125,7 @@ export const ConfirmBtns = (props) => {
       <Button type="primary" onClick={props.confirmSalaryBill}>{getLabel(111, "确认")}</Button>
     }
     {
-      props.showFeedback === "1" &&
+      ((props.showFeedback === "1" && !isIPhone) || (props.showFeedback === "1" && isIPhone && isEm)) &&
       <Button type="ghost" onClick={props.goFeedback}>{getLabel(111, "反馈")}</Button>
     }
   </div>;

pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js

@@ -53,7 +53,7 @@ class Index extends Component {
         } = payrollTempForm.getFormParams(),
         { ackFeedbackStatus, feedbackStatus, autoAckDays, ...extraFb } = payrollTempFeedbackForm.getFormParams(),
         { formData, smsSettingDialog } = this.tmpBaseSetRef.state;
-      if (autoSendStatus !== "1" && emailStatus !== "1" && msgStatus !== "1" && smsStatus !== 1) {
+      if (autoSendStatus !== "1" && emailStatus !== "1" && msgStatus !== "1" && smsStatus !== "1") {
         message.warning(getLabel(111, "工资单模板至少开启一个发送通道"));
         return;
       }

pc4mobx/hrmSalary/util/request.js

@@ -16,12 +16,12 @@ export const formHeaderPost = (url, method, params, header) => {
     body: formdata
   }).then(res => res.json());
 };
-export const postFetch = (url, params) => {
+export const postFetch = (url, params, header = {}) => {
   if (typeof localStorage.access_token === "string" && localStorage.access_token !== "") {
     params.access_token = localStorage.access_token;
   }
   url = server + url + "?__random__=" + (new Date()).valueOf();
-  return fetch(url, getFetchParams("POST", params)).then(res => res.json());
+  return fetch(url, getFetchParams("POST", params, header)).then(res => res.json());
 };
 export const headerRequestFetch = (url, method, params, header) => {
   if (typeof localStorage.access_token === "string" && localStorage.access_token !== "") {