Merge pull request 'feature/cl' (#51) from feature/cl into dev

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/51

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;

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;

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);

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);
     }

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
         })
     }
 

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>

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>;
               }

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);
       }