From e9f4d9b04344b1cc49526452bf4aaa57d4a15991 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 6 Nov 2024 11:06:55 +0800 Subject: [PATCH 1/9] release/2.16.1.2410.01 --- pc4mobx/hrmSalary/apis/mySalaryBenefits.js | 2 +- pc4mobx/hrmSalary/pages/mobilePayroll/index.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js index b79a6718..f197ba27 100644 --- a/pc4mobx/hrmSalary/apis/mySalaryBenefits.js +++ b/pc4mobx/hrmSalary/apis/mySalaryBenefits.js @@ -52,5 +52,5 @@ export const saveSecondaryPwd = params => { return WeaTools.callApi("/api/hrm/secondarypwd/saveSecondaryPwd", "POST", params); }; export const salaryBillGetToken = params => { - return WeaTools.callApi("/api/bs/hrmsalary/salaryBill/getToken", "GET", params); + return postFetch("/api/bs/hrmsalary/salaryBill/getToken", params); }; diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index 2fa560c3..0e343efb 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -73,7 +73,10 @@ export default class MobilePayroll extends React.Component { }); } else { const params = this.getUrlkey(); - const { data } = await salaryBillGetToken({ uid: _.pick(params, ["recipient"]).recipient }); + const { data } = await salaryBillGetToken({ + recipient: _.pick(params, ["recipient"]).recipient, + salaryCode: _.pick(params, ["salaryCode"]).salaryCode + }); this.setState({ salaryBillToken: data }, () => { API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken) .then(({ status, isNeedSecondAuth }) => { From 0abeee25f3d866b98193286627d4b08087ca2e78 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Thu, 7 Nov 2024 09:23:46 +0800 Subject: [PATCH 2/9] =?UTF-8?q?feature/2.16.1.2410.01-=E8=96=AA=E9=85=AC?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E8=96=AA=E8=B5=84=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=92=8C=E6=A8=A1=E6=9D=BF=E5=88=9B=E5=BB=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/index.js | 52 --------------- .../components/reportList.js | 7 ++- .../components/salaryDetails.js | 63 +++++++++++-------- .../pages/analysisOfSalaryStatistics/index.js | 19 ++---- .../analysisOfSalaryStatistics/index.less | 23 +++++-- 5 files changed, 65 insertions(+), 99 deletions(-) diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js index 27bc86f2..272bdbdd 100644 --- a/pc4mobx/hrmSalary/index.js +++ b/pc4mobx/hrmSalary/index.js @@ -54,68 +54,16 @@ import TopologyMap from "./pages/topologyMap"; import SupplementaryCalc from "./pages/supplementaryCalc"; import VariableSalary from "./pages/variableSalary"; import Layout from "./layout"; - import stores from "./stores"; import "./style/index"; - // 读取系统多语言配置 let getLocaleLabel = WeaLocaleProvider.getLocaleLabel.bind(this, "hrmSalary"); - // 不需要读取系统多语言 getLocaleLabel = function (nextState, replace, callback) { callback(); }; - -const Home = (props) => props.children; - const SocialSecurityBenefits = (props) => props.children; const DataAcquisition = (props) => props.children; - -// historicalPayroll 历史工资单查看 -// salaryAdjustmentRecords 调薪记录查看 - -// mySalaryMobile 我的薪资福利-移动端 -// mySalaryMobile 我的薪资福利-移动端 -// mySalary 我的薪资福利 -// mySalaryView 我的薪资福利-查看工资单 -// socialSecurityBenefits 社保福利 -// programme 社保福利方案 -// archives 社保福利档案 -// standingBook 社保福利台账 -// sbofflineComparison 社保福利台账线下对比 -// salaryItem 薪资项目管理 -// salaryFile 薪资档案 -// dataAcquisition 数据采集 -// CumDeduct 累计专项附加扣除 -// otherDeduct 其他免税扣除 -// cumSituation 往期累计情况 -// attendance 考勤引用 -// specialAddDeduction 专项附件扣除 -// ledger 薪资账套 -// calculate 薪资核算 -// calculateDetail 核算详情 -// DoCalcDetail 核算详情页面-新 -// CalcView 核算查看页面-新 -// OfflineCompare 薪资核算线下对比-新 -// placeOnFileDetail 核算归档详情 -// compareDetail 线下线上对比 -// payroll 工资单发放 -// declare 个税申报表 -// generateDeclarationDetail 个税单详情 -// taxRate 个税税率表 -// taxAgent 个税扣缴义务人 -// mobilepayroll 移动端工资单 -// sysconfig 系統配置 -// sysconfig-1 规则配置 -// appconfig 应用配置 -// fieldManagement 字段管理 -// analysisOfSalaryStatistics 薪酬统计分析 -// reportView 薪酬报表查看 -// externalPersonManage 非系统人员管理 -// adjustSalaryManage 档案管理 -// supplementaryCalc 补算 -// variableSalary 浮动薪酬 - const Routes = ( diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js index dccae63f..586a1216 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js @@ -5,7 +5,7 @@ * Date: 2023/4/17 */ import React, { Component } from "react"; -import { WeaLocaleProvider } from "ecCom"; +import { WeaAlertPage, WeaLocaleProvider } from "ecCom"; import { Button, Col, Dropdown, Menu, message, Modal, Row } from "antd"; import { reportStatisticsReportDelete, @@ -14,7 +14,6 @@ import { } from "../../../apis/statistics"; import "../index.less"; -const SubMenu = Menu.SubMenu; const { getLabel } = WeaLocaleProvider; class ReportList extends Component { @@ -87,7 +86,9 @@ class ReportList extends Component { return ( { - _.isEmpty(dataSource) ?
{getLabel(111, "暂无数据")}
: + _.isEmpty(dataSource) ? +
暂无数据
+ : _.map(dataSource, it => { const { reportName, dimension, id, dimensionId, isShare } = it; return this.handleGoReportView(id)}> diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js index 59995acd..cb427e5a 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js @@ -5,15 +5,19 @@ * 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 } from "ecCom"; import { message, Spin } from "antd"; -import { toJS } from "mobx"; import { getIframeParentHeight } from "../../../util"; import { sysConfCodeRule } from "../../../apis/ruleconfig"; import CustomTransferDialog from "../../../components/CustomBrowser/components/customTransferDialog"; +import { MonthRangePicker } from "../../reportView/components/statisticalMicroSettingsSlide"; +import AdvanceInputBtn from "../components/advanceInputBtn"; +import SearchPannel from "../components/searchPannel"; import * as API from "../../../apis/statistics"; +import cs from "classnames"; import "../index.less"; const WeaTableComx = WeaTableNew.WeaTable; @@ -131,7 +135,7 @@ class SalaryDetails extends Component { dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true, tableScrollHeight: 154, sumRowlistUrl, payload: { ...payload, updateSum }, columns: _.map(columns, (it, idx) => ({ - ...it, + ...it, calcDetail: true, width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : it.oldWidth, fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "", ellipsis: true @@ -167,30 +171,39 @@ class SalaryDetails extends Component { render() { const { loading, dataSource, transferDialog } = this.state; - const { attendanceStore: { tableStore } } = this.props; - return ( -
- -