Merge branch 'hotfix/V2-20230605' into release-2023-06-08

pc4mobx/hrmSalary/pages/payrollFiles/index.js

@@ -247,7 +247,7 @@ class Index extends Component {
     });
     queryList(payload, searchItemsValue, url).then(({ data, status }) => {
       this.setState({ loading: { ...loading, query: false } });
-      if (status) {
+      if (status && selectedKey === _.lowerCase(data.listType)) {
         const { pageInfo: paganition } = data;
         const { list: dataSource, total, pageNum: current, pageSize } = paganition;
         this.setState({

pc4mobx/hrmSalary/pages/reportView/index.js

@@ -31,9 +31,9 @@ class Index extends Component {
   }
 
   componentDidMount() {
-    const { taxAgentStore: { getTaxAgentSelectListAsAdmin } } = this.props;
+    const { taxAgentStore: { fetchTaxAgentOption } } = this.props;
     this.reportGetForm();
-    getTaxAgentSelectListAsAdmin();
+    fetchTaxAgentOption();
   }
 
   reportGetForm = () => {
@@ -98,7 +98,7 @@ class Index extends Component {
 
   render() {
     const { report, dimensionList, statisticalPayload } = this.state;
-    const { attendanceStore: { settingForm }, taxAgentStore: { taxAgentAdminOption } } = this.props;
+    const { attendanceStore: { settingForm }, taxAgentStore: { taxAgentOption } } = this.props;
     return (
       <WeaTop
         title={getLabel(111, "报表查看")}
@@ -137,7 +137,7 @@ class Index extends Component {
                         title={getLabel(111, "统计数据范围及规则设置")}
                         onClick={() => {
                           if (this.reportRef.state.loading) {
-                            message.info(getLabel(111, "列表正在加载中，请稍后"))
+                            message.info(getLabel(111, "列表正在加载中，请稍后"));
                           } else {
                             this.setState({
                               statisticalPayload: { visible: true, id: report.id, dimension: report.dimensionId }
@@ -150,7 +150,7 @@ class Index extends Component {
                     {/*统计数据范围及规则设置弹框*/}
                     <StatisticalMicroSettingsSlide
                       {...statisticalPayload} form={settingForm}
-                      taxAgentAdminOption={taxAgentAdminOption}
+                      taxAgentAdminOption={taxAgentOption}
                       onClose={(isRefresh) => this.setState({
                         statisticalPayload: { visible: false, id: "", dimension: "" }
                       }, () => isRefresh && this.reportRef.reportStatisticsReportGetData(report.id, report.dimensionId))}