-
+
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/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 [
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index facb4273..669f1ba1 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -155,6 +155,10 @@
.esf-base-info-form, .wea-title, .wea-content {
padding: 0;
+
+ .ant-row {
+ height: 100%;
+ }
}
.esf-form-content {
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/datapush/components/pushRecord/createPushRecordDialog.js b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
new file mode 100644
index 00000000..e0bd1255
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/datapush/components/pushRecord/createPushRecordDialog.js
@@ -0,0 +1,149 @@
+/*
+ * 数据推送记录
+ * 创建
+ * @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 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;
+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) => {
+ 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() {
+ 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 (
- 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, "设置")}
+
+ }
+