产品-release/2.8.3.2307.02bug修复

2023-07-20 17:03:20 +08:00 · 2023-07-20 17:03:20 +08:00 · d5a625d4c8
parent 12aa1c6c10
commit d5a625d4c8
9 changed files with 72 additions and 26 deletions
--- a/pc4mobx/hrmSalary/pages/calculateDetail/customExportDialog.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/customExportDialog.js
@ -36,7 +36,7 @@ class CustomExportDialog extends Component {
    const { itemsCheckeds } = this.state;
    customCacheExportField({ salaryItems: _.map(itemsCheckeds, it => it.toString()) }).then(({ status, errorMsg }) => {
      if (status) {
-        const { consolidatedTaxation, ...extra } = searchItemsValue;
+        const { consolidatedTaxation = "0", ...extra } = searchItemsValue;
        const payload = { ...extra, consolidatedTaxation: consolidatedTaxation === "0" ? "" : consolidatedTaxation };
        window.open(
          `/api/bs/hrmsalary/salaryacct/acctresult/exportWithCustomFields?salaryAcctRecordId=${getQueryString("id")}&ids=&${convertToUrlString(payload)}&salaryItemIds=${itemsCheckeds.join(",")}`
--- a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
@ -2,13 +2,16 @@ import React from "react";
 import { toJS } from "mobx";
 import CustomTab from "../../components/customTab";
 import { Dropdown, Menu, message } from "antd";
-import { WeaHelpfulTip, WeaInputSearch, WeaSlideModal } from "ecCom";
+import { WeaHelpfulTip, WeaInputSearch, WeaLocaleProvider, WeaSlideModal } from "ecCom";
 import SlideModalTitle from "../../components/slideModalTitle";
 import FileMergeDetail from "./fileMergeDetail";
 import { getQueryString } from "../../util/url";
 import { inject, observer } from "mobx-react";
+import { getExportField } from "../../apis/calculate";
 import "./index.less";
+import CustomExportDialog from "./customExportDialog";

+const getLabel = WeaLocaleProvider.getLabel;
@inject("calculateStore")
@observer
 export default class PlaceOnFileDetail extends React.Component {
@ -18,7 +21,10 @@ export default class PlaceOnFileDetail extends React.Component {
      slideVisiable: false,
      selectedRowKeys: [],
      searchValue: "",
-      columnIndex: ""
+      columnIndex: "",
+      customExportParams: {
+        visible: false, checkItems: [], itemsByGroup: []
+      }
    };
    this.id = "";
  }
@ -95,15 +101,33 @@ export default class PlaceOnFileDetail extends React.Component {
    childFrameObj.contentWindow.postMessage(JSON.stringify(payload), "*");
  };

-  handleMenuClick() {
-    const { calculateStore: { exportAll } } = this.props;
-    const { selectedRowKeys } = this.state;
-    if (selectedRowKeys.length === 0) {
-      message.warning("未选择条目");
-      return;
+  handleMenuClick = ({ key }) => {
+    if (key === "3") {
+      const { calculateStore: { exportAll } } = this.props;
+      const { selectedRowKeys } = this.state;
+      if (selectedRowKeys.length === 0) {
+        message.warning("未选择条目");
+        return;
+      }
+      exportAll(this.id, selectedRowKeys.join(","));
+    } else if (key === "4") {
+      this.getExportField();
    }
-    exportAll(this.id, selectedRowKeys.join(","));
-  }
+  };
+
+  getExportField = () => {
+    getExportField({ salaryAcctRecordId: getQueryString("id") }).then(({ status, data }) => {
+      if (status) {
+        const { checkItems, itemsByGroup } = data;
+        this.setState({
+          customExportParams: {
+            visible: true,
+            checkItems, itemsByGroup
+          }
+        });
+      }
+    });
+  };

  handleExportAll = () => {
    const { calculateStore: { exportAll } } = this.props;
@ -113,11 +137,12 @@ export default class PlaceOnFileDetail extends React.Component {
  render() {
    const { calculateStore } = this.props;
    const { baseSalarySobCycle, columnDescList } = calculateStore;
-    const { slideVisiable, columnIndex } = this.state;
+    const { slideVisiable, columnIndex, customExportParams } = this.state;

    const menu = (
      <Menu onClick={(e) => this.handleMenuClick(e)}>
        <Menu.Item key="3">导出所选</Menu.Item>
+        <Menu.Item key="4">{getLabel(111, "自定义导出")}</Menu.Item>
      </Menu>
    );

@ -171,6 +196,17 @@ export default class PlaceOnFileDetail extends React.Component {
            id="atdTable"
          />
        </div>
+        <CustomExportDialog
+          {...customExportParams}
+          searchItemsValue={{ employeeName: this.state.searchValue }}
+          onCancel={() => {
+            this.setState({
+              customExportParams: {
+                visible: false, checkItems: [], itemsByGroup: []
+              }
+            });
+          }}
+        />
        {
          slideVisiable &&
          <WeaSlideModal
--- a/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
+++ b/pc4mobx/hrmSalary/pages/externalPersonManage/index.js
@ -100,7 +100,10 @@ class Index extends Component {

  render() {
    const { showSearchAd, externalPersonManagePayload, loading, pageInfo, selectedRowKeys, dataSource } = this.state;
-    const { externalPersonManageStore: { form, addForm }, taxAgentStore: { showOperateBtn } } = this.props;
+    const {
+      externalPersonManageStore: { form, addForm },
+      taxAgentStore: { showOperateBtn, showSalaryItemBtn }
+    } = this.props;
    const pagination = {
      current: pageInfo.current,
      pageSize: pageInfo.pageSize,
@ -128,7 +131,7 @@ class Index extends Component {
        >
          <div className="externalPerCont">
            <WeaTab
-              buttons={showOperateBtn ? [
+              buttons={(showOperateBtn || showSalaryItemBtn) ? [
                <Button type="primary" onClick={() => this.handleAdd()}>新建</Button>
              ] : []}
              searchType={["base", "advanced"]} showSearchAd={showSearchAd}
@ -143,7 +146,7 @@ class Index extends Component {
            <WeaTable
              rowKey="id"
              loading={loading}
-              columns={showOperateBtn ? [
+              columns={(showOperateBtn || showSalaryItemBtn) ? [
                ...this.getColumns(),
                {
                  dataIndex: "operate",
@ -164,7 +167,7 @@ class Index extends Component {
              xWidth={800}
            />
            <ExternalPersonManageEditSlide
-              showOperateBtn={showOperateBtn} form={addForm} condition={condition}
+              showOperateBtn={showOperateBtn || showSalaryItemBtn} form={addForm} condition={condition}
              onCancel={this.handleCancel} {...externalPersonManagePayload}
            />
          </div>
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
@ -274,7 +274,7 @@ class LedgerAssociatedPersonnel extends Component {
    return (
      <div>
        <WeaTab
-          datas={extEmpsWitch === "0" ? _.dropRight(topTab) : topTab}
+          datas={(extEmpsWitch === "0" || !extEmpsWitch) ? _.dropRight(topTab) : topTab}
          keyParam="viewcondition" //主键
          selectedKey={selectedKey}
          buttons={showOperateBtn && selectedKey === "listInclude" ? btns : btns.slice(1)}
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@ -134,6 +134,7 @@ export default class MobilePayroll extends React.Component {
            const { mySalaryBillData } = this.state;
            const { salaryTemplate } = mySalaryBillData;
            const { feedbackUrl } = salaryTemplate;
+            this.getMySalaryBill(getQueryString("id"));
            window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`);
          } else {
            message.error(errorMsg);
@ -168,9 +169,10 @@ export default class MobilePayroll extends React.Component {
          </WeaError>
          {
            notSetting &&
-            <div style={{ clear: "both", paddingTop: 10 }} >
+            <div style={{ clear: "both", paddingTop: 10 }}>
              {getLabel("514970", "您还未设置二次验证密码，点击")}
-              <a href="javascript:void(0);" onClick={() => this.setState({ pwdSetVisible: true })}>{getLabel("30747", "设置")}</a>
+              <a href="javascript:void(0);"
+                 onClick={() => this.setState({ pwdSetVisible: true })}>{getLabel("30747", "设置")}</a>
            </div>
          }
        </WeaDialog>
--- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
@ -59,13 +59,17 @@ class MySalaryView extends Component {
      title: getLabel(131329, "信息确认"),
      content: getLabel(111, "请确认薪资信息是有误，进行反馈并发起反馈流程。"),
      onOk: () => {
-        const { params: { salaryInfoId } } = this.props;
+        const { params: { salaryInfoId }, mySalaryStore: { getMySalaryBill } } = this.props;
        feedBackSalaryBill({ salaryInfoId }).then(({ status, errorMsg }) => {
          if (status) {
            const { mySalaryStore } = this.state;
            const { salaryTemplate } = mySalaryStore;
            const { feedbackUrl } = salaryTemplate;
-            window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`);
+            getMySalaryBill(Number(salaryInfoId)).then(data => {
+              this.setState({ mySalaryStore: data }, () => {
+                window.open(`${window.ecologyContentPath || ""}${feedbackUrl}`);
+              });
+            });
          } else {
            message.error(errorMsg);
          }
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@ -778,7 +778,7 @@ class Index extends Component {
          dropMenuDatas={rightMenu}
        >
          <WeaTab
-            datas={extEmpsWitch === "0" ? _.dropRight(tabCondition) : tabCondition}
+            datas={(extEmpsWitch === "0" || !extEmpsWitch) ? _.dropRight(tabCondition) : tabCondition}
            counts={tabCount}
            className="payrollFilesTab"
            keyParam="viewcondition" //主键
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@ -24,7 +24,7 @@ export default class Index extends Component {
        ascOrDesc: "",
        rule: "",
        enctry: "",
-        operateTaxDeclaration: "",
+        operateTaxDeclaration: "1",
        matchRule: "",
        confValue: "0",
        withDrawTaxDeclaration: "0",
@ -54,7 +54,7 @@ export default class Index extends Component {
    const {
      data: {
        ascOrDesc = "", orderRule = "", showEncryptOperationButton, matchEmployeeMode: rule = "",
-        taxDeclarationFunction: operateTaxDeclaration = "0", salaryArchiveDelete: confValue,
+        taxDeclarationFunction: operateTaxDeclaration = "1", salaryArchiveDelete: confValue,
        salaryAcctEmployeeRule: matchRule, WITHDRAW_TAX_DECLARATION: withDrawTaxDeclaration = "0",
        OPEN_APPLICATION_ENCRYPT: enctry = "0", extEmpsWitch = "0"
      }
--- a/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
@ -28,6 +28,7 @@ export default class SlideTaxagentUser extends React.Component {
      extEmpsWitch: "1" //非系统人员开关， 1： 开启， 0：关闭
    };
  }
+
  componentDidMount() {
    this.getSysinfo();
  }
@ -199,10 +200,10 @@ export default class SlideTaxagentUser extends React.Component {
      <div className="slideRefereUser">
        <WeaTab
          datas={
-            extEmpsWitch === "0" ?
+            (extEmpsWitch === "0" || !extEmpsWitch) ?
              [
                { title: "人员范围", viewcondition: "1" },
-                { title: "从范围中排除", viewcondition: "0" },
+                { title: "从范围中排除", viewcondition: "0" }
              ] :
              [
                { title: "人员范围", viewcondition: "1" },