From 0556628ef853e3da8959952fb5490745b6fc3d6c 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, 8 Aug 2023 11:03:34 +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=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/payrollFiles/config/index.js    | 5 +++++
 pc4mobx/hrmSalary/pages/payrollFiles/index.js           | 8 ++++++--
 pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js | 2 ++
 pc4mobx/hrmSalary/pages/taxAgent/editModal.js           | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index 22a80218..97d5e28e 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -4,6 +4,7 @@ export const tabCondition = [
     groupid: "PENDING",
     showcount: true,
     title: "待定薪",
+    lanId: 542689,
     viewcondition: "pending"
   },
   {
@@ -11,6 +12,7 @@ export const tabCondition = [
     groupid: "FIXED",
     showcount: true,
     title: "发薪员工",
+    lanId: 111,
     viewcondition: "fixed"
   },
   {
@@ -18,6 +20,7 @@ export const tabCondition = [
     groupid: "SUSPEND",
     showcount: true,
     title: "待停薪",
+    lanId: 542691,
     viewcondition: "suspend"
   },
   {
@@ -25,6 +28,7 @@ export const tabCondition = [
     groupid: "STOP",
     showcount: true,
     title: "停薪员工",
+    lanId: 111,
     viewcondition: "stop"
   },
   {
@@ -32,6 +36,7 @@ export const tabCondition = [
     groupid: "EXT",
     showcount: true,
     title: "非系统人员",
+    lanId: 542679,
     viewcondition: "ext"
   }
 ];
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
index 65dde0d6..bc8da79c 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/index.js
@@ -552,7 +552,7 @@ class Index extends Component {
               this.setState({ selectedRowKeys: [] });
             }}/>
         }>
-          <Button type="primary">导入<i className="icon-coms-down2" style={{
+          <Button type="primary">{getLabel(32935, "导入")}<i className="icon-coms-down2" style={{
             marginLeft: 8,
             verticalAlign: "middle"
           }}/></Button>
@@ -803,7 +803,11 @@ class Index extends Component {
           dropMenuDatas={rightMenu}
         >
           <WeaTab
-            datas={(extEmpsWitch === "0" || !extEmpsWitch) ? _.dropRight(tabCondition) : tabCondition}
+            datas={
+              (extEmpsWitch === "0" || !extEmpsWitch) ?
+                _.map(_.dropRight(tabCondition), it=> ({...it, title: getLabel(it.lanId, it.title)})) :
+                _.map(tabCondition, it=> ({...it, title: getLabel(it.lanId, it.title)}))
+            }
             counts={tabCount}
             className="payrollFilesTab"
             keyParam="viewcondition" //主键
diff --git a/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js b/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js
index fbb01683..b88dab2a 100644
--- a/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryFile/changeSalaryModal.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { Button, Col, message, Row } from "antd";
 import { WeaDatePicker, WeaDialog, WeaInput, WeaLocaleProvider, WeaSelect, WeaTable } from "ecCom";
+import { toJS } from "mobx";
 import { inject, observer } from "mobx-react";
 import moment from "moment";
 import "./index.less";
@@ -78,6 +79,7 @@ export default class ChangeSalaryModal extends React.Component {
     const { salaryFileStore: { salaryItemChangeForm }, recordId } = this.props;
     const { salaryItemList } = salaryItemChangeForm;
     let { columns } = salaryItemChangeForm;
+    console.log(toJS(columns));
     return columns.map(item => {
       item = { ...item };
       if (item.dataIndex == "salaryItem") {
diff --git a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
index 3fdb60be..0d311f56 100644
--- a/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
+++ b/pc4mobx/hrmSalary/pages/taxAgent/editModal.js
@@ -139,7 +139,7 @@ export default class EditModal extends React.Component {
         initLoadCss
         className="taxagentModalWrapper"
         visible={visible}
-        style={{ width: 800, height: 450 }}
+        style={{ width: 860, height: 450 }}
         hasScroll>
         {title.indexOf(getLabel(501169, "编辑")) >= 0 && (
           <WeaTab