diff --git a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js index 63466abd..182a251c 100644 --- a/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js +++ b/pc4mobx/hrmSalary/components/excelEditor/components/codeAction.js @@ -169,7 +169,7 @@ class CodeAction extends Component {
{getLabel(30686, "函数")}
- this.setState({ funcText })}/>
} diff --git a/pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js b/pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js index 5e86924f..c9eb2312 100644 --- a/pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js +++ b/pc4mobx/hrmSalary/components/selectItemsModal/selectItemsWrapper.js @@ -61,7 +61,7 @@ class SelectItemsWrapper extends Component { const value = _.every(items, it => !!it.checked) ? "1" : "0"; return
onSelectGroupAll(groupId, val)}/> - {`${getLabel(111, "已选择")}${number}${getLabel(111, "个字段")}`} + {`${getLabel(500274, "已选择")}${number}${getLabel(543714, "个字段")}`}
; }; diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/index.js b/pc4mobx/hrmSalary/pages/calculateDetail/index.js index e9308df4..f2b10150 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/index.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/index.js @@ -118,7 +118,7 @@ export default class CalculateDetail extends React.Component { value={status} options={[ { key: "", showname: "" }, { key: "ALL", showname: getLabel(332, "全部") }, - { key: "NORMAL", showname: getLabel(111, "在职") }, { key: "UNAVAILABLE", showname: getLabel(6091, "离职") } + { key: "NORMAL", showname: getLabel(1831, "在职") }, { key: "UNAVAILABLE", showname: getLabel(6091, "离职") } ]} onChange={(val) => this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } })}/> diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js index d7841f90..f305bdbc 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js @@ -119,7 +119,7 @@ export default class PlaceOnFileDetail extends React.Component { const menu = ( this.handleMenuClick(e)}> - {getLabel(111, "导出所选")} + {getLabel(543715, "导出所选")} ); diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js index 05bd88c9..6252edb8 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js @@ -113,7 +113,7 @@ export default class UserSure extends React.Component { value={String(status)} options={[ { key: "", showname: "" }, { key: "ALL", showname: getLabel(332, "全部") }, - { key: "NORMAL", showname: getLabel(111, "在职") }, { key: "UNAVAILABLE", showname: getLabel(6091, "离职") } + { key: "NORMAL", showname: getLabel(1831, "在职") }, { key: "UNAVAILABLE", showname: getLabel(6091, "离职") } ]} onChange={(val) => this.setState({ searchItemsValue: { ...this.state.searchItemsValue, [key]: val } })}/> diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js index fee41065..7c94e3a3 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/warningModal.js @@ -10,7 +10,7 @@ export default class WarningModal extends React.Component { render() { const menu = ( - {getLabel(111, "导出所选")} + {getLabel(543715, "导出所选")} ); return ( diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js index f2555c19..63e4f6b0 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js @@ -141,7 +141,7 @@ export const conditions = [ { key: "TEXT", selected: false, - showname: getLabel(111, "文本") + showname: getLabel(128895, "文本") } ], rules: "required|string", diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js index 6739aa5f..47b03bdd 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js @@ -151,7 +151,7 @@ class Index extends Component { Modal.confirm({ title: getLabel(131329, "信息确认"), content: !id ? getLabel(543343, "确定删除所选数据吗?若数据已参与核算,已参与核算的数据不会受影响,点击核算将会按当前列表最新数据重新核算。") : - `${getLabel(111, "确定删除")}${departmentName}${username}(${getLabel(542240, "税款所属期")}:${declareMonth})${getLabel(543344, "的累计专项附加扣除数据吗")}?${getLabel(543340, "若数据已参与核算")},${getLabel(543341, "已参与核算的数据不会受影响")},${getLabel(543342, "点击核算将会按当前列表最新数据重新核算")}。`, + `${getLabel(514709, "确定删除")}${departmentName}${username}(${getLabel(542240, "税款所属期")}:${declareMonth})${getLabel(543344, "的累计专项附加扣除数据吗")}?${getLabel(543340, "若数据已参与核算")},${getLabel(543341, "已参与核算的数据不会受影响")},${getLabel(543342, "点击核算将会按当前列表最新数据重新核算")}。`, onOk: () => { deleteSelectAddUpDeduction(payload).then(({ status, errormsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js index bff47560..9717aaf8 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js @@ -260,7 +260,7 @@ class Index extends Component { Modal.confirm({ title: getLabel(131329, "信息确认"), content: !id ? getLabel(543343, "确定删除所选数据吗?若数据已参与核算,已参与核算的数据不会受影响,点击核算将会按当前列表最新数据重新核算。") : - `${getLabel(111, "确定删除")}${departmentName}${username}(${getLabel(542240, "税款所属期")}:${declareMonth})${getLabel(543367, "的往期累计情况数据吗")}?${getLabel(543340, "若数据已参与核算")},${getLabel(543341, "已参与核算的数据不会受影响")},${getLabel(543342, "点击核算将会按当前列表最新数据重新核算")}。`, + `${getLabel(514709, "确定删除")}${departmentName}${username}(${getLabel(542240, "税款所属期")}:${declareMonth})${getLabel(543367, "的往期累计情况数据吗")}?${getLabel(543340, "若数据已参与核算")},${getLabel(543341, "已参与核算的数据不会受影响")},${getLabel(543342, "点击核算将会按当前列表最新数据重新核算")}。`, onOk: () => { deleteSelectAddUpSituation(payload).then(({ status, errormsg }) => { if (status) { @@ -522,7 +522,7 @@ class Index extends Component { } = this.state; const tablePayload = { taxYearMonth: `${year}-${declareMonth}`, year, taxAgentId }; return ( - { deleteSelectData(payload).then(({ status, errormsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js index fd9e0d6e..735b72ff 100644 --- a/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js +++ b/pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js @@ -189,7 +189,7 @@ class Index extends Component { Modal.confirm({ title: getLabel(131329, "信息确认"), content: !id ? getLabel(543343, "确定删除所选数据吗?若数据已参与核算,已参与核算的数据不会受影响,点击核算将会按当前列表最新数据重新核算。") : - `${getLabel(111, "确定删除")}${departmentName}${username}${getLabel(543344, "的累计专项附加扣除数据吗")}?${getLabel(543340, "若数据已参与核算")},${getLabel(543341, "已参与核算的数据不会受影响")},${getLabel(543342, "点击核算将会按当前列表最新数据重新核算")}。`, + `${getLabel(514709, "确定删除")}${departmentName}${username}${getLabel(543344, "的累计专项附加扣除数据吗")}?${getLabel(543340, "若数据已参与核算")},${getLabel(543341, "已参与核算的数据不会受影响")},${getLabel(543342, "点击核算将会按当前列表最新数据重新核算")}。`, onOk: () => { specialAddDeductionDeleteSelectData(payload).then(({ status, errormsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js index 2d21c543..fa16b78a 100644 --- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js +++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js @@ -44,7 +44,7 @@ class FieldManagement extends Component { handleDeleteField = (filedIds) => { Modal.confirm({ title: getLabel(131329, "信息确认"), - content: getLabel(111, "确认要删除吗?"), + content: getLabel(388758, "确认要删除吗?"), onOk: () => { deleteSalaryField(filedIds).then(({ status, errormsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/ledger/addValidRuleModal.js b/pc4mobx/hrmSalary/pages/ledger/addValidRuleModal.js index b0c42864..73659c47 100644 --- a/pc4mobx/hrmSalary/pages/ledger/addValidRuleModal.js +++ b/pc4mobx/hrmSalary/pages/ledger/addValidRuleModal.js @@ -25,7 +25,6 @@ class AddValidRuleModal extends Component { }; handleSubmit = () => { if (!this.validateForm()) return; - console.log(111); }; validateForm = () => { const {name, value} = this.state; @@ -90,4 +89,4 @@ class AddValidRuleModal extends Component { } } -export default AddValidRuleModal; \ No newline at end of file +export default AddValidRuleModal; diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js index fff129a3..55376043 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/copyLedgerModal.js @@ -73,11 +73,11 @@ class CopyLedgerModal extends Component { duplicateLedger(payload).then(({ status, errormsg }) => { this.setState({ loading: false }); if (status) { - message.success(errormsg || getLabel(111, "复制成功")); + message.success(errormsg || getLabel(125245, "复制成功")); onRefreshList(); onCancel(); } else { - message.error(errormsg || getLabel(111, "复制失败")); + message.error(errormsg || getLabel(517265, "复制失败")); } }); } else { diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js index 2d8e1ff4..028bc106 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js @@ -132,7 +132,7 @@ export default class LedgerSalaryItemAddModal extends React.Component { return ( {getLabel(384113, "添加")}]} >
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js index 46fc33fa..6d8638a2 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js @@ -93,7 +93,7 @@ class LedgerSalaryItemTable extends Component { } }, { - title: getLabel(111, "个税申请表对应字段"), + title: getLabel(543718, "个税申请表对应字段"), dataIndex: "taxDeclarationColumn", key: "taxDeclarationColumn" }, diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js index 94b31312..3bc95bcc 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js @@ -740,7 +740,7 @@ export const roundingRules = [ { key: "UP_EVEN", selected: false, - showname: getLabel(111, "向上求偶") + showname: getLabel(542725, "向上求偶") } ]; export const keepDecimalPlaces = [ diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js index ad77b630..0969171a 100644 --- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js +++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js @@ -109,7 +109,7 @@ export default class MobilePayroll extends React.Component { }}> this.setState({ visible: false }, () => clearLoading())} - title={getLabel(111, "请输入二次验证密码")} visible={visible} initLoadCss + title={getLabel(501201, "请输入二次验证密码")} visible={visible} initLoadCss className="verifyWrapper" hasScroll buttons={[ diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js index 50ff8b16..6a060a81 100644 --- a/pc4mobx/hrmSalary/pages/payroll/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/index.js @@ -309,7 +309,7 @@ export default class Payroll extends React.Component { } Modal.confirm({ title: getLabel(131329, "信息确认"), - content: `${getLabel(111, "确定要将所选的工资单模板")}(${getLabel(18609, "共")}${selectedRowKeys.length}${getLabel(30690, "条数据")})${getLabel(543289, "删除吗")}?`, + content: `${getLabel(543719, "确定要将所选的工资单模板")}(${getLabel(18609, "共")}${selectedRowKeys.length}${getLabel(30690, "条数据")})${getLabel(543289, "删除吗")}?`, onOk: () => { deletePayroll(selectedRowKeys); } diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js index 6cbd71e5..8472895c 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/index.js @@ -98,7 +98,7 @@ export default class PayrollGrant extends React.Component { break; case "SELECT": if (selectedRowKeys.length === 0) { - message.warning(getLabel(111, "未选择发放条目")); + message.warning(getLabel(543720, "未选择发放条目")); return; } this.fetchGrantPayRoll({ @@ -267,7 +267,7 @@ export default class PayrollGrant extends React.Component { }; const menu = ( - {getLabel(111, "全部导出")} + {getLabel(125595, "全部导出")} {getLabel(512938, "导出选中")} ); diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js index 164bb7b1..ef428380 100644 --- a/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js +++ b/pc4mobx/hrmSalary/pages/payroll/payrollGrant/payrollPartTable.js @@ -71,11 +71,11 @@ class PayrollPartTable extends Component { const { grantType, salarySendId } = this.props; Modal.confirm({ title: getLabel(131329, "信息确认"), - content: getLabel(111, "确认要删除吗?"), + content: getLabel(388758, "确认要删除吗?"), onOk: () => { sendRangeDelete(selectedRowKeys).then(({ status, errormsg }) => { if (status) { - message.success(getLabel(111, "刪除成功")); + message.success(getLabel(543721, "刪除成功")); this.setState({ selectedRowKeys: [] }, () => { this.sendRangeList({ grantType, salarySendId, @@ -85,7 +85,7 @@ class PayrollPartTable extends Component { }); }); } else { - message.error(errormsg || getLabel(111, "刪除失败")); + message.error(errormsg || getLabel(543722, "刪除失败")); } }); }, diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js index 935d8809..1a5a232b 100644 --- a/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js +++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/allWithoutPay.js @@ -30,7 +30,7 @@ class AllWithoutPay extends Component { } Modal.warning({ title: getLabel(131329, "信息确认"), - content: `${getLabel(111, "确定要将所有待停薪人员")}(${getLabel(18609, "共")}${pageInfo.total}${getLabel(30690, "条数据")})${getLabel(543327, "设为停薪人员吗")}?`, + content: `${getLabel(543723, "确定要将所有待停薪人员")}(${getLabel(18609, "共")}${pageInfo.total}${getLabel(30690, "条数据")})${getLabel(543327, "设为停薪人员吗")}?`, onOk: () => { API.allGotoStop({}).then(({ status, data, errormsg }) => { if (status) { @@ -50,7 +50,7 @@ class AllWithoutPay extends Component { return ( {getLabel(543326, "全部停薪")} - {getLabel(111, "批量停薪")} + {getLabel(543724, "批量停薪")} ); } diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js index 44e7b0c8..17dbd19c 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/index.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js @@ -82,7 +82,7 @@ export default class SalaryItem extends React.Component { const { salaryItemStore: { deleteItemRequest, getTableDatas } } = this.props; Modal.confirm({ title: getLabel(131329, "信息确认"), - content: `${getLabel(111, "确认删除该条数据吗")}?`, + content: `${getLabel(543725, "确认删除该条数据吗")}?`, onOk: () => { deleteItemRequest([record.id]).then(() => { getTableDatas({ ...this.state.searchParams }).then(res => { diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js index ff1b9c15..5837f824 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js @@ -289,7 +289,7 @@ export default class StandingBook extends React.Component { this.setState({ drawerProps: { ...this.state.drawerProps, - title: getLabel(111, "核算异常"), + title: getLabel(543726, "核算异常"), visible: true } }); diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js index ae653df3..9797d690 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/makeupDifference.js @@ -65,7 +65,7 @@ class MakeupDifference extends Component { case "delete": Modal.confirm({ title: getLabel(131329, "信息确认"), - content: `${getLabel(111, "确认要删除吗?")}`, + content: `${getLabel(388758, "确认要删除吗?")}`, onOk: () => this.delBalance() }); break; diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js index 17b5ccdb..3c0f0d0e 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js @@ -522,7 +522,7 @@ export default class NormalIndex extends Component { setShowSearchAd={bool => this.setState({ showSearchAd: bool })} onSearchChange={searchValue => this.setState({ searchValue })} buttons={btn} onSearch={this.handleSearch} onAdSearch={this.handleSearch} - onAdReset={() => this.setState({ workcode: "" })} searchsBasePlaceHolder={getLabel(111, "请输入员工姓名")} + onAdReset={() => this.setState({ workcode: "" })} searchsBasePlaceHolder={getLabel(543727, "请输入员工姓名")} /> this.setState({ showSearchAd: bool })} onSearchChange={name => this.setState({ name })} buttons={this.renderTopBtns()} onSearch={() => onChange("search")} onAdSearch={() => onChange("search")} - onAdReset={() => this.setState({ workcode: "" })} searchsBasePlaceHolder={getLabel(111, "请输入员工姓名")} + onAdReset={() => this.setState({ workcode: "" })} searchsBasePlaceHolder={getLabel(543727, "请输入员工姓名")} /> // 账单月份{billMonth}} diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js index b4b06533..535e0c0b 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js @@ -87,7 +87,7 @@ class Regression extends Component { case "delete": Modal.confirm({ title: getLabel(131329, "信息确认"), - content: `${getLabel(111, "删除人员本账单月将不包含该人员的退差数据")}!`, + content: `${getLabel(543728, "删除人员本账单月将不包含该人员的退差数据")}!`, onOk: () => { this.delRecession(); }, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js index 6a0c210e..b15f78e7 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js @@ -189,7 +189,7 @@ class SupplementarySlide extends Component { businessAccounting: { socialSecurityBase: _.filter(data, it => it.title === getLabel(538967, "社保")), fundBase: _.filter(data, it => it.title === getLabel(538969, "公积金")), - otherBase: _.filter(data, it => it.title === getLabel(111, "企业年金及其它福利")) + otherBase: _.filter(data, it => it.title === getLabel(542518, "企业年金及其它福利")) } }); } else { @@ -218,7 +218,7 @@ class SupplementarySlide extends Component { inputPaymentAmount: { socialPayment: this.convertData(_.filter(data, it => it.title === getLabel(538967, "社保"))), fundPayment: this.convertData(_.filter(data, it => it.title === getLabel(538969, "公积金"))), - otherPayment: this.convertData(_.filter(data, it => it.title === getLabel(111, "企业年金及其它福利"))) + otherPayment: this.convertData(_.filter(data, it => it.title === getLabel(542518, "企业年金及其它福利"))) } }); } else { diff --git a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js index 52259536..1e1ae489 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/addTaxAgentModal.js @@ -193,7 +193,7 @@ export default class AddTaxAgentModal extends React.Component { tipPosition="bottom" style={{ width: "100%" }} ref="weaError1" - error={getLabel(111, "请选择员工状态")}> + error={getLabel(543729, "请选择员工状态")}> { if (checkAll === "1") { const checked = _.map(employeeStatus, it => it.id); diff --git a/pc4mobx/hrmSalary/pages/taxAgent/index.js b/pc4mobx/hrmSalary/pages/taxAgent/index.js index 699573da..c0305023 100644 --- a/pc4mobx/hrmSalary/pages/taxAgent/index.js +++ b/pc4mobx/hrmSalary/pages/taxAgent/index.js @@ -258,7 +258,7 @@ export default class TaxAgent extends React.Component { const { deleteTaxAgent, pageObj, doInit } = taxAgentStore; Modal.confirm({ title: getLabel(131329, "信息确认"), - content: getLabel(111, "确认要删除吗?"), + content: getLabel(388758, "确认要删除吗?"), onOk: () => { deleteTaxAgent([agentId]).then(({ status, errormsg }) => { if (status) { diff --git a/pc4mobx/hrmSalary/pages/taxRate/index.js b/pc4mobx/hrmSalary/pages/taxRate/index.js index 2b12fe19..c0cd0a18 100644 --- a/pc4mobx/hrmSalary/pages/taxRate/index.js +++ b/pc4mobx/hrmSalary/pages/taxRate/index.js @@ -82,7 +82,7 @@ export default class TaxRate extends React.Component { case "1": // 删除 Modal.confirm({ title: getLabel(131329, "信息确认"), - content: getLabel(111, "确定删除吗?"), + content: getLabel(388758, "确定删除吗?"), onOk() { doDelete([record.id]); }, diff --git a/pc4mobx/hrmSalary/util/date.js b/pc4mobx/hrmSalary/util/date.js index daa4e633..1db56053 100644 --- a/pc4mobx/hrmSalary/util/date.js +++ b/pc4mobx/hrmSalary/util/date.js @@ -57,7 +57,7 @@ export const generateBasicInfo = (monthCal, nowYear, nowMonth) => { break; case 1: nowMonthStr = getLabel(508987, "下月"); - nextMonthStr = getLabel(111, "下下月"); + nextMonthStr = getLabel(543730, "下下月"); break; }