From 80307c7b9177da68c2c86d9b06fcc543284bfb71 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 14 Apr 2025 16:38:41 +0800
Subject: [PATCH 01/25] release/2.19.1.2501.01

---
 .../calculate/doCalc/components/salaryEditCalc/index.less     | 4 ++++
 pc4mobx/hrmSalary/pages/payrollFiles/config/index.js          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 4e3fb3b4..ff3ef53f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -150,6 +150,10 @@
 
       .esf-base-info-form, .wea-title, .wea-content {
         padding: 0;
+
+        .ant-row {
+          height: 100%;
+        }
       }
 
       .esf-form-content {
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index ce378ee6..7802aee6 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -407,7 +407,7 @@ export const salaryFilesConditions = [
         domkey: ["position"],
         fieldcol: 14,
         label: "岗位",
-        lanId: 6086,
+        lanId: 111,
         labelcol: 10,
         value: "",
         viewAttr: 1

From 573f2cf62d8aa04c07294ec85b503e285b8bfcf0 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 09:26:52 +0800
Subject: [PATCH 02/25] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datapush/components/pushRecord/index.js   |  6 +++--
 pc4mobx/hrmSalary/pages/datapush/index.js     | 25 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
index f73e220b..7bcb8bd5 100644
--- a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
@@ -47,9 +47,11 @@ class Index extends Component {
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
           columns: [...columns, {
-            title: getLabel(111, "操作"), dataIndex: "opts", width: 120, render: (__, record) => (<React.Fragment>
+            title: getLabel(111, "操作"), dataIndex: "opts", width: 140, render: (__, record) => (<React.Fragment>
               <a href="javascript: void(0);" style={{ marginRight: 10 }}
-                 onClick={() => this.props.onChange("push", record)}>{getLabel(111, "推送")}</a>
+                 onClick={() => _.debounce(this.props.onChange("push", record), 300)}>{getLabel(111, "推送")}</a>
+              <a href="javascript: void(0);" style={{ marginRight: 10 }}
+                 onClick={() => this.props.onChange("withdraw", record)}>{getLabel(111, "撤回")}</a>
               <a href="javascript: void(0);"
                  onClick={() => this.props.onChange("view", record)}>{getLabel(111, "查看详情")}</a>
             </React.Fragment>)
diff --git a/pc4mobx/hrmSalary/pages/datapush/index.js b/pc4mobx/hrmSalary/pages/datapush/index.js
index bdabd479..17f23fab 100644
--- a/pc4mobx/hrmSalary/pages/datapush/index.js
+++ b/pc4mobx/hrmSalary/pages/datapush/index.js
@@ -27,7 +27,7 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedKey: "datapush", isQuery: false, query: { name: "" },
+      selectedKey: "pushRecord", isQuery: false, query: { name: "" },
       DPDialog: { visible: false, title: "", detail: {} }, //数据推送弹框
       pushDetailDialog: { visible: false, recordId: "" } //数据推送记录查看推送详情弹框
     };
@@ -60,6 +60,9 @@ class Index extends Component {
       case "view":
         this.setState({ pushDetailDialog: { visible: true, recordId: detail.id } });
         break;
+      case "push":
+        console.log(detail)
+        break;
       default:
         break;
     }
@@ -70,16 +73,6 @@ class Index extends Component {
     const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const tabs = [
-      {
-        title: getLabel(111, "数据推送"), key: "datapush", showDropIcon: false, dropMenuDatas: [],
-        buttons: showOperateBtn ? [
-          <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
-          <WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
-                          onChange={v => this.setState({ query: { ...query, name: v } })}/>
-        ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
-                             onChange={v => this.setState({ query: { ...query, name: v } })}/>],
-        children: <DatapushList isQuery={isQuery} query={query} onChange={this.handleOperate}/>
-      },
       {
         title: getLabel(111, "推送记录"), key: "pushRecord", showDropIcon: false, dropMenuDatas: [],
         buttons: showOperateBtn ? [
@@ -89,6 +82,16 @@ class Index extends Component {
         ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
                              onChange={v => this.setState({ query: { ...query, name: v } })}/>],
         children: <PushRecord isQuery={isQuery} query={query} onChange={this.handleOperate}/>
+      },
+      {
+        title: getLabel(111, "数据推送"), key: "datapush", showDropIcon: false, dropMenuDatas: [],
+        buttons: showOperateBtn ? [
+          <Button type="primary" onClick={() => this.handleOperate("create")}>{getLabel(111, "新建")}</Button>,
+          <WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                          onChange={v => this.setState({ query: { ...query, name: v } })}/>
+        ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
+                             onChange={v => this.setState({ query: { ...query, name: v } })}/>],
+        children: <DatapushList isQuery={isQuery} query={query} onChange={this.handleOperate}/>
       }
     ];
     return (

From 1cbb7ce9436fc3e7c86b2ea22768f4cdbdb88024 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 13:49:09 +0800
Subject: [PATCH 03/25] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/datapush.js            |   8 ++
 .../pushRecord/createPushRecordDialog.js      | 134 ++++++++++++++++++
 .../datapush/components/pushRecord/index.js   |  10 +-
 .../hrmSalary/pages/datapush/conditions.js    |  40 ++++++
 pc4mobx/hrmSalary/pages/datapush/index.js     |  59 +++++++-
 pc4mobx/hrmSalary/pages/datapush/index.less   |  25 ++++
 6 files changed, 267 insertions(+), 9 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js

diff --git a/pc4mobx/hrmSalary/apis/datapush.js b/pc4mobx/hrmSalary/apis/datapush.js
index 27d73608..e348875c 100644
--- a/pc4mobx/hrmSalary/apis/datapush.js
+++ b/pc4mobx/hrmSalary/apis/datapush.js
@@ -32,3 +32,11 @@ export const getPushRecordList = (params) => {
 export const getPushRecordDetail = (params) => {
   return postFetch("/api/bs/hrmsalary/push/record/detail", params);
 };
+// 推送记录-推送
+export const pushRecords = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/push", params);
+};
+// 推送记录-撤回
+export const withdrawRecords = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/withdraw", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
new file mode 100644
index 00000000..b6de8562
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
@@ -0,0 +1,134 @@
+/*
+  * 数据推送记录
+  * 创建
+  * @Author:    黎永顺
+  * @Date:      2025/4/15
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaDialog, WeaFormItem, WeaLocaleProvider, WeaTable, WeaTools } from "ecCom";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { Button } from "antd";
+import moment from "moment";
+import FormInfo from "../../../../components/FormInfo";
+import { RQconditions } from "../../conditions";
+import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide";
+import { getSalaryAcctList } from "../../../../apis/calculate";
+
+const form = new WeaForm();
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+class CreatePushRecordDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: [], columns: [], loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
+      conditions: []
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible && nextProps.visible) {
+      this.setState({
+        conditions: _.map(RQconditions, item => ({
+          ...item,
+          items: _.map(item.items, o => {
+            o = { ...o, label: getLabel(o.lanId, o.label) };
+            if (getKey(o) === "startMonthStr") {
+              return {
+                ...o, value: moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM")
+              };
+            } else if (getKey(o) === "endMonthStr") {
+              return {
+                ...o, value: moment(new Date()).endOf("year").format("YYYY-MM")
+              };
+            }
+            return o;
+          })
+        }))
+      }, () => {
+        form.initFormFields(this.state.conditions);
+        this.getSalaryAcctList();
+      });
+    } else {
+      form.resetForm();
+    }
+  }
+
+  getSalaryAcctList = () => {
+    const { pageInfo } = this.state, payload = { ...pageInfo, ...form.getFormParams() };
+    this.setState({ loading: true });
+    getSalaryAcctList(payload).then(({ status, data }) => {
+      this.setState({ loading: false });
+      if (status) {
+        const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
+        this.setState({
+          dataSource, pageInfo: { current, pageSize, total },
+          columns: _.filter(columns, it => (it.dataIndex !== "backCalcStatus" && it.dataIndex !== "acctTimes" && it.dataIndex !== "operate"))
+        });
+      }
+    }).catch(() => this.setState({ loading: false }));
+  };
+  save = (record) => {
+    console.log(record);
+  };
+
+  render() {
+    const { loading, conditions, dataSource, columns, pageInfo } = this.state;
+    const pagination = {
+      ...pageInfo,
+      showTotal: total => `${getLabel(18609, "共")} ${total} ${getLabel(18256, "条")}`,
+      showQuickJumper: true,
+      showSizeChanger: true,
+      pageSizeOptions: ["10", "20", "50", "100"],
+      onShowSizeChange: (current, pageSize) => {
+        this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () => this.getSalaryAcctList());
+      },
+      onChange: current => {
+        this.setState({ pageInfo: { ...pageInfo, current } }, () => this.getSalaryAcctList());
+      }
+    };
+    const itemRender = {
+      name: (field, textAreaProps, form, formParams) => {
+        return (<WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}
+                           onChange={_.debounce(() => this.getSalaryAcctList(), 500)}/>);
+      },
+      startMonthStr: () => null,
+      endMonthStr: () => null
+    };
+    const childrenComponents = {
+      startMonthStr: () => {
+        const { startMonthStr, endMonthStr } = form.getFormParams();
+        const coms = [], { fieldMap } = form;
+        const dateRange = [startMonthStr, endMonthStr];
+        coms.push(
+          <WeaFormItem label={<span>{fieldMap["startMonthStr"].label}</span>} labelCol={{ span: 6 }}
+                       wrapperCol={{ span: 14 }}>
+            <MonthRangePicker dateRange={dateRange} viewAttr={2} onChange={v => {
+              const [v1, v2] = v;
+              form.updateFields({ startMonthStr: v1, endMonthStr: v2 });
+              this.getSalaryAcctList();
+            }}/>
+          </WeaFormItem>
+        );
+        return [{ com: coms, col: 2 }];
+      }
+    };
+    console.log(this.refs.recordRef);
+    return (<WeaDialog {...this.props} style={{ width: 1000 }} initLoadCss className="record-dialog"
+                       title={getLabel(111, "创建推送记录")} ref="recordRef" buttons={[
+      <Button onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button>
+    ]}>
+      <FormInfo className="record-form" center={false} itemRender={itemRender} colCount={2}
+                form={form} formFields={conditions} childrenComponents={childrenComponents}/>
+      <WeaTable className="wea-browser-table-cursor" rowKey="id" scroll={{ y: "calc(100vh - 152px)" }}
+                dataSource={dataSource} loading={loading} pagination={pagination} columns={columns}
+                onRowClick={this.save}/>
+    </WeaDialog>);
+  }
+}
+
+export default CreatePushRecordDialog;
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
index 7bcb8bd5..08287119 100644
--- a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/index.js
@@ -27,7 +27,7 @@ class Index extends Component {
   }
 
   componentWillUnmount() {
-    this.setState({ selectedRowKeys: [] });
+    this.setState({ selectedRowKeys: [] }, () => this.props.onChange("rowKey", []));
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
@@ -49,9 +49,9 @@ class Index extends Component {
           columns: [...columns, {
             title: getLabel(111, "操作"), dataIndex: "opts", width: 140, render: (__, record) => (<React.Fragment>
               <a href="javascript: void(0);" style={{ marginRight: 10 }}
-                 onClick={() => _.debounce(this.props.onChange("push", record), 300)}>{getLabel(111, "推送")}</a>
+                 onClick={_.debounce(() => this.props.onChange("push", record), 300)}>{getLabel(111, "推送")}</a>
               <a href="javascript: void(0);" style={{ marginRight: 10 }}
-                 onClick={() => this.props.onChange("withdraw", record)}>{getLabel(111, "撤回")}</a>
+                 onClick={_.debounce(() => this.props.onChange("withdraw", record), 300)}>{getLabel(111, "撤回")}</a>
               <a href="javascript: void(0);"
                  onClick={() => this.props.onChange("view", record)}>{getLabel(111, "查看详情")}</a>
             </React.Fragment>)
@@ -78,9 +78,9 @@ class Index extends Component {
     };
     const rowSelection = {
       selectedRowKeys,
-      onChange: v => this.setState({ selectedRowKeys: v })
+      onChange: v => this.setState({ selectedRowKeys: v }, () => this.props.onChange("rowKey", v))
     };
-    return (<WeaTable loading={loading} dataSource={dataSource} columns={columns} pagination={pagination}
+    return (<WeaTable rowKey="id" loading={loading} dataSource={dataSource} columns={columns} pagination={pagination}
                       rowSelection={rowSelection} scroll={{ y: `calc(100vh - 182px)` }}/>);
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/datapush/conditions.js b/pc4mobx/hrmSalary/pages/datapush/conditions.js
index 04401305..c4f12a09 100644
--- a/pc4mobx/hrmSalary/pages/datapush/conditions.js
+++ b/pc4mobx/hrmSalary/pages/datapush/conditions.js
@@ -145,3 +145,43 @@ export const PDConditions = [
     defaultshow: true
   }
 ];// 推送详细配置表单
+
+
+export const RQconditions = [
+  {
+    items: [
+      {
+        conditionType: "MONTHPICKER",
+        domkey: ["startMonthStr"],
+        fieldcol: 14,
+        label: "薪资所属月",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "MONTHPICKER",
+        domkey: ["endMonthStr"],
+        fieldcol: 14,
+        label: "薪资所属月",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["name"],
+        fieldcol: 14,
+        label: "薪资账套",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];// 推送记录查询表单
diff --git a/pc4mobx/hrmSalary/pages/datapush/index.js b/pc4mobx/hrmSalary/pages/datapush/index.js
index 17f23fab..49d1d69d 100644
--- a/pc4mobx/hrmSalary/pages/datapush/index.js
+++ b/pc4mobx/hrmSalary/pages/datapush/index.js
@@ -18,6 +18,7 @@ import PushDetailDialog from "./components/pushRecord/pushDetailDialog";
 import { Button, message, Modal } from "antd";
 import cs from "classnames";
 import "./index.less";
+import CreatePushRecordDialog from "./components/pushRecord/createPushRecordDialog";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -27,7 +28,8 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedKey: "pushRecord", isQuery: false, query: { name: "" },
+      selectedKey: "pushRecord", isQuery: false, query: { name: "" }, selectedRowKeys: [],
+      loading: { push: false, withdraw: false }, visible: false,
       DPDialog: { visible: false, title: "", detail: {} }, //数据推送弹框
       pushDetailDialog: { visible: false, recordId: "" } //数据推送记录查看推送详情弹框
     };
@@ -60,23 +62,71 @@ class Index extends Component {
       case "view":
         this.setState({ pushDetailDialog: { visible: true, recordId: detail.id } });
         break;
+      case "rowKey":
+        this.setState({ selectedRowKeys: detail });
+        break;
+      case "addRecord":
+        this.setState({ visible: true });
+        break;
       case "push":
-        console.log(detail)
+      case "batchpush":
+        if (type === "batchpush" && _.isEmpty(this.state.selectedRowKeys)) {
+          message.warning(getLabel(111, "请选择数据"));
+          return;
+        }
+        this.pushRecords(type === "push" ? [detail.id] : this.state.selectedRowKeys);
+        break;
+      case "withdraw":
+      case "batchwithdraw":
+        if (type === "batchwithdraw" && _.isEmpty(this.state.selectedRowKeys)) {
+          message.warning(getLabel(111, "请选择数据"));
+          return;
+        }
+        this.withdrawRecords(type === "withdraw" ? [detail.id] : this.state.selectedRowKeys);
         break;
       default:
         break;
     }
   };
+  pushRecords = (ids) => {
+    this.setState({ loading: { ...this.state.loading, push: true } });
+    API.pushRecords({ ids }).then(({ status, errormsg }) => {
+      this.setState({ loading: { ...this.state.loading, push: false } });
+      if (status) {
+        this.handleAdvanceSearch();
+        message.success(getLabel(111, "推送成功！"));
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
+  withdrawRecords = (ids) => {
+    this.setState({ loading: { ...this.state.loading, withdraw: true } });
+    API.withdrawRecords({ ids }).then(({ status, errormsg }) => {
+      this.setState({ loading: { ...this.state.loading, withdraw: false } });
+      if (status) {
+        this.handleAdvanceSearch();
+        message.success(getLabel(111, "撤回成功！"));
+      } else {
+        message.error(errormsg);
+      }
+    });
+  };
 
   render() {
-    const { selectedKey, DPDialog, isQuery, query, pushDetailDialog } = this.state;
+    const { selectedKey, DPDialog, isQuery, query, pushDetailDialog, loading, visible } = this.state;
     const { taxAgentStore: { PageAndOptAuth } } = this.props;
     const showOperateBtn = PageAndOptAuth.opts.includes("admin");
     const tabs = [
       {
         title: getLabel(111, "推送记录"), key: "pushRecord", showDropIcon: false, dropMenuDatas: [],
         buttons: showOperateBtn ? [
-          <Button type="primary" onClick={() => this.handleOperate("batchpush")}>{getLabel(111, "批量推送")}</Button>,
+          <Button type="primary" onClick={() => this.handleOperate("addRecord")}
+                  loading={loading.add}>{getLabel(111, "创建")}</Button>,
+          <Button type="primary" onClick={() => this.handleOperate("batchpush")}
+                  loading={loading.push}>{getLabel(111, "批量推送")}</Button>,
+          <Button type="ghost" loading={loading.withdraw}
+                  onClick={() => this.handleOperate("batchwithdraw")}>{getLabel(111, "批量撤回")}</Button>,
           <WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
                           onChange={v => this.setState({ query: { ...query, name: v } })}/>
         ] : [<WeaInputSearch style={{ top: -3 }} value={query.name} onSearch={this.handleAdvanceSearch}
@@ -115,6 +165,7 @@ class Index extends Component {
         <PushDetailDialog {...pushDetailDialog} onClose={() => this.setState({
           pushDetailDialog: { ...pushDetailDialog, visible: false }
         })}/>
+        <CreatePushRecordDialog visible={visible} onCancel={() => this.setState({ visible: false })}/>
       </WeaReqTop>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/datapush/index.less b/pc4mobx/hrmSalary/pages/datapush/index.less
index 316932b9..71919160 100644
--- a/pc4mobx/hrmSalary/pages/datapush/index.less
+++ b/pc4mobx/hrmSalary/pages/datapush/index.less
@@ -167,3 +167,28 @@
     }
   }
 }
+
+.record-dialog {
+  .wea-dialog-body {
+    background: #f6f6f6;
+    padding: 8px 16px;
+
+    .record-form {
+      background: #FFF;
+      margin-bottom: 8px;
+
+      .wea-search-group, .wea-content {
+        padding: 0;
+      }
+
+      .rangePickerBox {
+        display: flex;
+        align-items: center;
+      }
+    }
+
+    .wea-new-table {
+      background: #FFF;
+    }
+  }
+}

From 950fa50d26c9d15594a15f0f344aef45505fe497 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 14:12:21 +0800
Subject: [PATCH 04/25] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/datapush.js            |  4 +++
 .../pushRecord/createPushRecordDialog.js      | 30 ++++++++++++++-----
 pc4mobx/hrmSalary/pages/datapush/index.js     |  3 +-
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/datapush.js b/pc4mobx/hrmSalary/apis/datapush.js
index e348875c..fb26cf9b 100644
--- a/pc4mobx/hrmSalary/apis/datapush.js
+++ b/pc4mobx/hrmSalary/apis/datapush.js
@@ -40,3 +40,7 @@ export const pushRecords = (params) => {
 export const withdrawRecords = (params) => {
   return postFetch("/api/bs/hrmsalary/push/record/withdraw", params);
 };
+//创建推送记录
+export const createPushRecords = (params) => {
+  return postFetch("/api/bs/hrmsalary/push/record/create", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
index b6de8562..50a46cbc 100644
--- a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
@@ -9,13 +9,14 @@
 */
 import React, { Component } from "react";
 import { WeaDialog, WeaFormItem, WeaLocaleProvider, WeaTable, WeaTools } from "ecCom";
-import { WeaForm, WeaSwitch } from "comsMobx";
-import { Button } from "antd";
-import moment from "moment";
 import FormInfo from "../../../../components/FormInfo";
 import { RQconditions } from "../../conditions";
 import { MonthRangePicker } from "../../../reportView/components/statisticalMicroSettingsSlide";
 import { getSalaryAcctList } from "../../../../apis/calculate";
+import { createPushRecords } from "../../../../apis/datapush";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { Button, message } from "antd";
+import moment from "moment";
 
 const form = new WeaForm();
 const getKey = WeaTools.getKey;
@@ -73,7 +74,16 @@ class CreatePushRecordDialog extends Component {
     }).catch(() => this.setState({ loading: false }));
   };
   save = (record) => {
-    console.log(record);
+    this.setState({ loading: true });
+    createPushRecords({ salaryAcctRecordIds: [record.id] }).then(({ status, errormsg }) => {
+      this.setState({ loading: false });
+      if (status) {
+        message.success(getLabel(111, "操作成功！"));
+        this.props.onCancel(this.props.onSuccess);
+      } else {
+        message.error(errormsg);
+      }
+    });
   };
 
   render() {
@@ -117,14 +127,18 @@ class CreatePushRecordDialog extends Component {
         return [{ com: coms, col: 2 }];
       }
     };
-    console.log(this.refs.recordRef);
-    return (<WeaDialog {...this.props} style={{ width: 1000 }} initLoadCss className="record-dialog"
-                       title={getLabel(111, "创建推送记录")} ref="recordRef" buttons={[
+    const scrollHeight = this.refs.recordRef ? this.refs.recordRef.state.height - 162 : 606;
+
+    return (<WeaDialog {...this.props} initLoadCss className="record-dialog" title={getLabel(111, "创建推送记录")}
+                       ref="recordRef" style={{
+      width: 1000, height: 606, minHeight: 200, minWidth: 380, maxHeight: "70%",
+      maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
+    }} buttons={[
       <Button onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button>
     ]}>
       <FormInfo className="record-form" center={false} itemRender={itemRender} colCount={2}
                 form={form} formFields={conditions} childrenComponents={childrenComponents}/>
-      <WeaTable className="wea-browser-table-cursor" rowKey="id" scroll={{ y: "calc(100vh - 152px)" }}
+      <WeaTable className="wea-browser-table-cursor" rowKey="id" scroll={{ y: scrollHeight + "px" }}
                 dataSource={dataSource} loading={loading} pagination={pagination} columns={columns}
                 onRowClick={this.save}/>
     </WeaDialog>);
diff --git a/pc4mobx/hrmSalary/pages/datapush/index.js b/pc4mobx/hrmSalary/pages/datapush/index.js
index 49d1d69d..e3da4cb4 100644
--- a/pc4mobx/hrmSalary/pages/datapush/index.js
+++ b/pc4mobx/hrmSalary/pages/datapush/index.js
@@ -165,7 +165,8 @@ class Index extends Component {
         <PushDetailDialog {...pushDetailDialog} onClose={() => this.setState({
           pushDetailDialog: { ...pushDetailDialog, visible: false }
         })}/>
-        <CreatePushRecordDialog visible={visible} onCancel={() => this.setState({ visible: false })}/>
+        <CreatePushRecordDialog visible={visible} onSuccess={this.handleAdvanceSearch}
+                                onCancel={(callback) => this.setState({ visible: false }, () => callback && callback())}/>
       </WeaReqTop>
     );
   }

From 142b84ca2d032cbacff3458b7a13139ddd1e9c7e Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 14:51:53 +0800
Subject: [PATCH 05/25] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pushRecord/createPushRecordDialog.js      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
index 50a46cbc..9db79ce3 100644
--- a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
@@ -130,10 +130,11 @@ class CreatePushRecordDialog extends Component {
     const scrollHeight = this.refs.recordRef ? this.refs.recordRef.state.height - 162 : 606;
 
     return (<WeaDialog {...this.props} initLoadCss className="record-dialog" title={getLabel(111, "创建推送记录")}
-                       ref="recordRef" style={{
-      width: 1000, height: 606, minHeight: 200, minWidth: 380, maxHeight: "70%",
-      maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
-    }} buttons={[
+                       ref="recordRef"
+                       style={{
+                         width: 1000, height: 580, minHeight: 200, minWidth: 380, maxHeight: "70%", maxWidth: "90%",
+                         overflow: "hidden", transform: "translate(0px, 0px)"
+                       }} buttons={[
       <Button onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button>
     ]}>
       <FormInfo className="record-form" center={false} itemRender={itemRender} colCount={2}

From 38572729fd6e9f96728249e7df4bfec264bb0a38 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 15:16:29 +0800
Subject: [PATCH 06/25] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/salaryEditCalc/editSalaryCalcSlide.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
index 5deeaecd..239ccb9e 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
@@ -99,7 +99,8 @@ class EditSalaryCalcSlide extends Component {
       return;
     }
     const payload = {
-      salaryAcctEmpId, employeeInfos: baseInfo,
+      salaryAcctEmpId,
+      employeeInfos: _.map(baseInfo, o => ({ ...o, fieldValue: o.fieldValue.id || o.fieldValue })),
       items: [
         ..._.reduce(itemsByGroup, (pre, cur) => {
           return [

From 6dfb4e6650bfa004b2af6a68e5526227db2056c0 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 16:13:15 +0800
Subject: [PATCH 07/25] release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/components/FormInfo/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/components/FormInfo/index.js b/pc4mobx/hrmSalary/components/FormInfo/index.js
index d6940489..d0d87963 100644
--- a/pc4mobx/hrmSalary/components/FormInfo/index.js
+++ b/pc4mobx/hrmSalary/components/FormInfo/index.js
@@ -67,7 +67,7 @@ export default class FormInfo extends Component {
           }
         }
         coms != null && formItems.push({
-          com: (<WeaFormItem {...itemProps}>{coms}</WeaFormItem>),
+          com: (<WeaFormItem {...itemProps}>{coms}</WeaFormItem>), hide: field.hide,
           col
         });
 

From 51d9c5888834d190f3856d6182473a0b6d786246 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 16:27:19 +0800
Subject: [PATCH 08/25] release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/apis/payroll.js              | 18 +++++++++++++-----
 pc4mobx/hrmSalary/pages/mobilePayroll/index.js | 18 ++++++++++--------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js
index 48fcecb2..c322c94f 100644
--- a/pc4mobx/hrmSalary/apis/payroll.js
+++ b/pc4mobx/hrmSalary/apis/payroll.js
@@ -210,18 +210,26 @@ export const payrollCheckType = params => {
   return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/payrollCheckType", "GET", params);
 };
 //工资单-反馈验证
-export const feedBackSalaryBill = params => {
+export const feedBackSalaryBill = async params => {
   const { header, ...payload } = params;
-  return fetch(`/api/bs/hrmsalary/salaryBill/feedBackSalaryBill?${convertToUrlString(payload)}`, {
+  const res = await fetch(`/api/bs/hrmsalary/salaryBill/feedBackSalaryBill?${convertToUrlString(payload)}`, {
     method: "GET",
     mode: "cors",
     headers: { "Content-Type": "application/json", ...header }
-  }).then(res => res.json());
+  });
+  return await res.json();
   // return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/feedBackSalaryBill", "GET", params);
 };
 //工资单-确认
-export const confirmSalaryBill = params => {
-  return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/confirmSalaryBill", "GET", params);
+export const confirmSalaryBill = async params => {
+  const { header, ...payload } = params;
+  const res = await fetch(`/api/bs/hrmsalary/salaryBill/confirmSalaryBill?${convertToUrlString(payload)}`, {
+    method: "GET",
+    mode: "cors",
+    headers: { "Content-Type": "application/json", ...header }
+  });
+  return await res.json();
+  // return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/confirmSalaryBill", "GET", params);
 };
 
 // 工资单基础设置-获取设置列表
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 1b598371..69d84928 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -144,14 +144,16 @@ export default class MobilePayroll extends React.Component {
     return params;
   };
   confirmSalaryBill = () => {
-    confirmSalaryBill({ salaryInfoId: getQueryString("id") }).then(({ status, errormsg }) => {
-      if (status) {
-        message.success(getLabel(30700, "操作成功"));
-        this.getMySalaryBill(getQueryString("id"));
-      } else {
-        message.error(errormsg || getLabel(30651, "操作失败"));
-      }
-    });
+    const { salaryBillToken } = this.state;
+    confirmSalaryBill({ salaryInfoId: getQueryString("id"), header: salaryBillToken })
+      .then(({ status, errormsg }) => {
+        if (status) {
+          message.success(getLabel(30700, "操作成功"));
+          this.getMySalaryBill(getQueryString("id"));
+        } else {
+          message.error(errormsg || getLabel(30651, "操作失败"));
+        }
+      });
   };
   handleGoFeedback = () => {
     Modal.confirm({

From 7677d201856585dabbdd103cc7704a0e8d780edf Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 15 Apr 2025 17:33:12 +0800
Subject: [PATCH 09/25] =?UTF-8?q?feature/2.19.1.2501.01-PC=E7=AB=AFToken?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/ledgerPage/components/index.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index 9e704e4c..724b344a 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -198,6 +198,10 @@
         }
       }
     }
+
+    .wea-new-table.wea-new-table-draggable table {
+      table-layout: fixed
+    }
   }
 
   .titleWrapper {

From 799b086d9b554cdb3cdf7124b2b04715925ce1c6 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 16 Apr 2025 09:42:38 +0800
Subject: [PATCH 10/25] =?UTF-8?q?release/3.0.1.2504.01-=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datapush/components/pushRecord/createPushRecordDialog.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
index 9db79ce3..e0bd1255 100644
--- a/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
@@ -135,7 +135,7 @@ class CreatePushRecordDialog extends Component {
                          width: 1000, height: 580, minHeight: 200, minWidth: 380, maxHeight: "70%", maxWidth: "90%",
                          overflow: "hidden", transform: "translate(0px, 0px)"
                        }} buttons={[
-      <Button onClick={this.props.onCancel}>{getLabel(111, "取消")}</Button>
+      <Button onClick={() => this.props.onCancel()}>{getLabel(111, "取消")}</Button>
     ]}>
       <FormInfo className="record-form" center={false} itemRender={itemRender} colCount={2}
                 form={form} formFields={conditions} childrenComponents={childrenComponents}/>

From 854a49b01803eb871b223064f1d520114859bc56 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 16 Apr 2025 15:51:28 +0800
Subject: [PATCH 11/25] release/2.19.1.2501.01

---
 .../payroll/payrollGrant/payrollPartTable.js      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
index 552a7122..df034794 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js
@@ -32,10 +32,10 @@ class PayrollPartTable extends Component {
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible) {
-      nextProps.visible && this.sendRangeList(nextProps);
-      this.setState({ selectedRowKeys: [] });
-    }
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.sendRangeList(nextProps);
+    if (nextProps.visible !== this.props.visible && !nextProps.visible) this.setState({
+      selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 }
+    });
   }
 
   sendRangeList = (props) => {
@@ -52,9 +52,9 @@ class PayrollPartTable extends Component {
     sendRangeList(payload).then(({ status, data }) => {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
-        const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
+        const { pageNum: current, total, columns, list: dataSource } = data;
         this.setState({
-          pageInfo: { ...pageInfo, current, pageSize, total },
+          pageInfo: { ...pageInfo, current, total },
           dataSource: _.map(dataSource, it => ({
             ...it,
             includeObj: _.map(it.includeObj, child => child.targetName || child.targetTypeName).join(","),
@@ -125,8 +125,7 @@ class PayrollPartTable extends Component {
       onChange: current => {
         this.setState({
           pageInfo: { ...pageInfo, current }
-        }, () => {
-        });
+        }, () => this.sendRangeList({ grantType, salarySendId }));
       }
     };
     const rowSelection = {

From 55ccd8391642bf448d9b1a3557e7fe3fa27ee3cf Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Wed, 16 Apr 2025 16:22:51 +0800
Subject: [PATCH 12/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/mobilePayroll/index.js    | 15 ++++--
 .../hrmSalary/pages/mobilePayroll/index.less  | 51 +++++++++++++++++++
 .../pages/mobilePayroll/mobileModal.js        | 33 ++++++++++++
 3 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 69d84928..38f53195 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -1,4 +1,5 @@
 import React from "react";
+import ReactDom from "react-dom";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 import { getQueryString } from "../../util/url";
@@ -15,6 +16,7 @@ import { ConfirmBtns } from "../mySalary/mySalaryView";
 import Content from "../../components/pcTemplate/content";
 import MobileTemplate from "../../components/mobileTemplate";
 import "../mySalary/index.less";
+import MobileModal from "./mobileModal";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -82,6 +84,8 @@ export default class MobilePayroll extends React.Component {
         API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
           .then(({ status, isNeedSecondAuth }) => {
             if (status && isNeedSecondAuth) {
+              ReactDom.render(<MobileModal/>, document.body);
+              return;
               this.setState({ visible: true }, () => {
                 API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
                   .then(({ status, notSetting }) => {
@@ -205,6 +209,12 @@ export default class MobilePayroll extends React.Component {
         }
       </WeaDialog>
       <PassSetDialog form={pwdForm} visible={pwdSetVisible} onCancel={() => this.setState({ pwdSetVisible: false })}/>
+      {/*发送验证码*/}
+      <CaptchaModal
+        visible={captchaVisible} id={getQueryString("id")}
+        onCancel={() => this.setState({ captchaVisible: false })}
+        onConfirm={() => this.props.mySalaryStore.setInitEmVerify()}
+      />
     </div>;
     const {
       salaryTemplate, salaryGroups, employeeInformation,
@@ -243,11 +253,6 @@ export default class MobilePayroll extends React.Component {
               </div>
             </Authority>
         }
-        <CaptchaModal
-          visible={captchaVisible} id={getQueryString("id")}
-          onCancel={() => this.setState({ captchaVisible: false })}
-          onConfirm={() => this.props.mySalaryStore.setInitEmVerify()}
-        />
       </React.Fragment>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
index 923d3d82..8726d37e 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
@@ -39,3 +39,54 @@
     }
   }
 }
+
+.am-modal-mask {
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  height: 100%;
+  z-index: 999;
+  background-color: rgba(0, 0, 0, .4);
+}
+
+.am-modal {
+  position: relative;
+}
+
+.am-modal-transparent {
+  width: 270px;
+}
+
+.am-modal-transparent .am-modal-content {
+  border-radius: 7px;
+  padding-top: 15px;
+}
+
+.am-modal-content {
+  position: relative;
+  background-color: #fff;
+  border: 0;
+  background-clip: padding-box;
+  text-align: center;
+  height: 100%;
+  overflow: hidden;
+}
+
+.am-modal-wrap {
+  position: fixed;
+  overflow: auto;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  height: 100%;
+  z-index: 999;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transform: translateZ(1px);
+}
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
new file mode 100644
index 00000000..493cb63a
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
@@ -0,0 +1,33 @@
+/*
+  *  自定义移动端弹框组件
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/16
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class MobileModal extends Component {
+  render() {
+    return (
+      <div id="am-modal-container">
+        <div>
+          <div className="am-modal-mask"></div>
+          <div className="am-modal-wrap">
+            <div className="am-modal am-modal-transparent">
+              <div className="am-modal-content">123</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default MobileModal;

From fab27c99ed3ccd87506334581a4602e7c1495e7a Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 09:54:03 +0800
Subject: [PATCH 13/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/mobilePayroll/conditions.js         |  21 ++++
 .../hrmSalary/pages/mobilePayroll/index.js    |   7 +-
 .../hrmSalary/pages/mobilePayroll/index.less  | 118 +++++++++++++++---
 .../pages/mobilePayroll/mobileModal.js        |  18 ++-
 .../pages/mobilePayroll/secondaryVerify.js    |  30 +++++
 pc4mobx/hrmSalary/util/index.js               |   4 +
 6 files changed, 176 insertions(+), 22 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
 create mode 100644 pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
new file mode 100644
index 00000000..af7a60c8
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
@@ -0,0 +1,21 @@
+export const secondaryVerifyConditions = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["authCode"],
+        fieldcol: 14,
+        label: "二次验证密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password"
+        },
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 38f53195..4e764da8 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -17,6 +17,7 @@ import Content from "../../components/pcTemplate/content";
 import MobileTemplate from "../../components/mobileTemplate";
 import "../mySalary/index.less";
 import MobileModal from "./mobileModal";
+import SecondaryVerify from "./secondaryVerify";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -84,7 +85,11 @@ export default class MobilePayroll extends React.Component {
         API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
           .then(({ status, isNeedSecondAuth }) => {
             if (status && isNeedSecondAuth) {
-              ReactDom.render(<MobileModal/>, document.body);
+              ReactDom.render(
+                <MobileModal title={getLabel(111, "身份验证")} onConfirm={() => message.error("请输入密码")}>
+                  <SecondaryVerify/>
+                </MobileModal>,
+                document.body);
               return;
               this.setState({ visible: true }, () => {
                 API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
index 8726d37e..c9bb4a6a 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
@@ -51,10 +51,6 @@
   background-color: rgba(0, 0, 0, .4);
 }
 
-.am-modal {
-  position: relative;
-}
-
 .am-modal-transparent {
   width: 270px;
 }
@@ -74,19 +70,103 @@
   overflow: hidden;
 }
 
-.am-modal-wrap {
-  position: fixed;
-  overflow: auto;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  height: 100%;
-  z-index: 999;
-  -webkit-overflow-scrolling: touch;
-  outline: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  transform: translateZ(1px);
+.am-modal-header {
+  padding: 15px;
+}
+
+.am-modal-title {
+  margin: 0;
+  letter-spacing: -.1px;
+  color: #333;
+  font-size: 14px;
+  line-height: 20px;
+  text-align: center;
+  height: auto;
+  max-height: 150px;
+  overflow-y: auto;
+}
+
+.am-modal-body {
+  font-size: 14px;
+  color: #868686;
+  height: 100%;
+  line-height: 1.5;
+  overflow: auto;
+  padding: 0 15px 15px;
+
+  .wea-search-group, .wea-content, .wea-form-cell {
+    padding: 0;
+  }
+}
+
+.am-modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 1000;
+}
+
+.am-modal-wrap {
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  //position: fixed;
+  //overflow: auto;
+  //top: 0;
+  //right: 0;
+  //bottom: 0;
+  //left: 0;
+  //height: 100%;
+  //z-index: 999;
+  //-webkit-overflow-scrolling: touch;
+  //outline: 0;
+  //display: -webkit-box;
+  //display: -webkit-flex;
+  //display: -ms-flexbox;
+  //display: flex;
+  //-webkit-box-align: center;
+  //-webkit-align-items: center;
+  //-ms-flex-align: center;
+  //align-items: center;
+  //-webkit-box-pack: center;
+  //-webkit-justify-content: center;
+  //-ms-flex-pack: center;
+  //justify-content: center;
+  //-webkit-transform: translateZ(1px);
+  //transform: translateZ(1px);
+}
+
+.am-modal-button-group-h {
+  position: relative;
+  border-top: 1px solid #ddd;
+  display: flex;
+}
+
+.am-modal-button-group-h .am-modal-button {
+  -webkit-touch-callout: none;
+  flex: 1 1;
+  box-sizing: border-box;
+  text-align: center;
+  text-decoration: none;
+  outline: none;
+  color: #55b1f9;
+  height: 50px;
+  line-height: 50px;
+  display: block;
+  width: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 14px;
+}
+
+.am-modal-button-group-h .am-modal-button:first-child {
+  color: #333;
+}
+
+.am-modal-button-group-h .am-modal-button:last-child {
+  position: relative;
+  border-left: 1px solid #ddd;
 }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
index 493cb63a..1f76b313 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
@@ -9,6 +9,7 @@
 */
 import React, { Component } from "react";
 import { WeaLocaleProvider } from "ecCom";
+import { removeElementById } from "../../util";
 import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -17,11 +18,24 @@ class MobileModal extends Component {
   render() {
     return (
       <div id="am-modal-container">
-        <div>
+        <div style={{overflow: "hidden"}}>
           <div className="am-modal-mask"></div>
           <div className="am-modal-wrap">
             <div className="am-modal am-modal-transparent">
-              <div className="am-modal-content">123</div>
+              <div className="am-modal-content">
+                <div className="am-modal-header">
+                  <div className="am-modal-title">{this.props.title}</div>
+                </div>
+                <div className="am-modal-body">{this.props.children}</div>
+                <div className="am-modal-footer">
+                  <div className="am-modal-button-group-h">
+                    <a href="javascript:void(0);" className="am-modal-button"
+                       onClick={() => removeElementById("am-modal-container")}>{getLabel(111, "取消")}</a>
+                    <a href="javascript:void(0);" className="am-modal-button"
+                       onClick={this.props.onConfirm}>{getLabel(111, "确定")}</a>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </div>
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
new file mode 100644
index 00000000..e8c18c3f
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -0,0 +1,30 @@
+/*
+  * 二次验证密码
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/16
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { WeaForm } from "comsMobx";
+import FormInfo from "../../components/FormInfo";
+import { secondaryVerifyConditions } from "./conditions";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SecondaryVerify extends Component {
+  componentDidMount() {
+    form.initFormFields(secondaryVerifyConditions);
+  }
+
+  render() {
+    const itemRender = {};
+    return (<FormInfo center={false} itemRender={itemRender} form={form} formFields={secondaryVerifyConditions}/>);
+  }
+}
+
+export default SecondaryVerify;
diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js
index 0b63ffda..4578ddac 100644
--- a/pc4mobx/hrmSalary/util/index.js
+++ b/pc4mobx/hrmSalary/util/index.js
@@ -143,3 +143,7 @@ export const getIframeParentHeight = (selector, total, extraHeight) => {
   }
   return height;
 };
+export const removeElementById = (id) => {
+  const element = document.getElementById(id);
+  if (element) element.remove();
+};

From 94c9a39f9f773fff1c9dd1e4e73984729fb90032 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 14:23:31 +0800
Subject: [PATCH 14/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/mobilePayroll/conditions.js         | 66 ++++++++++++++++++
 .../hrmSalary/pages/mobilePayroll/index.js    | 14 ++--
 .../hrmSalary/pages/mobilePayroll/index.less  | 60 +++++++---------
 .../pages/mobilePayroll/loginVerify.js        | 56 +++++++++++++++
 .../pages/mobilePayroll/mobileModal.js        | 20 +++++-
 .../pages/mobilePayroll/secondaryVerify.js    | 60 +++++++++++++++-
 .../pages/mobilePayroll/secondarypwdVerify.js | 68 +++++++++++++++++++
 7 files changed, 297 insertions(+), 47 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
 create mode 100644 pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
index af7a60c8..3462cb08 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
@@ -19,3 +19,69 @@ export const secondaryVerifyConditions = [
     defaultshow: true
   }
 ];
+export const loginCondition = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["password"],
+        fieldcol: 14,
+        label: "登录密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password"
+        },
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
+export const secondarypwdCondition = [
+  {
+    items: [
+      {
+        conditionType: "INPUT",
+        domkey: ["secondaryPwd1"],
+        fieldcol: 14,
+        label: "密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password",
+          passwordStrength: true
+        },
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["secondaryPwd2"],
+        fieldcol: 14,
+        label: "确认密码",
+        labelcol: 10,
+        value: "",
+        otherParams: {
+          type: "password"
+        },
+        rules: "required|string",
+        viewAttr: 3
+      },
+      {
+        conditionType: "INPUT",
+        domkey: ["validatecode"],
+        fieldcol: 14,
+        label: "验证码",
+        labelcol: 10,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    title: "",
+    defaultshow: true
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 4e764da8..eaa34aff 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -15,9 +15,9 @@ import PassSetDialog from "./passSetDialog";
 import { ConfirmBtns } from "../mySalary/mySalaryView";
 import Content from "../../components/pcTemplate/content";
 import MobileTemplate from "../../components/mobileTemplate";
-import "../mySalary/index.less";
-import MobileModal from "./mobileModal";
 import SecondaryVerify from "./secondaryVerify";
+import { removeElementById } from "../../util";
+import "../mySalary/index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -85,11 +85,11 @@ export default class MobilePayroll extends React.Component {
         API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
           .then(({ status, isNeedSecondAuth }) => {
             if (status && isNeedSecondAuth) {
-              ReactDom.render(
-                <MobileModal title={getLabel(111, "身份验证")} onConfirm={() => message.error("请输入密码")}>
-                  <SecondaryVerify/>
-                </MobileModal>,
-                document.body);
+              ReactDom.render(<SecondaryVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                               onSuccess={() => {
+                                                 removeElementById("am-modal-container");
+                                                 this.getMySalaryBill(getQueryString("id"));
+                                               }}/>, document.body);
               return;
               this.setState({ visible: true }, () => {
                 API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
index c9bb4a6a..8d600fc5 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
@@ -52,7 +52,7 @@
 }
 
 .am-modal-transparent {
-  width: 270px;
+  width: 80%;
 }
 
 .am-modal-transparent .am-modal-content {
@@ -92,50 +92,38 @@
   height: 100%;
   line-height: 1.5;
   overflow: auto;
-  padding: 0 15px 15px;
+  padding: 0 15px 30px;
 
   .wea-search-group, .wea-content, .wea-form-cell {
     padding: 0;
   }
 }
 
-.am-modal {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 1000;
-}
-
 .am-modal-wrap {
-  height: 100vh;
+  position: fixed;
+  overflow: auto;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  height: 100%;
+  z-index: 999;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
   display: flex;
-  justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  -ms-flex-align: center;
   align-items: center;
-  //position: fixed;
-  //overflow: auto;
-  //top: 0;
-  //right: 0;
-  //bottom: 0;
-  //left: 0;
-  //height: 100%;
-  //z-index: 999;
-  //-webkit-overflow-scrolling: touch;
-  //outline: 0;
-  //display: -webkit-box;
-  //display: -webkit-flex;
-  //display: -ms-flexbox;
-  //display: flex;
-  //-webkit-box-align: center;
-  //-webkit-align-items: center;
-  //-ms-flex-align: center;
-  //align-items: center;
-  //-webkit-box-pack: center;
-  //-webkit-justify-content: center;
-  //-ms-flex-pack: center;
-  //justify-content: center;
-  //-webkit-transform: translateZ(1px);
-  //transform: translateZ(1px);
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -webkit-transform: translateZ(1px);
+  transform: translateZ(1px);
 }
 
 .am-modal-button-group-h {
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
new file mode 100644
index 00000000..1be34d7a
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
@@ -0,0 +1,56 @@
+/*
+  * 登录密码验证
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/17
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import ReactDom from "react-dom";
+import { WeaLocaleProvider } from "ecCom";
+import { WeaForm } from "comsMobx";
+import FormInfo from "../../components/FormInfo";
+import { loginCondition } from "./conditions";
+import MobileModal from "./mobileModal";
+import SecondarypwdVerify from "./secondarypwdVerify";
+import { checkPassword } from "../../apis/mySalaryBenefits";
+import { RSAEcrypt } from "../../util/RSAUtil";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class LoginVerify extends Component {
+
+  componentDidMount() {
+    form.initFormFields(loginCondition);
+  }
+
+  save = async () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        RSAEcrypt("1", { ...form.getFormParams() }).then(RSAParam => {
+          checkPassword({ ...RSAParam }).then(({ result }) => {
+            if (result) {
+              ReactDom.render(<SecondarypwdVerify {...this.props} />, document.body);
+            } else {
+              form.showError("password", getLabel(504343, "登录密码错误"));
+            }
+          });
+        });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
+  render() {
+    const itemRender = {};
+    return (<MobileModal title={getLabel(111, "请先输入登录密码")} onConfirm={this.save}>
+      <FormInfo center={false} itemRender={itemRender} form={form} formFields={loginCondition}/>
+    </MobileModal>);
+  }
+}
+
+export default LoginVerify;
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
index 1f76b313..b6f388db 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/mobileModal.js
@@ -15,10 +15,28 @@ import "./index.less";
 const getLabel = WeaLocaleProvider.getLabel;
 
 class MobileModal extends Component {
+  componentDidMount() {
+    this.setMetaViewport();
+  }
+
+  setMetaViewport = () => {
+    // 检查是否已存在 viewport meta 标签
+    let viewportMeta = document.querySelector("meta[name=\"viewport\"]");
+    if (!viewportMeta) {
+      // 如果不存在，创建一个新的 meta 标签
+      viewportMeta = document.createElement("meta");
+      viewportMeta.setAttribute("name", "viewport");
+      document.head.appendChild(viewportMeta);
+    }
+    // 设置或更新 viewport 的 content 属性
+    const content = "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover";
+    viewportMeta.setAttribute("content", content);
+  };
+
   render() {
     return (
       <div id="am-modal-container">
-        <div style={{overflow: "hidden"}}>
+        <div>
           <div className="am-modal-mask"></div>
           <div className="am-modal-wrap">
             <div className="am-modal am-modal-transparent">
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
index e8c18c3f..1660dfee 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -8,22 +8,76 @@
   * @description:
 */
 import React, { Component } from "react";
+import ReactDom from "react-dom";
 import { WeaLocaleProvider } from "ecCom";
-import { WeaForm } from "comsMobx";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import { message } from "antd";
 import FormInfo from "../../components/FormInfo";
 import { secondaryVerifyConditions } from "./conditions";
+import * as API from "../../apis/mySalaryBenefits";
+import MobileModal from "./mobileModal";
+import LoginVerify from "./loginVerify";
 
 const form = new WeaForm();
 const getLabel = WeaLocaleProvider.getLabel;
 
 class SecondaryVerify extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { notSetting: false };
+  }
+
   componentDidMount() {
+    API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.props.salaryBillToken)
+      .then(({ notSetting }) => {
+        this.setState({ notSetting });
+      });
     form.initFormFields(secondaryVerifyConditions);
   }
 
+  doSecondAuth = () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        const { mySalaryStore: { setInitEmVerify }, salaryBillToken } = this.props;
+        API.doSecondAuth({ mouldCode: "HRM", itemCode: "SALARY", ...form.getFormParams() }, salaryBillToken)
+          .then(({ status, checkStatus, checkMsg }) => {
+            if (status && checkStatus === "1") {
+              message.success(checkMsg);
+              setInitEmVerify();
+              this.props.onSuccess();
+            } else {
+              form.showError("authCode", checkMsg);
+            }
+          });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  handleSetSecondaryPassword = () => {
+    ReactDom.render(<LoginVerify {...this.props} />, document.body);
+  };
+
   render() {
-    const itemRender = {};
-    return (<FormInfo center={false} itemRender={itemRender} form={form} formFields={secondaryVerifyConditions}/>);
+    const { notSetting } = this.state;
+    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.handleSetSecondaryPassword}>{getLabel(111, "设置")}</a>
+            </div>
+          }
+        </React.Fragment>);
+      }
+    };
+    return (<MobileModal title={getLabel(111, "身份验证")} onConfirm={this.doSecondAuth}>
+      <FormInfo center={false} custLabelCol={10} itemRender={itemRender} form={form}
+                formFields={secondaryVerifyConditions}/>
+    </MobileModal>);
   }
 }
 
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
new file mode 100644
index 00000000..fece44bd
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
@@ -0,0 +1,68 @@
+/*
+  *  二次验证密码设置
+  *
+  * @Author:    黎永顺
+  * @Date:      2025/4/17
+  * @Wechat:
+  * @Email:     971387674@qq.com
+  * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { WeaForm, WeaSwitch } from "comsMobx";
+import FormInfo from "../../components/FormInfo";
+import { secondarypwdCondition } from "./conditions";
+import MobileModal from "./mobileModal";
+import { RSAEcrypt } from "../../util/RSAUtil";
+
+const form = new WeaForm();
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SecondarypwdVerify 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);
+  }
+
+  save = async () => {
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        RSAEcrypt("1", { ...form.getFormParams() }).then(RSAParam => {
+          console.log(form.getFormParams(), this.props);
+        });
+      } 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: "105%" }}
+            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 (<MobileModal title={getLabel(111, "二次验证密码设置")} onConfirm={this.save}>
+      <FormInfo center={false} itemRender={itemRender} form={form} formFields={secondarypwdCondition}/>
+    </MobileModal>);
+  }
+}
+
+export default SecondarypwdVerify;

From aaf00ace3cfb180c6699ec6226fa8211e40307eb Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 15:13:40 +0800
Subject: [PATCH 15/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/mobilePayroll/index.js    |  1 +
 .../hrmSalary/pages/mobilePayroll/index.less  | 10 ++++++
 .../pages/mobilePayroll/loginVerify.js        |  8 +++--
 .../pages/mobilePayroll/secondaryVerify.js    |  6 +++-
 .../pages/mobilePayroll/secondarypwdVerify.js | 32 ++++++++++++++++---
 pc4mobx/hrmSalary/pages/mySalary/authority.js |  3 +-
 6 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index eaa34aff..882b0f9b 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -87,6 +87,7 @@ export default class MobilePayroll extends React.Component {
             if (status && isNeedSecondAuth) {
               ReactDom.render(<SecondaryVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
                                                onSuccess={() => {
+                                                 setInitEmVerify();
                                                  removeElementById("am-modal-container");
                                                  this.getMySalaryBill(getQueryString("id"));
                                                }}/>, document.body);
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
index 8d600fc5..9fd7d4d6 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.less
@@ -97,6 +97,16 @@
   .wea-search-group, .wea-content, .wea-form-cell {
     padding: 0;
   }
+
+  .secondarypwd-form {
+    .wea-form-cell-wrapper {
+      & > div:last-child {
+        .ant-col-16 {
+          width: 37.5% !important;
+        }
+      }
+    }
+  }
 }
 
 .am-modal-wrap {
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
index 1be34d7a..ad862dcf 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
@@ -15,7 +15,7 @@ import FormInfo from "../../components/FormInfo";
 import { loginCondition } from "./conditions";
 import MobileModal from "./mobileModal";
 import SecondarypwdVerify from "./secondarypwdVerify";
-import { checkPassword } from "../../apis/mySalaryBenefits";
+import * as API from "../../apis/mySalaryBenefits";
 import { RSAEcrypt } from "../../util/RSAUtil";
 
 const form = new WeaForm();
@@ -27,11 +27,15 @@ class LoginVerify extends Component {
     form.initFormFields(loginCondition);
   }
 
+  componentWillUnmount() {
+    form.resetForm();
+  }
+
   save = async () => {
     form.validateForm().then(f => {
       if (f.isValid) {
         RSAEcrypt("1", { ...form.getFormParams() }).then(RSAParam => {
-          checkPassword({ ...RSAParam }).then(({ result }) => {
+          API.checkPassword({ ...RSAParam }).then(({ result }) => {
             if (result) {
               ReactDom.render(<SecondarypwdVerify {...this.props} />, document.body);
             } else {
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
index 1660dfee..c80215a4 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -35,6 +35,10 @@ class SecondaryVerify extends Component {
     form.initFormFields(secondaryVerifyConditions);
   }
 
+  componentWillUnmount() {
+    form.resetForm();
+  }
+
   doSecondAuth = () => {
     form.validateForm().then(f => {
       if (f.isValid) {
@@ -75,7 +79,7 @@ class SecondaryVerify extends Component {
       }
     };
     return (<MobileModal title={getLabel(111, "身份验证")} onConfirm={this.doSecondAuth}>
-      <FormInfo center={false} custLabelCol={10} itemRender={itemRender} form={form}
+      <FormInfo center={false} custLabelCol={9} itemRender={itemRender} form={form}
                 formFields={secondaryVerifyConditions}/>
     </MobileModal>);
   }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
index fece44bd..5a5d58cd 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
@@ -8,12 +8,16 @@
   * @description:
 */
 import React, { Component } from "react";
+import ReactDom from "react-dom";
 import { WeaLocaleProvider } from "ecCom";
+import { message } from "antd";
 import { WeaForm, WeaSwitch } from "comsMobx";
 import FormInfo from "../../components/FormInfo";
 import { secondarypwdCondition } from "./conditions";
+import * as API from "../../apis/mySalaryBenefits";
 import MobileModal from "./mobileModal";
 import { RSAEcrypt } from "../../util/RSAUtil";
+import SecondaryVerify from "./secondaryVerify";
 
 const form = new WeaForm();
 const getLabel = WeaLocaleProvider.getLabel;
@@ -31,11 +35,30 @@ class SecondarypwdVerify extends Component {
     form.initFormFields(secondarypwdCondition);
   }
 
+  componentWillUnmount() {
+    form.resetForm();
+  }
+
   save = async () => {
     form.validateForm().then(f => {
       if (f.isValid) {
-        RSAEcrypt("1", { ...form.getFormParams() }).then(RSAParam => {
-          console.log(form.getFormParams(), this.props);
+        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 }).then(({ sign, message: msg }) => {
+            if (sign === "1") {
+              message.success(msg);
+              ReactDom.render(<SecondaryVerify {...this.props}/>, document.body);
+            } 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();
@@ -49,7 +72,7 @@ class SecondarypwdVerify extends Component {
         return (<React.Fragment>
           <WeaSwitch fieldConfig={{ ...field, ...textAreaProps }} form={form} formParams={formParams}/>
           <img
-            style={{ height: 30, cursor: "pointer", position: "absolute", left: "105%" }}
+            style={{ height: 30, cursor: "pointer", position: "absolute", left: "118%" }}
             src={this.state.src}
             onClick={() => {
               this.setState({ num: this.state.num + 1 }, () => {
@@ -60,7 +83,8 @@ class SecondarypwdVerify extends Component {
       }
     };
     return (<MobileModal title={getLabel(111, "二次验证密码设置")} onConfirm={this.save}>
-      <FormInfo center={false} itemRender={itemRender} form={form} formFields={secondarypwdCondition}/>
+      <FormInfo className="secondarypwd-form" center={false} itemRender={itemRender} form={form}
+                formFields={secondarypwdCondition}/>
     </MobileModal>);
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/mySalary/authority.js b/pc4mobx/hrmSalary/pages/mySalary/authority.js
index 00a74712..ef7261be 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/authority.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/authority.js
@@ -9,7 +9,7 @@ export default class Authority extends React.Component {
   render() {
     const { store } = this.props;
     const { loading, hasRight } = store;
-
+    console.log("store", store);
     const style = {
       position: "absolute",
       top: "50%",
@@ -27,6 +27,7 @@ export default class Authority extends React.Component {
     }
 
     if (hasRight) {
+      console.log("this.props.children", this.props.children);
       return this.props.children;
     } else {
       return (

From b3fff361ec438cc2589d81b35f60812c858cfbaf Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 15:23:58 +0800
Subject: [PATCH 16/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/mySalary/authority.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mySalary/authority.js b/pc4mobx/hrmSalary/pages/mySalary/authority.js
index ef7261be..ec098fc2 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/authority.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/authority.js
@@ -9,7 +9,6 @@ export default class Authority extends React.Component {
   render() {
     const { store } = this.props;
     const { loading, hasRight } = store;
-    console.log("store", store);
     const style = {
       position: "absolute",
       top: "50%",
@@ -27,7 +26,6 @@ export default class Authority extends React.Component {
     }
 
     if (hasRight) {
-      console.log("this.props.children", this.props.children);
       return this.props.children;
     } else {
       return (

From 5ab71a349208609067f2b475e0237b6886d32fbc Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 15:56:32 +0800
Subject: [PATCH 17/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/mobilePayroll/index.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 882b0f9b..165253ad 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -90,14 +90,14 @@ export default class MobilePayroll extends React.Component {
                                                  setInitEmVerify();
                                                  removeElementById("am-modal-container");
                                                  this.getMySalaryBill(getQueryString("id"));
-                                               }}/>, document.body);
-              return;
-              this.setState({ visible: true }, () => {
-                API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
-                  .then(({ status, notSetting }) => {
-                    this.setState({ notSetting });
-                  });
-              });
+                                               }}/>, document.getElementById("container"));
+              // return;
+              // this.setState({ visible: true }, () => {
+              //   API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
+              //     .then(({ status, notSetting }) => {
+              //       this.setState({ notSetting });
+              //     });
+              // });
             } else {
               this.getMySalaryBill(getQueryString("id"));
               setInitEmVerify();

From b01d2806442c8bbc553f34b23a079de77e8f3ac7 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 17:12:53 +0800
Subject: [PATCH 18/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/mobilePayroll/index.js    | 165 +++++-------------
 .../pages/mobilePayroll/loginVerify.js        |   2 +-
 .../pages/mobilePayroll/secondaryVerify.js    |   5 +-
 .../pages/mobilePayroll/secondarypwdVerify.js |   2 +-
 4 files changed, 51 insertions(+), 123 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 165253ad..389afbcd 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -1,17 +1,15 @@
 import React from "react";
-import ReactDom from "react-dom";
 import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 import { getQueryString } from "../../util/url";
-import { WeaDialog, WeaError, WeaInput, WeaLocaleProvider } from "ecCom";
-import { Button, message, Modal } from "antd";
+import { WeaLocaleProvider } from "ecCom";
+import { message, Modal } from "antd";
 import Authority from "../mySalary/authority";
 import "../payroll/templatePreview/index.less";
 import * as API from "../../apis/mySalaryBenefits";
 import { salaryBillGetToken } from "../../apis/mySalaryBenefits";
 import { confirmSalaryBill, feedBackSalaryBill, payrollCheckType } from "../../apis/payroll";
 import CaptchaModal from "../../components/captchaModal";
-import PassSetDialog from "./passSetDialog";
 import { ConfirmBtns } from "../mySalary/mySalaryView";
 import Content from "../../components/pcTemplate/content";
 import MobileTemplate from "../../components/mobileTemplate";
@@ -21,21 +19,14 @@ 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 = {
-      pwdSetVisible: false,
       visible: false,
       captchaVisible: false,
-      authCode: "",
-      notSetting: false,
-      mySalaryBillData: {
-        employeeInformation: {},
-        salaryTemplate: []
-      },
+      mySalaryBillData: { employeeInformation: {}, salaryTemplate: [] },
       salaryBillToken: {}
     };
     this.id = "";
@@ -63,12 +54,7 @@ export default class MobilePayroll extends React.Component {
       API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
         .then(({ status, isNeedSecondAuth }) => {
           if (status && isNeedSecondAuth) {
-            this.setState({ visible: true }, () => {
-              API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
-                .then(({ status, notSetting }) => {
-                  this.setState({ notSetting });
-                });
-            });
+            this.setState({ visible: true });
           } else {
             this.getMySalaryBill(getQueryString("id"));
             setInitEmVerify();
@@ -85,19 +71,7 @@ export default class MobilePayroll extends React.Component {
         API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
           .then(({ status, isNeedSecondAuth }) => {
             if (status && isNeedSecondAuth) {
-              ReactDom.render(<SecondaryVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
-                                               onSuccess={() => {
-                                                 setInitEmVerify();
-                                                 removeElementById("am-modal-container");
-                                                 this.getMySalaryBill(getQueryString("id"));
-                                               }}/>, document.getElementById("container"));
-              // return;
-              // this.setState({ visible: true }, () => {
-              //   API.getSecondAuthForm({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
-              //     .then(({ status, notSetting }) => {
-              //       this.setState({ notSetting });
-              //     });
-              // });
+              this.setState({ visible: true });
             } else {
               this.getMySalaryBill(getQueryString("id"));
               setInitEmVerify();
@@ -106,33 +80,12 @@ export default class MobilePayroll extends React.Component {
       });
     }
   };
-  doSecondAuth = () => {
-    const { salaryBillToken } = this.state;
-    const { mySalaryStore: { setInitEmVerify } } = this.props;
-    if (!this.state.authCode) {
-      this.refs.weaError.showError();
-      return;
-    }
-    API.doSecondAuth({
-      authCode: this.state.authCode, mouldCode: "HRM", itemCode: "SALARY"
-    }, salaryBillToken).then(({ status, checkStatus, checkMsg }) => {
-      if (status && checkStatus === "1") {
-        message.success(checkMsg);
-        setInitEmVerify();
-        this.setState({ visible: false });
-        this.getMySalaryBill(getQueryString("id"));
-      } else {
-        message.error(checkMsg);
-      }
-    });
-  };
   getMySalaryBill = (salaryInfoId) => {
     const { salaryBillToken } = this.state;
     const { mySalaryStore: { getMySalaryBill } } = this.props;
     const params = this.getUrlkey();
     const payload = {
-      salaryInfoId, header: salaryBillToken,
-      ..._.pick(params, ["recipient"])
+      salaryInfoId, header: salaryBillToken, ..._.pick(params, ["recipient"])
     };
     getMySalaryBill(payload).then(result => {
       this.setState({
@@ -142,10 +95,8 @@ export default class MobilePayroll extends React.Component {
   };
   getUrlkey = () => {
     let url = window.location.href;
-    let params = {},
-      arr = url.split("?");
-    if (arr.length <= 1)
-      return params;
+    let params = {}, arr = url.split("?");
+    if (arr.length <= 1) return params;
     arr = arr[1].split("&");
     for (var i = 0, l = arr.length; i < l; i++) {
       var a = arr[i].split("=");
@@ -189,77 +140,55 @@ export default class MobilePayroll extends React.Component {
   };
 
   render() {
-    const { mySalaryStore: { clearLoading, pwdForm } } = this.props;
-    const { mySalaryBillData, visible, captchaVisible, notSetting, pwdSetVisible } = this.state;
+    const { mySalaryStore: { setInitEmVerify } } = this.props, { captchaVisible, visible } = this.state;
     const type = getQueryString("type");
-    if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return <div>
-      <WeaDialog
-        onCancel={() => this.setState({ visible: false }, () => clearLoading())}
-        title="请输入二次验证密码" visible={visible} initLoadCss
-        className="verifyWrapper"
-        hasScroll buttons={[
-        <Button type="primary" size="small" onClick={this.doSecondAuth}>确定</Button>
-      ]}
-      >
-        <WeaError tipPosition="bottom" ref="weaError" error="此项必填">
-          <WeaInput value={this.state.authCode} type="password" viewAttr={3}
-                    onChange={authCode => this.setState({ authCode })}/>
-        </WeaError>
-        {
-          notSetting &&
-          <div style={{ clear: "both", paddingTop: 10 }}>
-            {getLabel("514970", "您还未设置二次验证密码，点击")}
-            <a href="javascript:void(0);"
-               onClick={() => this.setState({ pwdSetVisible: true })}>{getLabel("30747", "设置")}</a>
-          </div>
-        }
-      </WeaDialog>
-      <PassSetDialog form={pwdForm} visible={pwdSetVisible} onCancel={() => this.setState({ pwdSetVisible: false })}/>
+    if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return <React.Fragment>
+      {visible && <SecondaryVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                   onSuccess={() => {
+                                     setInitEmVerify();
+                                     // removeElementById("am-modal-container");
+                                     this.getMySalaryBill(getQueryString("id"));
+                                   }}/>}
       {/*发送验证码*/}
       <CaptchaModal
         visible={captchaVisible} id={getQueryString("id")}
         onCancel={() => this.setState({ captchaVisible: false })}
         onConfirm={() => this.props.mySalaryStore.setInitEmVerify()}
       />
-    </div>;
+    </React.Fragment>;
     const {
-      salaryTemplate, salaryGroups, employeeInformation,
-      sendTime, confirmStatus, showAck, showFeedback
+      salaryTemplate, salaryGroups, employeeInformation, sendTime, confirmStatus, showAck, showFeedback
     } = toJS(this.props.mySalaryStore.mySalaryBill);
     const salaryProps = {
-      theme: salaryTemplate.theme, tip: salaryTemplate.textContent, sendTime,
-      background: salaryTemplate.background, tipPosi: salaryTemplate.textContentPosition || "",
+      theme: salaryTemplate.theme,
+      tip: salaryTemplate.textContent,
+      sendTime,
+      background: salaryTemplate.background,
+      tipPosi: salaryTemplate.textContentPosition || "",
       itemTypeList: [employeeInformation, ...salaryGroups]
     };
-    return (
-      <React.Fragment>
-        {
-          type === "phone" ?
-            <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
-                       store={this.props.mySalaryStore}>
-              <MobileTemplate {...salaryProps} title={getLabel(111, "工资单查看")}>
-                <ConfirmBtns
-                  showAck={showAck} showFeedback={showFeedback}
-                  confirmSalaryBill={this.confirmSalaryBill}
-                  goFeedback={this.handleGoFeedback}
-                />
-              </MobileTemplate>
-            </Authority>
-            :
-            <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
-                       store={this.props.mySalaryStore}>
-              <div className="weapp-salary-my-salary-view-payroll">
-                <Content {...salaryProps}>
-                  <ConfirmBtns
-                    showAck={showAck} showFeedback={showFeedback}
-                    confirmSalaryBill={this.confirmSalaryBill}
-                    goFeedback={this.handleGoFeedback}
-                  />
-                </Content>
-              </div>
-            </Authority>
-        }
-      </React.Fragment>
-    );
+    return (<React.Fragment>
+      {type === "phone" ? <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
+                                     store={this.props.mySalaryStore}>
+        <MobileTemplate {...salaryProps} title={getLabel(111, "工资单查看")}>
+          <ConfirmBtns
+            showAck={showAck} showFeedback={showFeedback}
+            confirmSalaryBill={this.confirmSalaryBill}
+            goFeedback={this.handleGoFeedback}
+          />
+        </MobileTemplate>
+      </Authority> : <Authority ecId={`${this && this.props && this.props.ecId || ""}_Authority@lulowc`}
+                                store={this.props.mySalaryStore}>
+        <div className="weapp-salary-my-salary-view-payroll">
+          <Content {...salaryProps}>
+            <ConfirmBtns
+              showAck={showAck} showFeedback={showFeedback}
+              confirmSalaryBill={this.confirmSalaryBill}
+              goFeedback={this.handleGoFeedback}
+            />
+          </Content>
+        </div>
+      </Authority>}
+    </React.Fragment>);
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
index ad862dcf..33fd761b 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
@@ -37,7 +37,7 @@ class LoginVerify extends Component {
         RSAEcrypt("1", { ...form.getFormParams() }).then(RSAParam => {
           API.checkPassword({ ...RSAParam }).then(({ result }) => {
             if (result) {
-              ReactDom.render(<SecondarypwdVerify {...this.props} />, document.body);
+              ReactDom.render(<SecondarypwdVerify {...this.props} />, document.getElementById("container"));
             } else {
               form.showError("password", getLabel(504343, "登录密码错误"));
             }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
index c80215a4..a92fd378 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -42,12 +42,11 @@ class SecondaryVerify extends Component {
   doSecondAuth = () => {
     form.validateForm().then(f => {
       if (f.isValid) {
-        const { mySalaryStore: { setInitEmVerify }, salaryBillToken } = this.props;
+        const { salaryBillToken } = this.props;
         API.doSecondAuth({ mouldCode: "HRM", itemCode: "SALARY", ...form.getFormParams() }, salaryBillToken)
           .then(({ status, checkStatus, checkMsg }) => {
             if (status && checkStatus === "1") {
               message.success(checkMsg);
-              setInitEmVerify();
               this.props.onSuccess();
             } else {
               form.showError("authCode", checkMsg);
@@ -59,7 +58,7 @@ class SecondaryVerify extends Component {
     });
   };
   handleSetSecondaryPassword = () => {
-    ReactDom.render(<LoginVerify {...this.props} />, document.body);
+    ReactDom.render(<LoginVerify {...this.props} />, document.getElementById("container"));
   };
 
   render() {
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
index 5a5d58cd..00e75d22 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
@@ -51,7 +51,7 @@ class SecondarypwdVerify extends Component {
           API.saveSecondaryPwd({ ...RSAParam, validatecode }).then(({ sign, message: msg }) => {
             if (sign === "1") {
               message.success(msg);
-              ReactDom.render(<SecondaryVerify {...this.props}/>, document.body);
+              ReactDom.render(<SecondaryVerify {...this.props}/>, document.getElementById("container"));
             } else {
               form.showError("validatecode", msg);
               this.setState({ num: this.state.num + 1 }, () => {

From 6b3e321846484d82dbb594f1dc3201ec4f120036 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 17:18:36 +0800
Subject: [PATCH 19/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/mobilePayroll/secondaryVerify.js         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
index a92fd378..a9006367 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -8,7 +8,6 @@
   * @description:
 */
 import React, { Component } from "react";
-import ReactDom from "react-dom";
 import { WeaLocaleProvider } from "ecCom";
 import { WeaForm, WeaSwitch } from "comsMobx";
 import { message } from "antd";
@@ -24,7 +23,7 @@ const getLabel = WeaLocaleProvider.getLabel;
 class SecondaryVerify extends Component {
   constructor(props) {
     super(props);
-    this.state = { notSetting: false };
+    this.state = { notSetting: false, visible: false };
   }
 
   componentDidMount() {
@@ -36,7 +35,7 @@ class SecondaryVerify extends Component {
   }
 
   componentWillUnmount() {
-    form.resetForm();
+    this.setState({ notSetting: false, visible: false }, () => form.resetForm());
   }
 
   doSecondAuth = () => {
@@ -57,12 +56,10 @@ class SecondaryVerify extends Component {
       }
     });
   };
-  handleSetSecondaryPassword = () => {
-    ReactDom.render(<LoginVerify {...this.props} />, document.getElementById("container"));
-  };
+  handleSetSecondaryPassword = () => this.setState({ visible: false });
 
   render() {
-    const { notSetting } = this.state;
+    const { notSetting, visible } = this.state;
     const itemRender = {
       authCode: (field, textAreaProps, form, formParams) => {
         return (<React.Fragment>
@@ -80,6 +77,9 @@ class SecondaryVerify extends Component {
     return (<MobileModal title={getLabel(111, "身份验证")} onConfirm={this.doSecondAuth}>
       <FormInfo center={false} custLabelCol={9} itemRender={itemRender} form={form}
                 formFields={secondaryVerifyConditions}/>
+      {
+        visible && <LoginVerify {...this.props} />
+      }
     </MobileModal>);
   }
 }

From 554cf4b6b3082a6af1cca11fd8dacc4b5f2658b8 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Thu, 17 Apr 2025 17:44:30 +0800
Subject: [PATCH 20/25] =?UTF-8?q?feature/2.19.1.2501.01-=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E7=9C=8B=E5=B7=A5=E8=B5=84=E5=8D=95=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/mySalaryBenefits.js    | 10 +++++---
 .../hrmSalary/pages/mobilePayroll/index.js    | 16 ++++++++----
 .../pages/mobilePayroll/loginVerify.js        | 19 +++++++-------
 .../pages/mobilePayroll/secondaryVerify.js    | 13 +++-------
 .../pages/mobilePayroll/secondarypwdVerify.js | 25 +++++++++----------
 5 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
index f197ba27..75e3eb73 100644
--- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
+++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js
@@ -45,11 +45,13 @@ export const doSecondAuth = (params, headers) => {
 export const getPasswordForm = params => {
   return WeaTools.callApi("/api/hrm/secondarypwd/getPasswordForm", "GET", params);
 };
-export const checkPassword = params => {
-  return WeaTools.callApi("/api/hrm/secondarypwd/checkPassword", "POST", params);
+export const checkPassword = (params, headers) => {
+  return formHeaderPost("/api/hrm/secondarypwd/checkPassword", "POST", params, headers);
+  // return WeaTools.callApi("/api/hrm/secondarypwd/checkPassword", "POST", params);
 };
-export const saveSecondaryPwd = params => {
-  return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params);
+export const saveSecondaryPwd = (params, headers) => {
+  return formHeaderPost("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params, headers);
+  // return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params);
 };
 export const salaryBillGetToken = params => {
   return postFetch("/api/bs/hrmsalary/salaryBill/getToken", params);
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 389afbcd..a1756ede 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -14,7 +14,8 @@ import { ConfirmBtns } from "../mySalary/mySalaryView";
 import Content from "../../components/pcTemplate/content";
 import MobileTemplate from "../../components/mobileTemplate";
 import SecondaryVerify from "./secondaryVerify";
-import { removeElementById } from "../../util";
+import LoginVerify from "./loginVerify";
+import SecondarypwdVerify from "./secondarypwdVerify";
 import "../mySalary/index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -24,8 +25,7 @@ export default class MobilePayroll extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      visible: false,
-      captchaVisible: false,
+      visible: false, captchaVisible: false, loginVisible: false, pwdSetVisible: false,
       mySalaryBillData: { employeeInformation: {}, salaryTemplate: [] },
       salaryBillToken: {}
     };
@@ -140,15 +140,21 @@ export default class MobilePayroll extends React.Component {
   };
 
   render() {
-    const { mySalaryStore: { setInitEmVerify } } = this.props, { captchaVisible, visible } = this.state;
+    const { mySalaryStore: { setInitEmVerify } } = this.props, {
+      captchaVisible, visible, loginVisible, pwdSetVisible
+    } = this.state;
     const type = getQueryString("type");
     if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return <React.Fragment>
       {visible && <SecondaryVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                   onSetLogin={() => this.setState({ visible: false, loginVisible: true })}
                                    onSuccess={() => {
                                      setInitEmVerify();
-                                     // removeElementById("am-modal-container");
                                      this.getMySalaryBill(getQueryString("id"));
                                    }}/>}
+      {loginVisible && <LoginVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                    onSetPwdSet={() => this.setState({ loginVisible: false, pwdSetVisible: true })}/>}
+      {pwdSetVisible && <SecondarypwdVerify {...this.props} salaryBillToken={this.state.salaryBillToken}
+                                            onSuccess={() => this.setState({ pwdSetVisible: false }, () => this.initMobile())}/>}
       {/*发送验证码*/}
       <CaptchaModal
         visible={captchaVisible} id={getQueryString("id")}
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
index 33fd761b..90d231ca 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/loginVerify.js
@@ -8,13 +8,11 @@
   * @description:
 */
 import React, { Component } from "react";
-import ReactDom from "react-dom";
 import { WeaLocaleProvider } from "ecCom";
 import { WeaForm } from "comsMobx";
 import FormInfo from "../../components/FormInfo";
 import { loginCondition } from "./conditions";
 import MobileModal from "./mobileModal";
-import SecondarypwdVerify from "./secondarypwdVerify";
 import * as API from "../../apis/mySalaryBenefits";
 import { RSAEcrypt } from "../../util/RSAUtil";
 
@@ -34,15 +32,16 @@ class LoginVerify extends Component {
   save = async () => {
     form.validateForm().then(f => {
       if (f.isValid) {
-        RSAEcrypt("1", { ...form.getFormParams() }).then(RSAParam => {
-          API.checkPassword({ ...RSAParam }).then(({ result }) => {
-            if (result) {
-              ReactDom.render(<SecondarypwdVerify {...this.props} />, document.getElementById("container"));
-            } else {
-              form.showError("password", getLabel(504343, "登录密码错误"));
-            }
+        RSAEcrypt("1", { ...form.getFormParams() }, this.props.salaryBillToken)
+          .then(RSAParam => {
+            API.checkPassword({ ...RSAParam }).then(({ result }) => {
+              if (result) {
+                this.props.onSetPwdSet();
+              } else {
+                form.showError("password", getLabel(504343, "登录密码错误"));
+              }
+            });
           });
-        });
       } else {
         f.showErrors();
       }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
index a9006367..b5310466 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -15,7 +15,6 @@ import FormInfo from "../../components/FormInfo";
 import { secondaryVerifyConditions } from "./conditions";
 import * as API from "../../apis/mySalaryBenefits";
 import MobileModal from "./mobileModal";
-import LoginVerify from "./loginVerify";
 
 const form = new WeaForm();
 const getLabel = WeaLocaleProvider.getLabel;
@@ -23,7 +22,7 @@ const getLabel = WeaLocaleProvider.getLabel;
 class SecondaryVerify extends Component {
   constructor(props) {
     super(props);
-    this.state = { notSetting: false, visible: false };
+    this.state = { notSetting: false };
   }
 
   componentDidMount() {
@@ -35,7 +34,7 @@ class SecondaryVerify extends Component {
   }
 
   componentWillUnmount() {
-    this.setState({ notSetting: false, visible: false }, () => form.resetForm());
+    this.setState({ notSetting: false }, () => form.resetForm());
   }
 
   doSecondAuth = () => {
@@ -56,10 +55,9 @@ class SecondaryVerify extends Component {
       }
     });
   };
-  handleSetSecondaryPassword = () => this.setState({ visible: false });
 
   render() {
-    const { notSetting, visible } = this.state;
+    const { notSetting } = this.state;
     const itemRender = {
       authCode: (field, textAreaProps, form, formParams) => {
         return (<React.Fragment>
@@ -68,7 +66,7 @@ class SecondaryVerify extends Component {
             notSetting &&
             <div style={{ clear: "both", paddingTop: 10 }}>
               {getLabel(111, "您还未设置二次验证密码，点击")}
-              <a href="javascript:void(0);" onClick={this.handleSetSecondaryPassword}>{getLabel(111, "设置")}</a>
+              <a href="javascript:void(0);" onClick={this.props.onSetLogin}>{getLabel(111, "设置")}</a>
             </div>
           }
         </React.Fragment>);
@@ -77,9 +75,6 @@ class SecondaryVerify extends Component {
     return (<MobileModal title={getLabel(111, "身份验证")} onConfirm={this.doSecondAuth}>
       <FormInfo center={false} custLabelCol={9} itemRender={itemRender} form={form}
                 formFields={secondaryVerifyConditions}/>
-      {
-        visible && <LoginVerify {...this.props} />
-      }
     </MobileModal>);
   }
 }
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
index 00e75d22..a8f84027 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondarypwdVerify.js
@@ -8,7 +8,6 @@
   * @description:
 */
 import React, { Component } from "react";
-import ReactDom from "react-dom";
 import { WeaLocaleProvider } from "ecCom";
 import { message } from "antd";
 import { WeaForm, WeaSwitch } from "comsMobx";
@@ -17,7 +16,6 @@ import { secondarypwdCondition } from "./conditions";
 import * as API from "../../apis/mySalaryBenefits";
 import MobileModal from "./mobileModal";
 import { RSAEcrypt } from "../../util/RSAUtil";
-import SecondaryVerify from "./secondaryVerify";
 
 const form = new WeaForm();
 const getLabel = WeaLocaleProvider.getLabel;
@@ -48,17 +46,18 @@ class SecondarypwdVerify extends Component {
           return;
         }
         RSAEcrypt("1", { secondaryPwd1, secondaryPwd2 }).then(RSAParam => {
-          API.saveSecondaryPwd({ ...RSAParam, validatecode }).then(({ sign, message: msg }) => {
-            if (sign === "1") {
-              message.success(msg);
-              ReactDom.render(<SecondaryVerify {...this.props}/>, document.getElementById("container"));
-            } 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}` });
-              });
-            }
-          });
+          API.saveSecondaryPwd({ ...RSAParam, validatecode }, this.props.salaryBillToken)
+            .then(({ sign, message: msg }) => {
+              if (sign === "1") {
+                message.success(msg);
+                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();

From 34b2052926608858ecd8412875681870ce5b9895 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 18 Apr 2025 14:49:19 +0800
Subject: [PATCH 21/25] =?UTF-8?q?feature/2.19.1.2501.01-PC=E7=AB=AFToken?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/calculateQuery/index.js         | 13 ++++++++-----
 pc4mobx/hrmSalary/pages/calculate/index.less   | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
index 00cd202d..e8e89b97 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
@@ -21,11 +21,14 @@ class Index extends Component {
           <MonthRangePicker dateRange={dateRange} viewAttr={2}
                             onChange={v => this.props.onChange({ dateRange: v })}/>
         </div>
-        <WeaInputSearch value={name}
-                        placeholder={getLabel(543431, "请输入薪资账套名称")}
-                        onChange={v => this.props.onChange({ name: v })}
-                        onSearch={this.props.onSearch}
-        />
+        <div className="advance-custom">
+          <WeaInputSearch value={name}
+                          placeholder={getLabel(543431, "请输入薪资账套名称")}
+                          onChange={v => this.props.onChange({ name: v })}
+                          onSearch={this.props.onSearch}
+          />
+          <a href="javascript:void(0);">{getLabel(111, "高级搜索")}</a>
+        </div>
       </div>
     );
   }
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index 045f4b8c..d7f45047 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -62,6 +62,24 @@
     }
   }
 
+  .advance-custom {
+    display: flex;
+    align-items: center;
+
+    & > a {
+      border-radius: 0;
+      height: 28px;
+      position: relative;
+      color: #474747;
+      padding: 4px 15px;
+      background-color: transparent;
+      display: flex;
+      align-items: center;
+      border: 1px solid #d9d9d9;
+      border-left: none
+    }
+  }
+
   .wea-input-focus {
     margin-top: -4px;
   }

From 82ffd93fd59e86ae401307ec98bca086fe20a858 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 18 Apr 2025 15:10:05 +0800
Subject: [PATCH 22/25] 5release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/components/pcTemplate/content.js       | 2 +-
 .../hrmSalary/pages/payroll/templatePreview/index.less   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/components/pcTemplate/content.js b/pc4mobx/hrmSalary/components/pcTemplate/content.js
index 6bc3c60e..1665ac9e 100644
--- a/pc4mobx/hrmSalary/components/pcTemplate/content.js
+++ b/pc4mobx/hrmSalary/components/pcTemplate/content.js
@@ -10,7 +10,7 @@ class Content extends Component {
     const { onlyOneGrup, showData } = dealTemplate(_.filter(itemTypeList, o => !!o), "pc");
     return (
       <div className="salary-preview-container">
-        <div style={{ border: "10px solid #F3F9FF" }}>
+        <div style={{ border: "10px solid #F3F9FF", width: "100%" }}>
           <div className="edition-center">
             <div className="header">
               <div className="header-title">{theme || ""}</div>
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
index 7eae1948..9a7c033c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
@@ -173,8 +173,8 @@
 
     .ph-switch {
       height: 100%;
-      margin: 0 auto;
-      text-align: center;
+      display: flex;
+      justify-content: center;
 
       .active, .phs-btn:hover {
         background-color: rgba(0, 0, 0, .15);
@@ -184,8 +184,9 @@
       .phs-btn {
         height: 50px;
         min-width: 88px;
-        line-height: 50px;
-        display: inline-block;
+        display: flex;
+        justify-content: center;
+        align-items: center;
         color: #fff;
         padding: 0 15px;
         cursor: pointer;

From ae43a2aa7cc313cf7362f28255b5944006dc7695 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 18 Apr 2025 16:21:49 +0800
Subject: [PATCH 23/25] release/2.19.1.2501.01

---
 .../hrmSalary/pages/calculate/calculate.js    | 56 +++++++++++++++----
 .../components/calculateQuery/index.js        |  2 +-
 .../components/calculateTablelist/index.js    |  8 ++-
 pc4mobx/hrmSalary/pages/calculate/config.js   | 19 +++++++
 pc4mobx/hrmSalary/pages/calculate/index.less  | 26 +++++++++
 5 files changed, 97 insertions(+), 14 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/calculate/config.js

diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index e6207394..b23739b8 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -6,7 +6,8 @@
  */
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
-import { WeaLocaleProvider, WeaTop } from "ecCom";
+import { WeaLocaleProvider, WeaTools, WeaTop } from "ecCom";
+import { WeaForm } from "comsMobx";
 import { Button, message, Modal } from "antd";
 import moment from "moment";
 import CalculateQuery from "./components/calculateQuery";
@@ -15,9 +16,15 @@ import CalculateDialog from "./components/calculateDialog";
 import ProgressModal from "../../components/progressModal";
 import LogDialog from "../../components/logViewModal";
 import { backCalculate, deleteSalaryacct, fileSalaryAcct, reAccounting } from "../../apis/calculate";
+import FormInfo from "../../components/FormInfo";
+import { queryConditions } from "./config";
+import { getTaxAgentSelectList } from "../../apis/taxAgent";
+import cs from "classnames";
 import "./index.less";
 
+const getKey = WeaTools.getKey;
 const getLabel = WeaLocaleProvider.getLabel;
+const form = new WeaForm();
 
 @inject("calculateStore", "taxAgentStore")
 @observer
@@ -31,17 +38,32 @@ class Calculate extends Component {
           moment(new Date()).subtract(1, "year").startOf("year").format("YYYY-MM"),
           moment(new Date()).endOf("year").format("YYYY-MM")
         ]
-      }, isRefresh: false, logDialogVisible: false,
+      }, isRefresh: false, logDialogVisible: false, conditions: [],
       progressModule: { visible: false, progress: 0, title: getLabel(111, "正在归档中请稍后") },
-      calcDaialog: { visible: false, title: "" }
+      calcDaialog: { visible: false, title: "" }, showAdvance: false
     };
     this.timer = null;
     this.handleDebounce = null;
   }
 
+  async componentDidMount() {
+    const { data } = await getTaxAgentSelectList();
+    this.setState({
+      conditions: _.map(queryConditions, item => ({
+        ...item, items: _.map(item.items, o => {
+          o = { ...o, label: getLabel(o.lanId, o.label) };
+          if (getKey(o) === "taxAgentIds") {
+            return { ...o, options: _.map(data, k => ({ key: k.id, showname: k.content })) };
+          }
+          return { ...o };
+        })
+      }))
+    }, () => form.initFormFields(this.state.conditions));
+  }
+
   renderCalculateOpts = () => {
     const { taxAgentStore: { showOperateBtn } } = this.props;
-    const { queryParams, isRefresh } = this.state;
+    const { queryParams, isRefresh, showAdvance } = this.state;
     let calculateOpts = [
       <Button type="primary" onClick={() => this.setState({
         calcDaialog: {
@@ -49,10 +71,11 @@ class Calculate extends Component {
           title: getLabel(538780, "核算")
         }
       })}>{getLabel(538780, "核算")}</Button>,
-      <CalculateQuery queryParams={queryParams} onChange={v => this.setState({
-        isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh,
-        queryParams: { ...queryParams, ...v }
-      })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/>
+      <CalculateQuery queryParams={queryParams} onAdvance={() => this.setState({ showAdvance: !showAdvance })}
+                      onChange={v => this.setState({
+                        isRefresh: _.keys(v)[0] === "name" ? isRefresh : !isRefresh,
+                        queryParams: { ...queryParams, ...v }
+                      })} onSearch={() => this.setState({ isRefresh: !isRefresh })}/>
     ];
     return !showOperateBtn ? calculateOpts.slice(1) : calculateOpts;
   };
@@ -188,7 +211,9 @@ class Calculate extends Component {
   };
 
   render() {
-    const { queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions } = this.state;
+    const {
+      queryParams, isRefresh, calcDaialog, progressModule, logDialogVisible, filterConditions, conditions, showAdvance
+    } = this.state;
     return (
       <WeaTop title={getLabel(538011, "薪资核算")} icon={<i className="icon-coms-fa"/>} iconBgcolor="#F14A2D"
               buttons={this.renderCalculateOpts()} className="calculate-main-layout" showDropIcon
@@ -201,7 +226,18 @@ class Calculate extends Component {
               ]}
       >
         <div className="calculate-body">
-          <CalculateTablelist queryParams={queryParams} isRefresh={isRefresh} onCalcOpts={this.handleCalcOpts}/>
+          <div className={cs("advance-calc", { "show-advance-calc": showAdvance })}>
+            <FormInfo center={false} itemRender={{}} form={form} formFields={conditions} colCount={2}/>
+            <div className="advance-calc-btns">
+              <Button type="primary"
+                      onClick={() => this.setState({ isRefresh: !isRefresh })}>{getLabel(111, "搜索")}</Button>
+              <Button type="ghost" onClick={() => form.resetForm()}>{getLabel(111, "重置")}</Button>
+              <Button type="ghost"
+                      onClick={() => this.setState({ showAdvance: !showAdvance })}>{getLabel(111, "取消")}</Button>
+            </div>
+          </div>
+          <CalculateTablelist form={form} queryParams={queryParams} isRefresh={isRefresh}
+                              onCalcOpts={this.handleCalcOpts}/>
           <CalculateDialog {...calcDaialog}
                            onCancel={(bool, id) => this.setState({
                              calcDaialog: { ...calcDaialog, visible: false },
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
index e8e89b97..0c74ccd5 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateQuery/index.js
@@ -27,7 +27,7 @@ class Index extends Component {
                           onChange={v => this.props.onChange({ name: v })}
                           onSearch={this.props.onSearch}
           />
-          <a href="javascript:void(0);">{getLabel(111, "高级搜索")}</a>
+          <a href="javascript:void(0);" onClick={this.props.onAdvance}>{getLabel(111, "高级搜索")}</a>
         </div>
       </div>
     );
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
index eecfa1db..63ab2e87 100644
--- a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
@@ -29,12 +29,14 @@ class Index extends Component {
   }
 
   getSalaryAcctList = (props) => {
-    const { pageInfo } = this.state;
-    const { queryParams } = props;
+    const { pageInfo } = this.state, { queryParams, form } = props;
+    const { taxAgentIds } = form.getFormParams();
     const { dateRange, ...extra } = queryParams;
     const [startMonthStr, endMonthStr] = dateRange || [];
     const params = { startMonthStr, endMonthStr, ...extra };
-    const payload = { ...pageInfo, ...params };
+    const payload = {
+      ...pageInfo, ...params, taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : []
+    };
     this.setState({ loading: true });
     getSalaryAcctList(payload).then(({ status, data }) => {
       this.setState({ loading: false });
diff --git a/pc4mobx/hrmSalary/pages/calculate/config.js b/pc4mobx/hrmSalary/pages/calculate/config.js
new file mode 100644
index 00000000..02da5b10
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculate/config.js
@@ -0,0 +1,19 @@
+export const queryConditions = [
+  {
+    items: [
+      {
+        conditionType: "SELECT",
+        domkey: ["taxAgentIds"],
+        fieldcol: 14,
+        label: "个税扣缴义务人",
+        lanI: 111,
+        multiple: true,
+        options: [],
+        labelcol: 6,
+        value: "",
+        viewAttr: 2
+      }
+    ],
+    defaultshow: true
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/calculate/index.less b/pc4mobx/hrmSalary/pages/calculate/index.less
index d7f45047..2e73f6b2 100644
--- a/pc4mobx/hrmSalary/pages/calculate/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/index.less
@@ -90,6 +90,32 @@
     overflow-y: hidden;
   }
 
+  .advance-calc {
+    display: none;
+    background: #FFF;
+    margin-bottom: 8px;
+
+    .advance-calc-btns {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 15px 0;
+      border-top: 1px solid #dadada;
+
+      button {
+        margin-right: 15px;
+      }
+    }
+
+    .wea-search-group, .wea-content {
+      padding: 0;
+    }
+  }
+
+  .show-advance-calc {
+    display: block;
+  }
+
   .calculate-body {
     height: 100%;
     width: 100%;

From ec6874df2e4ab2ad348f7e58049d51eb6540a885 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 18 Apr 2025 16:26:05 +0800
Subject: [PATCH 24/25] release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/pages/calculate/calculate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index 98551065..eb8dba57 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -18,7 +18,7 @@ import LogDialog from "../../components/logViewModal";
 import { backCalculate, deleteSalaryacct, fileSalaryAcct, reAccounting } from "../../apis/calculate";
 import FormInfo from "../../components/FormInfo";
 import { queryConditions } from "./config";
-import { getTaxAgentSelectList } from "../../apis/taxAgent";
+import { postFetch } from "../../util/request";
 import cs from "classnames";
 import "./index.less";
 
@@ -47,7 +47,7 @@ class Calculate extends Component {
   }
 
   async componentDidMount() {
-    const { data } = await getTaxAgentSelectList();
+    const { data } = await postFetch("/api/bs/hrmsalary/taxAgent/listAuth", { filterType: "QUERY_DATA" });
     this.setState({
       conditions: _.map(queryConditions, item => ({
         ...item, items: _.map(item.items, o => {

From 1455707c9cb6aa15daac6ec81585cb5fd6859d30 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 18 Apr 2025 16:31:34 +0800
Subject: [PATCH 25/25] release/2.19.1.2501.01

---
 pc4mobx/hrmSalary/pages/calculate/calculate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/calculate.js b/pc4mobx/hrmSalary/pages/calculate/calculate.js
index eb8dba57..3a7b563d 100644
--- a/pc4mobx/hrmSalary/pages/calculate/calculate.js
+++ b/pc4mobx/hrmSalary/pages/calculate/calculate.js
@@ -53,7 +53,7 @@ class Calculate extends Component {
         ...item, items: _.map(item.items, o => {
           o = { ...o, label: getLabel(o.lanId, o.label) };
           if (getKey(o) === "taxAgentIds") {
-            return { ...o, options: _.map(data, k => ({ key: k.id, showname: k.content })) };
+            return { ...o, options: _.map(data, k => ({ key: k.id + "", showname: k.name })) };
           }
           return { ...o };
         })