From 27e4d2f254eed9985ba3a4ab8f89f88bc8a22b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 31 Jul 2023 15:30:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E7=B3=BB=E7=BB=9F=E5=A4=9A?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../calculateDetail/placeOnFileDetail.js      |  48 ++++-
 .../pages/calculateDetail/salaryDetail.js     |  71 ++++++-
 .../pages/calculateDetail/userSure.js         | 184 +++++++++++++++---
 pc4mobx/hrmSalary/pages/employeeView/index.js |  24 ++-
 .../fieldManagement/components/fieldSlide.js  |  11 +-
 .../pages/payroll/payrollDetail/index.js      |  47 ++++-
 pc4mobx/hrmSalary/pages/payrollFiles/index.js |  32 ++-
 .../reportView/components/reportContent.js    |  28 ++-
 pc4mobx/hrmSalary/pages/ruleConfig/index.js   |   2 +-
 .../pages/salaryFile/saralyFileViewSlide.js   |  16 +-
 pc4mobx/hrmSalary/pages/salaryItem/columns.js |  53 ++---
 pc4mobx/hrmSalary/pages/salaryItem/index.js   |   9 +-
 pc4mobx/hrmSalary/pages/salaryItem/options.js |  21 +-
 .../pages/salaryItem/salaryItemForm.js        |  52 +++--
 .../programme/defaultSlideForm.js             |   9 +-
 .../standingBook/index.js                     |   7 +-
 .../pages/taxAgent/editConditions.js          |   7 +
 pc4mobx/hrmSalary/pages/taxAgent/editModal.js |   4 +-
 18 files changed, 525 insertions(+), 100 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
index f305bdbc..9103f680 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/placeOnFileDetail.js
@@ -7,10 +7,10 @@ import SlideModalTitle from "../../components/slideModalTitle";
 import FileMergeDetail from "./fileMergeDetail";
 import { getQueryString } from "../../util/url";
 import { inject, observer } from "mobx-react";
-import { i18n } from "./userSure";
 import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
+
 @inject("calculateStore")
 @observer
 export default class PlaceOnFileDetail extends React.Component {
@@ -40,6 +40,29 @@ export default class PlaceOnFileDetail extends React.Component {
   }
 
   handleClick = ({ data }) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
     const { type, data: { id, data: record, extraId = "" } = {} } = data;
@@ -82,6 +105,29 @@ export default class PlaceOnFileDetail extends React.Component {
   };
 
   handleSearch = (employeeName) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
     const payload = {
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
index 63adb8f8..46de57cc 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/salaryDetail.js
@@ -9,9 +9,9 @@ import { inject, observer } from "mobx-react";
 import { toJS } from "mobx";
 import "./index.less";
 import ProgressModal from "../../components/progressModal";
-import { i18n } from "./userSure";
 
 const getLabel = WeaLocaleProvider.getLabel;
+
 @inject("calculateStore", "taxAgentStore")
 @observer
 export default class SalaryDetail extends React.Component {
@@ -49,6 +49,29 @@ export default class SalaryDetail extends React.Component {
   }
 
   handleClick = ({ data }) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
     const { type, data: { id, data: record, extraId = "" } = {} } = data;
@@ -120,6 +143,29 @@ export default class SalaryDetail extends React.Component {
 
   //列头解锁和锁定
   updateLockStatus = (lockStatus, salaryItemId) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const { calculateStore: { updateLockStatus } } = this.props;
     const salaryAcctRecordId = getQueryString("id");
     const module = {
@@ -181,6 +227,29 @@ export default class SalaryDetail extends React.Component {
 
   // 侧边栏保存
   handleEditSlideSave = () => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const { calculateStore } = this.props;
     const { saveAcctResult } = calculateStore;
     this.setState({ loading: true });
diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
index 4fdf844b..23072ae4 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/userSure.js
@@ -16,29 +16,6 @@ import { getQueryString } from "../../util/url";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
-export const i18n = {
-  "总计": getLabel(523, "总计"),
-  "编辑": getLabel(501169, "编辑"),
-  "操作": getLabel(30585, "操作"),
-  "姓名": getLabel(25034, "姓名"),
-  "共": getLabel(18609, "共"),
-  "条": getLabel(18256, "条"),
-  "加载中": getLabel(31230, "加载中"),
-  "删除": getLabel(535052, "删除"),
-  "锁定的项目值": getLabel(543647, "锁定的项目值"),
-  "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
-  "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
-  "查看": getLabel(33564, "查看"),
-  "第": getLabel(15323, "第"),
-  "次": getLabel(18929, "次"),
-  "更多": getLabel(17499, "更多"),
-  "删除待办": getLabel(543181, "删除待办"),
-  "设为发薪人员": getLabel(543308, "设为发薪人员"),
-  "调薪": getLabel(542686, "调薪"),
-  "停薪": getLabel(542692, "停薪"),
-  "取消停薪": getLabel(543309, "取消停薪"),
-  "删除档案": getLabel(23238, "删除档案")
-};
 @inject("calculateStore", "salaryFileStore")
 @observer
 export default class UserSure extends React.Component {
@@ -142,6 +119,29 @@ export default class UserSure extends React.Component {
   }
 
   handleClick = ({ data }) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
     const { type, data: { id, data: record, extraId = "" } = {} } = data;
@@ -199,6 +199,29 @@ export default class UserSure extends React.Component {
 
   // 添加人员回调
   handleUserBrowserChange(ids) {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
     if (ids && ids.length > 0) {
@@ -239,6 +262,29 @@ export default class UserSure extends React.Component {
 
   // 批量删除
   handleBatchDelete() {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const { selectedRowKeys } = this.state;
     const {
       calculateStore: { deleteAcctemployee }
@@ -276,6 +322,29 @@ export default class UserSure extends React.Component {
 
   // 删除人员
   handleDeleteItem = record => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const {
       calculateStore: { deleteAcctemployee }
     } = this.props;
@@ -306,6 +375,29 @@ export default class UserSure extends React.Component {
 
   // 刷新薪资核算人员的个税扣缴义务人
   handleRefresh = () => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
     const {
@@ -332,6 +424,29 @@ export default class UserSure extends React.Component {
 
   // 搜索
   handleUserListSearch = (value) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const salaryAcctRecordId = getQueryString("id");
     this.pageInfo.current = 1;
@@ -399,6 +514,29 @@ export default class UserSure extends React.Component {
       ];
       return <WeaSearchGroup title={getLabel(1361, "基本信息")} items={searchItems} showGroup/>;
     };
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
 
     return (
       <div className="userSure">
diff --git a/pc4mobx/hrmSalary/pages/employeeView/index.js b/pc4mobx/hrmSalary/pages/employeeView/index.js
index 783dee7a..46fcfa6b 100644
--- a/pc4mobx/hrmSalary/pages/employeeView/index.js
+++ b/pc4mobx/hrmSalary/pages/employeeView/index.js
@@ -13,7 +13,6 @@ import { inject, observer } from "mobx-react";
 import { MonthRangePicker } from "../reportView/components/statisticalMicroSettingsSlide";
 import { optionAddWhole } from "../../util/options";
 import moment from "moment";
-import { i18n } from "../calculateDetail/userSure";
 import "./index.less";
 
 const WeaTableComx = WeaTableNew.WeaTable;
@@ -71,6 +70,29 @@ class Index extends Component {
     }
   };
   postMessageToChild = (payload) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const { dataSource, columns, showSum, pageInfo, countResult } = payload;
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 354ee82c..d3f9afb7 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -24,6 +24,7 @@ import { commonEnumList } from "../../../apis/payrollFiles";
 import { dataTypeOptions, patternOptions, roundingModeOptions } from "../../salaryItem/options";
 
 const getLabel = WeaLocaleProvider.getLabel;
+
 @inject("taxAgentStore")
 @observer
 class FieldSlide extends Component {
@@ -300,14 +301,20 @@ class FieldSlide extends Component {
             <WeaFormItem label={getLabel(84113, "字段类型")} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
               <WeaSelect
                 value={dataType}
-                options={dataTypeOptions}
+                options={_.map(dataTypeOptions, it => ({
+                  ...it,
+                  showname: getLabel(it.lanId, it.showname)
+                }))}
                 onChange={value => this.handleChangeFields("dataType", value)}
               />
             </WeaFormItem>
             <WeaFormItem label={getLabel(543295, "舍入规则")} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
               <WeaSelect
                 value={roundingMode}
-                options={roundingModeOptions}
+                options={_.map(roundingModeOptions, it => ({
+                  ...it,
+                  showname: getLabel(it.lanId, it.showname)
+                }))}
                 onChange={value => this.handleChangeFields("roundingMode", value)}
               />
             </WeaFormItem>
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
index 98a41d7f..92bcfee0 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.js
@@ -6,7 +6,6 @@ import { getQueryString } from "../../../util/url";
 import { removePropertyCondition } from "../../../util/response";
 import { getSearchs } from "../../../util";
 import { getPayrollDetailList, getPayrollDetailSa, getPayrollInfo } from "../../../apis/payroll";
-import { i18n } from "../../calculateDetail/userSure";
 import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -37,6 +36,29 @@ export default class PayrollDetail extends React.Component {
   }
 
   handleReceiveMessage = async ({ data }) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const { dataSource, columns, pageInfo } = this.state;
     const childFrameObj = document.getElementById("atdTable");
     const { type, payload } = data;
@@ -85,6 +107,29 @@ export default class PayrollDetail extends React.Component {
     });
   };
   getPayrollDetailList = (extra = {}) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const { pageInfo } = this.state;
     const { child, ...extraParams } = extra;
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index 06887746..81ddb60c 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -32,7 +32,6 @@ import SlideModalTitle from "../../components/slideModalTitle";
 import SalaryFileViewSlide from "../salaryFile/saralyFileViewSlide";
 import ChangeSalaryModal from "../salaryFile/changeSalaryModal";
 import { sysinfo } from "../../apis/ruleconfig";
-import { i18n } from "../calculateDetail/userSure";
 import "./index.less";
 
 const getLabel = WeaLocaleProvider.getLabel;
@@ -215,6 +214,29 @@ class Index extends Component {
     }
   };
   postMessageToChild = (payload) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const { dataSource, columns, showSum, pageInfo, showOperateBtn, selectedKey, selectedRowKeys } = payload;
     const { salaryArchiveDelete } = this.state;
@@ -466,10 +488,10 @@ class Index extends Component {
           />
         }>
           <Button type="primary" style={{ marginLeft: 8 }}>{getLabel(543326, "全部停薪")}<i className="icon-coms-down2"
-                                                                                         style={{
-                                                                                           marginLeft: 8,
-                                                                                           verticalAlign: "middle"
-                                                                                         }}/></Button>
+                                                                                            style={{
+                                                                                              marginLeft: 8,
+                                                                                              verticalAlign: "middle"
+                                                                                            }}/></Button>
         </Dropdown>,
         <Button type="ghost" onClick={() => {
           const { selectedRowKeys } = this.state;
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index 85ca95fc..6e97f347 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -6,15 +6,16 @@
  */
 import React, { Component } from "react";
 import { Spin } from "antd";
-import { WeaEchart } from "ecCom";
+import { WeaEchart, WeaLocaleProvider } from "ecCom";
 import RightOptions from "./rightOptions";
 import ChartsRangeSettingsModal from "./chartsRangeSettingsModal";
 import { mapBarOptions, mapLineOptions, mapPieOptions } from "./condition";
 import { queryRangeSetting, reportStatisticsReportGetData } from "../../../apis/statistics";
 import PovitpivotChartModal from "./povitpivotChartModal";
-import {i18n} from "../../calculateDetail/userSure"
 import "../index.less";
 
+const getLabel = WeaLocaleProvider.getLabel;
+
 class ReportContent extends Component {
   constructor(props) {
     super(props);
@@ -76,6 +77,29 @@ class ReportContent extends Component {
     }
   };
   postMessageToChild = (payload) => {
+    const i18n = {
+      "总计": getLabel(523, "总计"),
+      "编辑": getLabel(501169, "编辑"),
+      "操作": getLabel(30585, "操作"),
+      "姓名": getLabel(25034, "姓名"),
+      "共": getLabel(18609, "共"),
+      "条": getLabel(18256, "条"),
+      "加载中": getLabel(31230, "加载中"),
+      "删除": getLabel(535052, "删除"),
+      "锁定的项目值": getLabel(543647, "锁定的项目值"),
+      "点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
+      "点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
+      "查看": getLabel(33564, "查看"),
+      "第": getLabel(15323, "第"),
+      "次": getLabel(18929, "次"),
+      "更多": getLabel(17499, "更多"),
+      "删除待办": getLabel(543181, "删除待办"),
+      "设为发薪人员": getLabel(543308, "设为发薪人员"),
+      "调薪": getLabel(542686, "调薪"),
+      "停薪": getLabel(542692, "停薪"),
+      "取消停薪": getLabel(543309, "取消停薪"),
+      "删除档案": getLabel(23238, "删除档案")
+    };
     const childFrameObj = document.getElementById("atdTable");
     const { dataSource, columns, showSum, countResult } = payload;
     childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
index bdbd0994..3ee9230c 100644
--- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js
+++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js
@@ -374,7 +374,7 @@ export default class Index extends Component {
             </WeaFormItem>
           </WeaSearchGroup>
           <WeaSearchGroup title={getLabel(538004, "薪资档案")} showGroup center>
-            <WeaFormItem label={getLabel(111, "允许删除档案")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
+            <WeaFormItem label={getLabel(544089, "允许删除档案")} labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
               <WeaCheckbox display="switch" value={confValue}
                            onChange={val => this.handleChange("confValue", val)}/>
             </WeaFormItem>
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
index 156eeac4..4d4b25c1 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/saralyFileViewSlide.js
@@ -20,15 +20,15 @@ const baseInfolist = [
     items: [
       {
         label: getLabel(25034, "姓名"),
-        value: "username"
+        value: "username", lanId: 25034
       },
       {
         label: getLabel(27511, "部门"),
-        value: "department"
+        value: "department", lanId: 27511
       },
       {
         label: getLabel(6086, "岗位"),
-        value: "position"
+        value: "position", lanId: 6086
       }
     ]
   },
@@ -37,15 +37,15 @@ const baseInfolist = [
     items: [
       {
         label: getLabel(1908, "入职时间"),
-        value: "hiredate"
+        value: "hiredate", lanId: 1908
       },
       {
         label: getLabel(125238, "手机号"),
-        value: "mobile"
+        value: "mobile", lanId: 125238
       },
       {
         label: getLabel(537996, "个税扣缴义务人"),
-        value: "taxAgent"
+        value: "taxAgent", lanId: 537996
       }
     ]
   }
@@ -113,9 +113,9 @@ export default class SalaryFileViewSlide extends React.Component {
                 return <tr key={id} className="descriptions-row">
                   {
                     _.map(items, it => {
-                      const { label, value } = it;
+                      const { label, value, lanId } = it;
                       return <React.Fragment>
-                        <th className="descriptions-label">{label}</th>
+                        <th className="descriptions-label">{getLabel(lanId, label)}</th>
                         <td className="descriptions-value">{baseInfo && baseInfo["employee"][value]}</td>
                       </React.Fragment>;
                     })
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
index e3925c9a..1314bcfa 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
@@ -7,52 +7,52 @@ export const columns = [
   {
     title: getLabel(33439, "名称"),
     dataIndex: "title",
-    key: "title"
+    key: "title", lanId: 33439
   },
   {
     title: getLabel(713, "属性"),
     dataIndex: "title",
-    key: "title"
+    key: "title", lanId: 713
   },
   {
     title: getLabel(500401, "类型"),
     dataIndex: "title",
-    key: "title"
+    key: "title", lanId: 500401
   },
   {
     title: getLabel(543299, "薪资档案引用"),
     dataIndex: "refere",
-    key: "refere"
+    key: "refere", lanId: 543299
   },
   {
     title: getLabel(543294, "默认使用"),
     dataIndex: "refere",
-    key: "refere"
+    key: "refere", lanId: 543294
   },
   {
     title: getLabel(543176, "进位规则"),
     dataIndex: "title",
-    key: "title"
+    key: "title", lanId: 543176
   },
   {
     title: getLabel(543296, "保留小数位"),
     dataIndex: "title",
-    key: "title"
+    key: "title", lanId: 543296
   },
   {
     title: getLabel(543297, "取值方式"),
     dataIndex: "title",
-    key: "title"
+    key: "title", lanId: 543297
   },
   {
     title: getLabel(536726, "备注"),
     dataIndex: "title",
-    key: "title"
+    key: "title", lanId: 536726
   },
   {
     title: getLabel(30585, "操作"),
     dataIndex: "cz",
-    key: "cz"
+    key: "cz", lanId: 30585
   }
 ];
 export const salaryItemFields = [
@@ -61,7 +61,7 @@ export const salaryItemFields = [
     label: getLabel(33439, "名称"),
     type: "INPUT",
     viewAttr: 3,
-    tip: ""
+    tip: "", lanId: 33439
   },
   // {
   //   key: 'useInEmployeeSalary',
@@ -75,28 +75,31 @@ export const salaryItemFields = [
     label: getLabel(543294, "默认使用"),
     type: "SWITCH",
     viewAttr: 2,
-    tip: getLabel(543298, "提示：开启后，每个薪资方案都有该薪资项目，可在具体薪资方案中删除")
+    tip: getLabel(543298, "提示：开启后，每个薪资方案都有该薪资项目，可在具体薪资方案中删除"), lanId: 543294,
+    tipLanId: 543298
   },
   {
     key: "sharedType",
     label: getLabel(543164, "可见性"),
     type: "SELECT",
     viewAttr: 2,
-    tip: ""
+    tip: "", lanId: 543164
   },
   {
     key: "hideDefault",
     label: getLabel(111, "核算时隐藏"),
     type: "SWITCH",
     viewAttr: 2,
-    tip: getLabel(111, "提示：开启后，在薪资账套中添加该项目时，默认勾选隐藏且在核算时隐藏该薪资项目，可在具体薪资账套中设置是否隐藏")
+    tip: getLabel(111, "提示：开启后，在薪资账套中添加该项目时，默认勾选隐藏且在核算时隐藏该薪资项目，可在具体薪资账套中设置是否隐藏"),
+    lanId: 111,
+    tipLanId: 543298
   },
   {
     key: "taxAgentIds",
     label: getLabel(543165, "可见性范围"),
     type: "SELECT",
     viewAttr: 3,
-    tip: ""
+    tip: "", lanId: 543165
   },
   {
     key: "dataType",
@@ -104,7 +107,7 @@ export const salaryItemFields = [
     type: "SELECT",
     viewAttr: 3,
     options: dataTypeOptions,
-    tip: ""
+    tip: "", lanId: 84113
   },
   {
     key: "roundingMode",
@@ -112,7 +115,7 @@ export const salaryItemFields = [
     type: "SELECT",
     viewAttr: 2,
     options: roundingModeOptions,
-    tip: ""
+    tip: "", lanId: 543295
   },
   {
     key: "pattern",
@@ -120,41 +123,41 @@ export const salaryItemFields = [
     type: "SELECT",
     viewAttr: 2,
     options: patternOptions,
-    tip: ""
+    tip: "", lanId: 543296
   },
   {
     key: "valueType",
     label: getLabel(543297, "取值方式"),
     type: "RADIO",
     viewAttr: 2,
-    tip: ""
+    tip: "", lanId: 543297
   },
   {
     key: "formulaContent",
     label: getLabel(18125, "公式"),
     type: "INPUT",
     viewAttr: 2,
-    tip: ""
+    tip: "", lanId: 18125
   },
   {
     key: "sortedIndex",
     label: getLabel(128719, "显示顺序"),
     type: "INPUTNUMBER",
     viewAttr: 2,
-    tip: ""
+    tip: "", lanId: 128719
   },
   {
     key: "description",
     label: getLabel(536726, "备注"),
     type: "TEXTAREA",
     viewAttr: 2,
-    tip: ""
+    tip: "", lanId: 536726
   }
 ];
 export const valTakeOptions = [
-  { key: "1", showname: getLabel(554, "输入") },
-  { key: "2", showname: getLabel(18125, "公式") },
-  { key: "3", showname: "SQL" }
+  { key: "1", showname: getLabel(554, "输入"), lanId: 554 },
+  { key: "2", showname: getLabel(18125, "公式"), lanId: 18125 },
+  { key: "3", showname: "SQL", lanId: 111 }
 ];
 
 
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index be05f1b3..26588a62 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -130,7 +130,7 @@ export default class SalaryItem extends React.Component {
         return (
           <React.Fragment>
             <a
-              onClick={() => this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}</a>
+              onClick={() => this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? getLabel(501169, "编辑") : getLabel(33564, "查看")}</a>
             {
               (record.canDelete && (showSalaryItemBtn || showOperateBtn)) &&
               <a href="javascript:void(0)" style={{ marginLeft: 10 }}
@@ -263,9 +263,10 @@ export default class SalaryItem extends React.Component {
               });
             }}>{getLabel(543290, "批量删除薪资项")}</Button>
         }
-        <WeaInputSearch value={this.state.searchValue} placeholder={getLabel(84078, "请输入名称")} onChange={(value) => {
-          this.setState({ searchValue: value });
-        }} onSearch={(value) => {
+        <WeaInputSearch value={this.state.searchValue} placeholder={getLabel(84078, "请输入名称")}
+                        onChange={(value) => {
+                          this.setState({ searchValue: value });
+                        }} onSearch={(value) => {
           this.handleSearch(value);
         }}/>
       </div>);
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/options.js b/pc4mobx/hrmSalary/pages/salaryItem/options.js
index f200f734..9021d201 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/options.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/options.js
@@ -5,27 +5,32 @@ export const roundingModeOptions = [
   {
     key: "1",
     selected: false,
-    showname: getLabel(19766, "原始数据")
+    showname: getLabel(19766, "原始数据"),
+    lanId: 19766
   },
   {
     key: "2",
     selected: false,
-    showname: getLabel(389654, "四舍五入")
+    showname: getLabel(389654, "四舍五入"),
+    lanId: 389654
   },
   {
     key: "3",
     selected: false,
-    showname: getLabel(542722, "向上舍入")
+    showname: getLabel(542722, "向上舍入"),
+    lanId: 542722
   },
   {
     key: "4",
     selected: false,
-    showname: getLabel(542723, "向下舍入")
+    showname: getLabel(542723, "向下舍入"),
+    lanId: 542723
   },
   {
     key: "5",
     selected: false,
-    showname: getLabel(542724, "见分进角")
+    showname: getLabel(542724, "见分进角"),
+    lanId: 542724
   }
 ];
 
@@ -71,11 +76,13 @@ export const dataTypeOptions = [
   {
     key: "number",
     showname: getLabel(17639, "数值"),
-    selected: false
+    selected: false,
+    lanId: 17639
   },
   {
     key: "string",
     showname: getLabel(391259, "字符"),
-    selected: false
+    selected: false,
+    lanId: 391259
   }
 ];
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index d28dd515..070bc33c 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -5,9 +5,20 @@
  * Date: 2023/2/9
  */
 import React, { Component } from "react";
-import { WeaCheckbox, WeaFormItem, WeaInput, WeaInputNumber, WeaSearchGroup, WeaSelect, WeaTextarea } from "ecCom";
+import {
+  WeaCheckbox,
+  WeaFormItem,
+  WeaInput,
+  WeaInputNumber,
+  WeaLocaleProvider,
+  WeaSearchGroup,
+  WeaSelect,
+  WeaTextarea
+} from "ecCom";
 import { salaryItemFields, valTakeOptions } from "./columns";
 
+const getLabel = WeaLocaleProvider.getLabel;
+
 class SalaryItemForm extends Component {
   constructor(props) {
     super(props);
@@ -22,19 +33,21 @@ class SalaryItemForm extends Component {
     const { systemType, sharedType, valueType } = request;
     this.setState({
       salaryItemFieldsList: _.map(salaryItemFieldsList, item => {
-        const { key } = item;
+        const { key, lanId, label } = item;
         switch (key) {
           case "useInEmployeeSalary":
             return {
               ...item,
               viewAttr: (editable && record.canEdit) || isAdd ? 2 : 1,
-              display: !isAdd
+              display: !isAdd,
+              label: getLabel(lanId, label)
             };
           case "sharedType":
             return {
               ...item,
               viewAttr: (editable && record.canEdit) || isAdd ? 2 : 1,
-              display: systemType.toString() === "0" || isAdd
+              display: systemType.toString() === "0" || isAdd,
+              label: getLabel(lanId, label)
             };
           case "taxAgentIds":
             return {
@@ -42,25 +55,28 @@ class SalaryItemForm extends Component {
               multiple: true,
               viewAttr: (editable && record.canEdit) || isAdd ? 3 : 1,
               display: (!_.isNil(sharedType) && sharedType.toString() === "1") && (!_.isNil(systemType) && systemType.toString() === "0"),
-              options: taxAgentAdminOption
+              options: taxAgentAdminOption,
+              label: getLabel(lanId, label)
             };
           case "valueType":
             return {
               ...item,
-              // viewAttr: isAdd ? 2 : 1
+              label: getLabel(lanId, label)
             };
           case "formulaContent":
             return {
               ...item,
               display: valueType === "2" || valueType === "3",
-              viewAttr: (editable && record.canEdit) || isAdd ? 2 : 1
+              viewAttr: (editable && record.canEdit) || isAdd ? 2 : 1,
+              label: getLabel(lanId, label)
             };
           default:
             break;
         }
         return {
           ...item,
-          viewAttr: (key === "name" && ((editable && record.canEdit) || isAdd)) ? 3 : (key !== "name" && ((editable && record.canEdit) || isAdd)) ? 2 : 1
+          viewAttr: (key === "name" && ((editable && record.canEdit) || isAdd)) ? 3 : (key !== "name" && ((editable && record.canEdit) || isAdd)) ? 2 : 1,
+          label: getLabel(lanId, label)
         };
       })
     });
@@ -98,7 +114,7 @@ class SalaryItemForm extends Component {
       <WeaSearchGroup showGroup needTigger={false}>
         {
           _.map(salaryItemFieldsList, item => {
-            const { key, label, type, viewAttr, tip, options, display = true, multiple = false } = item;
+            const { key, label, type, viewAttr, tip, tipLanId, options, display = true, multiple = false } = item;
             const value = !_.isNil(request[key]) ? request[key].toString() : "";
             return <React.Fragment>
               {
@@ -109,18 +125,30 @@ class SalaryItemForm extends Component {
                               onChange={v => this.handleChangeSalaryFiledItems(key, v)}/></WeaFormItem> :
                   (type === "SWITCH" && display) ?
                     <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
-                      <WeaCheckbox value={value} helpfulTip={tip} display="switch" viewAttr={viewAttr}
+                      <WeaCheckbox value={value} helpfulTip={getLabel(tipLanId, tip)} display="switch"
+                                   viewAttr={viewAttr}
                                    onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
                     </WeaFormItem> :
                     (type === "SELECT" && display) ?
                       <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
-                        <WeaSelect value={value} options={key !== "sharedType" ? options : userStatusList}
+                        <WeaSelect value={value}
+                                   options={key !== "sharedType" ? _.map(options, it => ({
+                                     ...it,
+                                     showname: getLabel(it.lanId, it.showname)
+                                   })) : _.map(userStatusList, it => ({
+                                     ...it,
+                                     showname: getLabel(it.lanId, it.showname)
+                                   }))}
                                    multiple={multiple} viewAttr={viewAttr}
                                    onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
                       </WeaFormItem> :
                       (type === "RADIO" && display) ?
                         <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
-                          <WeaSelect value={value} options={valTakeOptions} detailtype={3} viewAttr={viewAttr}
+                          <WeaSelect value={value}
+                                     options={_.map(valTakeOptions, it => ({
+                                       ...it,
+                                       showname: getLabel(it.lanId, it.showname)
+                                     }))} detailtype={3} viewAttr={viewAttr}
                                      onChange={v => this.handleChangeSalaryFiledItems(key, v)}/>
                         </WeaFormItem> :
                         (type === "TEXTAREA" && display) ?
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
index ec346fdd..4ea2e58e 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/defaultSlideForm.js
@@ -293,7 +293,7 @@ export default class DefaultSlideForm extends React.Component {
         </div>;
         item.render = (text, record) => {
           return (
-            <div>
+            <div style={{ display: "flex", alignItems: "center" }}>
               <WeaSelect
                 options={[
                   { key: "0", showname: getLabel(543159, "月缴") },
@@ -324,7 +324,12 @@ export default class DefaultSlideForm extends React.Component {
         item.render = (text, record) => {
           if (record.paymentCycle === "0") {
             return (
-              <div>{getLabel(543160, "基数*比例+固定费用")}</div>
+              <div style={{
+                maxWidth: 200,
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+                whiteSpace: "nowrap"
+              }}>{getLabel(543160, "基数*比例+固定费用")}</div>
             );
           } else {
             return (
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index bae14eaf..25a13420 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
 import { Button, DatePicker, Dropdown, Menu, message, Modal } from "antd";
-import { WeaLocaleProvider, WeaNewScroll, WeaTop } from "ecCom";
+import { WeaLocaleProvider, WeaNewScroll, WeaTools, WeaTop } from "ecCom";
 import { renderNoright } from "../../../util";
 import Accountdialog from "./components/accountDialog";
 import AbnormalDrawer from "./components/abnormalDrawer";
@@ -135,12 +135,13 @@ export default class StandingBook extends React.Component {
         return { ...it };
       });
       if (!this.state.adminData.isDefaultOpen || (this.state.adminData.isDefaultOpen && this.state.adminData.isAdminEnable)) {
+        const languageidweaver = WeaTools.ls.getJSONObj("languageidweaver");
         columns = [
           ...columns,
           {
             title: getLabel(30585, "操作"),
             dataIndex: "operate",
-            width: 150,
+            width: languageidweaver == "8" ? 260 : 150,
             key: "operate",
             render: (text, r) => {
               const { billStatus, billMonth, creator } = r;
@@ -177,7 +178,7 @@ export default class StandingBook extends React.Component {
                         paymentOrganizationId: r.paymentOrganizationId,
                         creator
                       })}>
-                      {getLabel(111, "查看")}
+                      {getLabel(33564, "查看")}
                     </a>
                   )}
                   {billStatus === "1" && (
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js b/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
index 23505cad..05b0529c 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/editConditions.js
@@ -17,6 +17,7 @@ export const editConditions = [
         fieldcol: 14,
         rules: "required|string",
         label: getLabel(33439, "名称"),
+        lanId: 33439,
         labelcol: 6,
         value: "",
         viewAttr: 3
@@ -49,6 +50,7 @@ export const editConditions = [
         domkey: ["adminUserIds"],
         fieldcol: 14,
         label: getLabel(1507, "管理员"),
+        lanId: 1507,
         labelcol: 6,
         viewAttr: 3
       },
@@ -58,6 +60,7 @@ export const editConditions = [
         domkey: ["sortedIndex"],
         fieldcol: 14,
         label: "显示顺序",
+        lanId: 128719,
         labelcol: 6,
         value: "",
         viewAttr: 2,
@@ -68,6 +71,7 @@ export const editConditions = [
         domkey: ["description"],
         fieldcol: 14,
         label: getLabel(536726, "备注"),
+        lanId: 536726,
         labelcol: 6,
         value: "",
         viewAttr: 2
@@ -86,6 +90,7 @@ export const decentralizationConditions = [
         fieldcol: 14,
         rules: "required|string",
         label: getLabel(33439, "名称"),
+        lanId: 33439,
         labelcol: 6,
         value: "",
         viewAttr: 3
@@ -96,6 +101,7 @@ export const decentralizationConditions = [
         domkey: ["sortedIndex"],
         fieldcol: 14,
         label: "显示顺序",
+        lanId: 128719,
         labelcol: 6,
         value: "",
         viewAttr: 2,
@@ -106,6 +112,7 @@ export const decentralizationConditions = [
         domkey: ["description"],
         fieldcol: 14,
         label: getLabel(536726, "备注"),
+        lanId: 536726,
         labelcol: 6,
         value: "",
         viewAttr: 2
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
index cc1477e6..3fdb60be 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
@@ -1,6 +1,6 @@
 import React from "react";
 import { Button } from "antd";
-import { WeaDialog, WeaFormItem, WeaSearchGroup, WeaSteps, WeaTab, WeaLocaleProvider } from "ecCom";
+import { WeaDialog, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaSteps, WeaTab } from "ecCom";
 import { WeaSwitch } from "comsMobx";
 import PersonalScope from "./personalScope";
 import "./index.less";
@@ -62,7 +62,7 @@ export default class EditModal extends React.Component {
           com: (
             <WeaFormItem
               ecId={`tasAgent_WeaFormItem@jsxoq6@${index}@${idx}`}
-              label={`${field.label}`}
+              label={getLabel(field.lanId, field.label)}
               labelCol={{ span: `${field.labelcol}` }}
               error={devolutionStatus === 1 ? form.getError(field) : formDecentralization.getError(field)}
               tipPosition="bottom"