git
/
admission-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【招生小程序】 新增# 主账号-团队：对接数据简报、线索转化情况分析接口以及条件查询（团队、组织、日期）

master
kaeery 2025-03-05 19:14:58 +08:00
parent 187a345608
commit c8ace90b43
18 changed files with 466 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.development
View File

@ -8,5 +8,6 @@
# 请求域名
# VITE_APP_BASE_URL= 'http://192.168.111.5:8086'
VITE_APP_BASE_URL="http://192.168.111.98:8086"
# VITE_APP_BASE_URL="http://f35n565161.vicp.fun"
# VITE_APP_BASE_URL="https://124.220.209.120:8086"
# VITE_APP_SOCKET_URL = 'wss://front.yuegoodlife.com'

31
src/api/admin.ts 100644
View File

@ -0,0 +1,31 @@
import request from '@/utils/request'
// 组织列表
export function apiOrganizationList() {
return request.get({ url: '/organization/list' })
}
// 获取所有团队
export function apiOrganizationTeamList() {
return request.get({ url: '/organization/getAllGroup' })
}
// 获取组织
export function apiOrganizationByIdList() {
return request.get({ url: '/organization/getAllOrg' })
}
// 获取该账号下的所有组织架构以及人员
export function apiOrganizationAllList() {
return request.get({ url: '/organization/getAllChildOrgInfo' })
}
// 数据简报
export function apiDataOverview(params: any) {
return request.get({ url: '/control/dataPresentation', data: params })
}
// 线索转客户统计
export function convertProcessApi(params?: any) {
return request.get({ url: '/control/leadToCustomerStatistics', data: params })
}
// 线索转化情况统计
export function clueStatusApi(params?: any) {
return request.get({ url: '/control/clueStatistics', data: params })
}

2
src/bundle/pages/login/login.vue
View File

@ -235,7 +235,7 @@ async function loginHandle(data: any) {
// appStore.setFirstLogin(true)
const { userInfo } = userStore
// 判断是主账号登录还是电销/招生登录
if (userInfo.postIds == 0) {
if (userInfo.postIds == 0 && userInfo.masterAccount == 1) {
cache.set(ROLEINDEX, 2)
setNextRoute()
} else {

2
src/components/da-dropdown/utils.ts
View File

@ -144,7 +144,7 @@ export function getRangeDate(v) {
// 昨日
if (v === '-1') {
dateRange.start = formatTime(new Date(nowTime - oneDay), 'y-m-d')
dateRange.start = formatTime(new Date(nowTime), 'y-m-d')
dateRange.end = dateRange.start
// 本周
} else if (v === '-7') {

13
src/components/date-dropdown/daterange.vue
View File

@ -36,9 +36,10 @@
<script>
import { defineComponent, ref, watch } from 'vue'
import { deepClone, getRangeDate } from '@/components/da-dropdown/utils'
import picker from './picker.vue'
import dropdownFooter from '../widgets/admin/dropdown-footer.vue'
import { deepClone, getRangeDate } from '@/components/da-dropdown/utils'
import { getCurDate } from '@/utils/util'
export default defineComponent({
components: { picker, dropdownFooter },
@ -56,6 +57,7 @@ export default defineComponent({
const daterange = ref(null)
const datetag = ref('')
const dateTagList = ref([
{ value: '-1', label: '今天' },
{ value: '-7', label: '本周' },
{ value: '-14', label: '上周' },
{ value: '-30', label: '本月' },
@ -70,15 +72,18 @@ export default defineComponent({
const item = deepClone(dropdownItem || null)
if (clearValue === true) {
daterange.value = {
start: '',
end: ''
start: getCurDate('start', 'YYYY-MM-DD'),
end: getCurDate('end', 'YYYY-MM-DD')
}
datetag.value = ''
datetag.value = '-1'
} else {
daterange.value = {
start: item.value?.start || '',
end: item.value?.end || ''
}
if (item.value?.start && item.value?.end) {
datetag.value = '-1'
}
}
}

197
src/components/select-dropdown/index.vue 100644
View File

@ -0,0 +1,197 @@
<template>
<view class="da-dropdown-cell">
<view
class="da-dropdown-cell-item"
:class="[item.checked ? 'is-actived' : '', item.disabled ? 'is-disabled' : '']"
v-for="(item, index) in cellOptions"
:key="index"
@click="handleSelect(item)"
>
<text class="da-dropdown-cell-item--label">{{ item.label }}</text>
<text class="da-dropdown-cell-item--suffix">{{ item.suffix }}</text>
<text class="da-dropdown-cell-item--check" v-if="item.checked && showIcon" />
</view>
</view>
<dropdown-footer @reset="handleReset" @confirm="handleConfirm" />
</template>
<script>
import { defineComponent, watch, ref } from 'vue'
import dropdownFooter from '../widgets/admin/dropdown-footer.vue'
import { deepClone } from '@/components/da-dropdown/utils'
export default defineComponent({
components: { dropdownFooter },
props: {
dropdownItem: {
type: Object,
default: null
},
dropdownIndex: {
type: Number
}
},
emits: ['success', 'reset', 'confirm'],
setup(props, { emit }) {
const cellOptions = ref([])
const showIcon = ref(false)
const selectedItem = ref()
function initData(options, value) {
const list = deepClone(options)
for (let i = 0; i < list.length; i++) {
const item = list[i]
if (item.value === value) {
item.checked = true
break
}
item.checked = false
selectedItem.value = null
}
cellOptions.value = list
}
function handleSelect(item) {
if (item.disabled) {
return
}
// 取消所有选项的选中状态
cellOptions.value.forEach(item => {
item.checked = false
})
// 选中当前选项
item.checked = true
selectedItem.value = item
if (props.dropdownItem?.prop) {
const res = { [props.dropdownItem.prop]: item.value }
emit('success', res, item, props.dropdownIndex)
} else {
console.error(`菜单项${props.dropdownItem.title}未定义prop，返回内容失败`)
}
}
function handleReset() {
initData(cellOptions.value)
emit('reset')
}
function handleConfirm() {
emit('confirm', selectedItem.value)
}
watch(
() => props.dropdownItem,
v => {
if (v?.options?.length) {
initData(v.options, v.value)
} else {
cellOptions.value = []
}
showIcon.value = v?.showIcon || false
},
{ immediate: true, deep: true }
)
return {
cellOptions,
showIcon,
handleSelect,
handleReset,
handleConfirm
}
}
})
</script>
<style lang="scss" scoped>
// 下拉列表
.da-dropdown-cell {
--cell-height: 80rpx;
width: 100%;
max-height: 60vh;
overflow: hidden auto;
&-item {
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: var(--cell-height);
padding: 0 24rpx;
overflow: hidden;
font-size: 28rpx;
color: var(--dropdown-text-color);
white-space: nowrap;
border-bottom: 1rpx solid #dedede;
&:last-child {
border-bottom: none;
}
&--label {
flex-grow: 1;
max-width: 80%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
// #ifdef H5
:deep(> span) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
// #endif
}
&--suffix {
flex-grow: 1;
margin-left: 10px;
overflow: hidden;
font-size: 24rpx;
color: #999;
text-align: right;
text-overflow: ellipsis;
white-space: nowrap;
// #ifdef H5
:deep(> span) {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
// #endif
}
&--check {
display: flex;
flex-shrink: 0;
align-items: center;
justify-content: center;
width: var(--cell-height);
height: var(--cell-height);
&::after {
/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
font-family: 'iconfont' !important;
font-size: calc(var(--cell-height) / 3 * 2);
font-style: normal;
content: '\e677';
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
}
&.is-actived {
color: $blue1;
}
&.is-disabled {
color: #aaa;
background: #efefef;
}
}
}
</style>

7
src/components/widgets/admin/orga-picker.vue
View File

@ -4,7 +4,7 @@
<scroll-view class="da-dropdown-picker-view" scroll-y>
<view
class="da-dropdown-picker-item"
:class="vr.checked ? 'is-actived' : ''"
:class="[vr.checked ? 'is-actived' : '', vr.disabled ? 'is-disabled' : '']"
v-for="(vr, vri) in viewRow[vci]"
:key="vri"
@click="handleSelect(vr, vci, vri)"
@ -84,6 +84,7 @@ export default defineComponent({
}
function handleSelect(item, colIndex, _rowIndex) {
if (item.disabled) return
let lastItem = false
viewCol.value.splice(colIndex)
viewCol.value[colIndex] = item.value
@ -242,6 +243,10 @@ export default defineComponent({
&.is-actived {
color: $blue-1;
}
&.is-disabled {
cursor: not-allowed;
opacity: 0.5;
}
}
}
</style>

4
src/components/widgets/admin/personally/components/telesale-card.vue
View File

@ -62,7 +62,7 @@ const emit = defineEmits(['handleCardClick'])
const parsePostionText = computed(() => {
const { postId } = props.item
const ids = postId.split(',')
const ids = postId?.split(',')
const positionsList = [
{ name: '电销老师', id: 5 },
{ name: '招生老师', id: 6 }
@ -93,7 +93,7 @@ const data = computed(() => {
})
const parsePostIds = computed(() => {
const { postId } = props.item
return postId.split(',').map(Number)
return postId?.split(',').map(Number)
})
const containPostIds = computed(() => {
return parsePostIds.value.includes(5) && parsePostIds.value.includes(6)

63
src/components/widgets/admin/personally/index.vue
View File

@ -14,7 +14,7 @@
<u-dropdown-item title="组织">
<view class="bg-white">
<DropdownPicker
:dropdownItem="dropdownMenuList"
:dropdownItem="dropdownMenuOrgList"
@reset="() => handleReset('organization')"
@confirm="value => handleConfirm('organization', value)"
/>
@ -55,6 +55,7 @@ import telesaleCard from './components/telesale-card.vue'
import dateDropdownPicker from '@/components/date-dropdown/daterange.vue'
import { useZPaging } from '@/hooks/useZPaging'
import { apiTeleClueList } from '@/api/clue'
import { apiOrganizationAllList } from '@/api/admin'
const dropdownMenuList2 = {
showQuick: true,
@ -65,31 +66,7 @@ const dropdownMenuList2 = {
// value: { start: '2022-01-01', end: '2022-02-01' },
}
const postId = ref()
const dropdownMenuList = [
{
label: '级联X1',
value: '1',
children: [
{
label: '级联X11',
value: '11',
children: [
{ label: '级联X111', value: '111' },
{ label: '级联X122', value: '122' }
]
},
{ label: '级联X12', value: '12' }
]
},
{
label: '级联X2',
value: '2',
children: [
{ label: '级联X21', value: '21' },
{ label: '级联X22', value: '22' }
]
}
]
const dropdownMenuOrgList = ref([])
const queryParams = ref({
likeWork: ''
@ -140,6 +117,40 @@ const handleReset = (type: string) => {
break
}
}
const fetchAllOrganizationList = async () => {
try {
const result = await apiOrganizationAllList()
dropdownMenuOrgList.value = renameFields(result)
console.log(dropdownMenuOrgList.value)
} catch (error) {}
}
const renameFields = (data: any[]): any[] => {
return data.map(item => {
const newItem = { ...item }
newItem.label = item.name
newItem.value = item.id
if (newItem.organizationVoList) {
newItem.children = renameFields(newItem.organizationVoList)
delete newItem.organizationVoList
}
if (newItem.userVos) {
newItem.userVos.forEach(item => {
item.label = item.username
item.value = item.id
})
newItem.children = newItem.children
? [...newItem.children, ...newItem.userVos]
: newItem.userVos
delete newItem.userVos
}
if (!newItem.children.length) {
newItem.disabled = true
}
return newItem
})
}
fetchAllOrganizationList()
</script>
<style scoped lang="scss"></style>

31
src/components/widgets/admin/team/components/clue-status.vue
View File

@ -29,6 +29,8 @@
<script setup lang="ts">
import { ref } from 'vue'
import card from '../../card.vue'
import { IForm } from '../index.vue'
import { clueStatusApi } from '@/api/admin'
interface ICluseStatus {
label: string
@ -36,19 +38,26 @@ interface ICluseStatus {
}
const data = ref<ICluseStatus[]>([])
const loading = ref(false)
const fetchData = () => {
const dataMap: Record<string, string> = {
unclaimedCount: '待领取',
conversionCount: '转化中',
addedCount: '已添加',
abnormalCount: '异常待处理',
tradedCount: '已成交',
failCount: '已战败'
}
const fetchData = async (payload: IForm) => {
loading.value = true
setTimeout(() => {
data.value = [
{ label: '待领取', value: 28 },
{ label: '转化中', value: 12 },
{ label: '已添加', value: 53 },
{ label: '异常待处理', value: 56 },
{ label: '已成交', value: 12 },
{ label: '已战败', value: 100 }
]
loading.value = false
try {
const result = await clueStatusApi(payload)
data.value = Object.keys(dataMap).map(item => {
return {
label: dataMap[item],
value: result[item] || 0
}
})
loading.value = false
} catch (error) {}
}
defineExpose({
fetchData

3
src/components/widgets/admin/team/components/converted-overview.vue
View File

@ -25,6 +25,7 @@
<script setup lang="ts">
import { ref } from 'vue'
import card from '../../card.vue'
import { IForm } from '../index.vue'
interface IConvertedData {
name: string
@ -32,7 +33,7 @@ interface IConvertedData {
}
const data = ref<IConvertedData[]>([])
const loading = ref(false)
const fetchData = () => {
const fetchData = (payload: IForm) => {
loading.value = true
setTimeout(() => {
data.value = [

33
src/components/widgets/admin/team/components/data-overview.vue
View File

@ -25,6 +25,8 @@
<script setup lang="ts">
import { ref } from 'vue'
import card from '../../card.vue'
import { apiDataOverview } from '@/api/admin'
import { IForm } from '../index.vue'
interface DataItem {
label: string
@ -32,19 +34,28 @@ interface DataItem {
}
const loading = ref(false)
const data = ref<DataItem[]>([])
const fetchData = () => {
const dataMap: Record<string, string> = {
followUpRecord: '新增跟进',
newCustomer: '新增客户',
transactionClient: '成交客户',
convertingClient: '转化中客户',
exceptionPending: '异常待处理',
defeatedClient: '战败客户'
}
const fetchData = async (payload: IForm) => {
if (data.value.length > 0) data.value = []
loading.value = true
setTimeout(() => {
data.value = [
{ label: '新增跟进', value: 368 },
{ label: '新增客户', value: 368 },
{ label: '成交客户', value: 368 },
{ label: '转化中客户', value: 368 },
{ label: '异常待处理', value: 368 },
{ label: '战败客户', value: 368 }
]
try {
const result = await apiDataOverview(payload)
data.value = Object.keys(dataMap).map(key => {
return {
label: dataMap[key],
value: result[key] || 0
}
})
} catch (error) {}
loading.value = false
}, 500)
}
defineExpose({
fetchData

151
src/components/widgets/admin/team/index.vue
View File

@ -1,11 +1,20 @@
<template>
<view class="flex flex-col gap-[24rpx] mb-[20rpx]">
<view class="bg-white">
<u-dropdown ref="uDropdownRef" menu-icon="arrow-down-fill" :isFlex="false">
<u-dropdown ref="uDropdownRef" menu-icon="arrow-down-fill">
<u-dropdown-item title="团队">
<view class="bg-white">
<selectDropdown
:dropdownItem="dropdownMenuTeamList"
@reset="() => handleReset('team')"
@confirm="value => handleConfirm('team', value)"
/>
</view>
</u-dropdown-item>
<u-dropdown-item title="组织">
<view class="bg-white">
<DropdownPicker
:dropdownItem="dropdownMenuList"
<selectDropdown
:dropdownItem="dropdownMenuAllOrgaList"
@reset="() => handleReset('organization')"
@confirm="value => handleConfirm('organization', value)"
/>
@ -14,7 +23,7 @@
<u-dropdown-item title="日期">
<view class="bg-white p-[20rpx]">
<dateDropdownPicker
:dropdownItem="dropdownMenuList2"
:dropdownItem="dropdownMenuDateList"
@reset="() => handleReset('date')"
@confirm="value => handleConfirm('date', value)"
/>
@ -35,74 +44,142 @@ import dataOverview from './components/data-overview.vue'
import convertedOverview from './components/converted-overview.vue'
import rank from './components/rank.vue'
import clueStatus from './components/clue-status.vue'
import DropdownPicker from '../orga-picker.vue'
import dateDropdownPicker from '@/components/date-dropdown/daterange.vue'
import selectDropdown from '@/components/select-dropdown/index.vue'
import { apiOrganizationByIdList, apiOrganizationList, apiOrganizationTeamList } from '@/api/admin'
import { formateDate, getCurDate } from '@/utils/util'
export interface IForm {
organizationId: number | null
createTimeStart: string
createTimeEnd: string
userId: string
}
const clueStatusRef = ref<InstanceType<typeof clueStatus>>()
const rankRef = ref<InstanceType<typeof rank>>()
const convertedOverviewRef = ref<InstanceType<typeof convertedOverview>>()
const dataOverviewRef = ref<InstanceType<typeof dataOverview>>()
const uDropdownRef = ref()
const dropdownMenuList = [
{
label: '级联X1',
value: '1',
children: [
{
label: '级联X11',
value: '11'
},
{ label: '级联X12', value: '12' }
]
},
{
label: '级联X2',
value: '2',
children: [
{ label: '级联X21', value: '21' },
{ label: '级联X22', value: '22' }
]
}
]
const dropdownMenuList2 = {
const organizationList = ref([])
const defaultValue = ref() //保存组织默认值
const form = ref<IForm>({
organizationId: null,
createTimeStart: getCurDate('start'),
createTimeEnd: getCurDate('end'),
userId: ''
})
const dropdownMenuDateList = {
showQuick: true,
title: '日期范围',
type: 'daterange',
prop: 'god6'
// 默认选中 2022-01-01到2022-02-01
// value: { start: '2022-01-01', end: '2022-02-01' },
prop: 'god6',
value: { start: getCurDate('start', 'YYYY-MM-DD'), end: getCurDate('end', 'YYYY-MM-DD') }
}
const dropdownMenuTeamList = ref({
title: '下拉',
type: 'cell',
prop: 'god1',
showAll: true,
showIcon: true,
options: []
})
const dropdownMenuAllOrgaList = ref({
title: '下拉',
type: 'cell',
prop: 'god1',
showAll: true,
showIcon: true,
options: []
})
// 查询条件
const handleConfirm = (type: string, item) => {
switch (type) {
case 'organization':
console.log(item)
break
case 'date':
console.log(item)
form.value.createTimeStart = formateDate(item.start, 'start')
form.value.createTimeEnd = formateDate(item.end, 'end')
break
case 'team':
form.value.organizationId = item.value
break
default:
break
}
fetchAllData()
closeDropDown()
}
// 重置条件
const handleReset = (type: string) => {
switch (type) {
case 'organization':
break
case 'date':
form.value.createTimeStart = getCurDate('start')
form.value.createTimeEnd = getCurDate('end')
break
case 'team':
form.value.organizationId = defaultValue.value
break
default:
break
}
fetchAllData()
closeDropDown()
}
const closeDropDown = () => {
uDropdownRef.value.close()
}
onMounted(() => {
dataOverviewRef.value?.fetchData()
convertedOverviewRef.value?.fetchData()
rankRef.value?.fetchData()
clueStatusRef.value?.fetchData()
onMounted(async () => {
await fetchOrganizationList()
fetchAllData()
})
const fetchAllData = () => {
dataOverviewRef.value?.fetchData(form.value)
convertedOverviewRef.value?.fetchData(form.value)
rankRef.value?.fetchData(form.value)
clueStatusRef.value?.fetchData(form.value)
}
// 获取主账号下的所有组织架构
const fetchOrganizationList = async () => {
try {
const result = await apiOrganizationList()
organizationList.value = result ?? []
if (result.length > 0) {
form.value.organizationId = result[0].id
defaultValue.value = result[0].id
}
} catch (error) {}
}
// 获取团队列表
const fetchTeamList = async () => {
try {
const result = await apiOrganizationTeamList()
dropdownMenuTeamList.value.options =
result.map(item => {
return {
label: item.name,
value: item.id
}
}) ?? []
} catch (error) {}
}
// 获取组织列表
const fetchAllOrganizationList = async () => {
try {
const result = await apiOrganizationByIdList()
dropdownMenuAllOrgaList.value.options =
result.map(item => {
return {
label: item.name,
value: item.id
}
}) ?? []
} catch (error) {}
}
fetchTeamList()
fetchAllOrganizationList()
</script>
<style scoped></style>

3
src/hooks/useCommon.ts
View File

@ -1,4 +1,5 @@
import { apiCluseDetail } from '@/api/clue'
import { IForm } from '@/components/widgets/admin/team/index.vue'
import { computed, ref, shallowRef } from 'vue'
// 获取线索详情
@ -72,7 +73,7 @@ export function useRank({ width }: { width: number }) {
resolve(tabs.value)
})
}
const fetchData = async () => {
const fetchData = async (payload: IForm) => {
await fetchTabs()
console.log(activeTab.value)
loading.value = true

2
src/hooks/useRoleData.ts
View File

@ -120,7 +120,7 @@ export const setNextRoute = () => {
const { userInfo } = userStore
const ind = cache.get(ROLEINDEX) || 0
const obj = roles[ind]
if (userInfo.postIds == 0 && obj.ids.length == 0) {
if (userInfo.postIds == 0 && obj.ids.length == 0 && userInfo.masterAccount == 1) {
tabBarStore.setTabBarList(obj.tabBarList)
uni.reLaunch({
url: obj.tabBarList[0].path

14
src/pages.json
View File

@ -1,12 +1,5 @@
{
"pages": [
{
"path": "pages/admin/home/index",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/index/index",
"style": {
@ -14,6 +7,13 @@
"navigationStyle": "custom"
}
},
{
"path": "pages/admin/home/index",
"style": {
"navigationBarTitleText": ""
}
},
{
"path": "pages/telesale/home/index",
"style": {

6
src/pages/index/index.vue
View File

@ -14,9 +14,9 @@ onLoad(() => {
// 已经登录 => 首页
setNextRoute()
} else {
// uni.navigateTo({
// url: '/bundle/pages/login/login'
// })
uni.navigateTo({
url: '/bundle/pages/login/login'
})
}
})
</script>

9
src/utils/util.ts
View File

@ -397,3 +397,12 @@ export function throttle(fn: any, gapTime: number) {
}
}
}
// 获取今天
export function getCurDate(type: string, format = 'YYYY-MM-DD HH:mm:ss') {
return formateDate('today', type, format)
}
// 格式化日期
export function formateDate(value: string, type: string, format = 'YYYY-MM-DD HH:mm:ss') {
const date = value == 'today' ? dayjs() : dayjs(value)
return type == 'start' ? date.startOf('day').format(format) : date.endOf('day').format(format)
}