From 4e2006ed3192afebe57e86e6837bc3e8d8f013af 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, 29 Aug 2024 10:07:39 +0800 Subject: [PATCH] =?UTF-8?q?custom/=E4=B8=8A=E6=B5=B7=E6=B8=AF=E6=B9=BE?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjustAdvanceSearchPannel/index.js | 4 +-- .../components/conditions.js | 15 +++++--- .../components/searchPannel/index.js | 5 +-- .../editCalcAdvanceSearchPannel.js | 2 +- .../salaryFileAdvanceSearchPannel/index.js | 8 ++--- .../pages/payrollFiles/config/index.js | 34 ++++++++++++------- .../condition.js | 6 ++-- .../standingBookOfflineComparison/index.js | 8 +++-- 8 files changed, 50 insertions(+), 32 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/adjustSalaryManage/components/adjustAdvanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/adjustSalaryManage/components/adjustAdvanceSearchPannel/index.js index fc98193a..3bab617d 100644 --- a/pc4mobx/hrmSalary/pages/adjustSalaryManage/components/adjustAdvanceSearchPannel/index.js +++ b/pc4mobx/hrmSalary/pages/adjustSalaryManage/components/adjustAdvanceSearchPannel/index.js @@ -36,7 +36,7 @@ class Index extends Component { items: _.map(item.items, o => { if (getKey(o) === "userStatus") { return { - ...o, + ...o, label: getLabel(o.lanId, o.label), options: [ { key: "0", showname: getLabel(18883, "试用") }, { key: "1", @@ -55,7 +55,7 @@ class Index extends Component { }; } else if (getKey(o) === "adjustReason") { return { - ...o, + ...o, label: getLabel(o.lanId, o.label), options: _.map(data, item => ({ key: item.value, showname: item.defaultLabel diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js index 9620be97..e271c383 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/conditions.js @@ -146,7 +146,8 @@ export const salaryDetailSearchConditions = [ conditionType: "INPUT", domkey: ["keyword"], fieldcol: 16, - label: getLabel(111, "姓名/工号"), + label: "姓名/工号", + lanId: 25034, labelcol: 8, value: "", viewAttr: 2 @@ -155,7 +156,8 @@ export const salaryDetailSearchConditions = [ conditionType: "SELECT", domkey: ["taxAgentIds"], fieldcol: 16, - label: getLabel(537996, "个税扣缴义务人"), + label: "个税扣缴义务人", + lanId: 537996, labelcol: 8, options: [], multiple: true, @@ -187,7 +189,8 @@ export const salaryDetailSearchConditions = [ conditionType: "BROWSER", domkey: ["subcompanyIds"], fieldcol: 16, - label: getLabel(33553, "分部"), + label: "分部", + lanId: 33553, labelcol: 8, viewAttr: 2 }, @@ -216,13 +219,15 @@ export const salaryDetailSearchConditions = [ conditionType: "BROWSER", domkey: ["departmentIds"], fieldcol: 16, - label: getLabel(27511, "部门"), + label: "部门", + lanId: 27511, labelcol: 8, viewAttr: 2 } ], defaultshow: true, - title: getLabel(1361, "基本信息"), + title: "基本信息", + lanId: 1361, col: 2 } ]; diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/searchPannel/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/searchPannel/index.js index 170320c9..9d02e6b9 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/searchPannel/index.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/searchPannel/index.js @@ -34,10 +34,11 @@ class SalaryDetailAdvanceSearchPannel extends Component { items: _.map(item.items, child => { if (getKey(child) === "taxAgentIds") { return { - ...child, options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content })) + ...child, label: getLabel(child.lanId, child.label), + options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content })) }; } - return { ...child }; + return { ...child, label: getLabel(child.lanId, child.label) }; }) }; }) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js index 9c7928b2..fabbfe1f 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcAdvanceSearchPannel.js @@ -38,7 +38,7 @@ class EditCalcAdvanceSearchPannel extends Component { items: _.map(item.items, o => { if (getKey(o) === "statuses") { return { - ...o, + ...o, label: getLabel(o.lanId, o.label), options: [ { key: "0", showname: getLabel(18883, "试用") }, { key: "1", showname: getLabel(15711, "正式") }, { key: "2", showname: getLabel(480, "临时") }, { key: "3", showname: getLabel(15844, "试用延期") }, diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js index d7b43cd5..4633126e 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileAdvanceSearchPannel/index.js @@ -34,20 +34,20 @@ class salaryFileAdvanceSearchPannel extends Component { this.setState({ searchConditions: _.map(salaryFileSearchConditions, item => { return { - ...item, + ...item, title: getLabel(item.lanId, item.label), items: _.map(item.items, child => { if (getKey(child) === "statuses") { return { - ...child, + ...child, label: getLabel(child.lanId, child.label), options: _.map(userStatusList, o => ({ key: String(o.value), showname: o.defaultLabel })) }; } else if (getKey(child) === "taxAgentId") { return { - ...child, + ...child, label: getLabel(child.lanId, child.label), options: _.map(taxAgentList, o => ({ key: o.id, showname: o.content })) }; } - return { ...child }; + return { ...child, label: getLabel(child.lanId, child.label) }; }) }; }) diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js index ea6b018f..dda3455b 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js @@ -224,7 +224,8 @@ export const salaryFileSearchConditions = [ conditionType: "INPUT", domkey: ["username"], fieldcol: 16, - label: getLabel(25034, "姓名"), + label: "姓名", + lanId: 25034, labelcol: 8, value: "", viewAttr: 2 @@ -255,7 +256,8 @@ export const salaryFileSearchConditions = [ conditionType: "BROWSER", domkey: ["subcompanyIds"], fieldcol: 16, - label: getLabel(33553, "分部"), + label: "分部", + lanId: 33553, labelcol: 8, viewAttr: 2 }, @@ -284,7 +286,8 @@ export const salaryFileSearchConditions = [ conditionType: "BROWSER", domkey: ["departmentIds"], fieldcol: 16, - label: getLabel(27511, "部门"), + label: "部门", + lanId: 27511, labelcol: 8, viewAttr: 2 }, @@ -313,7 +316,8 @@ export const salaryFileSearchConditions = [ conditionType: "BROWSER", domkey: ["positionIds"], fieldcol: 16, - label: getLabel(6086, "岗位"), + label: "岗位", + lanId: 6086, labelcol: 8, viewAttr: 2 }, @@ -321,7 +325,8 @@ export const salaryFileSearchConditions = [ conditionType: "SELECT", domkey: ["statuses"], fieldcol: 16, - label: getLabel(382300, "人员状态"), + label: "人员状态", + lanId: 382300, labelcol: 8, options: [], multiple: true, @@ -331,7 +336,8 @@ export const salaryFileSearchConditions = [ conditionType: "SELECT", domkey: ["taxAgentId"], fieldcol: 16, - label: getLabel(537996, "个税扣缴义务人"), + label: "个税扣缴义务人", + lanId: 537996, labelcol: 8, options: [], viewAttr: 2 @@ -340,7 +346,8 @@ export const salaryFileSearchConditions = [ conditionType: "INPUT", domkey: ["workcode"], fieldcol: 16, - label: getLabel(1933, "工号"), + label: "工号", + lanId: 1933, labelcol: 8, value: "", viewAttr: 2 @@ -349,7 +356,8 @@ export const salaryFileSearchConditions = [ conditionType: "RANGEPICKER", domkey: ["payStartDateStartDateStr", "payStartDateEndDateStr"], fieldcol: 16, - label: getLabel(542346, "起始发薪日期"), + label: "起始发薪日期", + lanId: 542346, labelcol: 8, value: "", viewAttr: 2 @@ -358,14 +366,16 @@ export const salaryFileSearchConditions = [ conditionType: "RANGEPICKER", domkey: ["payEndDateStartDateStr", "payEndDateEndDateStr"], fieldcol: 16, - label: getLabel(542347, "最后发薪日期"), + label: "最后发薪日期", + lanId: 542347, labelcol: 8, value: "", viewAttr: 2 } ], defaultshow: true, - title: getLabel(1361, "基本信息"), + title: "基本信息", + lanId: 1361, col: 2 } ]; @@ -444,7 +454,7 @@ export const salaryFilesConditions = [ }, { defaultshow: true, title: getLabel(543329, "发薪设置"), - col: 1,lanId: 543329, + col: 1, lanId: 543329, items: [ { colSpan: 1, @@ -475,7 +485,7 @@ export const salaryFilesConditions = [ defaultshow: true, title: getLabel(538004, "薪资档案"), titleHelpful: getLabel(543330, "提示：显示已生效的最新数据"), titleHelpfulLanId: 543330, - col: 2, salaryFile: true,lanId: 538004, + col: 2, salaryFile: true, lanId: 538004, items: [] } ]; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/condition.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/condition.js index 3930e0e8..0667e485 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/condition.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/condition.js @@ -1,6 +1,3 @@ -import { WeaLocaleProvider } from "ecCom"; - -const getLabel = WeaLocaleProvider.getLabel; export const conditions = [ { items: [ @@ -9,7 +6,8 @@ export const conditions = [ conditionType: "INPUT", domkey: ["userName"], fieldcol: 14, - label: getLabel(25034, "姓名"), + label: "姓名", + lanId: 25034, labelcol: 6, value: "", viewAttr: 2 diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/index.js index 9a50b30f..fcce7bd2 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookOfflineComparison/index.js @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import { WeaCheckbox, WeaTab, WeaTable, WeaLocaleProvider } from "ecCom"; +import { WeaCheckbox, WeaLocaleProvider, WeaTab, WeaTable } from "ecCom"; import { Button } from "antd"; import { inject, observer } from "mobx-react"; import * as API from "../../../apis/offlineCompare"; @@ -11,6 +11,7 @@ import { conditions } from "./condition"; import "./index.less"; const getLabel = WeaLocaleProvider.getLabel; + @inject("standingBookStore") @observer class StandingBookOfflineComparison extends Component { @@ -116,7 +117,10 @@ class StandingBookOfflineComparison extends Component { searchsBasePlaceHolder={getLabel(26919, "请输入姓名")} showSearchAd={showSearchAd} setShowSearchAd={showSearchAd => this.setState({ showSearchAd })} - searchsAd={getSearchs(form, conditions, 2)} + searchsAd={getSearchs(form, _.map(conditions, item => ({ + ...item, + items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) })) + })), 2)} onSearch={() => { this.setState({ showSearchAd: false }, () => { this.comparisonwelfareList();