feat(scrm): wecom sync pull department and users

Author: Matrix-X

src/api/wechat/official-account/media.ts renamed to src/api/scrm/official-account/media.ts

@@ -1,3 +1,4 @@
 export const UriWeCom = '/scrm/wechat/wecom';
 export const UriWeComUser = '/scrm/wechat/wecom/organization/users';
+export const UriWeComDepartment = '/scrm/wechat/wecom/organization/departments';
 export const UriWeComApp = '/scrm/wechat/wecom/app';

src/api/wechat/official-account/menu.ts renamed to src/api/scrm/official-account/menu.ts

@@ -123,12 +123,6 @@ export function wechatGroup(request: any) {
   );
 }
 
-export function pullSyncWeComDepartmentsAndUsers(request: any) {
-  return axios.get<GetCustomersReply>(
-    `${PrefixUriAdmin + UriWeComUser}/sync`,
-    request,
-  );
-}
 /**
  * customer
  * @description 群聊信息发送

src/api/scrm/base.ts renamed to src/api/scrm/wecom/base.ts

@@ -6,6 +6,8 @@
  * @LastEditTime: 2023-08-24 00:40:33
  */
 import axios from 'axios';
+import { PrefixUriAdmin } from '@/api';
+import { UriWeComDepartment } from '@/api/scrm/wecom/base';
 
 /**
  * Department
@@ -89,7 +91,7 @@ export function deleteDepartment(request: DeleteDepartmentRequest) {
   );
 }
 
-export interface Department {
+export interface WeComDepartment {
   id: number;
   depName: string;
   leader: DepartmentLeader;
@@ -99,15 +101,16 @@ export interface Department {
 }
 
 export interface GetDepartmentRequest {
-  id: number;
+  departmentId: number;
 }
 
 export interface GetDepartmentReply {
-  department: Department;
+  department: WeComDepartment;
 }
 
 export function getDepartment(request: GetDepartmentRequest) {
-  return axios.get<GetDepartmentReply>(
-    `/api/v1/admin/department/departments/${request.id}`,
+  return axios.post<GetDepartmentReply>(
+    `${PrefixUriAdmin + UriWeComDepartment}/tree`,
+    request,
   );
 }

src/api/scrm/customer/index.ts renamed to src/api/scrm/wecom/customer/index.ts

@@ -1,4 +1,7 @@
 import axios from 'axios';
+import { PrefixUriAdmin } from '@/api';
+import { UriWeComUser } from '@/api/scrm/wecom/base';
+import { GetCustomersReply } from '@/api/scrm/wecom/customer';
 
 /**
  * User
@@ -10,7 +13,7 @@ export interface UserDepartment {
   depName: string;
 }
 
-export interface User {
+export interface WeComUser {
   id: number;
   account: string;
   name: string;
@@ -33,12 +36,14 @@ export interface GetUserRequest {
   id: string;
 }
 
-export type GetUserReply = User;
+export type GetUserReply = WeComUser;
 export function getUser(request: GetUserRequest) {
-  return axios.get<GetUserReply>(`/api/v1/admin/user/users/${request.id}`);
+  return axios.get<GetUserReply>(
+    `${PrefixUriAdmin + UriWeComUser}/${request.id}`,
+  );
 }
 
-export interface ListUsersRequest {
+export interface listUsersPageRequest {
   id?: any;
   name?: string;
   email?: string;
@@ -53,17 +58,31 @@ export interface ListUsersRequest {
   likeName?: string;
 }
 
-export interface ListUsersReply {
-  list: User[];
+export interface listUsersPageReply {
+  list: WeComUser[];
   pageIndex: number;
   pageSize: number;
   total: number;
   children?: any[];
 }
 
-export function listUsers(request: ListUsersRequest) {
-  return axios.post<ListUsersReply>(
-    '/api/v1/admin/scrm/wechat/wecom/organization/users/page',
+export function listUsersPage(request: listUsersPageRequest) {
+  return axios.post<listUsersPageReply>(
+    `${PrefixUriAdmin + UriWeComUser}/page`,
+    request,
+  );
+}
+
+export interface listUsersRequest {
+  departmentId: number;
+}
+export interface listUsersReply {
+  list: WeComUser[];
+}
+
+export function listUsers(request: listUsersRequest) {
+  return axios.post<listUsersReply>(
+    `${PrefixUriAdmin + UriWeComUser}/`,
     request,
   );
 }
@@ -79,7 +98,14 @@ export interface SyncUsersReply {
 
 export function syncUsers(request: SyncUsersRequest) {
   return axios.post<SyncUsersReply>(
-    '/api/v1/admin/user/users/actions/sync',
+    `${PrefixUriAdmin + UriWeComUser}/actions/sync`,
+    request,
+  );
+}
+
+export function pullSyncWeComDepartmentsAndUsers(request: any) {
+  return axios.get<GetCustomersReply>(
+    `${PrefixUriAdmin + UriWeComUser}/sync`,
     request,
   );
 }

src/api/scrm/department/index.ts renamed to src/api/scrm/wecom/department/index.ts

@@ -41,7 +41,7 @@ export function getUser(request: GetUserRequest) {
   return axios.get<GetUserReply>(`/api/v1/admin/user/users/${request.id}`);
 }
 
-export interface ListUsersRequest extends Pagination {
+export interface listUsersPageRequest extends Pagination {
   ids?: number[];
   likeName?: string;
   likeEmail?: string;
@@ -52,12 +52,12 @@ export interface ListUsersRequest extends Pagination {
   isEnable?: any;
 }
 
-export interface ListUsersReply extends Pagination {
+export interface listUsersPageReply extends Pagination {
   list: User[];
 }
 
-export function listUsers(request: ListUsersRequest) {
-  return axios.get<ListUsersReply>('/api/v1/admin/user/users', {
+export function listUsersPage(request: listUsersPageRequest) {
+  return axios.get<listUsersPageReply>('/api/v1/admin/user/users', {
     params: request,
   });
 }

src/api/scrm/enterprise-qr/index.ts renamed to src/api/scrm/wecom/enterprise-qr/index.ts

@@ -1,13 +1,14 @@
 import { defineStore } from 'pinia';
+import { getDepartment, WeComDepartment } from '@/api/scrm/wecom/department';
+import { Message } from '@arco-design/web-vue';
 
-type DepartmentTree = any;
 type TagTree = any;
 type UserList = any;
 
 export type ViewType = 'department' | 'tag';
 
 interface UserState {
-  departmentTree: DepartmentTree | null;
+  departmentTree: WeComDepartment | null;
   tagTree: TagTree | null;
   userList: UserList | null;
   selectedDepartment: number | null;
@@ -25,7 +26,7 @@ const useWeComUserStore = defineStore('weComUser', {
     selectedViewType: 'department',
   }),
   actions: {
-    setDepartmentTree(tree: DepartmentTree) {
+    setDepartmentTree(tree: WeComDepartment) {
       this.departmentTree = tree;
     },
     setTagTree(tree: TagTree) {
@@ -44,6 +45,17 @@ const useWeComUserStore = defineStore('weComUser', {
       // console.log('setSelectedViewType', type);
       this.selectedViewType = type;
     },
+    async loadDepartmentTree(departmentId: number) {
+      const res = await getDepartment({ departmentId });
+      if (res.data) {
+        this.departmentTree = res.data.department;
+      } else {
+        Message.error('获取部门信息失败');
+      }
+    },
+    async loadCurrentUserByDepartmentId(departmentId: number) {
+      const res = await getDepartment({ departmentId });
+    },
   },
 });
 

src/api/scrm/tag/index.ts renamed to src/api/scrm/wecom/tag/index.ts

@@ -144,9 +144,9 @@
   import EditUser from '@/views/admin/user/components/edit-user.vue';
   import {
     deleteUser,
-    listUsers,
-    ListUsersReply,
-    ListUsersRequest,
+    listUsersPage,
+    listUsersPageReply,
+    listUsersPageRequest,
     updateUser,
   } from '@/api/user';
 
@@ -181,7 +181,7 @@
     roleCodes: [] as string[],
     isEnable: undefined as undefined | boolean,
     depIds: [],
-  } as ListUsersRequest);
+  } as listUsersPageRequest);
 
   const state = reactive({
     tableLoading: false,
@@ -193,7 +193,7 @@
     },
   });
 
-  const pageData = ref({} as ListUsersReply);
+  const pageData = ref({} as listUsersPageReply);
 
   function fetchOption() {
     getUserQueryOptions().then((res) => {
@@ -210,7 +210,7 @@
       return;
     }
     state.tableLoading = true;
-    listUsers(queryForm)
+    listUsersPage(queryForm)
       .then((res) => {
         pageData.value = res.data;
       })

src/api/scrm/user/index.ts renamed to src/api/scrm/wecom/user/index.ts

@@ -13,8 +13,8 @@
       @on-delete="onDeleteMedia"
       @page-change="pageChange"
       @page-size-change="pageSizeChange"
-      @onChangeTab="onChangeTab"
-      @onPreview="onPreview"
+      @on-change-tab="onChangeTab"
+      @on-preview="onPreview"
       @on-upload-success="onUploadSuccess"
     />
   </div>
@@ -29,7 +29,7 @@
     GetMediaByVideo,
     GetMediaOtherList,
     UriOAMedia,
-  } from '@/api/wechat/official-account/media';
+  } from '@/api/scrm/official-account/media';
   import { PrefixUriAdmin } from '@/api';
   import { getToken } from '@/utils/auth';
 

src/api/user.ts

@@ -15,7 +15,7 @@
     getOAMenuTree,
     GetOAMenuTreeReply,
     syncOAMenu,
-  } from '@/api/wechat/official-account/menu';
+  } from '@/api/scrm/official-account/menu';
   import { Message } from '@arco-design/web-vue';
 
   const submitMenuData = async (menuData: any) => {

src/store/modules/scrm/wecom/user.ts

@@ -83,8 +83,8 @@
     wechatMessageArticles,
     GetMessageArticlesRequest,
     Articles,
-  } from '@/api/scrm/customer';
-  import { listUsers } from '@/api/scrm/user';
+  } from '@/api/scrm/wecom/customer';
+  import { listUsersPage } from '@/api/scrm/wecom/user';
 
   const prop = defineProps({
     agentid: {
@@ -192,7 +192,7 @@
     },
   );
   async function fetchUsers() {
-    const res = await listUsers({});
+    const res = await listUsersPage({});
     try {
       usersList.list = res.data?.list;
     } catch (err) {

src/views/admin/user/components/search-user-table.vue

@@ -70,7 +70,7 @@
 
 <script lang="ts" setup>
   import { onMounted, reactive, ref } from 'vue';
-  import { wechatAppList } from '@/api/scrm/customer';
+  import { wechatAppList } from '@/api/scrm/wecom/customer';
   import SendMessage from '@/views/scrm/wecom/app/components/send-message.vue';
 
   const state = reactive({

src/views/scrm/official-account/media/index.vue

@@ -54,7 +54,7 @@
     customerTag,
     CustomerTagList,
     getGroupTagList,
-  } from '@/api/scrm/tag';
+  } from '@/api/scrm/wecom/tag';
 
   const prop = defineProps({
     usersList: {

src/views/scrm/official-account/menu/index.vue

@@ -200,8 +200,8 @@
 
 <script lang="ts" setup>
   import { onMounted, reactive, ref, toRaw } from 'vue';
-  import { corpOption } from '@/api/scrm/tag';
-  import { getCustomers, GetCustomersRequest } from '@/api/scrm/customer';
+  import { corpOption } from '@/api/scrm/wecom/tag';
+  import { getCustomers, GetCustomersRequest } from '@/api/scrm/wecom/customer';
 
   const state = reactive({
     loading: false,

src/views/scrm/wecom/app/components/send-message.vue

@@ -34,7 +34,12 @@
 <script lang="ts" setup>
   import { onMounted, reactive, ref } from 'vue';
   import { FieldRule, Message } from '@arco-design/web-vue';
-  import { addTag, AddTagRequest, groupOption, TagList } from '@/api/scrm/tag';
+  import {
+    addTag,
+    AddTagRequest,
+    groupOption,
+    TagList,
+  } from '@/api/scrm/wecom/tag';
 
   const emits = defineEmits(['submitSuccess', 'submitFailed', 'update:id']);
   const formRef = ref();

src/views/scrm/wecom/app/index.vue

@@ -58,7 +58,7 @@
 <script lang="ts" setup>
   import { watch, reactive, ref, PropType } from 'vue';
   import { FieldRule, Message } from '@arco-design/web-vue';
-  import { editTag, EditTagRequest } from '@/api/scrm/tag';
+  import { editTag, EditTagRequest } from '@/api/scrm/wecom/tag';
 
   const prop = defineProps({
     usersList: {

src/views/scrm/wecom/customer-domain/customer/components/add-tag.vue

@@ -191,7 +191,7 @@
     GetTagRequest,
     wechatTagSync,
     corpOption,
-  } from '@/api/scrm/tag';
+  } from '@/api/scrm/wecom/tag';
   import EditTag from './components/edit-tag.vue';
   import AddTag from './components/add-tag.vue';
 

src/views/scrm/wecom/customer-domain/customer/index.vue

@@ -82,8 +82,8 @@
     wechatMessageTemplate,
     GetWechatGroupArticlesRequest,
     GetMessageTemplateRequest,
-  } from '@/api/scrm/customer';
-  import { listUsers } from '@/api/scrm/user';
+  } from '@/api/scrm/wecom/customer';
+  import { listUsersPage } from '@/api/scrm/wecom/user';
 
   const emits = defineEmits(['submitSuccess', 'submitFailed', 'update:id']);
 
@@ -161,7 +161,7 @@
     return true;
   };
   async function fetchUsers() {
-    const res = await listUsers({});
+    const res = await listUsersPage({});
     try {
       usersList.list = res.data?.list;
     } catch (err) {

src/views/scrm/wecom/customer-domain/tag/components/add-tag.vue

@@ -127,8 +127,8 @@
   import {
     getCustomersGroups,
     GetCustomersGroupsRequest,
-    pullSyncWeComDepartmentsAndUsers,
-  } from '@/api/scrm/customer';
+  } from '@/api/scrm/wecom/customer';
+  import { pullSyncWeComDepartmentsAndUsers } from '@/api/scrm/wecom/user';
 
   const sender = ref('');
   const chatIds = ref([] as string[]);