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

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

pc4mobx/organization/components/columnSetting/defineShowItems.js

@@ -38,11 +38,16 @@ export default class DefineShowItems extends Component {
         draggable
         deleteConfirm
         title=""
+        pageSize={10}
+        pageSizeOptions={[10, 20, 50]}
         columns={toJS(columns)}
         datas={toJS(datas)}
         copyFilterProps={["id"]}
         selectedData={!loading && toJS(selectedData)}
         onChange={e => columnSetting.setTableEditDatas(e)}
+        tableProps={{
+          scroll: { y: 400 }
+        }}
         onRowSelect={(sRowKeys, rows, dataIndex, selectedDatas) => this.onRowSelect(sRowKeys, rows, dataIndex, selectedDatas)}
       />
     );

pc4mobx/organization/components/resource/resource.js

@@ -381,13 +381,18 @@ export default class Resource extends React.Component {
 
     reRenderColumns(columns) {
         let _this = this;
+        const {
+            resource
+        } = _this.props,{
+            url
+        } = resource;
         columns.forEach((c, index) => {
             c.className = "wea-table-indent"
             c.oldWidth = (100 / columns.length).toFixed(2) + '%';
             if (c.dataIndex == 'lastname') {
                 c.render = function (text, record) {
                     return <a href='javascript:void(0);' onClick={() => {
-                        window.open(`/spa/organization/static/index.html#/main/organization/resourceCard/${record.id}`);
+                        window.open(url+record.id);
                     }}>{text}</a>
                 }
             }
@@ -404,7 +409,12 @@ export default class Resource extends React.Component {
     }
 
     view(id) {
-        window.open(`/spa/organization/static/index.html#/main/organization/resourceCard/${id}`);
+        const {
+            resource
+        } = this.props,{
+            url
+        } = resource;
+        window.open(url+id);
     }
 
     version(record) {

pc4mobx/organization/stores/resource.js

@@ -65,6 +65,7 @@ export class ResourceStore extends HrmBaseStore{
     @observable loginId = '';
 
     @observable selectTreeNodeInfo;
+    @observable url = '';
 
     @observable enable = false;
     @observable _showRadioGroup = false;
@@ -240,6 +241,11 @@ export class ResourceStore extends HrmBaseStore{
                 this.getHSearchTemplate(res.data.searchTemplateId);
                 //2.获取列定制内容
                 this.getSearchTemplate(res.data.customTemplateId);
+                let url = '/spa/organization/static/index.html#/main/organization/resourceCard/';
+                if(res.data.cardType == "2") {
+                    url = '/spa/hrm/index_mobx.html#/main/hrm/card/cardInfo/';
+                }
+                this.url = url;
             } else {
                 message.warning(res.msg);
             }

pc4mobx/organization/style/card.less

@@ -188,12 +188,17 @@
       width: 10%;
       background-color: #ffffff;
       margin-left: 20px;
+      position: fixed;
+      height: 100%;
+      top: 0;
+      right: 0;
+      overflow: scroll;
       .right{
         height: 100%;
         padding-left: 20px;
         .ant-timeline{
-          position: fixed;
-          top: 20px;
+          // position: fixed;
+          margin-top: 20px;
           .title {
             cursor: pointer;
           }