hotfix/2.12.1.2403.02

1、工资单发放-查看详情-高级搜索部门能多选，多选分部 2、社保福利台账：正常缴纳、补缴、退差、补差高级搜索增加部门筛选，多分部筛选
2024-03-21 13:49:18 +08:00 · 2024-03-21 13:49:18 +08:00 · a7e75331e1
parent 272e45d3e5
commit a7e75331e1
6 changed files with 86 additions and 41 deletions
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
@ -87,9 +87,14 @@ export default class PayrollDetail extends React.Component {
    const { child, ...extraParams } = extra;
    const salarySendId = getQueryString("id");
    const { payrollStore } = this.props;
-    const { detailListConditionForm: form } = payrollStore;
-    const payload = { salarySendId, ...pageInfo, ...extraParams, ...form.getFormParams() };
+    const { detailListConditionForm: form, setDetailListShowSearchAd } = payrollStore;
+    const payload = {
+      salarySendId, ...pageInfo, ...extraParams, ...form.getFormParams(),
+      departmentIds: form.getFormParams().departmentIds ? form.getFormParams().departmentIds.split(",") : [],
+      subCompanyIds: form.getFormParams().subCompanyIds ? form.getFormParams().subCompanyIds.split(",") : []
+    };
    this.setState({ loading: true });
+    setDetailListShowSearchAd(false)
    getPayrollDetailList(payload).then(({ status, data }) => {
      this.setState({ loading: false });
      if (status) {
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js
@ -62,6 +62,8 @@ class MakeupDifference extends Component {
    const { importDiffModal, addPersonalDialog } = this.state;
    const name = this.regTopRef.state.name;
    const workcode = this.regTopRef.state.workcode;
+    const departmentIds = this.regTopRef.state.departmentIds ? this.regTopRef.state.departmentIds.split(",") : [];
+    const subCompanyIds = this.regTopRef.state.subCompanyIds ? this.regTopRef.state.subCompanyIds.split(",") : [];
    const billMonth = getQueryString("billMonth");
    const paymentOrganization = getQueryString("paymentOrganization");
    switch (key) {
@ -85,7 +87,7 @@ class MakeupDifference extends Component {
        window.open(url, "_self");
        break;
      case "search":
-        this.diffListRef.recessionList({ userName: name, workcode, current: 1 });
+        this.diffListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 });
        break;
      case "add":
        this.setState({
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@ -5,9 +5,9 @@
 * LastEditTime: 2022-06-29 09:53:36
 */
 import React, { Component } from "react";
-import { Button, Icon, message, Modal, Spin, Tooltip } from "antd";
+import { Button, Col, Icon, message, Modal, Row, Spin, Tooltip } from "antd";
 import { inject, observer } from "mobx-react";
-import { WeaFormItem, WeaInput, WeaSearchGroup, WeaTab } from "ecCom";
+import { WeaBrowser, WeaFormItem, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
 import { calcPageNo } from "../../../../util";
 import { getQueryString } from "../../../../util/url";
 import ProgressModal from "../../../../components/progressModal";
@ -19,6 +19,7 @@ import SupplementarySlide from "./supplementarySlide";
 import _ from "lodash";
 import "./index.less";

+const getLabel = WeaLocaleProvider.getLabel;
@inject("standingBookStore")
@observer
 export default class NormalIndex extends Component {
@ -44,6 +45,8 @@ export default class NormalIndex extends Component {
      },
      searchValue: "",
      workcode: "",
+      departmentIds: "",
+      subCompanyIds: "",
      progressVisible: false,
      progress: 0,
      fieldData: {}, //选中的表单头信息
@ -149,14 +152,18 @@ export default class NormalIndex extends Component {
        current: 1,
        paymentOrganization,
        userName: this.state.searchValue,
-        workcode: this.state.workcode
+        workcode: this.state.workcode,
+        departmentIds: this.state.departmentIds ? this.state.departmentIds.split(",") : [],
+        subCompanyIds: this.state.subCompanyIds ? this.state.subCompanyIds.split(",") : []
      })
      : this.getSupplementaryList({
        billMonth,
        current: 1,
        paymentOrganization,
        userName: this.state.searchValue,
-        workcode: this.state.workcode
+        workcode: this.state.workcode,
+        departmentIds: this.state.departmentIds ? this.state.departmentIds.split(",") : [],
+        subCompanyIds: this.state.subCompanyIds ? this.state.subCompanyIds.split(",") : []
      });
  };

@ -445,12 +452,24 @@ export default class NormalIndex extends Component {
  };
  getSearchs = () => {
    return <WeaSearchGroup needTigger showGroup title="其他条件">
-      <WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}>
-        <WeaInput
-          value={this.state.workcode}
-          onChange={v => this.setState({ workcode: v })}
-        />
-      </WeaFormItem>
+      <Row>
+        <Col span={12}><WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <WeaInput
+            value={this.state.workcode}
+            onChange={v => this.setState({ workcode: v })}
+          />
+        </WeaFormItem></Col>
+        <Col span={12}><WeaFormItem label={getLabel(27511, "部门")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <WeaBrowser
+            isSingle={false} value={this.state.departmentIds} type={57}
+            onChange={v => this.setState({ departmentIds: v })}/>
+        </WeaFormItem></Col>
+        <Col span={12}><WeaFormItem label={getLabel(33553, "分部")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <WeaBrowser
+            isSingle={false} value={this.state.subCompanyIds} type={164}
+            onChange={v => this.setState({ subCompanyIds: v })}/>
+        </WeaFormItem></Col>
+      </Row>
    </WeaSearchGroup>;
  };

--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
@ -1,6 +1,6 @@
 import React, { Component } from "react";
-import { Button } from "antd";
-import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
+import { Button, Col, Row } from "antd";
+import { WeaBrowser, WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
 import { getQueryString } from "../../../../util/url";

 const getLabel = WeaLocaleProvider.getLabel;
@ -11,6 +11,8 @@ class RegTop extends Component {
    this.state = {
      name: "",
      workcode: "",
+      departmentIds: "",
+      subCompanyIds: "",
      showSearchAd: false
    };
  }
@ -56,12 +58,24 @@ class RegTop extends Component {
  };
  getSearchs = () => {
    return <WeaSearchGroup needTigger showGroup title="其他条件">
-      <WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 8 }}>
-        <WeaInput
-          value={this.state.workcode}
-          onChange={v => this.setState({ workcode: v })}
-        />
-      </WeaFormItem>
+      <Row>
+        <Col span={12}><WeaFormItem label="工号" labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <WeaInput
+            value={this.state.workcode}
+            onChange={v => this.setState({ workcode: v })}
+          />
+        </WeaFormItem></Col>
+        <Col span={12}><WeaFormItem label={getLabel(27511, "部门")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <WeaBrowser
+            isSingle={false} value={this.state.departmentIds} type={57}
+            onChange={v => this.setState({ departmentIds: v })}/>
+        </WeaFormItem></Col>
+        <Col span={12}><WeaFormItem label={getLabel(33553, "分部")} labelCol={{ span: 4 }} wrapperCol={{ span: 18 }}>
+          <WeaBrowser
+            isSingle={false} value={this.state.subCompanyIds} type={164}
+            onChange={v => this.setState({ subCompanyIds: v })}/>
+        </WeaFormItem></Col>
+      </Row>
    </WeaSearchGroup>;
  };

--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
@ -6,7 +6,6 @@
 */
 import React, { Component } from "react";
 import { message, Modal } from "antd";
-import { WeaNewScroll } from "ecCom";
 import RegTop from "./regTop";
 import RegList from "./regList";
 import RegAddEmployee from "./regAddEmployee";
@ -75,6 +74,8 @@ class Regression extends Component {
    const { returnPersonModal } = this.state;
    const name = this.regTopRef.state.name;
    const workcode = this.regTopRef.state.workcode;
+    const departmentIds = this.regTopRef.state.departmentIds ? this.regTopRef.state.departmentIds.split(",") : [];
+    const subCompanyIds = this.regTopRef.state.subCompanyIds ? this.regTopRef.state.subCompanyIds.split(",") : [];
    const billMonth = getQueryString("billMonth");
    const creator = Number(getQueryString("creator"));
    const paymentOrganization = getQueryString("paymentOrganization");
@ -98,7 +99,7 @@ class Regression extends Component {
        window.open(url, "_self");
        break;
      case "search":
-        this.regListRef.recessionList({ userName: name, workcode, current: 1 });
+        this.regListRef.recessionList({ userName: name, workcode, departmentIds, subCompanyIds, current: 1 });
        break;
      default:
        break;
@ -136,23 +137,23 @@ class Regression extends Component {
        />
        <div className="tableWrapper">
          {/*<WeaNewScroll height="100%">*/}
-            <RegList
-              type="regression"
-              ref={dom => this.regListRef = dom}
-              visible={returnPersonModal.visible}
-              onChangeRowkey={(selectKey) => this.setState({ selectKey })}
-              onEdit={this.handleEdit}
-            />
-            {/*编辑弹框*/}
-            <RegEditDetial {...returnEditPersonSlide} onCancel={this.handleCloseModal}/>
-            {/* 弹框 */}
-            <RegAddEmployee
-              ref={dom => this.regEmmployeeRef = dom}
-              {...returnPersonModal}
-              loading={loading}
-              onCancel={this.handleCloseModal}
-              onSave={this.handleSave}
-            />
+          <RegList
+            type="regression"
+            ref={dom => this.regListRef = dom}
+            visible={returnPersonModal.visible}
+            onChangeRowkey={(selectKey) => this.setState({ selectKey })}
+            onEdit={this.handleEdit}
+          />
+          {/*编辑弹框*/}
+          <RegEditDetial {...returnEditPersonSlide} onCancel={this.handleCloseModal}/>
+          {/* 弹框 */}
+          <RegAddEmployee
+            ref={dom => this.regEmmployeeRef = dom}
+            {...returnPersonModal}
+            loading={loading}
+            onCancel={this.handleCloseModal}
+            onSave={this.handleSave}
+          />
          {/*</WeaNewScroll>*/}
        </div>
      </div>
--- a/pc4mobx/hrmSalary/stores/payroll.js
+++ b/pc4mobx/hrmSalary/stores/payroll.js
@ -453,7 +453,11 @@ export class payrollStore {
  @action
  getInfoList = (params = {}) => {
    let form = this.grantListConditionForm.getFormParams();
-    params = { ...form, ...params };
+    params = {
+      ...form, ...params,
+      departmentIds: form.departmentIds ? form.departmentIds.split(",") : [],
+      subCompanyIds: form.subCompanyIds ? form.subCompanyIds.split(",") : []
+    };
    API.getInfoList(params).then(res => {
      if (res.status) {
        this.salaryGrantTableStore = res.data.columns;