Merge pull request '权限' (#16) from feature/cl into dev

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

pc4mobx/organization/apis/columnPermission.js

@@ -13,12 +13,5 @@ export const getTable = (params) => {
   return WeaTools.callApi('/api/bs/hrmorganization/cardAccess/getTable', 'GET', params);
 }
 export const cardAccessSave = (params) => {
-  return fetch('/api/bs/hrmorganization/cardAccess/save', {
-    method: 'POST',
-    mode: 'cors',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify(params)
-  })
+  return WeaTools.callApi('/api/bs/hrmorganization/cardAccess/save', 'POST', params);
 }

pc4mobx/organization/components/columnPermission/components/permissionItem.js

@@ -51,6 +51,7 @@ class PermissionItem extends Component {
             <WeaBrowser
               inputStyle={{ width: 200 }}
               type={65}
+              isSingle={false}
               value={record[c.dataIndex]}
               title="多角色"
               linkUrl="/spa/hrm/engine.html#/hrmengine/roleInfo/info?id="
@@ -73,14 +74,6 @@ class PermissionItem extends Component {
           comsWeaTableStore={tableStore}
           hasOrder={true}
           needScroll={true}
-          // rowSelection={{
-          //   getCheckboxProps: record => {
-          //     console.log(record);
-          //     return {
-          //       disabled: true // 配置无法勾选的列
-          //     };
-          //   }
-          // }}
           getColumns={c => this.renderRenderColumns(c)}
           onOperatesClick={(record, index, operate) =>
             this.onOperatesClick(record, index, operate)}

pc4mobx/organization/stores/columnPermission.js

@@ -194,7 +194,9 @@ export class ColumnPermission {
   }
 
   arrColumnsToJson(arr, rows) {
-    let jsonColumn = {};
+    let jsonColumn = {
+      rownum:arr.length
+    };
     arr.map((item, index) => {
       for (let key in item) {
         jsonColumn[key + "_" + index] = item[key];