diff --git a/pro-components/layout/components/SiderMenu/BaseMenu.tsx b/pro-components/layout/components/SiderMenu/BaseMenu.tsx index 92a46de..1c996f9 100644 --- a/pro-components/layout/components/SiderMenu/BaseMenu.tsx +++ b/pro-components/layout/components/SiderMenu/BaseMenu.tsx @@ -246,7 +246,7 @@ export default defineComponent({ localSelectedKeys.value = route.matched.filter(x => x.path !== '/').map(x => x.path) }) - console.log(props.menuData) + // console.log(props.menuData) // 选中菜单的时候进行路由切换 const router = useRouter() diff --git a/pro-components/table/Table.tsx b/pro-components/table/Table.tsx index 56b6fe0..8687e69 100644 --- a/pro-components/table/Table.tsx +++ b/pro-components/table/Table.tsx @@ -4,7 +4,7 @@ import 'ant-design-vue/es/table/style/index.less' import 'ant-design-vue/es/pagination/style/index.less' import ProCard from '#/card' - + import type { TableCurrentDataSource, SortOrder, @@ -380,7 +380,6 @@ 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/directResources/index.ts b/src/api/directResources/index.ts new file mode 100644 index 0000000..853c8a1 --- /dev/null +++ b/src/api/directResources/index.ts @@ -0,0 +1,17 @@ +import httpClient from '@/utils/axios' +import type { ApiResult } from '@/api/types' +import type { directPageParam, distributeData } from './types' + +export function pageQueryPage(pageParams: directPageParam) { + return httpClient.get('/directClue/page', { + params: pageParams + }) +} + +export function upDistribute(data: distributeData[]) { + return httpClient.post('/directClue/distribute', data) +} + +export function getfFindDirectSalesman() { + return httpClient.get('/system/user/findDirectSalesman', {}) +} diff --git a/src/api/directResources/types.ts b/src/api/directResources/types.ts new file mode 100644 index 0000000..b2a444f --- /dev/null +++ b/src/api/directResources/types.ts @@ -0,0 +1,32 @@ +import type { PageParam } from '@/api/types' +import type { Dayjs } from 'dayjs' +export type directParam = { + customName?: string + originType?: number | null + attribute?: string + distributeDate?: [Dayjs, Dayjs] +} +interface otherObj { + [name: string]: any +} +export type directDTO = { + directClueId?: number + batchNo?: string + nid?: string | undefined + customName?: string + originType: number + effectiveStatus: number + otherClueObj: otherObj + clueLabelName?: string + distributeType: number + distributeDate?: Dayjs | null + distributeUserId?: number | null + userId?: number[] +} +export type directPageParam = directParam & PageParam + +export type distributeData = { + clueId: number + userId: number + userName: string +} diff --git a/src/components/Lov/LovModal.vue b/src/components/Lov/LovModal.vue index b4e86ad..1eceea0 100644 --- a/src/components/Lov/LovModal.vue +++ b/src/components/Lov/LovModal.vue @@ -145,7 +145,6 @@ const tableRequest: TableRequest = (params, sorter, filter) => { res.data.records.forEach(item => { item[props.dataKey] = String(item[props.dataKey]) }) - console.log(res) return Promise.resolve(res) }) } diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index ca262ff..f8772da 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -134,7 +134,6 @@ const menuState = reactive<{ watchEffect(() => { const matchedRoutes = route.matched - console.log(matchedRoutes, 'matchedRoutes') menuState.selectedKeys = matchedRoutes.filter(x => x.path !== '/').map(x => x.path) menuState.matchMenuKeys = matchedRoutes.filter(x => x.path !== '/').map(x => x.path) }) diff --git a/src/styles/index.less b/src/styles/index.less index a0dd0f6..083ab24 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -8,6 +8,9 @@ display: flex; align-items: center; } +.flex-between { + justify-content: space-between; +} // 滚动条 .sim-cont{ max-height: 100%; @@ -29,4 +32,10 @@ } .flex-1 { flex: 1; +} +.c-red { + color: red; +} +.text-center { + text-align: center; } \ No newline at end of file diff --git a/src/views/directResources/cluePanel/clueIndex.vue b/src/views/directResources/cluePanel/clueIndex.vue new file mode 100644 index 0000000..7e94f9c --- /dev/null +++ b/src/views/directResources/cluePanel/clueIndex.vue @@ -0,0 +1,168 @@ + + + + diff --git a/src/views/directResources/cluePanel/clueModal.vue b/src/views/directResources/cluePanel/clueModal.vue new file mode 100644 index 0000000..4abde9f --- /dev/null +++ b/src/views/directResources/cluePanel/clueModal.vue @@ -0,0 +1,172 @@ + + + + diff --git a/src/views/directResources/cluePanel/clueSearch.vue b/src/views/directResources/cluePanel/clueSearch.vue new file mode 100644 index 0000000..4fce0fd --- /dev/null +++ b/src/views/directResources/cluePanel/clueSearch.vue @@ -0,0 +1,137 @@ + + + diff --git a/src/views/directResources/customerPanel/customerIndex.vue b/src/views/directResources/customerPanel/customerIndex.vue new file mode 100644 index 0000000..e2da368 --- /dev/null +++ b/src/views/directResources/customerPanel/customerIndex.vue @@ -0,0 +1,172 @@ + + + + diff --git a/src/views/directResources/customerPanel/customerModal.vue b/src/views/directResources/customerPanel/customerModal.vue new file mode 100644 index 0000000..90a25b1 --- /dev/null +++ b/src/views/directResources/customerPanel/customerModal.vue @@ -0,0 +1,171 @@ + + + + diff --git a/src/views/directResources/customerPanel/customerSearch.vue b/src/views/directResources/customerPanel/customerSearch.vue new file mode 100644 index 0000000..e55c882 --- /dev/null +++ b/src/views/directResources/customerPanel/customerSearch.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/views/directResources/distributeManage/distributeIndex.vue b/src/views/directResources/distributeManage/distributeIndex.vue new file mode 100644 index 0000000..2719277 --- /dev/null +++ b/src/views/directResources/distributeManage/distributeIndex.vue @@ -0,0 +1,188 @@ + + + + diff --git a/src/views/directResources/distributeManage/distributeModal.vue b/src/views/directResources/distributeManage/distributeModal.vue new file mode 100644 index 0000000..154f3f7 --- /dev/null +++ b/src/views/directResources/distributeManage/distributeModal.vue @@ -0,0 +1,216 @@ + + + + diff --git a/src/views/directResources/distributeManage/distributeSearch.vue b/src/views/directResources/distributeManage/distributeSearch.vue new file mode 100644 index 0000000..92c25dc --- /dev/null +++ b/src/views/directResources/distributeManage/distributeSearch.vue @@ -0,0 +1,101 @@ + + diff --git a/src/views/shopManage/shopIndex.vue b/src/views/shopManage/shopIndex.vue index 791d9f7..42a21a8 100644 --- a/src/views/shopManage/shopIndex.vue +++ b/src/views/shopManage/shopIndex.vue @@ -57,7 +57,7 @@ import shopSearch from './shopSearch.vue' import { pageQueryPage, deleteShop } from '@/api/shopManage' import type { shopDetailVO, shopParam } from '@/api/shopManage/types' -defineOptions({ name: 'GeopoliticalCustomers' }) +defineOptions({ name: 'ShopIndex' }) //底部表格 // 表格组件引用 diff --git a/src/views/system/user/SysUserPage.vue b/src/views/system/user/SysUserPage.vue index 83d9b04..c88a8db 100644 --- a/src/views/system/user/SysUserPage.vue +++ b/src/views/system/user/SysUserPage.vue @@ -9,7 +9,7 @@ --> - +