Merge branch 'master' into kitchenmanage

src/pages/org/roles/index.jsx

@@ -142,33 +142,6 @@ const roleManager = () => {
     >
       更新
     </a>);
-    if (record.status == 1) {
-      arr.push(<a
-        disabled={record.code == 'sys_manager_role'}
-        style={{ pointerEvents: record.code == 'sys_manager_role' ? 'none' : 'auto' }}
-        onClick={() => {
-          Enable(record.id).then(r => {
-            actionRef.current.reload();
-          })
-        }}
-      >
-        启用
-      </a>);
-    }
-    if (record.status == 0) {
-      arr.push(<a
-        disabled={record.code == 'sys_manager_role'}
-        style={{ pointerEvents: record.code == 'sys_manager_role' ? 'none' : 'auto' }}
-        onClick={() => {
-          Disable(record.id).then(r => {
-            actionRef.current.reload();
-          })
-        }}
-      >
-        禁用
-      </a>);
-    }
-
     arr.push(
       <Popconfirm
       title="确认删除吗？"
@@ -225,10 +198,10 @@ const roleManager = () => {
       hideInTable: true,
       hideInSearch: true,
     },
-    {
-      title: '角色编码',
-      dataIndex: 'code',
-    },
+    // {
+    //   title: '角色编码',
+    //   dataIndex: 'code',
+    // },
     {
       title: '角色名称',
       dataIndex: 'name',
@@ -238,15 +211,6 @@ const roleManager = () => {
       dataIndex: 'remark',
       hideInSearch: true,
     },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      hideInSearch: true,
-      valueEnum: {
-        0: { text: '启用', status: 'Success' },
-        1: { text: '禁用', status: 'Warning' },
-      },
-    },
     {
       title: '创建时间',
       search: false,

src/pages/org/roles/service.js

@@ -45,7 +45,7 @@ export async function removeRole(params) {
 
 //设置菜单
 export async function setMenu(params) {
-  return request('​/kitchen/api/roles/addorupdatemenurole',{
+  return request('​/saasbase/api/roles/addorupdatemenurole',{
     method:'post',
     data:params
   });