diff --git a/pro-components/table/Table.tsx b/pro-components/table/Table.tsx index 39e8119..56b6fe0 100644 --- a/pro-components/table/Table.tsx +++ b/pro-components/table/Table.tsx @@ -380,6 +380,7 @@ const ProTable = defineComponent({ const fetchData = () => { if (!props.request) return undefined return async (pageParams?: Record) => { + console.log(pageParams, 'pageParams') const actionParams = { ...(pageParams || {}), ...formSearch, diff --git a/src/api/geopoliticalCustomers/types.ts b/src/api/geopoliticalCustomers/types.ts index 7f816d1..c101f5a 100644 --- a/src/api/geopoliticalCustomers/types.ts +++ b/src/api/geopoliticalCustomers/types.ts @@ -242,6 +242,7 @@ export type GeopoliticalCustomersRecord = { * 地缘获客搜索区域表单 */ export interface GeopoliticalCustomersSearch { + // salesmanType: number | undefined customName?: string customNid?: string enrollStatus?: string @@ -254,6 +255,9 @@ export interface GeopoliticalCustomersSearch { * 表单重审搜索区域表单 */ export interface FormReviewSearch { + //角色 + // salesmanType: string | undefined + //编号 batchNo?: string // 访问时间区间的开始值 startTime?: string diff --git a/src/api/salesmanagement/salespersonList/types.ts b/src/api/salesmanagement/salespersonList/types.ts index 9894826..6c6d2ba 100644 --- a/src/api/salesmanagement/salespersonList/types.ts +++ b/src/api/salesmanagement/salespersonList/types.ts @@ -54,7 +54,7 @@ export type SysUserDTO = { // 组织机构ID organizationId?: number // 角色标识列表 - roleCodes: string[] + roleCodes: any // desc: objectState // stage: objectState } diff --git a/src/utils/page-utils.ts b/src/utils/page-utils.ts index dc626b6..d4b1e12 100644 --- a/src/utils/page-utils.ts +++ b/src/utils/page-utils.ts @@ -8,10 +8,11 @@ export type MergePageParamFunction = ( keyword?: string }, sorter: Record, - filter: Record + filter: Record, + salesmanType?: number | undefined ) => Record -export const mergePageParam: MergePageParamFunction = (params, sorter, filter) => { +export const mergePageParam: MergePageParamFunction = (params, sorter, filter, salesmanType?) => { const sort = [] for (const key in sorter) { sort.push(sorter[key] === 'ascend' ? `${key},asc` : `${key},desc`) @@ -24,6 +25,7 @@ export const mergePageParam: MergePageParamFunction = (params, sorter, filter) = page: current, ...rest, ...filter, - sort + sort, + salesmanType } } diff --git a/src/views/formReview/formReview.vue b/src/views/formReview/formReview.vue index 756ffdf..548d1bf 100644 --- a/src/views/formReview/formReview.vue +++ b/src/views/formReview/formReview.vue @@ -54,6 +54,14 @@ import type { defineOptions({ name: 'FormReview' }) +//获取当前账号角色 +import { useUserStore } from '@/stores/user-store' +const { userInfo } = useUserStore() +const salesmanType = ref() +onMounted(() => { + salesmanType.value = userInfo?.salesmanType +}) + //底部表格 // 表格组件引用 const tableRef = ref() @@ -64,7 +72,7 @@ let searchParams: GeopoliticalCustomersPageParam = {} //远程加载表格数据 const tableRequest: TableRequest = (params, sorter, filter) => { - const pageParam = mergePageParam(params, sorter, filter) + const pageParam = mergePageParam(params, sorter, filter, salesmanType.value) return pageAccessLogs({ ...pageParam, ...searchParams }) } diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomers.vue b/src/views/geopoliticalCustomers/geopoliticalCustomers.vue index e583828..4617021 100644 --- a/src/views/geopoliticalCustomers/geopoliticalCustomers.vue +++ b/src/views/geopoliticalCustomers/geopoliticalCustomers.vue @@ -55,6 +55,14 @@ import type { defineOptions({ name: 'GeopoliticalCustomers' }) +//获取当前账号角色 +import { useUserStore } from '@/stores/user-store' +const { userInfo } = useUserStore() +const salesmanType = ref() +onMounted(() => { + salesmanType.value = userInfo?.salesmanType +}) + //底部表格 // 表格组件引用 const tableRef = ref() @@ -65,7 +73,7 @@ let searchParams: GeopoliticalCustomersPageParam = {} //远程加载表格数据 const tableRequest: TableRequest = (params, sorter, filter) => { - const pageParam = mergePageParam(params, sorter, filter) + const pageParam = mergePageParam(params, sorter, filter, salesmanType.value) return pageAccessLogs({ ...pageParam, ...searchParams }) } diff --git a/src/views/qualityInspectionDistribution/inspectionIndex.vue b/src/views/qualityInspectionDistribution/inspectionIndex.vue index 5a106d9..347a960 100644 --- a/src/views/qualityInspectionDistribution/inspectionIndex.vue +++ b/src/views/qualityInspectionDistribution/inspectionIndex.vue @@ -53,6 +53,14 @@ import type { defineOptions({ name: 'GeopoliticalCustomers' }) +//获取当前账号角色 +import { useUserStore } from '@/stores/user-store' +const { userInfo } = useUserStore() +const salesmanType = ref() +onMounted(() => { + salesmanType.value = userInfo?.salesmanType +}) + //底部表格 // 表格组件引用 const tableRef = ref() @@ -63,7 +71,7 @@ let searchParams: GeopoliticalCustomersPageParam = {} //远程加载表格数据 const tableRequest: TableRequest = (params, sorter, filter) => { - const pageParam = mergePageParam(params, sorter, filter) + const pageParam = mergePageParam(params, sorter, filter, salesmanType.value) return pageAccessLogs({ ...pageParam, ...searchParams }) } diff --git a/src/views/salesmanagement/salespersonList/salespersonListModal.vue b/src/views/salesmanagement/salespersonList/salespersonListModal.vue index 1abc108..c891129 100644 --- a/src/views/salesmanagement/salespersonList/salespersonListModal.vue +++ b/src/views/salesmanagement/salespersonList/salespersonListModal.vue @@ -116,6 +116,11 @@ const { submitLoading, validateAndSubmit, resetFields, validateInfos } = useAdmi //表单提交处理 const handleSubmit = () => { console.log(formModel, 'formModel') + console.log() + if (typeof formModel.roleCodes === 'string') { + formModel.roleCodes = [formModel.roleCodes] + } + validateAndSubmit( { ...formModel, diff --git a/vite.config.ts b/vite.config.ts index 8d04afb..c42433a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -22,13 +22,13 @@ import { antdvStyleDeps } from './src/utils/resolvers' //项目 // const serverAddress = 'http://admin.ballcat.cn' //xy -const serverAddress = 'http://172.18.0.225:8000' +// const serverAddress = 'http://172.18.0.225:8000' //jt // const serverAddress = 'http://172.18.1.8:8000' //ts // const serverAddress = 'http://172.18.0.228:8000' //测试 -// const serverAddress = 'http://39.100.77.21:8000' +const serverAddress = 'http://39.100.77.21:8000' //线上ip // const serverAddress = 'http://175.27.212.74:80'