Compare commits

..

No commits in common. 'main' and 'dev-cjl' have entirely different histories.

  1. 4
      src/api/clue/index.js
  2. 14
      src/api/clue/sign.js
  3. 8
      src/api/home/reportChannel.js
  4. 8
      src/api/home/reportSaler.js
  5. 8
      src/api/home/reportSignDetail.js
  6. 4
      src/api/home/reportSignRate.js
  7. 33
      src/api/school/setting/supplier.js
  8. 13
      src/api/system/user/index.ts
  9. 4
      src/components/ConfigGlobal/src/ConfigGlobal.vue
  10. 2
      src/components/UploadFile/src/UploadFile.vue
  11. 7
      src/hooks/web/useMessage.ts
  12. 2
      src/permission.js
  13. 3
      src/router/modules/remaining.ts
  14. 13
      src/styles/index.scss
  15. 12
      src/views/Basic/Role/Comp/RoleEmployee.vue
  16. 11
      src/views/Basic/User/UserForm.vue
  17. 114
      src/views/Basic/User/index.vue
  18. 30
      src/views/Clue/Order/Comp/AfterSales.vue
  19. 130
      src/views/Clue/Order/Comp/DialogAddProduct.vue
  20. 4
      src/views/Clue/Order/Comp/DialogAfterSale.vue
  21. 13
      src/views/Clue/Order/Comp/DialogDelivery.vue
  22. 13
      src/views/Clue/Order/Comp/DialogOrder.vue
  23. 46
      src/views/Clue/Order/Comp/MallOrderList.vue
  24. 13
      src/views/Clue/Order/Comp/MallSettle.vue
  25. 20
      src/views/Clue/Order/Comp/OrderList.vue
  26. 188
      src/views/Clue/Order/Comp/Reback.vue
  27. 13
      src/views/Clue/Order/Comp/SchoolSettle.vue
  28. 15
      src/views/Clue/Pool/index.vue
  29. 170
      src/views/Clue/Set/Comp/DialogSource.vue
  30. 35
      src/views/Home/ChannelReport.vue
  31. 109
      src/views/Home/CloseRate.vue
  32. 62
      src/views/Home/Comp/BarSalerClueReport.vue
  33. 147
      src/views/Home/Comp/ChannelMonthly.vue
  34. 169
      src/views/Home/Comp/ChannelPeriod.vue
  35. 402
      src/views/Home/Comp/DialogSalerReportDetail.vue
  36. 162
      src/views/Home/Comp/SignListCard.vue
  37. 195
      src/views/Home/Comp/SignTotalCard.vue
  38. 20
      src/views/Home/Index.vue
  39. 248
      src/views/Home/SalesReport.vue
  40. 13
      src/views/Home/SignReport.vue
  41. 7
      src/views/Home/channel.vue
  42. 38
      src/views/MiniMall/MallSet/Comp/DialogSupplier.vue
  43. 28
      src/views/MiniMall/MallSet/Comp/SupplierSet.vue
  44. 12
      src/views/MiniMall/Product/index.vue
  45. 12
      src/views/MiniMall/Purchase/index.vue
  46. 4
      src/views/Profile/NotifyMessageDetail.vue
  47. 5
      src/views/Profile/components/BasicInfo.vue
  48. 4
      src/views/Profile/components/UserSocial.vue

@ -6,8 +6,8 @@ export const getSimpleClueList = async () => {
}
// 查询列表
export const getCluePage = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/page', data })
export const getCluePage = async (params) => {
return await request.get({ url: '/admin-api/crm/sch-clue/page', params })
}
// 查询详情

@ -1,8 +1,8 @@
import request from '@/config/axios'
// 查询列表
export const getSignPage = async (data) => {
return await request.post({ url: '/admin-api/crm/sign/page', data })
export const getSignPage = async (params) => {
return await request.get({ url: '/admin-api/crm/sign/page', params })
}
// 查询详情
@ -51,13 +51,3 @@ export const updateProduceSort = (data) => {
export const getSignProfit = (params) => {
return request.get({ url: '/admin-api/crm/sign/profit', params })
}
// 新增产品
export const addOrderProduct = (data) => {
return request.post({ url: '/admin-api/crm/sign-prodcut/create', data })
}
// 新增产品
export const removeOrderProduct = (id) => {
return request.delete({ url: '/admin-api/crm/sign-prodcut/delete?id=' + id })
}

@ -1,8 +0,0 @@
import request from '@/config/axios'
export const getList = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/report', data })
}
export const getPeriodList = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/clueQuality/period/report', data })
}

@ -1,8 +0,0 @@
import request from '@/config/axios'
export const getInfo = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/sale/report/detail', data })
}
export const getList = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/sale/report', data })
}

@ -1,8 +0,0 @@
import request from '@/config/axios'
export const getInfo = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/one', data })
}
export const getList = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/signData/report/two', data })
}

@ -1,4 +0,0 @@
import request from '@/config/axios'
export const getList = async (data) => {
return await request.post({ url: '/admin-api/crm/sch-clue/signRate/report', data })
}

@ -1,33 +0,0 @@
import request from '@/config/axios'
// 查询列表
export const getSupplierPage = async (params) => {
return await request.get({ url: '/admin-api/crm/erp-supplier/page', params })
}
export const getSupplierSimpleList = async (params) => {
return await request.get({ url: '/admin-api/crm/erp-supplier/simple-list', params })
}
// 查询详情
export const getSupplier = async (id) => {
return await request.get({ url: '/admin-api/crm/erp-supplier/get?id=' + id })
}
// 新增
export const createSupplier = async (data) => {
return await request.post({
url: '/admin-api/crm/erp-supplier/create',
data: data,
isSubmitForm: true
})
}
// 修改
export const updateSupplier = async (params) => {
return await request.put({ url: '/admin-api/crm/erp-supplier/update', data: params })
}
// 删除
export const deleteSupplier = async (id) => {
return await request.delete({ url: '/admin-api/crm/erp-supplier/delete?id=' + id })
}

@ -12,11 +12,9 @@ export interface UserVO {
avatar: string
loginIp: string
status: number
hireStatus: number
remark: string
loginDate: Date
createTime: Date
retireDate: string
}
// 查询用户管理列表
@ -64,17 +62,10 @@ export const resetUserPwd = (id: number, password: string) => {
}
// 用户状态修改
export const updateUserStatus = (
id: number,
status: number,
retireDate: string,
hireStatus: number
) => {
export const updateUserStatus = (id: number, status: number) => {
const data = {
id,
status,
retireDate,
hireStatus
status
}
return request.put({ url: '/admin-api/system/user/update-status', data: data })
}

@ -22,13 +22,13 @@ onMounted(() => {
appStore.setCssVarTheme()
})
const { width, height } = useWindowSize()
const { width } = useWindowSize()
//
watch(
() => width.value,
(width: number) => {
if (width < 768 || height.value < 450) {
if (width < 768) {
!appStore.getMobile ? appStore.setMobile(true) : undefined
setCssVar('--left-menu-min-width', '0')
appStore.setCollapse(true)

@ -47,7 +47,7 @@ const props = defineProps({
// fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // , ['png', 'jpg', 'jpeg']
fileType: propTypes.array.def([]),
accept: propTypes.string.def('*'),
fileSize: propTypes.number.def(100), // (MB)
fileSize: propTypes.number.def(5), // (MB)
limit: propTypes.number.def(5), //
autoUpload: propTypes.bool.def(true), //
drag: propTypes.bool.def(false), //

@ -13,12 +13,7 @@ export const useMessage = () => {
},
// 成功消息
success(content: string) {
// ElMessage.success(content)
ElMessage({
message: content,
duration: 1500,
type: 'success'
})
ElMessage.success(content)
},
// 警告消息
warning(content: string) {

@ -45,7 +45,7 @@ router.beforeEach(async (to, from, next) => {
const dictStore = useDictStoreWithOut()
const userStore = useUserStoreWithOut()
const permissionStore = usePermissionStoreWithOut()
if (!dictStore.getIsSetDict && to.path != '/nm-detail') {
if (!dictStore.getIsSetDict) {
await dictStore.setDictMap()
}
if (!userStore.getIsSetUser) {

@ -106,6 +106,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
}
]
},
// {
// path: '/dict',
// component: Layout,
@ -133,7 +134,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
// path: '/Basic',
// component: Layout,
// name: 'Basic',
// meta: { title: '菜单管理' },
// meta: {},
// redirect: '/Basic/menu',
// children: [
// {

@ -69,16 +69,3 @@
width: 100%;
}
}
.el-table {
.caret-wrapper {
width: 16px;
}
.sort-caret {
left: 2px;
}
}
.el-table--default .cell {
padding: 0 5px;
}

@ -9,18 +9,6 @@
:label="col.label"
:width="col.width"
/>
<el-table-column label="状态" key="status">
<template #default="scope">
<el-switch
v-model="scope.row.status"
:active-value="0"
active-text="在职"
inactive-text="离职"
:inactive-value="1"
disabled
/>
</template>
</el-table-column>
</el-table>
<Pagination
v-model:limit="pageSize"

@ -85,11 +85,6 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="微信号" prop="wxAlias">
<el-input v-model="formData.wxAlias" placeholder="请输入微信号" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="入职日期" prop="hireDate">
<el-date-picker
@ -145,8 +140,7 @@ const formData = ref({
status: CommonStatusEnum.ENABLE,
roleIds: [],
hireDate: '',
isNewUserConfirm: false,
wxAlias: ''
isNewUserConfirm: false
})
const formRules = ref<any>({
username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
@ -234,8 +228,7 @@ const resetForm = () => {
status: CommonStatusEnum.ENABLE,
roleIds: [],
hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
isNewUserConfirm: false,
wxAlias: ''
isNewUserConfirm: false
}
formRef.value?.resetFields()
}

@ -6,8 +6,8 @@
</el-col>
<el-col :span="20" :xs="24">
<!-- 搜索 -->
<el-form :model="queryParams" ref="queryFormRef" inline label-width="0">
<el-form-item>
<el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="queryParams.nickname"
placeholder="请输入姓名"
@ -16,7 +16,7 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-form-item label="手机号码" prop="mobile">
<el-input
v-model="queryParams.mobile"
placeholder="请输入手机号码"
@ -25,12 +25,6 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-radio-group v-model="queryParams.status" @change="handleQuery">
<el-radio :label="0"> 启用 </el-radio>
<el-radio :label="1"> 禁用 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
<el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
@ -45,44 +39,29 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list">
<el-table-column label="用户编号" key="id" prop="id" width="100" />
<el-table-column label="用户编号" key="id" prop="id" />
<el-table-column label="登录账号" prop="username" />
<el-table-column label="用户姓名" prop="nickname" />
<el-table-column label="部门" key="deptName" prop="deptName" width="100" />
<el-table-column label="部门" key="deptName" prop="deptName" />
<el-table-column label="手机号码" prop="mobile" width="120" />
<el-table-column label="微信号" prop="wxAlias" min-width="80" />
<el-table-column label="在职状态" key="hireStatus" width="120">
<template #default="scope">
<el-switch
v-model="scope.row.hireStatus"
:active-value="0"
:inactive-value="1"
active-text="在职"
inactive-text="离职"
size="small"
v-hasPermi="['basic:employee:update']"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="启用状态" key="status" width="120">
<el-table-column label="状态" key="status">
<template #default="scope">
<el-switch
v-model="scope.row.status"
:active-value="0"
:inactive-value="1"
active-text="启用"
inactive-text="禁用"
size="small"
:disabled="scope.row.hireStatus == 1"
v-hasPermi="['basic:employee:update']"
@change="handleUseChange(scope.row)"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="入职日期" prop="hireDate" width="120" :formatter="dateFormatter" />
<el-table-column label="离职日期" prop="" width="120" :formatter="dateFormatter" />
<el-table-column label="操作" width="180">
<el-table-column
label="创建时间"
prop="createTime"
width="180"
:formatter="dateFormatter"
/>
<el-table-column label="操作" width="260">
<template #default="scope">
<el-button
type="primary"
@ -135,14 +114,13 @@ const { t } = useI18n() // 国际化
const loading = ref(true) //
const total = ref(0) //
const list = ref([]) //
const queryParams = ref({
const queryParams = reactive({
pageNo: 1,
pageSize: 20,
pageSize: 10,
username: undefined,
nickname: undefined,
mobile: undefined,
deptId: undefined,
status: undefined
deptId: undefined
})
const queryFormRef = ref() //
@ -150,7 +128,7 @@ const queryFormRef = ref() // 搜索的表单
const getList = async () => {
loading.value = true
try {
const data = await UserApi.getUserPage(queryParams.value)
const data = await UserApi.getUserPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
@ -160,28 +138,19 @@ const getList = async () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNo = 1
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields()
queryParams.value = {
pageNo: 1,
pageSize: 20,
username: undefined,
nickname: undefined,
mobile: undefined,
deptId: undefined,
status: undefined
}
handleQuery()
}
/** 处理部门被点击 */
const handleDeptNodeClick = async (row) => {
queryParams.value.deptId = row.id
queryParams.deptId = row.id
await getList()
}
@ -191,49 +160,14 @@ const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 修改在职状态 */
/** 修改用户状态 */
const handleStatusChange = async (row: UserApi.UserVO) => {
try {
//
const text = row.hireStatus === CommonStatusEnum.ENABLE ? '入职' : '离职'
let result = { value: '' }
if (text == '入职') {
await message.confirm('确认要"' + text + '""' + row.nickname + '"吗?')
} else {
result = await message.prompt(
'请输入年月日,如2024-01-01',
'确认要"' + text + '""' + row.nickname + '"用户吗?'
)
const regex = /^\d{4}-\d{2}-\d{2}$/
if (!regex.test(result.value)) {
message.error('请输入离职日期')
throw new Error()
}
}
//
await UserApi.updateUserStatus(row.id, row.status, result.value, row.hireStatus)
message.success('修改成功')
//
await getList()
} catch {
//
row.hireStatus =
row.hireStatus === CommonStatusEnum.ENABLE
? CommonStatusEnum.DISABLE
: CommonStatusEnum.ENABLE
}
}
//
const handleUseChange = async (row: UserApi.UserVO) => {
try {
//
const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '禁用'
await message.confirm('确认要"' + text + '""' + row.nickname + '"吗?')
const text = row.status === CommonStatusEnum.ENABLE ? '启用' : '停用'
await message.confirm('确认要"' + text + '""' + row.username + '"用户吗?')
//
await UserApi.updateUserStatus(row.id, row.status, row.retireDate, row.hireStatus)
message.success('修改成功')
await UserApi.updateUserStatus(row.id, row.status)
//
await getList()
} catch {

@ -83,18 +83,6 @@
style="width: 240px"
/>
</el-form-item>
<template v-if="appStore.getAppInfo?.instanceType == 1">
<el-form-item>
<el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
<el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
查询
@ -116,14 +104,8 @@
>
<el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
<el-table-column prop="signId" label="成交单号" min-width="150px" />
<el-table-column prop="name" label="线索名称" min-width="150px" />
<el-table-column prop="phone" label="联系方式" min-width="120px" />
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="area"
label="区域"
min-width="90"
/>
<el-table-column prop="name" label="线索名称" min-width="200px" />
<el-table-column prop="phone" label="联系方式" min-width="150px" />
<el-table-column prop="reason" label="售后原因" min-width="150px" />
<el-table-column prop="refundAmount" label="退款金额" min-width="90px" />
<el-table-column prop="percentageDeductAmount" label="提成扣款" min-width="90px" />
@ -201,7 +183,6 @@
<script setup name="AfterSales">
import * as AfterSaleApi from '@/api/clue/afterSale'
import { getSimpleUserList as getUserOption } from '@/api/system/user'
import { getAreaSimpleList } from '@/api/school/setting/area'
import { useUserStore } from '@/store/modules/user'
import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
@ -210,12 +191,10 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
import { removeNullField } from '@/utils'
import { dateFormatter } from '@/utils/formatTime'
import { useAppStore } from '@/store/modules/app'
const afterSaleAuditDialog = ref()
const userStore = useUserStore()
const appStore = useAppStore()
const message = useMessage() //
const currentUserId = userStore.getUser.id
@ -305,12 +284,7 @@ function handleAudit(row) {
afterSaleAuditDialog.value.open(row)
}
const areaOptions = ref([])
function getOptions() {
//
getAreaSimpleList().then((data) => {
areaOptions.value = data
})
getUserOption().then((data) => {
userOptions.value = data
})

@ -1,130 +0,0 @@
<template>
<Dialog title="添加产品" v-model="show" width="800px">
<el-form :model="form" ref="formRef" :rules="rules" label-width="80px">
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form-item label="成交产品" prop="productId">
<el-select
v-model="form.productId"
placeholder="选择成交产品"
filterable
@change="form.specsId = undefined"
>
<el-option
v-for="item in prodOptions"
:key="item.productId"
:label="item.productName"
:value="item.productId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="产品规格" prop="specsId">
<el-select
v-model="form.specsId"
placeholder="选择规格"
filterable
:disabled="!form.productId"
>
<el-option
v-for="item in specsOptions(form.productId)"
:key="item.specsId"
:label="item.specsName"
:value="item.specsId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="成交数量" prop="signNum">
<el-input-number v-model="form.signNum" :min="1" :controls="false" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="生产状态" prop="isProduced">
<el-radio-group v-model="form.isProduced">
<el-radio :label="0">待生产</el-radio>
<el-radio :label="1">已生产</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
:autoSize="{ minRows: 3 }"
v-model="form.remark"
placeholder="请输入备注"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span>
<el-button @click="show = false"> </el-button>
<el-button :disabled="formLoading" type="primary" @click="handleSave"> </el-button>
</span>
</template>
</Dialog>
</template>
<script setup name="DialogProduct">
import { addOrderProduct } from '@/api/clue/sign'
const message = useMessage() //
const specsOptions = computed({
get() {
return (prodId) => {
if (prodId) {
return prodOptions.value.find((it) => it.productId == prodId).productSpecList
}
return []
}
}
})
const show = ref(false)
const form = ref({})
const rules = {
productId: { required: true, message: '成交产品不可为空', trigger: 'change' },
specsId: { required: true, message: '产品规格不可为空', trigger: 'change' },
signNum: { required: true, message: '成交数量不可为空', trigger: 'blur' }
}
const prodOptions = ref([])
function open(signId, arr) {
prodOptions.value = arr
form.value.signId = signId
form.value.isProduced = 0
show.value = true
}
defineExpose({ open })
const emit = defineEmits(['success'])
const formRef = ref()
const formLoading = ref(false)
async function handleSave() {
//
if (!formRef.value) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
await addOrderProduct(form.value)
message.success('新增成功!')
show.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
</script>
<style lang="scss" scoped></style>

@ -45,7 +45,7 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
<el-col :span="24" :offset="0">
<el-form-item label="是否退货" prop="isReturns">
<el-radio-group v-model="form.isReturns">
<el-radio :label="true"> 退货 </el-radio>
@ -79,9 +79,7 @@
<script setup name="DialogAfterSale">
import { getAfterSalePage, createAfterSale } from '@/api/clue/afterSale'
import { useAppStore } from '@/store/modules/app'
const appStore = useAppStore()
const message = useMessage() //
const show = ref(false)

@ -28,9 +28,9 @@
<el-select v-model="form.supplier" placeholder="选择供应商" filterable>
<el-option
v-for="item in supplierOptions"
:key="item.id"
:label="item.supplierName"
:value="item.id"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@ -141,18 +141,15 @@
import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/warehouse'
import { createDelivery } from '@/api/clue/delivery'
import { getConfigList } from '@/api/system/set'
import { getSupplierSimpleList } from '@/api/school/setting/supplier'
import { getDictOptions } from '@/utils/dict'
import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
const message = useMessage() //
const warehouseOptions = ref([])
const extraPayOptions = ref([])
const supplierOptions = ref([])
const supplierOptions = getDictOptions('erp_supplier')
function getOptions() {
getSupplierSimpleList().then((data) => {
supplierOptions.value = data
})
getSimpleWarehouseList().then((data) => {
warehouseOptions.value = data
})

@ -61,15 +61,14 @@
</el-table>
</div>
</el-tab-pane>
<el-tab-pane label="回款记录" name="returnRecord">
<el-tab-pane
label="回款记录"
name="returnRecord"
v-if="checkPermi(['clue:order:return-list'])"
>
<el-table :data="returnRecordList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column
v-if="checkPermi(['clue:order:return-list'])"
prop="money"
label="回款金额"
/>
<el-table-column prop="personProfit" label="员工利润" />
<el-table-column prop="money" label="回款金额" />
<el-table-column prop="applyTime" label="申请日期" />
<el-table-column prop="isPayoff" label="是否结清" />
<el-table-column prop="stateName" label="审核状态" />

@ -74,8 +74,8 @@
@get-checked-columns="getCheckedColumns"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="60" fixed="left" />
<el-table-column type="expand" fixed="left">
<el-table-column type="selection" width="60" />
<el-table-column type="expand">
<template #default="{ row }">
<div class="p-10px flex justify-center">
<VueDraggable
@ -91,8 +91,8 @@
stripe
style="width: 80%; margin: 0 auto"
>
<el-table-column prop="productName" label="成交产品" width="120px" />
<el-table-column prop="specsName" label="产品规格" width="120px" />
<el-table-column prop="productName" label="成交产品" />
<el-table-column prop="specsName" label="产品规格" />
<el-table-column prop="signNum" label="成交数量" width="90px" />
<el-table-column prop="remark" label="成交备注" width="100px" />
<el-table-column label="生产状态" width="160px">
@ -147,15 +147,6 @@
>
发货
</el-button>
<el-button
type="danger"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:remove-product']"
@click="handleRemoveProduct(scope.row)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
@ -237,16 +228,6 @@
>
取消登记
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:add-product']"
@click="handleAddProduct(scope.row)"
>
添加产品
</el-button>
</template>
</el-table-column>
</SSTable>
@ -257,7 +238,6 @@
<DialogAfterSale ref="afterSaleDialog" />
<DialogExtraFee ref="extraFeeDialog" />
<DialogDelivery ref="deliveryDialog" @success="getTableList" />
<DialogAddProduct ref="addProductDialog" @success="getTableList" />
</div>
</template>
@ -272,7 +252,6 @@ import DialogFeeback from './DialogFeeback.vue'
import DialogAfterSale from './DialogAfterSale.vue'
import DialogExtraFee from './DialogExtraPay.vue'
import DialogDelivery from './DialogDelivery.vue'
import DialogAddProduct from './DialogAddProduct.vue'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
@ -425,11 +404,6 @@ function handleDelivery(row) {
deliveryDialog.value.open(row)
}
const addProductDialog = ref()
function handleAddProduct(row) {
addProductDialog.value.open(row.signId, prodOptions.value)
}
const batchIds = ref([])
function handleSelectionChange(val) {
batchIds.value = val.map((it) => it.signId)
@ -486,18 +460,6 @@ function handleBatchUpdateInstall() {
}
}
async function handleRemoveProduct(row) {
try {
//
await message.confirm(`确认要删除${row.productName}吗?`)
//
await SignApi.removeOrderProduct(row.id)
message.success('删除成功')
//
getTableList()
} catch {}
}
async function handleChangeProdoce(row) {
try {
//

@ -116,9 +116,9 @@
>
<el-option
v-for="item in supplierOptions"
:key="item.id"
:label="item.supplierName"
:value="item.id"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@ -267,7 +267,7 @@ import { getSimpleUserList as getUserOption } from '@/api/system/user'
import { getSimpleProductList } from '@/api/mall/product'
import * as SettleApi from '@/api/clue/settle'
import { getSupplierSimpleList } from '@/api/school/setting/supplier'
import { getDictOptions } from '@/utils/dict'
import { removeNullField } from '@/utils/index'
import { dateFormatter } from '@/utils/formatTime'
@ -419,12 +419,9 @@ async function handleSaveSettle() {
const userOptions = ref([])
const prodOptions = ref([])
const supplierOptions = ref([])
const supplierOptions = getDictOptions('erp_supplier')
function getOptions() {
getSupplierSimpleList().then((data) => {
supplierOptions.value = data
})
//
getSimpleProductList().then((data) => {
prodOptions.value = data

@ -100,20 +100,10 @@
<span v-else-if="item.form?.component == 'DatePicker'">
{{ formatDate(row[item.field]) }}
</span>
<div v-else-if="item.form?.component == 'UploadImg'">
<el-image
v-if="row[item.field]"
:src="row[item.field]"
preview-teleported
:lazy="true"
:preview-src-list="[row[item.field]]"
/>
<!-- <img v-if="row[item.field]" :src="row[item.field]" style="width: 100%; height: 100%" /> -->
</div>
<span v-else>{{ row[item.field] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="170px" fixed="right">
<el-table-column label="操作" width="240px" fixed="right">
<template #default="scope">
<el-button
type="primary"
@ -160,7 +150,6 @@
type="primary"
class="mr-10px"
link
:disabled="scope.row.isCommissioned != '未发放'"
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:pool:enroll']"
@click="cancelDeal(scope.row)"
@ -251,11 +240,6 @@ async function getTableList() {
pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize
}
searchFieldList.value.map((it) => {
if (params[it.field]) {
params.diyParams[it.field] = params[it.field]
}
})
const data = await SignApi.getSignPage(removeNullField(params))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
tableObject.value.total = data.total
@ -265,12 +249,10 @@ async function getTableList() {
}
const loading = ref(true)
const searchFieldList = ref([])
async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom)
data.forEach((elem) => {
if (['createUser'].includes(elem.field)) {
elem.search.options = userOptions.value

@ -18,93 +18,22 @@
<el-option label="已驳回" :value="4" />
</el-select>
</el-form-item>
<template v-if="appStore.getAppInfo?.instanceType == 1">
<el-form-item>
<el-select
v-model="searchForm.receiver"
placeholder="接待人"
clearable
filterable
style="width: 120px"
>
<el-option
v-for="item in allUserOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signSchool"
placeholder="选择驾校"
filterable
clearable
@change="changeSchool"
>
<el-option
v-for="item in schoolOptions"
:key="item.schoolId"
:label="item.schoolName"
:value="item.schoolId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signPlace"
placeholder="选择场地"
filterable
clearable
:disabled="!searchForm.signSchool"
@change="changePlace"
>
<el-option
v-for="item in placeOptions"
:key="item.placeId"
:label="item.name"
:value="item.placeId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signClass"
:disabled="!searchForm.signPlace"
placeholder="选择班型"
filterable
clearable
>
<el-option
v-for="item in classOptions"
:key="item.typeId"
:label="item.typeName"
:value="item.typeId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.licenseType" placeholder="驾照类型" filterable clearable>
<el-option
v-for="item in getDictOptions(DICT_TYPE.LINCENSE_TYPE)"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
<el-option
v-for="item in areaOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</template>
<el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
<el-select
v-model="searchForm.receiver"
placeholder="接待人"
clearable
filterable
style="width: 120px"
>
<el-option
v-for="item in allUserOptions"
:key="item.id"
:label="item.nickname"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
<el-select
v-model="searchForm.convertPeople"
@ -207,7 +136,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
<el-table-column prop="signId" label="成交单号" min-width="120px" />
<el-table-column prop="signId" label="成交单号" min-width="150px" />
<el-table-column prop="name" label="线索名称" width="120px" />
<el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
<el-table-column prop="money" label="回款金额" min-width="120px">
@ -259,7 +188,7 @@
<div v-else>{{ row.personProfit }}</div>
</template>
</el-table-column>
<el-table-column prop="signPrice" label="成交价" min-width="120" />
<el-table-column prop="signPrice" label="成交价" min-width="90" />
<el-table-column prop="isPayoff" label="是否结清" min-width="90">
<template #default="{ row }">
<el-select v-if="row.edit" size="small" v-model="row.isPayoffValue">
@ -269,30 +198,6 @@
<div v-else>{{ row.isPayoff }}</div>
</template>
</el-table-column>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signSchool"
label="报名驾校"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signPlace"
label="报名场地"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="signClass"
label="报名班型"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="licenseType"
label="驾照类型"
min-width="90"
/>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="receiverName"
@ -348,12 +253,11 @@
:formatter="dateFormatter"
/>
<el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" />
<el-table-column label="操作" width="150px" fixed="right">
<el-table-column label="操作" width="220px" fixed="right">
<template #default="{ row }">
<el-button
type="primary"
class="mr-10px"
style="padding: 0; margin-left: 0"
style="padding: 0"
text
v-hasPermi="['clue:order:return-detail']"
@click="handleDetail(row)"
@ -362,8 +266,7 @@
</el-button>
<el-button
type="primary"
class="mr-10px"
style="padding: 0; margin-left: 0"
style="padding: 0"
text
v-if="row.state == 1 && currentUserId == row.applyUser"
v-hasPermi="['clue:order:return']"
@ -373,8 +276,7 @@
</el-button>
<el-button
type="primary"
class="mr-10px"
style="padding: 0; margin-left: 0"
style="padding: 0"
text
v-if="row.state == 1"
v-hasPermi="['clue:order:update-return-money']"
@ -384,8 +286,7 @@
</el-button>
<el-button
type="primary"
class="mr-10px"
style="padding: 0; margin-left: 0"
style="padding: 0"
text
v-if="row.state == 1"
v-hasPermi="['clue:order:return-audit']"
@ -412,10 +313,6 @@
<script setup name="Reback">
import * as FeebackApi from '@/api/clue/payment'
import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
import { getAreaSimpleList } from '@/api/school/setting/area'
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import { useUserStore } from '@/store/modules/user'
import DialogFeebackAudit from './DialogFeebackAudit.vue'
@ -451,13 +348,6 @@ const searchForm = ref({
const userOptions = ref([])
const allUserOptions = ref([])
const schoolOptions = ref([])
const allPlaceOptions = ref([])
const placeOptions = computed(() => {
return allPlaceOptions.value.filter((it) => it.schoolId == searchForm.value.signSchool)
})
const tableList = ref([])
const total = ref(0)
@ -479,31 +369,11 @@ function handleReset() {
applyUser: undefined,
checkTime: [],
mobile: undefined,
signSchool: undefined,
signPlace: undefined,
signClass: undefined,
area: undefined,
pageNo: 1,
pageSize: 20
}
}
function changeSchool() {
searchForm.value.signPlace = undefined
searchForm.value.signClass = undefined
}
function changePlace() {
searchForm.value.signClass = undefined
getClassTypeOptions()
}
const classOptions = ref([])
async function getClassTypeOptions() {
const data = await getClassTypeList({ placeId: searchForm.value.signPlace, status: 0 })
classOptions.value = data
}
const totalInfo = ref({})
const loading = ref(false)
async function getList() {
@ -526,7 +396,7 @@ function handleSelectionChange(val) {
const batchAuditDialog = ref()
function batchAudit() {
if (batchIds.value.length) {
batchAuditDialog.value.open('feeback', batchIds.value)
batchAuditDialog.value.open('aftersale', batchIds.value)
} else {
message.info('请选择表格中需要审核的数据')
}
@ -553,17 +423,7 @@ function handleAudit(row) {
feebackDialog.value.open(row)
}
const areaOptions = ref([])
function getOptions() {
//
getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
schoolOptions.value = data.schoolList
allPlaceOptions.value = data.placeList
})
//
getAreaSimpleList().then((data) => {
areaOptions.value = data
})
getUserOption().then((data) => {
userOptions.value = data
})

@ -248,16 +248,6 @@
<el-form-item label="结算金额">
{{ settleAmount }}
</el-form-item>
<el-form-item label="结算日期">
<el-date-picker
v-model="form.settlementDate"
type="date"
placeholder="选择日期时间"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
:clearable="false"
/>
</el-form-item>
<el-form-item label="结算备注" prop="remark">
<Editor v-model:modelValue="form.remark" />
</el-form-item>
@ -280,7 +270,7 @@ import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
import * as SettleApi from '@/api/clue/settle'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import { dateFormatter } from '@/utils/formatTime'
import { removeNullField } from '@/utils/index'
const message = useMessage() //
@ -405,7 +395,6 @@ function batchSettle() {
showDailog.value = true
form.value = {
settlementIds: selectList.value.map((it) => it.settlementId),
settlementDate: formatDate(new Date()),
reamrk: undefined
}
settleAmount.value = selectList.value.reduce((pre, cur) => pre + cur.settlementMoney, 0)

@ -92,9 +92,6 @@
快速新增
</el-button>
</div>
<div v-else-if="item.field == 'intentionStateName'">
<DictTag type="intention_state" :value="row.intentionState + ''" />
</div>
<div v-else-if="item.field == 'contact'">
<span>{{ row[item.field] }}</span>
<Icon class="ml-5px" icon="ep:phone" @click="makeCall(row.contact)" />
@ -231,13 +228,11 @@ const followRef = ref()
const loading = ref(true)
const allSchemas = ref({})
const searchFieldList = ref([])
async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom)
data.forEach((elem) => {
if (['followUser', 'convertPeople'].includes(elem.field)) {
elem.search.options = userOptions.value
@ -295,18 +290,12 @@ async function getTableList() {
getSearchCount()
try {
const queryParams = await searchRef.value.getFormModel()
let params = {
const params = {
...queryParams,
pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize,
queryType: queryType.value,
diyParams: {}
queryType: queryType.value
}
searchFieldList.value.map((it) => {
if (params[it.field]) {
params.diyParams[it.field] = params[it.field]
}
})
const data = await ClueApi.getCluePage(removeNullField(params))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
tableObject.value.total = data.total

@ -7,130 +7,30 @@
:rules="formRules"
label-width="80px"
>
<el-row :gutter="20">
<el-col v-if="formData.parentSource" :span="12" :offset="0">
<el-form-item label="上级来源">
<el-input v-model="formData.parentSource" disabled />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="来源名称" prop="sourceName">
<el-input v-model="formData.sourceName" placeholder="请输入来源名称" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="排序" prop="sort">
<el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="0"> 启用 </el-radio>
<el-radio :label="1"> 禁用 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="开户费用" prop="accountFee">
<el-input-number
v-model="formData.accountFee"
:controls="false"
style="width: 100%"
:min="0"
/>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="开户日期" prop="accountStartTime">
<el-date-picker
v-model="formData.accountStartTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期时间"
/>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="到期日期" prop="accountEndTime">
<el-date-picker
v-model="formData.accountEndTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期时间"
/>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
v-model="formData.remark"
placeholder="请输入备注"
:autosize="{ minRows: 4, maxRows: 8 }"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item v-if="formData.parentSource" label="上级来源">
<el-input v-model="formData.parentSource" disabled />
</el-form-item>
<el-form-item label="来源名称" prop="sourceName">
<el-input v-model="formData.sourceName" placeholder="请输入来源名称" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="0"> 启用 </el-radio>
<el-radio :label="1"> 禁用 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
v-model="formData.remark"
placeholder="请输入备注"
:autosize="{ minRows: 4, maxRows: 8 }"
/>
</el-form-item>
</el-form>
<el-divider direction="horizontal" content-position="left">线索成本</el-divider>
<el-button class="mb-10px" type="primary" @click="handleAddPrice"> 添加年份 </el-button>
<el-table :data="formData.sourceCostVOS" border>
<el-table-column label="年份" width="120">
<template #default="{ row }">
<el-date-picker
v-model="row.year"
type="year"
placeholder="选择年份"
size="small"
format="YYYY"
value-format="YYYY"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column v-for="col in 12" :key="col" :label="`${col}月`" width="100px">
<el-table-column label="充值">
<template #default="{ row }">
<el-input-number
v-model="row.monthData[col - 1].rechargeFee"
size="small"
:min="0"
:controls="false"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column label="消耗">
<template #default="{ row }">
<el-input-number
v-model="row.monthData[col - 1].consumeFee"
size="small"
:controls="false"
:min="0"
style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column label="线索数">
<template #default="{ row }">
<el-input-number
v-model="row.monthData[col - 1].clueNum"
size="small"
:controls="false"
style="width: 100%"
:min="0"
/>
</template>
</el-table-column>
</el-table-column>
</el-table>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
@ -149,7 +49,6 @@ const formLoading = ref(false) // 表单的加载中:1)修改时的数据加
const formType = ref('') // create - update -
const formData = ref({
sourceName: '',
accountFee: undefined,
sort: 1,
remark: ''
})
@ -212,29 +111,8 @@ const resetForm = () => {
sourceName: '',
status: 0,
sort: 1,
remark: '',
costModel: 0,
sourceCostVOS: []
remark: ''
}
formRef.value?.resetFields()
}
function handleAddPrice() {
const obj = {
year: undefined,
monthData: []
}
for (let i = 1; i <= 12; i++) {
obj.monthData.push({
month: i,
consumeFee: 0,
rechargeFee: 0,
clueNum: 0
})
}
if (!formData.value.sourceCostVOS) {
formData.value.sourceCostVOS = []
}
formData.value.sourceCostVOS.push(obj)
}
</script>

@ -1,35 +0,0 @@
<template>
<div>
<el-tabs v-model="tabName" type="border-card" tab-position="top">
<el-tab-pane label="月度统计" name="monthly">
<ChannelMonthly :sourceOptions="sourceOptions" />
</el-tab-pane>
<el-tab-pane label="周期统计" name="period">
<ChannelPeriod :sourceOptions="sourceOptions" />
</el-tab-pane>
</el-tabs>
</div>
</template>
<script setup name="ChannelReport">
import ChannelMonthly from './Comp/ChannelMonthly.vue'
import ChannelPeriod from './Comp/ChannelPeriod.vue'
import { getSimpleSourceList } from '@/api/clue/source'
import { handleTree } from '@/utils/tree'
const tabName = ref('monthly')
onMounted(() => {
getOptions()
})
const sourceOptions = ref([])
function getOptions() {
getSimpleSourceList().then((data) => {
sourceOptions.value = handleTree(data, 'sourceId')
})
}
</script>
<style lang="scss" scoped></style>

@ -1,112 +1,7 @@
<template>
<div>
<ContentWrap>
<el-form :model="searchForm" label-width="0" inline>
<el-form-item>
<el-date-picker
v-model="searchForm.year"
type="year"
format="YYYY"
value-format="YYYY"
placeholder="选择年"
:clearable="false"
/>
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.nickname" placeholder="销售姓名" clearable />
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="tableList" border stripe>
<el-table-column type="index" width="50" fixed="left" />
<el-table-column prop="nickname" label="姓名" width="80" fixed="left" />
<el-table-column
v-for="(item, index) in new Date().getMonth() + 1"
:key="index"
:label="item + '月'"
sortable
min-width="150"
:sort-method="(pre, cur) => monthSort(pre, cur, index)"
>
<template #default="{ row }">
<span>{{ (row.monthClueSignRateReportList[index].rate * 100).toFixed(2) }}%</span>
<span>({{ row.monthClueSignRateReportList[index].clueSignNum }}/</span>
<span>{{ row.monthClueSignRateReportList[index].followClueNum }})</span>
</template>
</el-table-column>
<el-table-column
label="总成交率"
prop="totalRate"
min-width="150"
fixed="right"
sortable
:sort-method="totalSort"
/>
</el-table>
</ContentWrap>
</div>
<div> 成交率 </div>
</template>
<script setup name="CloseRate">
import * as reportApi from '@/api/home/reportSignRate'
import { removeNullField } from '@/utils'
onMounted(() => {
handleReset()
handleSearch()
})
const searchForm = ref({})
function handleReset() {
searchForm.value = {
nickname: undefined,
year: new Date().getFullYear() + ''
}
}
const loading = ref(false)
const tableList = ref([])
async function handleSearch() {
loading.value = true
try {
const data = await reportApi.getList(removeNullField(searchForm.value))
tableList.value = data.map((item) => {
const count = item.monthClueSignRateReportList.reduce(
(pre, cur) => {
return {
signCount: pre.signCount + cur.clueSignNum,
clueCount: pre.clueCount + cur.followClueNum
}
},
{ signCount: 0, clueCount: 0 }
)
const rate = count.clueCount > 0 ? ((count.signCount * 100) / count.clueCount).toFixed(2) : 0
return {
...item,
totalRate: `${rate}%(${count.signCount}/${count.clueCount})`,
totalRateNum: rate
}
})
} finally {
loading.value = false
}
}
function totalSort(pre, cur) {
return Number(pre.totalRateNum) - Number(cur.totalRateNum)
}
function monthSort(pre, cur, idx) {
return (
Number(pre.monthClueSignRateReportList[idx].rate) -
Number(cur.monthClueSignRateReportList[idx].rate)
)
}
</script>
<script setup name="CloseRate"></script>
<style lang="scss" scoped></style>

@ -1,62 +0,0 @@
<template>
<Echart :options="optionsData" :width="400" :height="200" />
</template>
<script setup name="BarSalerClueReport">
import { set } from 'lodash-es'
onMounted(() => {
nextTick(() => {
getReportData()
})
})
const optionsData = ref({})
const getReportData = async () => {
// const data = await HomeApi.getClueSignSignRate()
set(optionsData, 'radiusAxis', {
type: 'category',
data: ['宝典', '一点通', '抖音', '小红书'],
z: 10
})
set(optionsData, 'series', [
{
type: 'bar',
data: [1, 2, 3, 4],
coordinateSystem: 'polar',
name: '高意向A',
stack: 'a',
emphasis: {
focus: 'series'
}
},
{
type: 'bar',
data: [2, 4, 6, 8],
coordinateSystem: 'polar',
name: '中意向B',
stack: 'a',
emphasis: {
focus: 'series'
}
},
{
type: 'bar',
data: [1, 2, 3, 4],
coordinateSystem: 'polar',
name: '低意向C',
stack: 'a',
emphasis: {
focus: 'series'
}
}
])
}
defineExpose({
getReportData
})
</script>
<style lang="scss" scoped></style>

@ -1,147 +0,0 @@
<template>
<ContentWrap>
<el-form :model="searchForm" label-width="0" inline>
<el-form-item>
<el-date-picker
v-model="searchForm.period"
type="month"
format="YYYY-MM"
value-format="YYYY-MM"
placeholder="选择年月"
:clearable="false"
/>
</el-form-item>
<el-form-item>
<el-tree-select
v-model="searchForm.sourceId"
:data="props.sourceOptions"
:props="defaultProps"
check-strictly
node-key="sourceId"
placeholder="请选择渠道"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="tableList"
border
stripe
:summary-method="getSummaries"
show-summary
>
<el-table-column prop="sourceName" label="渠道名称" />
<el-table-column prop="newClueSignNum" label="新线索当月成交数" sortable>
<template #header>
<Tooltip message="当月咨询且当月成交的线索数" /> <span>新线索当月成交数</span>
</template>
</el-table-column>
<el-table-column prop="newClueNum" label="新线索总数" sortable>
<template #header>
<Tooltip message="当月咨询的线索数" /> <span>新线索总数</span>
</template>
</el-table-column>
<el-table-column prop="rate" label="新线索当月成交率" sortable :formatter="parseRate" />
<el-table-column prop="reallyClueSignNum" sortable>
<template #header>
<Tooltip message="成交日期在本月的线索数" /> <span>当月总成交数</span>
</template>
</el-table-column>
</el-table>
</ContentWrap>
</template>
<script setup name="ChannelMonthly">
import * as reportApi from '@/api/home/reportChannel'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
const props = defineProps({
sourceOptions: {
type: Array,
default: () => []
}
})
const defaultProps = {
children: 'children',
label: 'sourceName',
value: 'sourceId',
isLeaf: 'leaf'
}
onMounted(() => {
getOptions()
handleReset()
handleSearch()
})
const searchForm = ref({})
function handleReset() {
searchForm.value = {
sourceId: undefined,
period: formatDate(new Date(), 'YYYY-MM')
}
}
function getOptions() {}
const loading = ref(false)
const tableList = ref([])
async function handleSearch() {
loading.value = true
try {
const data = await reportApi.getList(removeNullField(searchForm.value))
tableList.value = data
} finally {
loading.value = false
}
}
function parseRate(row) {
return Number(row.rate * 100).toFixed(2) + '%'
}
function getSummaries({ columns, data }) {
let sums = []
columns.forEach((column, index) => {
if (index == 0) {
sums[index] = '合计'
return
}
const values = data.map((item) => Number(item[column.property]))
if (!values.every((value) => Number.isNaN(value))) {
if (column.property == 'rate') {
const sum = data.reduce(
(pre, cur) => ({
clueNum: pre.clueNum + cur.newClueNum,
signNum: pre.signNum + cur.newClueSignNum
}),
{ clueNum: 0, signNum: 0 }
)
sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
} else {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
}
} else {
sums[index] = ''
}
})
return sums
}
</script>
<style lang="scss" scoped></style>

@ -1,169 +0,0 @@
<template>
<ContentWrap>
<el-form ref="searchRef" :model="searchForm" :rules="searchRules" label-width="100px" inline>
<el-form-item label="咨询日期" prop="consultDate">
<el-date-picker
v-model="searchForm.consultDate"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
start-placeholder="选择日期"
end-placeholder="选择日期"
/>
</el-form-item>
<el-form-item label="成交周期" prop="periodNumber">
<el-input-number
v-model="searchForm.periodNumber"
:min="1"
:controls="false"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="渠道来源" prop="sourceId">
<el-tree-select
v-model="searchForm.sourceId"
:data="props.sourceOptions"
:props="defaultProps"
check-strictly
node-key="sourceId"
placeholder="请选择渠道"
style="width: 100%"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="tableList"
border
stripe
:summary-method="getSummaries"
show-summary
>
<el-table-column prop="sourceName" label="渠道名称" />
<el-table-column prop="newClueSignNum" label="新线索成交数" sortable>
<template #header>
<Tooltip message="咨询日期在查询范围内,且在所查成交周期内成交的线索数" />
<span>新线索成交数</span>
</template>
</el-table-column>
<el-table-column prop="newClueNum" label="新线索总数" sortable>
<template #header>
<Tooltip message="咨询日期在查询范围内,咨询的线索数" /> <span>新线索总数</span>
</template>
</el-table-column>
<el-table-column prop="rate" label="新线索成交率" sortable :formatter="parseRate" />
</el-table>
</ContentWrap>
</template>
<script setup name="ChannelPeriod">
import { getPeriodList } from '@/api/home/reportChannel'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
const props = defineProps({
sourceOptions: {
type: Array,
default: () => []
}
})
const defaultProps = {
children: 'children',
label: 'sourceName',
value: 'sourceId',
isLeaf: 'leaf'
}
const searchRef = ref()
const searchRules = {
// consultDate: { required: true, type: 'array', message: '', trigger: 'change,blur' },
periodNumber: { required: true, message: '请输入成交周期', trigger: 'blur' }
}
onMounted(() => {
getOptions()
handleReset()
handleSearch()
})
const searchForm = ref({})
function handleReset() {
const date = new Date()
date.setDate(1)
searchForm.value = {
sourceId: undefined,
periodNumber: 30,
consultDate: [formatDate(date), formatDate(new Date())]
}
}
function getOptions() {}
const loading = ref(false)
const tableList = ref([])
async function handleSearch() {
try {
const valid = await searchRef.value.validate()
if (!valid) return
loading.value = true
const params = { ...searchForm.value }
if (params.consultDate && params.consultDate.length) {
params.startDateTime = params.consultDate[0]
params.endDateTime = params.consultDate[1]
}
const data = await getPeriodList(removeNullField(params))
tableList.value = data
} finally {
loading.value = false
}
}
function parseRate(row) {
return Number(row.rate * 100).toFixed(2) + '%'
}
function getSummaries({ columns, data }) {
let sums = []
columns.forEach((column, index) => {
if (index == 0) {
sums[index] = '合计'
return
}
const values = data.map((item) => Number(item[column.property]))
if (!values.every((value) => Number.isNaN(value))) {
if (column.property == 'rate') {
const sum = data.reduce(
(pre, cur) => ({
clueNum: pre.clueNum + cur.newClueNum,
signNum: pre.signNum + cur.newClueSignNum
}),
{ clueNum: 0, signNum: 0 }
)
sums[index] = sum.clueNum > 0 ? ((sum.signNum * 100) / sum.clueNum).toFixed(2) + '%' : 0
} else {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
}
} else {
sums[index] = ''
}
})
return sums
}
</script>
<style lang="scss" scoped></style>

@ -1,402 +0,0 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
<el-form :model="searchForm" label-width="0" inline>
<el-form-item>
<el-date-picker
v-model="searchForm.consultTime"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
start-placeholder="选择日期"
end-placeholder="选择日期"
:clearable="false"
/>
</el-form-item>
<el-form-item>
<el-tree-select
v-model="searchForm.sourceId"
:data="props.sourceOptions"
:props="defaultProps"
check-strictly
clearable
filterable
node-key="sourceId"
placeholder="请选择渠道"
@change="sourceChange"
/>
</el-form-item>
<el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
<el-select
v-model="searchForm.licenseTypeList"
placeholder="选择驾照类型"
clearable
multiple
>
<el-option
v-for="item in props.licenseTypeOptions"
:key="item.label"
:label="item.label"
:value="item.label"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-tabs v-model="showPane" class="pb-10px">
<el-tab-pane label="详细数据" :name="1">
<el-table v-loading="loading" :data="tableList" border stripe>
<el-table-column prop="sourceName" label="渠道名称" width="100" fixed="left" />
<el-table-column prop="newClueNumber" label="新线索数" sortable min-width="100" />
<el-table-column prop="signNumber" label="成交数" sortable min-width="100" />
<el-table-column
prop="signRate"
label="成交率"
sortable
min-width="100"
:formatter="(row) => row.signRate + '%'"
/>
<el-table-column prop="averageSignPeriod" label="成交周期" sortable min-width="100" />
<el-table-column
prop="grossProfitOfSingleSign"
label="毛利/单"
sortable
min-width="100"
/>
<el-table-column prop="payPriceOfSingleSign" label="支出/单" sortable min-width="100" />
<el-table-column prop="costOfSingleClue" label="线索成本/条" sortable min-width="100" />
<el-table-column
prop="netProfitOfSingleSign"
label="净利润/单"
sortable
min-width="100"
/>
<el-table-column label="总线索成本" prop="clueCostTotal" sortable min-width="100" />
<el-table-column label="总支出" prop="payPriceTotal" sortable min-width="100" />
<el-table-column label="总利润" prop="profitTotal" sortable min-width="100" />
</el-table>
</el-tab-pane>
<el-tab-pane label="图表展示" :name="2" lazy>
<el-row :gutter="20">
<el-col :span="24" :offset="0">
<el-checkbox-group v-model="showChannel" @change="setReportData">
<el-checkbox v-for="(item, index) in channelArr" :key="index" :label="item" />
</el-checkbox-group>
</el-col>
<el-col :span="12" :offset="0">
<el-skeleton :loading="loading" animated>
<Echart :options="echart1Option" width="100%" :height="400" />
</el-skeleton>
</el-col>
<el-col :span="12" :offset="0" v-if="appStore.getAppInfo?.instanceType == 1">
<Echart :options="echart2Option" width="100%" :height="400" />
</el-col>
<el-col :span="24" :offset="0">
<Echart :options="echart3Option" width="100%" :height="400" />
</el-col>
</el-row>
</el-tab-pane>
</el-tabs>
</Dialog>
</template>
<script setup name="DialogSalerReportDetail">
import { set } from 'lodash-es'
import * as reportApi from '@/api/home/reportSaler'
import { getIntDictOptions } from '@/utils/dict'
import { removeNullField } from '@/utils'
import { useAppStore } from '@/store/modules/app'
import { formatDate } from '@/utils/formatTime'
const appStore = useAppStore()
const props = defineProps({
licenseTypeOptions: {
type: Array,
default: () => []
},
sourceOptions: {
type: Array,
default: () => []
}
})
const defaultProps = {
children: 'children',
label: 'sourceName',
value: 'sourceId',
isLeaf: 'leaf'
}
const showChannel = ref([])
const intentionOptions = getIntDictOptions('intention_state')
const channelArr = computed(() => {
if (searchForm.value.sourceId) {
let arr =
props.sourceOptions.find((it) => it.sourceId == searchForm.value.sourceId)?.children || []
return arr.map((it) => it.sourceName)
} else {
return props.sourceOptions.map((it) => it.sourceName)
}
})
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const loading = ref(false)
const searchForm = ref({})
const showPane = ref(1)
function handleReset() {
searchForm.value = {
nickname: undefined,
consultTime: [`${year}-${month}-01`, formatDate(new Date())],
licenseTypeList: [],
sourceId: undefined
}
}
/** 打开弹窗 */
const open = async (info, queryInfo) => {
showPane.value = 1
dialogVisible.value = true
dialogTitle.value = info.nickname
searchForm.value = { ...queryInfo }
searchForm.value.userId = info.userId
sourceChange()
}
defineExpose({ open }) // open
const tableList = ref([])
async function handleSearch() {
loading.value = true
try {
const params = { ...searchForm.value }
const data = await reportApi.getInfo(removeNullField(params))
tableList.value = data.sourceDetailVOList
setReportData(data)
} finally {
loading.value = false
}
}
function sourceChange() {
handleSearch()
showChannel.value = channelArr.value
}
const echart1Option = ref({
title: {
text: '线索分布图'
},
radiusAxis: {},
angleAxis: {},
tooltip: {
show: true,
formatter: '{b0}-{a}: {c}'
},
polar: {},
legend: {
show: true,
type: 'scroll',
left: 100
}
})
const echart2Option = ref({
title: {
text: '成交分布图'
},
radiusAxis: {},
angleAxis: {},
tooltip: {
show: true,
formatter: '{b0}-{a}: {c}'
},
polar: {},
legend: {
show: true,
type: 'scroll',
left: 100
}
})
const echart3Option = ref({
title: {
text: '销售雷达图'
},
radar: {
indicator: [
{ name: '成交周期' },
{ name: '毛利/单' },
{ name: '支出/单' },
{ name: '线索成本/条' },
{ name: '净利润/单' },
{ name: '成交率' }
// { name: '线' },
// { name: '' },
// { name: '' }
]
},
legend: {
show: true,
right: '10px',
orient: 'vertical'
}
})
const setReportData = async (data) => {
// const data = await HomeApi.getClueSignSignRate()
const channelClueArr = showChannel.value.sort((pre, cur) => {
const preArr = tableList.value.find((it) => it.sourceName == pre).clueIntentionNumVOList || []
const curArr = tableList.value.find((it) => it.sourceName == cur).clueIntentionNumVOList || []
const preCount = preArr.reduce((preVal, curVal) => preVal + curVal.intentionNum, 0)
const curCount = curArr.reduce((preVal, curVal) => preVal + curVal.intentionNum, 0)
return preCount - curCount
})
const arr1 = intentionOptions.map((intention) => {
const list = []
channelClueArr.map((item) => {
const row = tableList.value.find((it) => item == it.sourceName)
if (row) {
list.push(
row.clueIntentionNumVOList.find((it) => it.intentionState == intention.value).intentionNum
)
}
})
return {
type: 'bar',
data: list,
coordinateSystem: 'polar',
name: intention.label,
stack: 'a',
emphasis: {
focus: 'series'
},
label: {
show: true,
position: 'middle'
}
}
})
const channelSignArr = showChannel.value.sort((pre, cur) => {
const preArr = tableList.value.find((it) => it.sourceName == pre).signLicenseTypeNumVOList || []
const curArr = tableList.value.find((it) => it.sourceName == cur).signLicenseTypeNumVOList || []
const preCount = preArr.reduce((preVal, curVal) => preVal + curVal.licenseTypeNum, 0)
const curCount = curArr.reduce((preVal, curVal) => preVal + curVal.licenseTypeNum, 0)
return preCount - curCount
})
const arr2 = props.licenseTypeOptions.map((cartype) => {
const list = []
channelClueArr.map((item) => {
const row = tableList.value.find((it) => item == it.sourceName)
if (row) {
list.push(
row.signLicenseTypeNumVOList.find((it) => it.licenseType == cartype.label).licenseTypeNum
)
}
})
return {
type: 'bar',
data: list,
coordinateSystem: 'polar',
name: cartype.label,
stack: 'a',
emphasis: {
focus: 'series'
},
label: {
show: true,
position: 'middle'
}
}
})
set(echart1Option.value, 'radiusAxis', {
type: 'category',
data: channelClueArr,
axisLabel: {
margin: 5,
fontSize: 10,
interval: 0
}
})
set(echart1Option.value, 'series', arr1)
set(echart2Option.value, 'radiusAxis', {
type: 'category',
data: channelSignArr,
axisLabel: {
margin: 5,
fontSize: 10,
interval: 0
}
})
set(echart2Option.value, 'series', arr2)
const { personDetail, averageDetail } = data
set(echart3Option.value, 'series', [
{
type: 'radar',
data: [
{
value: [
averageDetail.averageSignPeriod,
averageDetail.grossProfitOfSingleSign,
averageDetail.payPriceOfSingleSign,
averageDetail.costOfSingleClue,
averageDetail.netProfitOfSingleSign,
averageDetail.signRate
// averageDetail.clueCostTotal,
// averageDetail.payPriceTotal,
// averageDetail.profitTotal
],
name: '平均水平',
lineStyle: {
type: 'dashed'
},
areaStyle: {
color: 'rgba(0, 191, 255, 0.6)'
},
label: {
show: true
}
},
{
value: [
personDetail.averageSignPeriod,
personDetail.grossProfitOfSingleSign,
personDetail.payPriceOfSingleSign,
personDetail.costOfSingleClue,
personDetail.netProfitOfSingleSign,
personDetail.signRate
// personDetail.clueCostTotal,
// personDetail.payPriceTotal,
// personDetail.profitTotal
],
name: dialogTitle.value,
areaStyle: {
color: 'rgba(255, 145, 124, 0.4)'
},
label: {
show: true
}
}
]
}
])
}
</script>
<style lang="scss" scoped></style>

@ -1,162 +0,0 @@
<template>
<ContentWrap>
<el-form :model="searchForm" label-width="0" inline>
<el-form-item>
<el-select v-model="searchForm.detailType" :clearable="false" filterable>
<el-option
v-for="item in detailTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="searchForm.detailType == 1">
<el-date-picker
v-model="searchForm.month"
type="month"
format="YYYY-MM"
value-format="YYYY-MM"
placeholder="选择年月"
:clearable="false"
/>
</el-form-item>
<el-form-item v-if="[2, 3].includes(searchForm.detailType)">
<el-date-picker
v-model="searchForm.year"
type="year"
format="YYYY"
value-format="YYYY"
placeholder="选择年"
:clearable="false"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-table :data="tableList" border stripe show-summary :summary-method="getSummaries">
<el-table-column label="周期" prop="period" width="110px" />
<el-table-column label="成交" align="center">
<el-table-column prop="signNumber" label="成交数" />
<el-table-column prop="signPrice" label="成交额" />
<el-table-column prop="signPriceSequentialGrowth" label="环比" :formatter="parseRate" />
<el-table-column
prop="signPriceSamePeriodCompareGrowth"
label="同比"
:formatter="parseRate"
/>
</el-table-column>
<el-table-column label="利润" align="center">
<el-table-column prop="profit">
<template #header> <Tooltip message="公司利润" /> <span>利润</span> </template>
</el-table-column>
<el-table-column prop="profitSequentialGrowth" label="环比" :formatter="parseRate" />
<el-table-column prop="profitSamePeriodCompareGrowth" label="同比" :formatter="parseRate" />
</el-table-column>
<el-table-column prop="notReceivedMoney">
<template #header>
<Tooltip message="回款列表中未审核的公司利润" /> <span>未到账</span>
</template>
</el-table-column>
<el-table-column prop="receivedMoney">
<template #header>
<Tooltip message="回款列表中已审核的公司利润" /> <span>已到账</span>
</template>
</el-table-column>
<el-table-column prop="waitSettleMoney" label="待结算金额" />
<el-table-column prop="settledMoney" label="已结算金额" />
<el-table-column prop="refundAmount" label="已退款金额" />
<el-table-column prop="remainMoney">
<template #header>
<Tooltip message="已到账金额-已结算金额-已退款金额" /> <span>结余</span>
</template>
</el-table-column>
</el-table>
</ContentWrap>
</template>
<script setup name="SignListCard">
import { getList } from '@/api/home/reportSignDetail'
import { formatDate } from '@/utils/formatTime'
import { removeNullField } from '@/utils'
const detailTypeOptions = [
{ label: '日明细', value: 1 },
{ label: '月明细', value: 2 },
{ label: '季明细', value: 3 },
{ label: '年明细', value: 4 }
]
onMounted(() => {
handleReset()
handleSearch()
})
const searchForm = ref({})
function handleReset() {
searchForm.value = {
detailType: 2,
month: formatDate(new Date(), 'YYYY-MM'),
year: new Date().getFullYear() + ''
}
}
const loading = ref(false)
const tableList = ref([])
async function handleSearch() {
loading.value = true
try {
let params = { detailType: searchForm.value.detailType }
if (params.detailType == 1) {
const d = new Date(searchForm.value.month)
params.month = d.getMonth() + 1
params.year = d.getFullYear()
} else if ([2, 3].includes(params.detailType)) {
params.year = searchForm.value.year
}
const data = await getList(removeNullField(params))
tableList.value = data
} finally {
loading.value = false
}
}
function parseRate(row, column) {
return Number(row[column.property] * 100).toFixed(2) + '%'
}
function getSummaries({ columns, data }) {
let sums = []
columns.forEach((column, index) => {
if (index == 0) {
sums[index] = '合计'
return
}
const values = data.map((item) => Number(item[column.property]))
if (!values.every((value) => Number.isNaN(value))) {
if (column.property.includes('Growth')) {
sums[index] = ''
} else {
sums[index] = values
.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
.toFixed(2)
}
} else {
sums[index] = ''
}
})
return sums
}
</script>
<style lang="scss" scoped></style>

@ -1,195 +0,0 @@
<template>
<ContentWrap>
<div class="flex items-center">
<span class="mr-20px">成交概况</span>
<el-dropdown>
<el-button size="small"
>{{ periodTypeOptions[periodType] }} <Icon icon="ep:arrow-down"
/></el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item
v-for="(item, index) in periodTypeOptions"
:key="index"
@click="handleSearchTotalInfo(index)"
>
{{ item }}
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</div>
<el-row :gutter="20" v-loading="infoLoading">
<el-col :span="8" :offset="0">
<div class="statistic-card">
<el-statistic :value="totalData.signNumber" title="成交数" />
<div
class="statistic-footer"
:class="periodType != 4 ? 'justify-between' : 'justify-center'"
>
<div class="footer-item">
<span>环比</span>
<span :class="getColor(totalData.signNumberSequentialGrowth)">
{{ totalData.signNumberSequentialGrowth }}%
<Icon class="ml-2px" :icon="getIcon(totalData.signNumberSequentialGrowth)" />
</span>
</div>
<div class="footer-item" v-if="periodType != 4">
<span>同比</span>
<span :class="getColor(totalData.signNumberPeriodCompareGrowth)">
{{ totalData.signNumberPeriodCompareGrowth }}%
<Icon class="ml-2px" :icon="getIcon(totalData.signNumberPeriodCompareGrowth)" />
</span>
</div>
</div>
</div>
</el-col>
<el-col :span="8" :offset="0">
<div class="statistic-card">
<el-statistic :value="totalData.signPrice" title="成交额" :precision="2" />
<div
class="statistic-footer"
:class="periodType != 4 ? 'justify-between' : 'justify-center'"
>
<div class="footer-item">
<span>环比</span>
<span :class="getColor(totalData.signPriceSequentialGrowth)">
{{ totalData.signPriceSequentialGrowth }}%
<Icon class="ml-2px" :icon="getIcon(totalData.signPriceSequentialGrowth)" />
</span>
</div>
<div class="footer-item" v-if="periodType != 4">
<span>同比</span>
<span :class="getColor(totalData.signPriceSamePeriodCompareGrowth)">
{{ totalData.signPriceSamePeriodCompareGrowth }}%
<Icon class="ml-2px" :icon="getIcon(totalData.signPriceSamePeriodCompareGrowth)" />
</span>
</div>
</div>
</div>
</el-col>
<el-col :span="8" :offset="0">
<div class="statistic-card">
<el-statistic :value="totalData.profit" title="利润" :precision="2" />
<div
class="statistic-footer"
:class="periodType != 4 ? 'justify-between' : 'justify-center'"
>
<div class="footer-item">
<span>环比</span>
<span :class="getColor(totalData.profitSequentialGrowth)">
{{ totalData.profitSequentialGrowth }}%
<Icon class="ml-2px" :icon="getIcon(totalData.profitSequentialGrowth)" />
</span>
</div>
<div class="footer-item" v-if="periodType != 4">
<span>同比</span>
<span :class="getColor(totalData.profitSamePeriodCompareGrowth)">
{{ totalData.profitSamePeriodCompareGrowth }}%
<Icon class="ml-2px" :icon="getIcon(totalData.profitSamePeriodCompareGrowth)" />
</span>
</div>
</div>
</div>
</el-col>
</el-row>
</ContentWrap>
</template>
<script setup name="SignTotalCard">
import { getInfo } from '@/api/home/reportSignDetail'
const periodTypeOptions = ['本日', '本周', '本月', '本季', '本年']
const periodType = ref(2)
const totalData = ref({})
onMounted(() => {
handleSearchTotalInfo(2)
})
const infoLoading = ref(false)
async function handleSearchTotalInfo(index) {
periodType.value = index
infoLoading.value = true
try {
const data = await getInfo({ periodType: periodType.value + 1 })
totalData.value = data
} finally {
infoLoading.value = false
}
}
function getIcon(val) {
if (val > 0) {
return 'ep:caret-top'
} else if (val < 0) {
return 'ep:caret-bottom'
} else {
return 'ep:minus'
}
}
function getColor(val) {
if (val > 0) {
return 'green'
} else if (val < 0) {
return 'red'
} else {
return 'gley'
}
}
</script>
<style lang="scss" scoped>
.el-col {
text-align: center;
}
:global(h2#card-usage ~ .example .example-showcase) {
background-color: var(--el-fill-color) !important;
}
.el-statistic {
--el-statistic-content-font-size: 28px;
}
.statistic-card {
height: 100%;
// padding: 20px;
border-radius: 4px;
background-color: var(--el-bg-color-overlay);
}
.statistic-footer {
margin: 16px auto 0;
display: flex;
// justify-content: space-between;
align-items: center;
flex-wrap: wrap;
font-size: 12px;
color: var(--el-text-color-regular);
width: 300px;
}
.statistic-footer .footer-item {
display: flex;
justify-content: space-between;
align-items: center;
}
.statistic-footer .footer-item span:last-child {
display: inline-flex;
align-items: center;
margin-left: 4px;
}
.green {
color: var(--el-color-success);
}
.gley {
color: var(--el-color-info);
}
.red {
color: var(--el-color-error);
}
</style>

@ -67,8 +67,8 @@
</el-row>
</el-skeleton>
</el-card>
<div class="mt-10px flex" style="flex-wrap: wrap">
<el-card shadow="never" :class="mobile ? 'w-full mb-10px' : 'flex-1'">
<div class="mt-10px flex">
<el-card shadow="never" class="flex-1">
<template #header>
<div class="flex justify-between">
<span>成交率</span>
@ -80,7 +80,7 @@
</el-skeleton>
</el-skeleton>
</el-card>
<el-card shadow="never" :class="mobile ? 'flex-1' : 'ml-10px'">
<el-card shadow="never" class="ml-10px">
<template #header>
<div class="flex justify-between items-center">
<span>跟进榜Top10</span>
@ -107,17 +107,16 @@
</ul>
</el-skeleton>
</el-card>
<el-card shadow="never" :class="mobile ? 'flex-1 ml-10px' : 'ml-10px'">
<el-card shadow="never" class="ml-10px">
<template #header>
<div class="flex justify-between"> 本月成交榜Top10 </div>
</template>
<el-skeleton :loading="loading" animated>
<el-table :data="signList" size="small">
<el-table-column type="index" width="40" />
<el-table-column prop="username" label="姓名" width="80" />
<el-table-column prop="followNum" label="成交数量" width="90" sortable />
<el-table-column prop="signPrice" label="成交额" min-width="90" sortable />
<el-table-column prop="deptName" label="所属组织" width="150" />
<el-table-column type="index" />
<el-table-column prop="username" label="姓名" width="100" />
<el-table-column prop="followNum" label="成交数量" width="70" />
<el-table-column prop="deptName" label="所属组织" />
</el-table>
</el-skeleton>
</el-card>
@ -143,15 +142,12 @@ import { useUserStore } from '@/store/modules/user'
import avatarImg from '@/assets/imgs/avatar.gif'
import { lineOptions } from './echarts-data'
import * as HomeApi from '@/api/home/index'
import { useAppStore } from '@/store/modules/app'
const { t } = useI18n()
const userStore = useUserStore()
const appStore = useAppStore()
const loading = ref(false)
const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg
const username = userStore.getUser.nickname
const mobile = appStore.getMobile
const followDate = ref(1)

@ -1,248 +0,0 @@
<template>
<ContentWrap>
<el-form :model="searchForm" label-width="0" inline>
<el-form-item>
<el-date-picker
v-model="searchForm.consultTime"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
start-placeholder="选择日期"
end-placeholder="选择日期"
:clearable="false"
/>
</el-form-item>
<el-form-item>
<el-input v-model="searchForm.nickname" placeholder="销售姓名" clearable />
</el-form-item>
<el-form-item>
<el-tree-select
v-model="searchForm.sourceId"
:data="sourceOptions"
:props="defaultProps"
check-strictly
clearable
filterable
node-key="sourceId"
placeholder="请选择渠道"
/>
</el-form-item>
<el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
<el-select
v-model="searchForm.licenseTypeList"
placeholder="选择驾照类型"
clearable
multiple
>
<el-option
v-for="item in licenseTypeOptions"
:key="item.label"
:label="item.label"
:value="item.label"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="tableList"
border
stripe
show-summary
:summary-method="getSummaries"
>
<el-table-column type="index" width="60" fixed="left" align="center" />
<el-table-column prop="nickname" label="姓名" width="80" fixed="left">
<template #default="{ row }">
<el-button type="primary" style="padding: 0" text @click="handleDetail(row)">{{
row.nickname
}}</el-button>
</template>
</el-table-column>
<el-table-column prop="newClueNumber" sortable min-width="100">
<template #header>
<Tooltip message="咨询日期在所选周期内的线索总数" />
<span>新线索数</span>
</template>
</el-table-column>
<el-table-column label="成交数" prop="signNumber" sortable min-width="100">
<template #header>
<Tooltip message="成交日期在所选周期内的成交数" />
<span>成交数</span>
</template>
</el-table-column>
<el-table-column
label="成交率"
prop="signRate"
sortable
min-width="100"
:formatter="(row) => row.signRate + '%'"
/>
<el-table-column label="跟进数/日" prop="dayFollowNumber" sortable min-width="100" />
<el-table-column label="成交数/日" prop="daySignNumber" sortable min-width="100" />
<el-table-column label="平均成交周期" prop="averageSignPeriod" sortable min-width="100">
<template #header>
<Tooltip message="平均每条成交的线索,从咨询开始到成交所需要的天数" />
<span>平均成交周期</span>
</template>
</el-table-column>
<el-table-column prop="grossProfitOfSingleSign" sortable min-width="100">
<template #header>
<Tooltip
message="平均每笔成交订单的公司利润【按照登记,不按审核到账】=总公司利润/总成交数"
/>
<span>毛利/</span>
</template>
</el-table-column>
<el-table-column prop="payPriceOfSingleSign" sortable min-width="100">
<template #header>
<Tooltip
message="平均每笔成交订单的额外支出(返费等)【按照登记,不按审核到账】=总支出/总成交数"
/>
<span>支出/</span>
</template>
</el-table-column>
<el-table-column prop="costOfSingleClue" sortable min-width="100">
<template #header>
<Tooltip message="平均每条线索的成本=总线索成本/新线索条数" />
<span>线索成本/</span>
</template>
</el-table-column>
<el-table-column prop="netProfitOfSingleSign" sortable min-width="100">
<template #header>
<Tooltip message="=(总公司利润-总支出-总线索成本)/总成交数" />
<span>净利润/</span>
</template>
</el-table-column>
<el-table-column label="总线索成本" prop="clueCostTotal" sortable min-width="100" />
<el-table-column label="总支出" prop="payPriceTotal" sortable min-width="100" />
<el-table-column label="总利润" prop="profitTotal" sortable min-width="100" />
<el-table-column prop="efficiency" sortable min-width="100">
<template #header>
<Tooltip message="=总利润/(总成本+总支出)" />
<span>能效</span>
</template>
</el-table-column>
<el-table-column label="撞单数" prop="repeatClueNum" sortable min-width="100" />
<el-table-column label="撞单成交数" prop="repeatClueSignNum" sortable min-width="100" />
</el-table>
<DialogSalerReportDetail
:licenseTypeOptions="licenseTypeOptions"
:source-options="sourceOptions"
ref="SalerDetailDialog"
/>
</ContentWrap>
</template>
<script setup name="SalesReport">
import DialogSalerReportDetail from './Comp/DialogSalerReportDetail.vue'
import * as reportApi from '@/api/home/reportSaler'
import { getSimpleSourceList as getResourceOptions } from '@/api/clue/source'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
import { handleTree } from '@/utils/tree'
import { getIntDictOptions } from '@/utils/dict'
import { useAppStore } from '@/store/modules/app'
const appStore = useAppStore()
onMounted(() => {
getOptions()
handleReset()
handleSearch()
})
const defaultProps = {
children: 'children',
label: 'sourceName',
value: 'sourceId',
isLeaf: 'leaf'
}
const sourceOptions = ref([])
const licenseTypeOptions = ref([])
const searchForm = ref({})
function handleReset() {
const year = new Date().getFullYear()
const month = new Date().getMonth() + 1
searchForm.value = {
nickname: undefined,
consultTime: [`${year}-${month}-01`, formatDate(new Date())],
licenseTypeList: [],
sourceId: undefined
}
}
const loading = ref(false)
const tableList = ref([])
const avgData = ref({})
async function handleSearch() {
loading.value = true
try {
const data = await reportApi.getList(removeNullField(searchForm.value))
tableList.value = data.personDataVOList
avgData.value = data.averageDataVO
} finally {
loading.value = false
}
}
function getSummaries({ columns, data }) {
const sums = []
columns.forEach((column, index) => {
if (index == 0) {
sums[index] = '统计'
return
}
const doubleSumsColumns = [
'newClueNumber',
'signNumber',
'clueCostTotal',
'payPriceTotal',
'profitTotal'
]
if (column.property in avgData.value) {
sums[index] = `均值: ${avgData.value[column.property]}`
} else if (doubleSumsColumns.includes(column.property)) {
const values = data.map((item) => Number(item[column.property]))
let sum = values.reduce((prev, curr) => prev + curr, 0)
let avg = sum / values.length
if (['newClueNumber', 'signNumber'].includes(column.property)) {
avg = Math.floor(avg)
} else {
sum = sum.toFixed(2)
avg = avg.toFixed(2)
}
sums[index] = h('div', {}, [h('div', {}, `合计:${sum}`), h('div', {}, `均值:${avg}`)])
} else {
sums[index] = ''
}
})
return sums
}
const SalerDetailDialog = ref()
function handleDetail(info) {
SalerDetailDialog.value.open(info, searchForm.value)
}
function getOptions() {
getResourceOptions().then((data) => {
sourceOptions.value = handleTree(data, 'sourceId')
})
licenseTypeOptions.value = getIntDictOptions('license_type')
}
</script>
<style lang="scss" scoped></style>

@ -1,13 +0,0 @@
<template>
<div>
<SignTotalCard />
<SignListCard />
</div>
</template>
<script setup name="SignReport">
import SignTotalCard from './Comp/SignTotalCard.vue'
import SignListCard from './Comp/SignListCard.vue'
</script>
<style lang="scss" scoped></style>

@ -0,0 +1,7 @@
<template>
<div> </div>
</template>
<script setup></script>
<style lang="scss" scoped></style>

@ -1,5 +1,5 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="500px">
<Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<el-form
ref="formRef"
v-loading="formLoading"
@ -7,17 +7,11 @@
:rules="formRules"
label-width="80px"
>
<el-form-item label="名称" prop="supplierName">
<el-input v-model="formData.supplierName" placeholder="请输入供应商名称" />
<el-form-item label="名称" prop="label">
<el-input v-model="formData.label" placeholder="请输入供应商名称" />
</el-form-item>
<el-form-item label="微信群" prop="wechatGroup">
<el-input v-model="formData.wechatGroup" placeholder="请输入微信群" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="0"> 启用 </el-radio>
<el-radio :label="1"> 禁用 </el-radio>
</el-radio-group>
<el-form-item label="排序" prop="sort">
<el-input v-model="formData.sort" placeholder="请输入排序" type="number" :min="0" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
@ -35,7 +29,7 @@
</Dialog>
</template>
<script name="DialogSupplier" setup>
import * as SupplierApi from '@/api/school/setting/supplier'
import * as dictApi from '@/api/system/dict/dict.data'
const { t } = useI18n() //
const message = useMessage() //
@ -44,12 +38,12 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
supplierName: '',
wechatGroup: 1,
label: '',
sort: 1,
remark: ''
})
const formRules = reactive({
supplierName: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
label: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
@ -63,7 +57,7 @@ const open = async (type, id) => {
if (id) {
formLoading.value = true
try {
formData.value = await SupplierApi.getSupplier(id)
formData.value = await dictApi.getDictData(id)
} finally {
formLoading.value = false
}
@ -81,11 +75,14 @@ const submitForm = async () => {
//
formLoading.value = true
try {
if (!formData.value.value) {
formData.value.value = formData.value.label
}
if (formType.value === 'create') {
await SupplierApi.createSupplier(formData.value)
await dictApi.createDictData(formData.value)
message.success(t('common.createSuccess'))
} else {
await SupplierApi.updateSupplier(formData.value)
await dictApi.updateDictData(formData.value)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
@ -99,9 +96,10 @@ const submitForm = async () => {
/** 重置表单 */
const resetForm = () => {
formData.value = {
supplierName: '',
wechatGroup: '',
label: '',
sort: 1,
status: 0,
dictType: 'erp_supplier',
remark: ''
}
formRef.value?.resetFields()

@ -3,7 +3,7 @@
<el-form ref="queryForm" :model="searchForm" label-width="0" inline>
<el-form-item>
<el-input
v-model="searchForm.supplierName"
v-model="searchForm.name"
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
@ -16,13 +16,8 @@
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="tableList">
<el-table-column prop="supplierName" label="供应商名称" />
<el-table-column prop="wechatGroup" label="微信群名称" />
<el-table-column label="状态" min-width="150" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column prop="label" label="供应商名称" />
<el-table-column prop="sort" label="排序" width="100px" />
<el-table-column prop="remark" label="备注" />
<el-table-column
label="创建时间"
@ -51,16 +46,16 @@
<script setup name="SupplierSet">
import { dateFormatter } from '@/utils/formatTime'
import DialogSupplier from './DialogSupplier.vue'
import * as SupplierApi from '@/api/school/setting/supplier'
import { DICT_TYPE } from '@/utils/dict'
import * as dictApi from '@/api/system/dict/dict.data'
const { t } = useI18n() //
const message = useMessage() //
const searchForm = ref({
supplierName: '',
label: '',
pageSize: 20,
pageNo: 1
pageNo: 1,
dictType: 'erp_supplier'
})
const total = ref(0)
@ -74,9 +69,10 @@ function handleQuery() {
}
function resetQuery() {
searchForm.value = {
supplierName: '',
label: '',
pageSize: 20,
pageNo: 1
pageNo: 1,
dictType: 'erp_supplier'
}
getList()
}
@ -84,7 +80,7 @@ function resetQuery() {
async function getList() {
loading.value = true
try {
const data = await SupplierApi.getSupplierPage(searchForm.value)
const data = await dictApi.getDictDataPage(searchForm.value)
tableList.value = data.list
total.value = data.total
} finally {
@ -101,7 +97,7 @@ async function handleDelete(id) {
//
await message.delConfirm()
//
await SupplierApi.deleteSupplier(id)
await dictApi.deleteDictData(id)
message.success(t('common.delSuccess'))
//
await getList()

@ -49,7 +49,7 @@
<!-- 列表 -->
<el-table v-loading="loading" class="mt-20px" :data="tableList" border>
<el-table-column type="expand" width="30" fixed="left">
<el-table-column type="expand" width="30">
<template #default="{ row }">
<div class="pl-100px pr-100px">
<el-table :data="row.productSpecList">
@ -71,16 +71,16 @@
</template>
</el-table-column>
<el-table-column key="productId" label="产品编码" prop="productId" />
<el-table-column show-overflow-tooltip label="产品名称" min-width="100" prop="productName" />
<el-table-column label="分类" width="90" prop="productCategoryName" />
<el-table-column label="品牌" width="90" prop="productBrandName" />
<el-table-column show-overflow-tooltip label="产品名称" min-width="200" prop="productName" />
<el-table-column label="分类" min-width="90" prop="productCategoryName" />
<el-table-column label="品牌" min-width="90" prop="productBrandName" />
<el-table-column label="商品图" min-width="80">
<template #default="{ row }">
<el-image :src="row.mainImage" @click="imagePreview(row.mainImage)" class="w-30px h-30px" />
</template>
</el-table-column>
<el-table-column label="简介" min-width="200" prop="productIntro" />
<el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="120" />
<el-table-column label="简介" min-width="70" prop="productIntro" />
<el-table-column :formatter="dateFormatter" label="创建时间" prop="createTime" width="180" />
<el-table-column v-for="item in diyFieldList" :key="item.clueParamId" :label="item.label">
<template #default="{ row }">
<div v-if="item.component == 'DatePicker'">

@ -37,9 +37,9 @@
<el-select v-model="queryParams.supplier" placeholder="供应商" clearable filterable>
<el-option
v-for="item in opts.supplier"
:key="item.id"
:label="item.supplierName"
:value="item.id"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@ -135,7 +135,7 @@ import { allSchemas } from './index.data.js'
import DialogAdd from './Comp/DialogAdd.vue'
import DialogAudit from './Comp/DialogAudit.vue'
import * as PurchaseApi from '@/api/mall/purchase'
import { getSupplierSimpleList } from '@/api/school/setting/supplier'
import { getDictOptions } from '@/utils/dict'
const creatPurchase = ref()
const auditPurchase = ref()
@ -164,9 +164,7 @@ function getOptions() {
ProductApi.getSimpleProductList().then((data) => {
opts.value.product = data
})
getSupplierSimpleList().then((data) => {
opts.value.supplier = data
})
opts.value.supplier = getDictOptions('erp_supplier')
}
function changeProd(val) {

@ -7,7 +7,7 @@
-->
<template>
<div class="container">
<ContentWrap style="max-width: 1000px; margin: 0 auto; overflow-x: auto">
<ContentWrap style="max-width: 1000px; margin: 0 auto">
<div class="text-center">
<div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
{{ info.title }}
@ -82,8 +82,6 @@ onMounted(() => {
text-align: left;
border-width: 1px;
box-sizing: border-box;
min-width: 44px;
word-break: break-all;
}
:deep(.el-card__body) {
padding: 20px 10px;

@ -59,11 +59,6 @@ const schema = reactive<FormSchema[]>([
label: t('profile.user.email'),
component: 'Input'
},
{
field: 'wxAlias',
label: '微信号',
component: 'Input'
},
{
field: 'sex',
label: t('profile.user.sex'),

@ -61,8 +61,8 @@ const bindSocial = () => {
})
}
const bind = (row) => {
// message.info('')
// return
message.info('暂未开放,敬请期待')
return
const redirectUri = location.origin + '/user/profile?type=' + row.type
//
socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => {

Loading…
Cancel
Save