-
+
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 00cd202d..0c74ccd5 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 {
this.props.onChange({ dateRange: v })}/>
-
+
+
+
+
+
+
+
+
+ this.props.onChange({ name: v })}
+ onSearch={this.props.onSearch}
+ />
+ {getLabel(111, "高级搜索")}
+
);
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateTablelist/index.js
index 5059017f..0b4ea0a0 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 045f4b8c..2e73f6b2 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;
}
@@ -72,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%;
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
new file mode 100644
index 00000000..3462cb08
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/conditions.js
@@ -0,0 +1,87 @@
+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
+ }
+];
+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 69d84928..a1756ede 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -2,37 +2,31 @@ import React from "react";
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";
+import SecondaryVerify from "./secondaryVerify";
+import LoginVerify from "./loginVerify";
+import SecondarypwdVerify from "./secondarypwdVerify";
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: []
- },
+ visible: false, captchaVisible: false, loginVisible: false, pwdSetVisible: false,
+ mySalaryBillData: { employeeInformation: {}, salaryTemplate: [] },
salaryBillToken: {}
};
this.id = "";
@@ -60,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();
@@ -82,12 +71,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();
@@ -96,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({
@@ -132,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("=");
@@ -179,76 +140,61 @@ 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, loginVisible, pwdSetVisible
+ } = this.state;
const type = getQueryString("type");
- if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return
- this.setState({ visible: false }, () => clearLoading())}
- title="请输入二次验证密码" visible={visible} initLoadCss
- className="verifyWrapper"
- hasScroll buttons={[
-
- ]}
- >
-
- this.setState({ authCode })}/>
-
- {
- notSetting &&
-
- this.setState({ pwdSetVisible: false })}/>
-
;
+ if (_.isEmpty(toJS(this.props.mySalaryStore.mySalaryBill))) return
- {getLabel("514970", "您还未设置二次验证密码，点击")}
- this.setState({ pwdSetVisible: true })}>{getLabel("30747", "设置")}
-
- }
-
-
-
-
-
+
+
+
+
+
+ );
+ }
+}
+
+export default MobileModal;
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
new file mode 100644
index 00000000..b5310466
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/secondaryVerify.js
@@ -0,0 +1,82 @@
+/*
+ * 二次验证密码
+ *
+ * @Author: 黎永顺
+ * @Date: 2025/4/16
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+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";
+
+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);
+ }
+
+ componentWillUnmount() {
+ this.setState({ notSetting: false }, () => form.resetForm());
+ }
+
+ doSecondAuth = () => {
+ form.validateForm().then(f => {
+ if (f.isValid) {
+ const { salaryBillToken } = this.props;
+ API.doSecondAuth({ mouldCode: "HRM", itemCode: "SALARY", ...form.getFormParams() }, salaryBillToken)
+ .then(({ status, checkStatus, checkMsg }) => {
+ if (status && checkStatus === "1") {
+ message.success(checkMsg);
+ this.props.onSuccess();
+ } else {
+ form.showError("authCode", checkMsg);
+ }
+ });
+ } else {
+ f.showErrors();
+ }
+ });
+ };
+
+ render() {
+ const { notSetting } = this.state;
+ const itemRender = {
+ authCode: (field, textAreaProps, form, formParams) => {
+ return (
+
+
+
+
+
+
+
+
+
+
+ {this.props.title}
+ {this.props.children}
+
+
+ {getLabel(111, "您还未设置二次验证密码，点击")}
+ {getLabel(111, "设置")}
+
+ }
+