Sfoglia il codice sorgente

feat(roles): role add company id

gemercheung 3 anni fa
parent
commit
6d8615f0fd

+ 12 - 0
src/api/corporation/list.ts

@@ -5,6 +5,7 @@ import { Result, UploadFileParams } from '/#/axios';
 
 enum Api {
   selectCompanyNum = '/zfb-api/zfb/company/selectCompanyNum',
+  listAllCompany = '/zfb-api/zfb/company/listAll',
   selectCompanyByType = '/zfb-api/zfb/company/selectCompanyByType',
   uploadLogo = '/zfb-api/zfb/company/uploadLogo',
 }
@@ -22,6 +23,17 @@ export const ListApi = (params: PageParams) =>
       ignoreCancelToken: true,
     },
   });
+
+export const ListAllCompanyApi = (params: PageParams) =>
+  defHttp.post<CorporationListGetResultModel>({
+    url: Api.listAllCompany,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
 export const ListVerifyApi = (params: PageParams) =>
   defHttp.post<CorporationListGetResultModel>({
     url: Api.selectCompanyByType,

+ 2 - 2
src/views/devices/list.vue

@@ -109,7 +109,7 @@
           {
             field: 'part',
             component: 'Select',
-            label: '选择',
+            label: t('routes.devices.deviceList'),
             defaultValue: '1',
             colProps: {
               span: 4,
@@ -154,7 +154,7 @@
       };
       // { getForm }
       const [registerTable] = useTable({
-        title: '设备列表',
+        title: t('routes.devices.deviceList'),
         api: ListApi,
         columns: columns,
         useSearchForm: true,

+ 3 - 5
src/views/system/role/role.data.ts

@@ -3,9 +3,7 @@ import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Switch } from 'ant-design-vue';
 import { Time } from '/@/components/Time';
-import { ListApi } from '/@/api/corporation/list';
-// import { setRoleStatus } from '/@/api/system/system';
-// import { useMessage } from '/@/hooks/web/useMessage';
+import { ListAllCompanyApi } from '/@/api/corporation/list';
 
 export const columns: BasicColumn[] = [
   {
@@ -107,10 +105,10 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'companyId',
-    label: '部门',
+    label: '公司',
     component: 'ApiSelect',
     componentProps: {
-      api: ListApi,
+      api: ListAllCompanyApi,
       resultField: 'list',
       labelField: 'name',
       valueField: 'id',