diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/index.js b/pc4mobx/hrmSalary/components/CustomBrowser/index.js
index b0a9ead4..b7afc211 100644
--- a/pc4mobx/hrmSalary/components/CustomBrowser/index.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/index.js
@@ -40,7 +40,10 @@ class Index extends Component {
}
componentWillReceiveProps(nextProps, nextContext) {
- if (nextProps.value !== this.props.value && _.isEmpty(nextProps.value)) {
+ if (
+ (nextProps.value !== this.props.value && _.isEmpty(nextProps.value)) ||
+ (nextProps.fieldConfig.value !== this.props.fieldConfig.value && _.isEmpty(nextProps.fieldConfig.value))
+ ) {
this.setState({ searchKeys: [], selectedData: [] });
}
}
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.js
new file mode 100644
index 00000000..77d46acc
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.js
@@ -0,0 +1,36 @@
+/*
+ * 业务线管理
+ * 高级搜索
+ * @Author: 黎永顺
+ * @Date: 2024/9/24
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { Button } from "antd";
+import { WeaInputSearch, WeaLocaleProvider } from "ecCom";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class Index extends Component {
+ render() {
+ const { taxAgentStore: { advanceForm } } = this.props;
+ return (
+
+ advanceForm.updateFields({ name: v })}
+ onSearch={this.props.onAdvanceSearch}
+ />
+
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.less b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.less
new file mode 100644
index 00000000..556cfd69
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceInputBtn/index.less
@@ -0,0 +1,27 @@
+.role-advance-search {
+ display: flex;
+ align-items: center;
+ position: relative;
+
+ .wea-advanced-search {
+ top: 0;
+ left: -1px;
+ height: 28px;
+ line-height: 1;
+ border-radius: 0;
+ position: relative;
+ color: #474747;
+ padding: 4px 15px;
+ }
+
+ .wea-advanced-search:hover {
+ border: 1px solid #dadada;
+ color: #474747;
+ }
+
+ .text-elli {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/advanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceSearchPannel/index.js
new file mode 100644
index 00000000..fab6c856
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/advanceSearchPannel/index.js
@@ -0,0 +1,98 @@
+/*
+ * 业务线管理
+ * 高级搜索面板
+ * @Author: 黎永顺
+ * @Date: 2024/9/24
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaLocaleProvider, WeaTools } from "ecCom";
+import { roleSearchConditions } from "../conditions";
+import { getSearchs } from "../../../../util";
+import { Button } from "antd";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore")
+@observer
+class AdvanceSearchPannel extends Component {
+ constructor(props) {
+ super(props);
+ this.state = { conditions: [] };
+ }
+
+ componentDidMount() {
+ const { taxAgentStore: { advanceForm } } = this.props;
+ this.setState({
+ conditions: _.map(roleSearchConditions, item => ({
+ ...item, title: getLabel(item.lanId, item.title),
+ items: _.map(item.items, o => {
+ if (getKey(0) === "opts") {
+ return {
+ ...o, label: getLabel(o.lanId, o.label),
+ options: _.map(o.options, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
+ };
+ }
+ return { ...o, label: getLabel(o.lanId, o.label) };
+ })
+ }))
+ }, () => advanceForm.initFormFields(this.state.conditions));
+ }
+
+ handleReset = () => {
+ const { taxAgentStore: { advanceForm } } = this.props;
+ this.setState({
+ conditions: _.map(roleSearchConditions, item => ({
+ ...item, items: _.map(item.items, o => ({ ...o, value: "" }))
+ }))
+ }, () => advanceForm.resetForm());
+ };
+ handleFormChange = (val) => {
+ const key = _.keys(val)[0];
+ const { taxAgentStore: { advanceForm } } = this.props;
+ if (key === "taxAgentIds" || key === "sobIds") {
+ this.setState({
+ conditions: _.map(roleSearchConditions, item => ({
+ ...item, items: _.map(item.items, o => {
+ if (key === getKey(o)) {
+ return { ...o, value: _.map(val[key], o => o.id).join(",") };
+ }
+ return { ...o, value: advanceForm.getFormParams()[getKey(o)] };
+ })
+ }))
+ });
+ }
+ };
+
+ render() {
+ const { taxAgentStore: { advanceForm } } = this.props;
+ const { conditions } = this.state;
+ return (
+
+
+ {getSearchs(advanceForm, conditions, 2, false, this.handleFormChange)}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
this.setState({ showSearchAd: false })}
+ onAdSearch={() => this.setState({
+ showSearchAd: false, pageInfo: { ...pageInfo, current: 1 }
+ }, () => this.getRoleList())}/>
+
{/*添加角色*/}
@@ -156,6 +197,9 @@ class Index extends Component {
callback && callback();
})}/>