Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送

# Conflicts: # pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js # pc4mobx/hrmSalary/util/index.js
2024-11-26 14:40:33 +08:00 · 2024-11-26 14:40:33 +08:00 · 179e58357d
parent 18029e6dba 7c13ddb970
commit 179e58357d
4 changed files with 50 additions and 31 deletions
--- a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
@ -75,9 +75,9 @@ class CustomBrowserMutiRight extends Component {
    const targetNode = obj.node.props.eventKey;
    const result = [];
    this.nodeIds.filter((item) => {
-      return dragNodes.indexOf(item) === -1;
+      return dragNodes.indexOf(String(item)) === -1;
    }).forEach((id) => {
-      if (id === targetNode) {
+      if (String(id) === targetNode) {
        dragNodes.forEach((drag) => {
          result.push(this.nodeObj[drag]);
        });
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@ -5,7 +5,6 @@
 * Date: 2024/3/26
 */
 import React, { Component } from "react";
-import { toJS } from "mobx";
 import { inject, observer } from "mobx-react";
 import { WeaTableNew } from "comsMobx";
 import { WeaLoadingGlobal, WeaLocaleProvider, WeaSelect } from "ecCom";
@ -34,7 +33,8 @@ class SalaryDetails extends Component {
      pageInfo: { current: 1, pageSize: 10, total: 0 }, payload: {}, templateId: "",
      showTotalCell: false, updateSum: true, tempDialog: { visible: false, setting: [], id: "", template: {} },
      transferDialog: {
-        visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" }, saveLoading: false,
+        visible: false, searchParamsKey: "name", saveLoading: false,
+        dataParams: { page: "salary_details_report", defaultSetting: "0" },
        completeURL: "", convertDatasource: datas => {
          return {
            listDatas: _.map(datas.setting, o => ({ id: o.id || o.column, name: o.name || o.text })),
@ -51,7 +51,7 @@ class SalaryDetails extends Component {
    this.setState({
      showTotalCell: confCode === "1"
    }, () => {
-      this.getSalaryList(this.props);
+      // this.getSalaryList(this.props);
      this.getPageListTemplatelist();
    });
    window.addEventListener("message", this.handleReceive, false);
@ -85,7 +85,8 @@ class SalaryDetails extends Component {
    const { type, payload: { id, params } = {} } = data;
    const { pageInfo } = this.state;
    if (type === "init") {
-      this.getColumns();
+      // this.getColumns();
+      this.getSalaryList(this.props);
    } else if (type === "turn") {
      if (id === "PAGEINFO") {
        const { pageNum: current, size: pageSize } = params;
@ -127,7 +128,10 @@ class SalaryDetails extends Component {
        const { list: dataSource, pageNum: current, total, pageSize } = pageparams;
        this.setState({
          columns, dataSource, pageInfo: { ...pageInfo, current, total, pageSize }, payload
-        }, () => tableStore.getDatas(dataKey.datas));
+        }, () => {
+          // tableStore.getDatas(dataKey.datas)
+          this.getColumns();
+        });
      }
    }).catch(() => this.setState({ loading: false }));
  };
@ -137,10 +141,11 @@ class SalaryDetails extends Component {
    });
  };
  handleExportSalaryList = (key) => {
-    const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
+    // const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
    let { selectedRowKeys, payload, columns: tempCols } = this.state;
-    const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
-    const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
+    // const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
+    // const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
+    const columns = _.filter(tempCols, o => o.column !== "acctTimes");
    if (key === "SELECTED" && selectedRowKeys.length === 0) {
      message.warning(getLabel(543345, "请选择需要导出的数据！"));
      return;
@ -151,12 +156,13 @@ class SalaryDetails extends Component {
    });
  };
  getColumns = () => {
-    const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
+    // const { attendanceStore: { tableStore }, salaryDetailShowType } = this.props;
    const {
-      columns: tempCols, dataSource, pageInfo, selectedRowKeys, showTotalCell, sumRow, transferDialog
+      columns: tempCols, dataSource, pageInfo, selectedRowKeys, showTotalCell, sumRow
    } = this.state;
-    const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
-    const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
+    // const customCols = _.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes");
+    // const columns = salaryDetailShowType === "1" ? _.filter(tempCols, o => o.column !== "acctTimes") : customCols;
+    const columns = _.filter(tempCols, o => o.column !== "acctTimes");
    if (!_.isEmpty(columns)) {
      this.postMessageToChild({
        dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRow,
@ -170,15 +176,15 @@ class SalaryDetails extends Component {
    }
    return [];
  };
-  handleSetDefCols = () => this.setState({
+  handleSetDefCols = (params) => this.setState({
    transferDialog: {
      ...this.state.transferDialog, completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", visible: true,
-      dataParams: { page: "salary_details_report" }
+      dataParams: { ...this.state.transferDialog.dataParams, ...params }
    }
  });
  converCheckedCol = (data) => {
    return _.reduce(data.checked || [], (pre, cur) => {
-      const item = _.find(data.setting, k => (k.id === cur) || (k.column === cur.column));
+      const item = _.find(data.setting, k => k.column === cur.column);
      if (!_.isEmpty(item)) return [...pre, { ...item, id: item.id || item.column, name: item.name || item.text }];
      return pre;
    }, []);
@ -192,8 +198,7 @@ class SalaryDetails extends Component {
      return;
    }
    const payload = {
-      page: "salary_details_report",
-      setting: _.map(values, o => o.id)
+      ...transferDialog.dataParams, setting: _.map(values, o => o.id)
    };
    this.setState({ transferDialog: { ...this.state.transferDialog, saveLoading: true } });
    API.savePageListSetting(payload).then(({ status, errormsg }) => {
@ -269,12 +274,12 @@ class SalaryDetails extends Component {
              id="atdTable"
            />
          </Spin>
-          <WeaTableComx
-            style={{ display: "none" }}
-            comsWeaTableStore={tableStore}
-            needScroll={true}
-            columns={this.getColumns()}
-          />
+          {/*<WeaTableComx*/}
+          {/*  style={{ display: "none" }}*/}
+          {/*  comsWeaTableStore={tableStore}*/}
+          {/*  needScroll={true}*/}
+          {/*  columns={this.getColumns()}*/}
+          {/*/>*/}
          {/*默认显示列,薪资模板列表*/}
          <CustomTransferDialog {...transferDialog} onChange={this.savePageListSetting}
                                onCancel={() => this.setState({
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
@ -320,8 +320,9 @@ class Index extends Component {
        icon: <i className="icon-coms-Custom"/>,
        content: getLabel(111, "显示列定制"),
        onClick: () => {
-          tableStore.setColSetVisible(true);
-          tableStore.tableColSet(true);
+          this.salaryRef.wrappedInstance.handleSetDefCols({ defaultSetting: "0" });
+          // tableStore.setColSetVisible(true);
+          // tableStore.tableColSet(true);
        }
      }
    ];
@ -333,7 +334,7 @@ class Index extends Component {
    dropMenuDatas = selectedKey === "salaryDetail" ? dropMenuDatas.slice(-1) : dropMenuDatas.slice(0, 1);
    (PageAndOptAuth.isChief && selectedKey === "salaryDetail") && (dropMenuDatas = [...dropMenuDatas, {
      key: "DEF_COLUMN", icon: <i className="icon-coms-Custom"/>, content: getLabel(111, "默认显示列"),
-      onClick: () => this.salaryRef.wrappedInstance.handleSetDefCols()
+      onClick: () => this.salaryRef.wrappedInstance.handleSetDefCols({ defaultSetting: "1" })
    }]);
    return (
      <WeaReqTop
--- a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@ -79,8 +79,7 @@ class Index extends Component {
        if (!_.isEmpty(detail)) {
          VSSalaryFileForm.updateFields({
            employeeId: {
-              value: detail["employeeId"],
-              valueSpan: detail["username"],
+              value: detail["employeeId"], valueSpan: detail["username"],
              valueObj: [{ id: detail["employeeId"], name: detail["username"] }]
            }
          });
@ -131,6 +130,19 @@ class Index extends Component {
      </div>
    </div>;
  };
+  handleChange = (formVal) => {
+    const key = _.keys(formVal)[0], value = formVal[key].value;
+    const [__, fields] = this.state.conditions, { items } = fields;
+    _.forEach(items, o => {
+      if (getKey(o) === key && o.dataType === "number") {
+        if (_.isNaN(Number(value))) {
+          const { baseTableStore: { VSSalaryFileForm } } = this.props;
+          message.warning(getLabel(111, "数值类型有误！"));
+          VSSalaryFileForm.updateFields({ [getKey(o)]: { value: "" } });
+        }
+      }
+    });
+  };

  render() {
    const { conditions } = this.state;
@ -138,7 +150,8 @@ class Index extends Component {
    return (<WeaSlideModal
      className="variable_salary_file_dialog" {...this.props} direction="right" onClose={() => onClose()}
      top={0} width={800} height={100} measureT="%" measureX="px" measureY="%" title={this.renderTitle()}
-      content={<div className="form-dialog-layout">{getSearchs(VSSalaryFileForm, conditions, 2, false)}</div>}
+      content={<div
+        className="form-dialog-layout">{getSearchs(VSSalaryFileForm, conditions, 2, false, this.handleChange)}</div>}
    />);
  }
 }