From ed7cd3c3f4e3c7d5904f8480d79307a8116ba018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 10 Aug 2023 17:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=A4=9A=E8=AF=AD=E8=A8=80-?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/payrollFiles/config/index.js | 4 +- pc4mobx/hrmSalary/pages/payrollFiles/index.js | 454 ++++++++++++------ .../pages/salaryItem/salaryItemForm.js | 6 +- .../pages/salaryItem/systemSalaryItemModal.js | 4 +- .../socialSecurityBenefits/archives/index.js | 187 +++++--- 5 files changed, 442 insertions(+), 213 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js index 97d5e28e..684c84a5 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js @@ -12,7 +12,7 @@ export const tabCondition = [ groupid: "FIXED", showcount: true, title: "发薪员工", - lanId: 111, + lanId: 544638, viewcondition: "fixed" }, { @@ -28,7 +28,7 @@ export const tabCondition = [ groupid: "STOP", showcount: true, title: "停薪员工", - lanId: 111, + lanId: 544637, viewcondition: "stop" }, { diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js index bc8da79c..ad9b1fd9 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js @@ -20,10 +20,11 @@ import { WeaSelect, WeaSlideModal, WeaTab, + WeaTools, WeaTop } from "ecCom"; import { WeaTableNew } from "comsMobx"; -import { Button, Dropdown, Menu, message, Modal, Spin } from "antd"; +import { Button, Dropdown, Icon, Menu, message, Modal, Spin } from "antd"; import ImportMenu from "./components/importMenu"; import ExportMenu from "./components/exportMenu"; import AllWithoutPay from "./components/allWithoutPay"; @@ -417,147 +418,306 @@ class Index extends Component { } }; getRightOptionBtns = () => { + const languageidweaver = WeaTools.ls.getJSONObj("languageidweaver"); const { selectedKey, importType, selectedRowKeys, searchItemsValue, pageInfo } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; - if (selectedKey === "pending" && showOperateBtn) { - return [ - , - }> - - , - , - - {getLabel(543305, "批量设为发薪员工")} - {getLabel(543186, "批量删除待办")} - - } - > - - - ]; - } else if (selectedKey === "fixed" && showOperateBtn) { - return [ - } - placement="topLeft" - />, - { - this.query(); - this.setState({ selectedRowKeys: [] }); - }}/> - }> - - , - }> - - - ]; - } else if (selectedKey === "suspend" && showOperateBtn) { - return [ - { - this.queryTabTotal(); - this.query(); - this.setState({ selectedRowKeys: [] }); - }} - /> - }> - - , - , - , - }> - - - ]; - } else if (selectedKey === "stop" && showOperateBtn) { - return [ - { - this.queryTabTotal(); - this.query(); - this.setState({ selectedRowKeys: [] }); - }} - /> - }> - - , - }> - - - ]; - } else if (selectedKey === "ext" && showOperateBtn) { - return [ - } - placement="topLeft" - />, - { - this.query(); - this.setState({ selectedRowKeys: [] }); - }}/> - }> - - - ]; + if (languageidweaver == "8") { + if (selectedKey === "pending" && showOperateBtn) { + return [ + }> + + , + + +
this.importRef.handleMenuClick({ key: "PENDING" })}>{getLabel(32935, "导入")}
+
+ +
{getLabel(543304, "全部设为发薪人员")}
+
+ +
this.handleClick({ key: "batchSet" })}>{getLabel(543305, "批量设为发薪员工")}
+
+ +
this.handleClick({ key: "batchDelete" })}>{getLabel(543186, "批量删除待办")}
+
+ }> + +
+ ]; + } else if (selectedKey === "fixed" && showOperateBtn) { + return [ + } + placement="topLeft" + />, + { + this.query(); + this.setState({ selectedRowKeys: [] }); + }}/> + }> + + , + }> + + + ]; + } else if (selectedKey === "suspend" && showOperateBtn) { + return [ + { + this.queryTabTotal(); + this.query(); + this.setState({ selectedRowKeys: [] }); + }} + /> + }> + + , + }> + + , + + +
{ + const { selectedRowKeys } = this.state; + if (selectedRowKeys.length === 0) { + message.warning(getLabel(543306, "未选择条目")); + return; + } + this.deleteSuspendTodo(selectedRowKeys); + }}>{getLabel(543186, "批量删除待办")}
+
+ +
this.importRef.handleMenuClick({ key: "SUSPEND" })}>{getLabel(32935, "导入")}
+
+ }> + +
+ ]; + } else if (selectedKey === "stop" && showOperateBtn) { + return [ + { + this.queryTabTotal(); + this.query(); + this.setState({ selectedRowKeys: [] }); + }} + /> + }> + + , + }> + + + ]; + } else if (selectedKey === "ext" && showOperateBtn) { + return [ + } + placement="topLeft" + />, + { + this.query(); + this.setState({ selectedRowKeys: [] }); + }}/> + }> + + + ]; + } + return []; + } else { + if (selectedKey === "pending" && showOperateBtn) { + return [ + , + }> + + , + , + + {getLabel(543305, "批量设为发薪员工")} + {getLabel(543186, "批量删除待办")} + + } + > + + + ]; + } else if (selectedKey === "fixed" && showOperateBtn) { + return [ + } + placement="topLeft" + />, + { + this.query(); + this.setState({ selectedRowKeys: [] }); + }}/> + }> + + , + }> + + + ]; + } else if (selectedKey === "suspend" && showOperateBtn) { + return [ + { + this.queryTabTotal(); + this.query(); + this.setState({ selectedRowKeys: [] }); + }} + /> + }> + + , + , + , + }> + + + ]; + } else if (selectedKey === "stop" && showOperateBtn) { + return [ + { + this.queryTabTotal(); + this.query(); + this.setState({ selectedRowKeys: [] }); + }} + /> + }> + + , + }> + + + ]; + } else if (selectedKey === "ext" && showOperateBtn) { + return [ + } + placement="topLeft" + />, + { + this.query(); + this.setState({ selectedRowKeys: [] }); + }}/> + }> + + + ]; + } } return []; }; @@ -805,8 +965,8 @@ class Index extends Component { ({...it, title: getLabel(it.lanId, it.title)})) : - _.map(tabCondition, it=> ({...it, title: getLabel(it.lanId, it.title)})) + _.map(_.dropRight(tabCondition), it => ({ ...it, title: getLabel(it.lanId, it.title) })) : + _.map(tabCondition, it => ({ ...it, title: getLabel(it.lanId, it.title) })) } counts={tabCount} className="payrollFilesTab" @@ -928,12 +1088,12 @@ export default Index; const HelpfulDiv = () => { return
- 导入按钮使用场景说明: - 1.档案初始化: + {getLabel(111, "导入按钮使用场景说明:")} + {getLabel(111, "1.档案初始化:")} - a.初次使用薪酬模块,全量导入员工的薪资档案数据; - b.员工入职,导入新入职的员工的薪资档案数据(若导入表格中的人员已存在在薪资档案中,初始化导入会将档案中该人员的数据清除再导入); - c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴; + {getLabel(111, "a.初次使用薪酬模块,全量导入员工的薪资档案数据;")} + {getLabel(111, "b.员工入职,导入新入职的员工的薪资档案数据(若导入表格中的人员已存在在薪资档案中,初始化导入会将档案中该人员的数据清除再导入);")} + {getLabel(111, "c.返聘人员使用调薪功能调整薪资档案值或使用调整个税扣缴;")} 2.调薪:档案中已存在的人员批量调整薪资项目值(包括返聘人员的情况); 3.调整个税扣缴义务人:档案中已存在的人员批量调整个税扣缴义务人(包括返聘人员的情况); diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js index 958fe161..80431ebf 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js @@ -42,7 +42,8 @@ class SalaryItemForm extends Component { return { ...item, viewAttr: (!isLedger && ((editable && record.canEdit) || isAdd)) ? 2 : 1, - display: !isLedger + display: !isLedger, + label: getLabel(lanId, label) }; case "useInEmployeeSalary": return { @@ -71,7 +72,8 @@ class SalaryItemForm extends Component { return { ...item, viewAttr: 2, - tip: isLedger ? getLabel(544291, "开启后,薪资核算不会展示该项目,但是不影响该项目的核算值") : item.tip + tip: isLedger ? getLabel(544291, "开启后,薪资核算不会展示该项目,但是不影响该项目的核算值") : item.tip, + label: getLabel(lanId, label) }; case "valueType": return { diff --git a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js index 60dc767a..c9f82c1e 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/systemSalaryItemModal.js @@ -96,7 +96,7 @@ export default class SystemSalaryItemModal extends React.Component { }; return ( { this.setState({ selectedRowKeys: [] }, () => { @@ -104,7 +104,7 @@ export default class SystemSalaryItemModal extends React.Component { }); }} style={{ width: "60vw" }} scalable buttons={[ - + ]} >
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js index 5a358ac5..3b3973cb 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js @@ -1,7 +1,7 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { toJS } from "mobx"; -import { Button, Dropdown, Menu, message, Modal, Popover } from "antd"; +import { Button, Dropdown, Icon, Menu, message, Modal, Popover } from "antd"; import { WeaHelpfulTip, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTools, WeaTop } from "ecCom"; import { getSearchs, renderLoading } from "../../../util"; import BaseForm from "./baseForm"; @@ -654,43 +654,77 @@ export default class Archives extends React.Component { } window.open(url, "_self"); }; - - const btns = selectedKey === "fixed" ? - [ - , - - {getLabel(512938, "导出选中")} + let btns = []; + if (languageidweaver == "8") { + const menus = selectedKey === "fixed" ? + ( + + this.handleBtnImport("2")}>{getLabel(32935, "导入")} + {getLabel(512938, "导出选中")} + {getLabel(81272, "导出全部")} - } type="ghost"> - {getLabel(81272, "导出全部")} - - ] : selectedKey === "pending" ? - [ - - {getLabel(544348, "提示:缴纳月份区间包含起始缴纳月,不包含最后缴纳月; 若员工离职时还未增员进入在缴员工,则数据会自动清除,因此若确认缴纳,请及时维护档案数据并增员操作。若清除后还需缴纳,需先在个税扣缴义务人菜单将员工按离职状态添加回来,会重新出现在待增员。")} -
- } - placement="topLeft" - />, - - {getLabel(543187, "批量增员")} - {getLabel(543186, "批量删除待办")} + ) : selectedKey === "pending" ? + ( + + {getLabel(543185, "全量增员")} + this.handleMenuItemClick({ key: "1" })}>{getLabel(543187, "批量增员")} + this.handleMenuItemClick({ key: "4" })}>{getLabel(543186, "批量删除待办")} + this.handleBtnImport("1")}>{getLabel(32935, "导入")} + {getLabel(512938, "导出选中")} + {getLabel(81272, "导出全部")} + + ) : selectedKey === "suspend" ? + ( + + {getLabel(543189, "全量减员")} + this.handleMenuItemClick({ key: "1" })}>{getLabel(543188, "批量减员")} + this.handleMenuItemClick({ key: "2" })}>{getLabel(543186, "批量删除待办")} + {getLabel(512938, "导出选中")} + {getLabel(81272, "导出全部")} - } type="ghost" - > - {getLabel(543185, "全量增员")} - , + ) : ( + + this.cancelStopPayment(selectedRowKeys)}>{getLabel(543190, "批量取消停缴")} + {getLabel(512938, "导出选中")} + {getLabel(81272, "导出全部")} + + ); + btns = [ + + + + ]; + selectedKey === "pending" && btns.unshift( + {getLabel(544348, "提示:缴纳月份区间包含起始缴纳月,不包含最后缴纳月; 若员工离职时还未增员进入在缴员工,则数据会自动清除,因此若确认缴纳,请及时维护档案数据并增员操作。若清除后还需缴纳,需先在个税扣缴义务人菜单将员工按离职状态添加回来,会重新出现在待增员。")} +
+ } + placement="topLeft" + />); + selectedKey === "suspend" && btns.unshift(} + placement="topLeft" + />); + selectedKey === "stop" && btns.unshift(} + placement="topLeft" + />); + } else { + btns = selectedKey === "fixed" ? + [ , @@ -699,25 +733,31 @@ export default class Archives extends React.Component { } type="ghost"> {getLabel(81272, "导出全部")} - ] : selectedKey === "suspend" ? + ] : selectedKey === "pending" ? [ } + title={ +
+ {getLabel(544348, "提示:缴纳月份区间包含起始缴纳月,不包含最后缴纳月; 若员工离职时还未增员进入在缴员工,则数据会自动清除,因此若确认缴纳,请及时维护档案数据并增员操作。若清除后还需缴纳,需先在个税扣缴义务人菜单将员工按离职状态添加回来,会重新出现在待增员。")} +
+ } placement="topLeft" />, - {getLabel(543188, "批量减员")} - {getLabel(543186, "批量删除待办")} + {getLabel(543187, "批量增员")} + {getLabel(543186, "批量删除待办")} - } - type="primary" + } type="ghost" > - {getLabel(543189, "全量减员")} + {getLabel(543185, "全量增员")} , + , {getLabel(512938, "导出选中")} @@ -725,23 +765,50 @@ export default class Archives extends React.Component { } type="ghost"> {getLabel(81272, "导出全部")} - ] : - [ - } - placement="topLeft" - />, - , - - {getLabel(512938, "导出选中")} - - } type="ghost"> - {getLabel(81272, "导出全部")} - - ]; + ] : selectedKey === "suspend" ? + [ + } + placement="topLeft" + />, + + {getLabel(543188, "批量减员")} + {getLabel(543186, "批量删除待办")} + + } + type="primary" + > + {getLabel(543189, "全量减员")} + , + + {getLabel(512938, "导出选中")} + + } type="ghost"> + {getLabel(81272, "导出全部")} + + ] : + [ + } + placement="topLeft" + />, + , + + {getLabel(512938, "导出选中")} + + } type="ghost"> + {getLabel(81272, "导出全部")} + + ]; + } const pagination = { current: pageInfo.current, @@ -778,7 +845,7 @@ export default class Archives extends React.Component { ({ ...it, title: getLabel(it.lanId, it.title) }))} buttons={showOperateBtn ? btns : []} - leftStyle={{ paddingRight: languageidweaver == "8" ? 380 : 640 }} + leftStyle={{ paddingRight: languageidweaver == "8" ? 460 : 640 }} counts={tabCount} countParam="groupid" //数量 keyParam="viewcondition" //主键