From 342aeed9537097959ec34320459fac01b5b0023c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 2 Apr 2024 17:45:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/salaryFilesEditSlide/index.js | 5 ++- .../pages/payrollFiles/config/index.js | 17 ++++---- .../pages/payrollFiles/salaryFiles.js | 3 +- .../pages/reportView/components/index.less | 1 + pc4mobx/hrmSalary/pages/salaryItem/index.less | 1 + .../standingBook/index.less | 1 + .../welfareArchive/config.js | 12 +++--- .../welfareArchive/index.js | 3 +- .../welfarePlanAdvanceSearchPannel/index.js | 18 +++++++- .../components/welfarePlanCopyDialog/index.js | 2 +- .../components/welfarePlanEditSlide/index.js | 13 ++++-- .../components/welfarePlanList/index.js | 14 ++++-- .../welfarePlan/config.js | 43 +++++++++++++------ .../welfarePlan/index.js | 4 +- .../welfarePlan/index.less | 1 + 15 files changed, 96 insertions(+), 42 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js index d4eaf520..d93c4aba 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFilesEditSlide/index.js @@ -62,7 +62,8 @@ class Index extends Component { conditions: _.map(salaryFilesConditions, o => { if (o.salaryFile) { return { - ...o, items: _.map(adjustSalaryItems, g => { + ...o, title: getLabel(o.lanId, o.title), titleHelpful: getLabel(o.titleHelpfulLanId, o.titleHelpful), + items: _.map(adjustSalaryItems, g => { const otherParams = g.dataType === "number" ? { precision: g.pattern } : {}; return { colSpan: 3, fieldcol: 14, label: g.name, labelcol: 10, ...otherParams, @@ -73,7 +74,7 @@ class Index extends Component { }; } return { - ...o, items: _.map(o.items, g => { + ...o, title: getLabel(o.lanId, o.title), items: _.map(o.items, g => { if (getKey(g) === "payStartDate") { return { ...g, label: getLabel(g.lanId, g.label), diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js index ffd98075..46bce19e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js @@ -43,11 +43,11 @@ export const tabCondition = [ } ]; export const tabList = [ - { viewcondition: "pending", title: getLabel(542689, "待定薪"), showcount: true, groupid: "PENDING" }, - { viewcondition: "fixed", title: getLabel(544638, "发薪员工"), showcount: true, groupid: "FIXED" }, - { viewcondition: "suspend", title: getLabel(542691, "待停薪"), showcount: true, groupid: "SUSPEND" }, - { viewcondition: "stop", title: getLabel(544637, "停薪员工"), showcount: true, groupid: "STOP" }, - { viewcondition: "ext", title: getLabel(542679, "非系统人员"), showcount: true, groupid: "EXT" } + { viewcondition: "pending", title: "待定薪", lanId: 542689, showcount: true, groupid: "PENDING" }, + { viewcondition: "fixed", title: "发薪员工", lanId: 544638, showcount: true, groupid: "FIXED" }, + { viewcondition: "suspend", title: "待停薪", lanId: 542691, showcount: true, groupid: "SUSPEND" }, + { viewcondition: "stop", title: "停薪员工", lanId: 544637, showcount: true, groupid: "STOP" }, + { viewcondition: "ext", title: "非系统人员", lanId: 542679, showcount: true, groupid: "EXT" } ]; export const renderReqBtns = (selectedKey, salaryImportTypes, onSalaryOpts, showOperateBtn) => { let reqBtns = [ @@ -367,7 +367,7 @@ export const salaryFileSearchConditions = [ export const salaryFilesConditions = [ { defaultshow: true, title: getLabel(1361, "基本信息"), - col: 3, + col: 3, lanId: 1361, items: [ { colSpan: 3, @@ -439,7 +439,7 @@ export const salaryFilesConditions = [ }, { defaultshow: true, title: getLabel(543329, "发薪设置"), - col: 1, + col: 1,lanId: 543329, items: [ { colSpan: 1, @@ -469,7 +469,8 @@ export const salaryFilesConditions = [ { defaultshow: true, title: getLabel(538004, "薪资档案"), titleHelpful: getLabel(543330, "提示：显示已生效的最新数据"), - col: 2, salaryFile: true, + titleHelpfulLanId: 543330, + col: 2, salaryFile: true,lanId: 538004, items: [] } ]; diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js index 596b79c1..59fed35e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js @@ -242,6 +242,7 @@ class SalaryFiles extends Component { salaryFileImpDialog, salaryImportTypes, logDialogVisible, filterConditions } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; + const tabs = _.map(tabList, o => ({ ...o, title: getLabel(o.lanId, o.title) })); return (
this.setState({ selectedKey: key })} /> diff --git a/pc4mobx/hrmSalary/pages/reportView/components/index.less b/pc4mobx/hrmSalary/pages/reportView/components/index.less index 53e93a64..f4a8496f 100644 --- a/pc4mobx/hrmSalary/pages/reportView/components/index.less +++ b/pc4mobx/hrmSalary/pages/reportView/components/index.less @@ -106,6 +106,7 @@ .wea-select .wdb { word-break: break-all !important; word-wrap: break-word !important; + white-space: nowrap !important; } .wea-select .wea-select-input { diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.less b/pc4mobx/hrmSalary/pages/salaryItem/index.less index 90870f6c..1d28f1ca 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.less +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.less @@ -139,6 +139,7 @@ .wea-select .wdb { word-break: break-all !important; word-wrap: break-word !important; + white-space: nowrap !important; } .wea-select .wea-select-input { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less index bd34d5bd..38dae0ed 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less @@ -104,6 +104,7 @@ .wea-select .wdb { word-break: break-all !important; word-wrap: break-word !important; + white-space: nowrap !important; } .wea-select .wea-select-input { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js index 2c0a760d..7431c2d7 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/config.js @@ -54,11 +54,11 @@ export const optTypeEnum = [ } ]; export const tabList = [ - { viewcondition: "1", title: getLabel(542711, "待增员"), showcount: true, groupid: "stayAdd" }, - { viewcondition: "2,3", title: getLabel(542504, "在缴员工"), showcount: true, groupid: "paying" }, - { viewcondition: "3", title: getLabel(542713, "待减员"), showcount: true, groupid: "stayDel" }, - { viewcondition: "4,5", title: getLabel(542505, "停缴员工"), showcount: true, groupid: "stopPay" }, - { viewcondition: "ext", title: getLabel(542679, "非系统人员"), showcount: true, groupid: "ext" } + { viewcondition: "1", title: "待增员", lanId: 542711, showcount: true, groupid: "stayAdd" }, + { viewcondition: "2,3", title: "在缴员工", lanId: 542504, showcount: true, groupid: "paying" }, + { viewcondition: "3", title: "待减员", lanId: 542713, showcount: true, groupid: "stayDel" }, + { viewcondition: "4,5", title: "停缴员工", lanId: 542505, showcount: true, groupid: "stopPay" }, + { viewcondition: "ext", title: "非系统人员", lanId: 542679, showcount: true, groupid: "ext" } ]; export const welfareTipList = [ { @@ -143,7 +143,7 @@ export const renderDropMenuDatas = (selectedKey, getLabel, showOperateBtn) => { key: "record", icon: , content: getLabel(111, "基数调整记录") - },{ + }, { key: "log", icon: , content: getLabel(545781, "操作日志") diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js index f2844ef5..76d00398 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js @@ -147,6 +147,7 @@ class Index extends Component { } = this.state; const { taxAgentStore: { showOperateBtn } } = this.props; const tipList = _.find(welfareTipList, o => o.viewcondition === selectedKey).list; + const tabs = _.map(tabList, o => ({ ...o, title: getLabel(o.lanId, o.title) })); return (
this.setState({ selectedKey: key })} /> diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanAdvanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanAdvanceSearchPannel/index.js index 0ea2dcc2..7e28cdbf 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanAdvanceSearchPannel/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanAdvanceSearchPannel/index.js @@ -5,12 +5,13 @@ * Date: 2024/2/2 */ import React, { Component } from "react"; -import { WeaLocaleProvider } from "ecCom"; +import { WeaLocaleProvider, WeaTools } from "ecCom"; import { Button } from "antd"; import { inject, observer } from "mobx-react"; import { getSearchs } from "../../../../../util"; import { searchConditons } from "../../config"; +const getKey = WeaTools.getKey; const getLabel = WeaLocaleProvider.getLabel; @inject("programmeStore") @@ -27,7 +28,20 @@ class WelfarePlanAdvanceSearchPannel extends Component { return (
- {getSearchs(planSearchForm, searchConditons, 2, false)} + {getSearchs(planSearchForm, _.map(searchConditons, item => ({ + ...item, title: getLabel(item.lanId, item.title), + items: _.map(item.items, o => { + if (getKey(o) === "paymentTypeEnum") { + return { + ...o, label: getLabel(o.lanId, o.label), + options: _.map(o.options, k => ({ ...k, showname: getLabel(k.lanId, k.showname) })) + }; + } + return { + ...o, label: getLabel(o.lanId, o.label) + }; + }) + })), 2, false)}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCopyDialog/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCopyDialog/index.js index 59af2d46..79685e74 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCopyDialog/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanCopyDialog/index.js @@ -54,7 +54,7 @@ class Index extends Component { const { programmeStore: { planCopyForm }, conditions } = this.props; return ( {getLabel(537558, "保存")} ]} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js index a70da52f..d97654e6 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/index.js @@ -48,15 +48,22 @@ class Index extends Component { this.setState({ planDatas: schemeDetailList, conditions: _.map(planConditons, item => ({ - ...item, items: _.map(item.items, o => { + ...item, title: getLabel(item.lanId, item.title), + items: _.map(item.items, o => { if (getKey(o) === "taxAgentIds") { return { ...o, hide: schemeBatch["sharedType"] === "0" || _.isNil(schemeBatch["sharedType"]), viewAttr: (schemeBatch["sharedType"] === "1" && showOperateBtn) ? 3 : showOperateBtn ? o.viewAttr : 1, - options: _.map(result, k => ({ key: k.id, showname: k.content })) + options: _.map(result, k => ({ key: k.id, showname: k.content })), + label: getLabel(o.lanId, o.label) + }; + } else if (getKey(o) === "paymentType" || getKey(o) === "sharedType") { + return { + ...o, label: getLabel(o.lanId, o.label), + options: _.map(o.options, k => ({ ...k, showname: getLabel(k.lanId, k.showname) })) }; } - return { ...o, viewAttr: showOperateBtn ? o.viewAttr : 1 }; + return { ...o, viewAttr: showOperateBtn ? o.viewAttr : 1, label: getLabel(o.lanId, o.label) }; }) })) }, () => { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js index 8b661ed0..1035015a 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanList/index.js @@ -178,12 +178,18 @@ class Index extends Component { this.setState({ copyDialog: { visible: true, copyId: id, copyName: `${schemeName}-${getLabel(77, "复制")}`, - title: `${getLabel(77, "复制")}-${_.find(tabWelfarePlanList, o => o.key === selectedKey).title}`, + title: `${getLabel(77, "复制")}-${ + getLabel(_.find(tabWelfarePlanList, o => o.key === selectedKey).lanId, _.find(tabWelfarePlanList, o => o.key === selectedKey).title) + }`, conditions: welfarePlanCopyConditions[selectedKey] } }, () => { const { copyDialog: { conditions, copyName } } = this.state; - planCopyForm.initFormFields(conditions); + planCopyForm.initFormFields(_.map(conditions, item => ({ + ...item, items: _.map(item.items, o => { + return { ...o, label: getLabel(o.lanId, o.label) }; + }) + }))); planCopyForm.updateFields({ [`${selectedKey}_schemeName`]: { value: copyName } }); }); break; @@ -311,7 +317,9 @@ class Index extends Component {
{ selectedKey === "CUSTOM" && -
+
+ getLabel(o.lanId, o.title))}/> +
} {/*复制方案*/} onSalaryOpts("SEARCH", v)} value={customQuery} options={[ - { key: "", showname: getLabel(111, "全部"), selected: true }, + { key: "", showname: getLabel(332, "全部"), selected: true }, { key: "SOCIAL_SECURITY", showname: getLabel(538967, "社保") }, { key: "ACCUMULATION_FUND", showname: getLabel(538969, "公积金") }, { key: "OTHER", showname: getLabel(542717, "企业年金及其他福利") } @@ -63,6 +66,7 @@ export const searchConditons = [ fieldcol: 16, isQuickSearch: true, label: getLabel(33162, "方案名称"), + lanId: 33162, labelcol: 8, value: "", viewAttr: 2 @@ -74,16 +78,18 @@ export const searchConditons = [ fieldcol: 16, isQuickSearch: true, label: getLabel(543163, "缴纳类型"), + lanId: 543163, labelcol: 8, value: "", options: [ - { key: "SCHEME_TOWN", showname: getLabel(19702, "城镇") }, - { key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村") } + { key: "SCHEME_TOWN", showname: getLabel(19702, "城镇"), lanId: 19702 }, + { key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村"), lanId: 19703 } ], viewAttr: 2 } ], title: getLabel(82743, "基础信息"), + lanId: 82743, defaultshow: true } ]; @@ -96,6 +102,7 @@ export const welfarePlanCopyConditions = { domkey: ["SOCIAL_SECURITY_schemeName"], fieldcol: 16, label: getLabel(111, "社保名称"), + lanId: 111, labelcol: 8, value: "", rules: "required|string", @@ -115,6 +122,7 @@ export const welfarePlanCopyConditions = { domkey: ["ACCUMULATION_FUND_schemeName"], fieldcol: 16, label: getLabel(111, "公积金名称"), + lanId: 111, labelcol: 8, value: "", rules: "required|string", @@ -134,6 +142,7 @@ export const welfarePlanCopyConditions = { domkey: ["OTHER_schemeName"], fieldcol: 16, label: getLabel(111, "企业年金及其他福利名称"), + lanId: 111, labelcol: 8, value: "", rules: "required|string", @@ -154,10 +163,11 @@ export const planConditons = [ domkey: ["paymentType"], fieldcol: 14, label: getLabel(543163, "缴纳类型"), + lanId: 543163, labelcol: 6, options: [ - { key: "SCHEME_TOWN", showname: getLabel(19702, "城镇") }, - { key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村") } + { key: "SCHEME_TOWN", showname: getLabel(19702, "城镇"), lanId: 19702 }, + { key: "SCHEME_VILLAGE", showname: getLabel(19703, "农村"), lanId: 19703 } ], value: "SCHEME_TOWN", rules: "required|string", @@ -168,6 +178,7 @@ export const planConditons = [ domkey: ["schemeName"], fieldcol: 14, label: getLabel(33162, "方案名称"), + lanId: 33162, labelcol: 6, value: "", rules: "required|string", @@ -178,10 +189,11 @@ export const planConditons = [ domkey: ["sharedType"], fieldcol: 14, label: getLabel(543164, "可见性"), + lanId: 543164, labelcol: 6, options: [ - { key: "0", showname: getLabel(111, "公共") }, - { key: "1", showname: getLabel(111, "私有") } + { key: "0", showname: getLabel(111, "公共"), lanId: 111 }, + { key: "1", showname: getLabel(111, "私有"), lanId: 111 } ], value: "0", rules: "required|string", @@ -192,6 +204,7 @@ export const planConditons = [ domkey: ["taxAgentIds"], fieldcol: 14, label: getLabel(543165, "可见性范围"), + lanId: 543165, labelcol: 6, multiple: true, options: [], @@ -204,12 +217,14 @@ export const planConditons = [ domkey: ["remarks"], fieldcol: 14, label: getLabel(536726, "备注"), + lanId: 536726, labelcol: 6, value: "", viewAttr: 2 } ], title: getLabel(82743, "基础信息"), + lanId: 82743, defaultshow: true } ]; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js index d1bd4b81..20d50c88 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.js @@ -13,6 +13,7 @@ import WelfarePlanList from "./components/welfarePlanList"; import LogDialog from "../../../components/logViewModal"; import cs from "classnames"; import "./index.less"; +import { tabList } from "../welfareArchive/config"; const getLabel = WeaLocaleProvider.getLabel; @@ -64,12 +65,13 @@ class Index extends Component { render() { const { taxAgentStore: { showOperateBtn } } = this.props; const { logDialogVisible, filterConditions, selectedKey, showSearchAd, isQuery, customQuery } = this.state; + const tabs = _.map(tabWelfarePlanList, o => ({ ...o, title: getLabel(o.lanId, o.title) })); return (
} iconBgcolor="#F14A2D" showDropIcon dropMenuDatas={renderDropMenuDatas(selectedKey, showOperateBtn)} - onDropMenuClick={this.onDropMenuClick} tabDatas={tabWelfarePlanList} selectedKey={selectedKey} + onDropMenuClick={this.onDropMenuClick} tabDatas={tabs} selectedKey={selectedKey} onChange={selectedKey => this.setState({ selectedKey, showSearchAd: false, customQuery: "" })} buttons={renderReqBtns(selectedKey, this.handleReqBtnsCLick, showOperateBtn, customQuery)} > diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less index dc2ed68b..5a057203 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/index.less @@ -210,6 +210,7 @@ .wea-select .wdb { word-break: break-all !important; word-wrap: break-word !important; + white-space: nowrap !important; } .wea-select .wea-select-input {