qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix/2.10.1.2402.01' into release/2.10.1.2402.01-个税

This commit is contained in:
黎永顺 2024-02-27 16:34:26 +08:00
parent bfa0288585 194e575e25
commit c4d78463da
5 changed files with 118 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pc4mobx/hrmSalary/index.js
View File

@ -6,15 +6,12 @@ import SalaryAdjustmentRecords from "./pages/salaryAdjustmentRecords";
import MySalaryMobile from "./pages/mySalaryMobile";
import MySalary from "./pages/mySalaryBenefits";
import Programme from "./pages/socialSecurityBenefits/welfarePlan";
import Programme_old from "./pages/socialSecurityBenefits/programme";
// import Archivess from "./pages/socialSecurityBenefits/archives";
import Archives from "./pages/socialSecurityBenefits/welfareArchive"; //社保福利档案重构页面
import StandingBookDemo from "./pages/socialSecurityBenefits/standingBook";
import StandingBook from "./pages/socialSecurityBenefits/standingBook/standingBook";//社保福利台账重构页面
import StandingBook from "./pages/socialSecurityBenefits/standingBook/standingBook"; //社保福利台账重构页面
import StandingBookDetail from "./pages/socialSecurityBenefits/standingBookDetail";
import StandingBookOfflineComparison from "./pages/socialSecurityBenefits/standingBookOfflineComparison";
import SalaryItem from "./pages/salaryItem";
import PayrollFiles from "./pages/payrollFiles";
import SalaryFiles from "./pages/payrollFiles/salaryFiles";
import CumDeduct from "./pages/dataAcquisition/cumDeduct";
import OtherDeduct from "./pages/dataAcquisition/otherDeduct";
@ -142,10 +139,7 @@ const Routes = (
path="socialSecurityBenefits"
component={SocialSecurityBenefits}>
<Route key="programme" path="programme" component={Programme}/>
<Route key="programme_old" path="programme_old" component={Programme_old}/>
<Route key="archives" path="archives" component={Archives}/>
{/*<Route key="archives_demo" path="archives_demo" component={Archivess}/>*/}
<Route key="standingBook_demo" path="standingBook_demo" component={StandingBookDemo}/>
<Route key="standingBook" path="standingBook" component={StandingBook}/>
<Route
key="standingBookDetail"
@ -160,7 +154,6 @@ const Routes = (
</Route>
<Route key="salaryItem" path="salaryItem" component={SalaryItem}/>
<Route key="salaryFile" path="salaryFile" component={SalaryFiles}/>
<Route key="salaryFile-reconfig" path="salaryFile-reconfig" component={PayrollFiles}/>
<Route key="adjustSalaryManage" path="adjustSalaryManage" component={AdjustSalaryManage}/>
<Route
key="dataAcquisition"

71
pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
View File

@ -59,12 +59,27 @@ export const renderReqBtns = (selectedKey, salaryImportTypes, onSalaryOpts, show
switch (selectedKey) {
case "pending":
!showOperateBtn && reqBtns.shift();
showOperateBtn && reqBtns.splice(1, 0, <Button type="ghost" onClick={() => onSalaryOpts("ALL-GO-TO-FIXED")}>
{getLabel(543304, "全部设为发薪人员")}
</Button>);
showOperateBtn && reqBtns.splice(1, 0, <Dropdown.Button type="ghost" style={{ marginRight: "10px" }}
onClick={() => onSalaryOpts("ALL-GO-TO-FIXED")}
overlay={<Menu
onClick={({ key }) => onSalaryOpts(key)}>
<Menu.Item
key="ADD-TO-SALARYPAYMENT">{getLabel(543305, "批量设为发薪员工")}</Menu.Item>
<Menu.Item
key="DEL-PENDITNG-TO-DO">{getLabel(543186, "批量删除待办")}</Menu.Item>
</Menu>}>{getLabel(543304, "全部设为发薪人员")}</Dropdown.Button>);
break;
case "suspend":
!showOperateBtn && reqBtns.shift();
showOperateBtn && reqBtns.splice(1, 0, <Dropdown.Button type="ghost" style={{ marginRight: "10px" }}
onClick={() => onSalaryOpts("FULL-SALARY-SUSPENSION")}
overlay={<Menu
onClick={({ key }) => onSalaryOpts(key)}>
<Menu.Item
key="SALARY-SUSPENSION">{getLabel(543724, "批量停薪")}</Menu.Item>
<Menu.Item
key="DEL-SUSPEND-TO-DO">{getLabel(543186, "批量删除待办")}</Menu.Item>
</Menu>}>{getLabel(543326, "全部停薪")}</Dropdown.Button>);
break;
case "fixed":
case "ext":
@ -104,16 +119,16 @@ export const renderDropMenuDatas = (selectedKey, showOperateBtn) => {
switch (selectedKey) {
case "pending":
menus = [
{
key: "ADD-TO-SALARYPAYMENT",
icon: <i className="icon-coms-BatchEditing-Hot"/>,
content: getLabel(543305, "批量设为发薪员工")
},
{
key: "DEL-PENDITNG-TO-DO",
icon: <i className="iconfont icon-piliangshanchu"/>,
content: getLabel(543186, "批量删除待办")
},
// {
// key: "ADD-TO-SALARYPAYMENT",
// icon: <i className="icon-coms-BatchEditing-Hot"/>,
// content: getLabel(543305, "批量设为发薪员工")
// },
// {
// key: "DEL-PENDITNG-TO-DO",
// icon: <i className="iconfont icon-piliangshanchu"/>,
// content: getLabel(543186, "批量删除待办")
// },
{
key: "exportAll",
icon: <i className="iconfont icon-daochu"/>,
@ -144,21 +159,21 @@ export const renderDropMenuDatas = (selectedKey, showOperateBtn) => {
break;
case "suspend":
menus = [
{
key: "FULL-SALARY-SUSPENSION",
icon: <i className="icon-coms02-all"/>,
content: getLabel(543326, "全部停薪")
},
{
key: "SALARY-SUSPENSION",
icon: <i className="icon-coms-BatchEditing-Hot"/>,
content: getLabel(543724, "批量停薪")
},
{
key: "DEL-SUSPEND-TO-DO",
icon: <i className="iconfont icon-piliangshanchu"/>,
content: getLabel(543186, "批量删除待办")
},
// {
// key: "FULL-SALARY-SUSPENSION",
// icon: <i className="icon-coms02-all"/>,
// content: getLabel(543326, "全部停薪")
// },
// {
// key: "SALARY-SUSPENSION",
// icon: <i className="icon-coms-BatchEditing-Hot"/>,
// content: getLabel(543724, "批量停薪")
// },
// {
// key: "DEL-SUSPEND-TO-DO",
// icon: <i className="iconfont icon-piliangshanchu"/>,
// content: getLabel(543186, "批量删除待办")
// },
{
key: "exportAll",
icon: <i className="iconfont icon-daochu"/>,

7
pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
View File

@ -117,6 +117,13 @@ class SalaryFiles extends Component {
}
handleSalaryOpts && handleSalaryOpts(_.camelCase(type), selectedRowKeys);
break;
case "ADD-TO-SALARYPAYMENT":
case "DEL-PENDITNG-TO-DO":
case "FULL-SALARY-SUSPENSION":
case "SALARY-SUSPENSION":
case "DEL-SUSPEND-TO-DO":
this.onDropMenuClick(type);
break;
default:
break;
}

96
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js
View File

@ -9,7 +9,7 @@ import {
WeaTools
} from "ecCom";
import { WeaSwitch } from "comsMobx";
import { Button } from "antd";
import { Button, Dropdown, Menu } from "antd";
import AdvanceInputBtn from "./components/advanceInputBtn";
import { CancelHelpfulDiv, HelpfulDiv } from "./components/welfareTip";
@ -148,21 +148,21 @@ export const renderDropMenuDatas = (selectedKey, getLabel, showOperateBtn) => {
switch (selectedKey) {
case "1":
menus = [
{
key: "fullStaffIncrease",
icon: <i className="iconfont icon-quanbu"/>,
content: getLabel(543185, "全量增员")
},
{
key: "batchStaffIncrease",
icon: <i className="iconfont icon-piliangcaozuo"/>,
content: getLabel(543187, "批量增员")
},
{
key: "batchDeleteTodolist",
icon: <i className="iconfont icon-piliangshanchu"/>,
content: getLabel(543186, "批量删除待办")
},
// {
// key: "fullStaffIncrease",
// icon: <i className="iconfont icon-quanbu"/>,
// content: getLabel(543185, "全量增员")
// },
// {
// key: "batchStaffIncrease",
// icon: <i className="iconfont icon-piliangcaozuo"/>,
// content: getLabel(543187, "批量增员")
// },
// {
// key: "batchDeleteTodolist",
// icon: <i className="iconfont icon-piliangshanchu"/>,
// content: getLabel(543186, "批量删除待办")
// },
{
key: "exportAll",
icon: <i className="iconfont icon-daochu"/>,
@ -193,21 +193,21 @@ export const renderDropMenuDatas = (selectedKey, getLabel, showOperateBtn) => {
break;
case "3":
menus = [
{
key: "fullReduction",
icon: <i className="iconfont icon-quanbu"/>,
content: getLabel(543189, "全量减员")
},
{
key: "batchReduction",
icon: <i className="iconfont icon-piliangcaozuo"/>,
content: getLabel(543188, "批量减员")
},
{
key: "batchDeleteTodolistStayDel",
icon: <i className="iconfont icon-piliangshanchu"/>,
content: getLabel(543186, "批量删除待办")
},
// {
// key: "fullReduction",
// icon: <i className="iconfont icon-quanbu"/>,
// content: getLabel(543189, "全量减员")
// },
// {
// key: "batchReduction",
// icon: <i className="iconfont icon-piliangcaozuo"/>,
// content: getLabel(543188, "批量减员")
// },
// {
// key: "batchDeleteTodolistStayDel",
// icon: <i className="iconfont icon-piliangshanchu"/>,
// content: getLabel(543186, "批量删除待办")
// },
{
key: "exportAll",
icon: <i className="iconfont icon-daochu"/>,
@ -223,11 +223,11 @@ export const renderDropMenuDatas = (selectedKey, getLabel, showOperateBtn) => {
break;
case "4,5":
menus = [
{
key: "batchCancellationOfSuspended",
icon: <i className="iconfont icon-piliangcaozuo"/>,
content: getLabel(543190, "批量取消停缴")
},
// {
// key: "batchCancellationOfSuspended",
// icon: <i className="iconfont icon-piliangcaozuo"/>,
// content: getLabel(543190, "批量取消停缴")
// },
{
key: "exportAll",
icon: <i className="iconfont icon-daochu"/>,
@ -247,14 +247,23 @@ export const renderDropMenuDatas = (selectedKey, getLabel, showOperateBtn) => {
}
return menus;
};
export const renderReqBtns = (selectedKey, getLabel, onOpenAdvanceSearch, onAdvanceSearch, onImport, showOperateBtn) => {
export const renderReqBtns = (selectedKey, getLabel, onOpenAdvanceSearch, onAdvanceSearch, onDropMenuClick, showOperateBtn) => {
let reqBtns = showOperateBtn ? [
<Button type="primary" onClick={onImport}>{getLabel(32935, "导入")}</Button>,
<Button type="primary" onClick={() => onDropMenuClick("import")}>{getLabel(32935, "导入")}</Button>,
<AdvanceInputBtn onOpenAdvanceSearch={onOpenAdvanceSearch} onAdvanceSearch={onAdvanceSearch}/>
] : [<AdvanceInputBtn onOpenAdvanceSearch={onOpenAdvanceSearch} onAdvanceSearch={onAdvanceSearch}/>];
if (showOperateBtn) {
switch (selectedKey) {
case "1":
showOperateBtn && reqBtns.splice(1, 0, <Dropdown.Button type="ghost" style={{ marginRight: "10px" }}
onClick={() => onDropMenuClick("fullStaffIncrease")}
overlay={<Menu
onClick={({ key }) => onDropMenuClick(key)}>
<Menu.Item
key="batchStaffIncrease">{getLabel(543187, "批量增员")}</Menu.Item>
<Menu.Item
key="batchDeleteTodolist">{getLabel(543186, "批量删除待办")}</Menu.Item>
</Menu>}>{getLabel(543185, "全量增员")}</Dropdown.Button>);
reqBtns.unshift(<WeaHelpfulTip
width={300} placement="topLeft"
title={
@ -266,6 +275,15 @@ export const renderReqBtns = (selectedKey, getLabel, onOpenAdvanceSearch, onAdva
break;
case "3":
reqBtns.shift();
showOperateBtn && reqBtns.splice(0, 0, <Dropdown.Button type="primary" style={{ marginRight: "10px" }}
onClick={() => onDropMenuClick("fullReduction")}
overlay={<Menu
onClick={({ key }) => onDropMenuClick(key)}>
<Menu.Item
key="batchReduction">{getLabel(543188, "批量减员")}</Menu.Item>
<Menu.Item
key="batchDeleteTodolistStayDel">{getLabel(543186, "批量删除待办")}</Menu.Item>
</Menu>}>{getLabel(543189, "全量减员")}</Dropdown.Button>);
reqBtns.unshift(<WeaHelpfulTip
width={300} placement="topLeft"
title={HelpfulDiv}
@ -273,6 +291,8 @@ export const renderReqBtns = (selectedKey, getLabel, onOpenAdvanceSearch, onAdva
break;
case "4,5":
reqBtns.shift();
showOperateBtn && reqBtns.splice(0, 0, <Button type="primary" style={{ marginRight: "10px" }}
onClick={() => onDropMenuClick("batchCancellationOfSuspended")}>{getLabel(543190, "批量取消停缴")}</Button>);
reqBtns.unshift(<WeaHelpfulTip
width={300} placement="topLeft"
title={CancelHelpfulDiv}

18
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
View File

@ -57,16 +57,16 @@ class Index extends Component {
};
handleOpenAdvanceSearch = () => this.setState({ showSearchAd: true });
handleAdvanceSearch = () => this.setState({ isQuery: !this.state.isQuery });
handleImport = () => {
this.setState({
welfareImpDialog: {
...this.state.welfareImpDialog, visible: true,
runStatuses: this.state.selectedKey
}
});
};
onDropMenuClick = (key) => {
switch (key) {
case "import":
this.setState({
welfareImpDialog: {
...this.state.welfareImpDialog, visible: true,
runStatuses: this.state.selectedKey
}
});
break;
case "fullStaffIncrease":
case "fullReduction":
this.handleFullOptions(key);
@ -138,7 +138,7 @@ class Index extends Component {
title={getLabel(538001, "社保福利档案")} buttonSpace={10} icon={<i className="icon-coms-fa"/>}
iconBgcolor="#F14A2D" showDropIcon onDropMenuClick={this.onDropMenuClick}
dropMenuDatas={renderDropMenuDatas(selectedKey, getLabel, showOperateBtn)}
buttons={renderReqBtns(selectedKey, getLabel, this.handleOpenAdvanceSearch, this.handleAdvanceSearch, this.handleImport, showOperateBtn)}
buttons={renderReqBtns(selectedKey, getLabel, this.handleOpenAdvanceSearch, this.handleAdvanceSearch, this.onDropMenuClick, showOperateBtn)}
replaceTab={
<WeaTab
datas={!showExtEmpsWitch ? _.dropRight(tabList) : tabList} autoCalculateWidth