From 7de556b23142173c067e807642248e034e6ea280 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 17 Jun 2024 14:30:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/apis/department.js                  | 5 +++--
 pc4mobx/organization/apis/resource.js                    | 5 +++--
 pc4mobx/organization/components/department/department.js | 2 +-
 pc4mobx/organization/components/job/Job.js               | 5 +++--
 pc4mobx/organization/components/log/LogView.js           | 2 +-
 pc4mobx/organization/stores/job.js                       | 7 +++++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pc4mobx/organization/apis/department.js b/pc4mobx/organization/apis/department.js
index a98ec59..58a02d8 100644
--- a/pc4mobx/organization/apis/department.js
+++ b/pc4mobx/organization/apis/department.js
@@ -1,7 +1,8 @@
 
 import {
-    WeaTools
+    WeaTools,WeaLocaleProvider
 } from 'ecCom'
+const getLabel = WeaLocaleProvider.getLabel;
 
 export const getSearchList = (params) => {
     return fetch('/api/bs/hrmorganization/dept/listPage', {
@@ -50,7 +51,7 @@ export const exportData = () => {
     return new Promise(resolve => {
         fetch('/api/bs/hrmorganization/common/department/export').then(res => res.blob().then(blob => {
             resolve();
-            var filename=`部门档案.xlsx`
+            var filename=`${getLabel(547606,'部门档案数据')}.xlsx`
             var a = document.createElement('a');
             var url = window.URL.createObjectURL(blob); 
             a.href = url;
diff --git a/pc4mobx/organization/apis/resource.js b/pc4mobx/organization/apis/resource.js
index 3d5c366..7e05037 100644
--- a/pc4mobx/organization/apis/resource.js
+++ b/pc4mobx/organization/apis/resource.js
@@ -1,7 +1,8 @@
 
 import {
-    WeaTools
+    WeaTools,WeaLocaleProvider
 } from 'ecCom'
+const getLabel = WeaLocaleProvider.getLabel;
 
 export const getSearchList = (params) => {
     return WeaTools.callApi('/api/bs/hrmorganization/hrmresource/listPage', 'GET', params);
@@ -52,7 +53,7 @@ export const exportResource = (ids) => {
     return new Promise(resolve => {
         fetch('/api/bs/hrmorganization/common/resource/export?ids='+ids).then(res => res.blob().then(blob => {
             resolve();
-            var filename=`人员档案.xlsx`
+            var filename=`${getLabel(547539,'人员信息')}.xlsx`
             var a = document.createElement('a');
             var url = window.URL.createObjectURL(blob); 
             a.href = url;
diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index e322700..6bbbb74 100644
--- a/pc4mobx/organization/components/department/department.js
+++ b/pc4mobx/organization/components/department/department.js
@@ -149,7 +149,7 @@ export default class Department extends React.Component {
             department
         } = this.props;
 
-        department.setNeDialogTitle("联查岗位");
+        department.setNeDialogTitle(i18n.button.associateJob());
         department.setVisible(true);
         department.setDialogLoadingStatus(true);
         department.getPostionTable(id);
diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js
index 1c49129..6dd56bd 100644
--- a/pc4mobx/organization/components/job/Job.js
+++ b/pc4mobx/organization/components/job/Job.js
@@ -18,7 +18,7 @@ import {
     WeaRightMenu,
     WeaTable,
     WeaLeftRightLayout,
-    WeaOrgTree, WeaDialog
+    WeaOrgTree, WeaDialog,WeaLocaleProvider
 } from 'ecCom'
 import {
     Row,
@@ -44,6 +44,7 @@ import NewAndEditDialog from '../NewAndEditDialog';
 import NewWeaTableDialog from '../NewWeaTableDialog';
 import { renderNoright } from '../../util';
 
+const getLabel = WeaLocaleProvider.getLabel;
 
 
 const toJS = mobx.toJS;
@@ -145,7 +146,7 @@ export default class Job extends React.Component {
             job
         } = this.props;
 
-        job.setNeDialogTitle("联查人员");
+        job.setNeDialogTitle(getLabel(547609,'联查人员'));
         job.setVisible(true);
         job.getHrmTable(id);
     }
diff --git a/pc4mobx/organization/components/log/LogView.js b/pc4mobx/organization/components/log/LogView.js
index 86b5ac3..5231603 100644
--- a/pc4mobx/organization/components/log/LogView.js
+++ b/pc4mobx/organization/components/log/LogView.js
@@ -69,7 +69,7 @@ export default class LogView extends React.Component {
         this.setState({
             record:record,
             detailVisible: true,
-            detailDialogTitle: record.operate_typespan + " - " + record.operate_module_name + " : "+record.value
+            detailDialogTitle: record.operate_typespan + " - " + record.operate_module_namespan + " : "+record.value
         })
     }
 
diff --git a/pc4mobx/organization/stores/job.js b/pc4mobx/organization/stores/job.js
index 5555b1c..cfb1c60 100644
--- a/pc4mobx/organization/stores/job.js
+++ b/pc4mobx/organization/stores/job.js
@@ -20,12 +20,15 @@ import {
 import {
   findIndex
 } from 'lodash';
+import {
+  WeaLocaleProvider
+} from 'ecCom'
 
 const toJS = mobx.toJS;
 const {
   TableStore
 } = WeaTableNew;
-
+const getLabel = WeaLocaleProvider.getLabel;
 
 export class JobStore {
   @observable tableStore = new TableStore();
@@ -161,7 +164,7 @@ export class JobStore {
     Api.refresh().then(res => {
       if (res.code === 200) {
         this.getTableInfo();
-        message.success("数据刷新成功");
+        message.success(getLabel(547202,'数据刷新成功'));
       } else {
         message.warning(res.msg);
       }

From a5c7400b995441528656cfa628fcde329ac19a0b Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 19 Jun 2024 09:44:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E5=9C=B0=E7=90=83=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/organization/components/resource/ResourceCard.js | 4 ++--
 pc4mobx/organization/stores/columnSetting.js             | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js
index c1fef92..493f622 100644
--- a/pc4mobx/organization/components/resource/ResourceCard.js
+++ b/pc4mobx/organization/components/resource/ResourceCard.js
@@ -241,12 +241,12 @@ export default class ResourceCard extends React.Component {
                                     <div className='name'>{data.user.name}
                                         <span>{data.user.sex == 0 ? <i className="icon-coms-men" /> : <i className="icon-coms-women" />}</span>
                                     </div>
-                                    <div className='icon-info'>
+                                    {/* <div className='icon-info'>
                                         <i className="icon-coms-Send-message" />
                                         <i className="icon-coms-message-o" />
                                         <i className="icon-coms-Send-emails" />
                                         <i className="icon-coms-New-schedule-o" />
-                                    </div>
+                                    </div> */}
                                     <div className='content'>
                                         <div>
                                             <span className='label'><i className="icon-portal-email-o" /></span>
diff --git a/pc4mobx/organization/stores/columnSetting.js b/pc4mobx/organization/stores/columnSetting.js
index 2154699..5d083bf 100644
--- a/pc4mobx/organization/stores/columnSetting.js
+++ b/pc4mobx/organization/stores/columnSetting.js
@@ -179,9 +179,7 @@ export class ColumnSetting {
                   <span style={{ marginLeft: 10 }}>
                     <WeaHelpfulTip
                       ecId={`${this && this.props && this.props.ecId || ""}_WeaHelpfulTip@4vdvfp@${index}`}
-                      title={getLabel('547638', `页面链接地址可以为外网地址，如：http://www.baidu.com
-                      也可以是内部地址，如：/test.jsp，可以带上参数传参，像这样：/test.jsp?a=1&b=2
-                      也可以写占位符${id}传人员id，像这样：/test.jsp?a=1&b=${id}&mypara2=${id}`)}/>
+                      title={getLabel('547638', "页面链接地址可以为外网地址，如：http://www.baidu.com也可以是内部地址，如：/test.jsp，可以带上参数传参，像这样：/test.jsp?a=1&b=2也可以写占位符${id}传人员id，像这样：/test.jsp?a=1&b=${id}&mypara2=${id}")}/>
                   </span>
               </span>;
               }