diff --git a/src/api/crm/followup/index.ts b/src/api/crm/followup/index.ts index f6b66105..852d8079 100644 --- a/src/api/crm/followup/index.ts +++ b/src/api/crm/followup/index.ts @@ -7,6 +7,8 @@ export interface FollowUpRecordVO { bizId: number // 数据编号 type: number // 跟进类型 content: string // 跟进内容 + picUrls: string[] + fileUrls: string[] nextTime: Date // 下次联系时间 businessIds: number[] // 关联的商机编号数组 contactIds: number[] // 关联的联系人编号数组 diff --git a/src/api/crm/permission/index.ts b/src/api/crm/permission/index.ts index 9a098b81..e616a404 100644 --- a/src/api/crm/permission/index.ts +++ b/src/api/crm/permission/index.ts @@ -2,14 +2,15 @@ import request from '@/config/axios' export interface PermissionVO { id?: number // 数据权限编号 - userId: number | undefined // 用户编号 - bizType: number | undefined // Crm 类型 - bizId: number | undefined // Crm 类型数据编号 - level: number | undefined // 权限级别 + userId: number // 用户编号 + bizType: number // Crm 类型 + bizId: number // Crm 类型数据编号 + level: number // 权限级别 deptName?: string // 部门名称 nickname?: string // 用户昵称 postNames?: string[] // 岗位名称数组 createTime?: Date + ids?: number[] } /** @@ -50,11 +51,11 @@ export const updatePermission = async (data) => { } // 删除数据权限(删除团队成员) -export const deletePermissionBatch = async (params) => { - return await request.delete({ url: '/crm/permission/delete', params }) +export const deletePermissionBatch = async (val: number[]) => { + return await request.delete({ url: '/crm/permission/delete?ids=' + val.join(',') }) } // 删除自己的数据权限(退出团队) -export const deleteSelfPermission = async (id) => { - return await request.delete({ url: '/crm/permission/quit-team?id=' + id }) +export const deleteSelfPermission = async (id: number) => { + return await request.delete({ url: '/crm/permission/delete-self?id=' + id }) } diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue index 041c8ca5..aa465b56 100644 --- a/src/components/UploadFile/src/UploadImgs.vue +++ b/src/components/UploadFile/src/UploadImgs.vue @@ -28,7 +28,7 @@ 查看 -
+
删除
@@ -46,7 +46,6 @@
diff --git a/src/views/crm/followup/components/BusinessTableSelect.vue b/src/views/crm/followup/components/BusinessTableSelect.vue new file mode 100644 index 00000000..5a34484e --- /dev/null +++ b/src/views/crm/followup/components/BusinessTableSelect.vue @@ -0,0 +1,84 @@ + + + diff --git a/src/views/crm/followup/components/ContactList.vue b/src/views/crm/followup/components/ContactList.vue index 2cd7ccf0..5e31718a 100644 --- a/src/views/crm/followup/components/ContactList.vue +++ b/src/views/crm/followup/components/ContactList.vue @@ -69,7 +69,7 @@ const props = withDefaults(defineProps<{ contactIds: number[] }>(), { const list = ref([] as ContactApi.ContactVO[]) const getContactList = async () => { list.value = (await ContactApi.getContactListByIds( - props.contactIds + unref(props.contactIds) )) as unknown as ContactApi.ContactVO[] } watch( diff --git a/src/views/crm/followup/components/ContactTableSelect.vue b/src/views/crm/followup/components/ContactTableSelect.vue new file mode 100644 index 00000000..6790d6e1 --- /dev/null +++ b/src/views/crm/followup/components/ContactTableSelect.vue @@ -0,0 +1,83 @@ + + + diff --git a/src/views/crm/followup/components/index.ts b/src/views/crm/followup/components/index.ts index b3e7f257..48d90daa 100644 --- a/src/views/crm/followup/components/index.ts +++ b/src/views/crm/followup/components/index.ts @@ -1,4 +1,6 @@ import BusinessList from './BusinessList.vue' +import BusinessTableSelect from './BusinessTableSelect.vue' import ContactList from './ContactList.vue' +import ContactTableSelect from './ContactTableSelect.vue' -export { BusinessList, ContactList } +export { BusinessList, BusinessTableSelect, ContactList, ContactTableSelect } diff --git a/src/views/crm/message/tables/TodayCustomer.vue b/src/views/crm/message/tables/TodayCustomer.vue index f4b59be1..df463d7f 100644 --- a/src/views/crm/message/tables/TodayCustomer.vue +++ b/src/views/crm/message/tables/TodayCustomer.vue @@ -15,9 +15,9 @@ @@ -25,9 +25,9 @@ @@ -84,7 +84,7 @@ - + -