非标bug修复

pc4mobx/organization/components/company/company.js

@@ -548,7 +548,7 @@ export default class Company extends React.Component {
 
 
         return (
-            hasRight && <div ref='page' style={{ height: '100%' }}>
+            hasRight && <div ref='page' style={{ height: '100%' }} className = 'organization-scrollable-table'>
                 <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
                     datas={this.getDropMenuDatas()}
                     onClick={key => this.handleMenuClick(key)}

pc4mobx/organization/components/department/department.js

@@ -660,7 +660,7 @@ export default class Department extends React.Component {
 
 
         return (
-            hasRight && <div ref='page' style={{ height: '100%' }}>
+            hasRight && <div ref='page' style={{ height: '100%' }} className = 'organization-scrollable-table'>
                 <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
                     datas={this.getDropMenuDatas()}
                     onClick={key => this.handleMenuClick(key)}

pc4mobx/organization/components/job/Job.js

@@ -608,7 +608,7 @@ export default class Job extends React.Component {
 
 
         return (
-            hasRight && <div ref='page' style={{ height: '100%' }}>
+            hasRight && <div ref='page' style={{ height: '100%' }} className = 'organization-scrollable-table'>
                 <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
                     datas={this.getDropMenuDatas()}
                     onClick={key => this.handleMenuClick(key)}

pc4mobx/organization/components/resource/resource.js

@@ -499,6 +499,15 @@ export default class Resource extends React.Component {
         return true;
     }
 
+    getTableWidth = (columns) => {
+        const columnLength = columns.filter((col)=>col.display === 'true').length;
+        if(columnLength>10){
+          return columnLength*150;
+        }else{
+          return '100%' 
+        }
+      }
+
 
     render() {
 
@@ -513,7 +522,7 @@ export default class Resource extends React.Component {
         if (hasRight === false) {
             return renderNoright();
         }
-        const width = tableStore.columns.filter(c => c.display === "true").length * 50;
+        
         return (
             hasRight && <div ref='page' style={{ height: '100%' }}>
                 <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
@@ -555,7 +564,7 @@ export default class Resource extends React.Component {
                                 needScroll={true}
                                 getColumns={c => this.reRenderColumns(c)}
                                 onOperatesClick={(record, index, operate) => this.onOperatesClick(record, index, operate)}
-                                tableWidth={width}
+                                tableWidth={this.getTableWidth}
                             />
                         </WeaLeftRightLayout>
                     </WeaTop>

pc4mobx/organization/stores/resource.js

@@ -600,6 +600,7 @@ export class ResourceStore {
                     this.customTemplateId = res.data.templateId;
                 }
                 bool ? this.setTemplates(res.data.templates) : this.setCustomTemplates(res.data.templates);
+                this.getCustomTransferData();
             } else {
                 message.warning(res.msg);
             }
@@ -727,7 +728,6 @@ export class ResourceStore {
         this.search = bool;
         this.searchDialog.loading = true;
         this.getSearchTemplate(bool);
-        this.getCustomTransferData();
 
     }
 

pc4mobx/organization/style/common.less

@@ -28,7 +28,8 @@
   margin-top: 10px;
 }
 
-.wea-left-right-layout-right {
+//分部 部门 岗位
+.organization-scrollable-table  .wea-left-right-layout-right{
   overflow: scroll !important;
 }