Compare commits

..

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

  1. 4
      src/api/clue/index.js
  2. 4
      src/api/clue/sign.js
  3. 4
      src/components/ConfigGlobal/src/ConfigGlobal.vue
  4. 2
      src/permission.js
  5. 40
      src/views/Basic/User/index.vue
  6. 12
      src/views/Clue/Order/Comp/AfterSales.vue
  7. 4
      src/views/Clue/Order/Comp/DialogAfterSale.vue
  8. 20
      src/views/Clue/Order/Comp/OrderList.vue
  9. 18
      src/views/Clue/Order/Comp/Reback.vue
  10. 12
      src/views/Clue/Pool/index.vue
  11. 13
      src/views/Home/Index.vue
  12. 4
      src/views/Profile/NotifyMessageDetail.vue

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

@ -1,8 +1,8 @@
import request from '@/config/axios' import request from '@/config/axios'
// 查询列表 // 查询列表
export const getSignPage = async (data) => { export const getSignPage = async (params) => {
return await request.post({ url: '/admin-api/crm/sign/page', data }) return await request.get({ url: '/admin-api/crm/sign/page', params })
} }
// 查询详情 // 查询详情

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

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

@ -6,8 +6,8 @@
</el-col> </el-col>
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<!-- 搜索 --> <!-- 搜索 -->
<el-form :model="queryParams" ref="queryFormRef" inline label-width="0"> <el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
<el-form-item> <el-form-item label="姓名" prop="nickname">
<el-input <el-input
v-model="queryParams.nickname" v-model="queryParams.nickname"
placeholder="请输入姓名" placeholder="请输入姓名"
@ -16,7 +16,7 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item label="手机号码" prop="mobile">
<el-input <el-input
v-model="queryParams.mobile" v-model="queryParams.mobile"
placeholder="请输入手机号码" placeholder="请输入手机号码"
@ -25,12 +25,6 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </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-form-item>
<el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button> <el-button @click="handleQuery" v-hasPermi="['basic:employee:search']">搜索</el-button>
<el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button> <el-button @click="resetQuery" v-hasPermi="['basic:employee:reset']">重置</el-button>
@ -50,14 +44,12 @@
<el-table-column label="用户姓名" prop="nickname" /> <el-table-column label="用户姓名" prop="nickname" />
<el-table-column label="部门" key="deptName" prop="deptName" /> <el-table-column label="部门" key="deptName" prop="deptName" />
<el-table-column label="手机号码" prop="mobile" width="120" /> <el-table-column label="手机号码" prop="mobile" width="120" />
<el-table-column label="状态" key="status" width="180"> <el-table-column label="状态" key="status">
<template #default="scope"> <template #default="scope">
<el-switch <el-switch
v-model="scope.row.status" v-model="scope.row.status"
:active-value="0" :active-value="0"
:inactive-value="1" :inactive-value="1"
active-text="在职"
inactive-text="离职"
v-hasPermi="['basic:employee:update']" v-hasPermi="['basic:employee:update']"
@change="handleStatusChange(scope.row)" @change="handleStatusChange(scope.row)"
/> />
@ -69,7 +61,7 @@
width="180" width="180"
:formatter="dateFormatter" :formatter="dateFormatter"
/> />
<el-table-column label="操作" width="200"> <el-table-column label="操作" width="260">
<template #default="scope"> <template #default="scope">
<el-button <el-button
type="primary" type="primary"
@ -122,14 +114,13 @@ const { t } = useI18n() // 国际化
const loading = ref(true) // const loading = ref(true) //
const total = ref(0) // const total = ref(0) //
const list = ref([]) // const list = ref([]) //
const queryParams = ref({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 10,
username: undefined, username: undefined,
nickname: undefined, nickname: undefined,
mobile: undefined, mobile: undefined,
deptId: undefined, deptId: undefined
status: undefined
}) })
const queryFormRef = ref() // const queryFormRef = ref() //
@ -137,7 +128,7 @@ const queryFormRef = ref() // 搜索的表单
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true
try { try {
const data = await UserApi.getUserPage(queryParams.value) const data = await UserApi.getUserPage(queryParams)
list.value = data.list list.value = data.list
total.value = data.total total.value = data.total
} finally { } finally {
@ -147,28 +138,19 @@ const getList = async () => {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.value.pageNo = 1 queryParams.pageNo = 1
getList() getList()
} }
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value?.resetFields() queryFormRef.value?.resetFields()
queryParams.value = {
pageNo: 1,
pageSize: 20,
username: undefined,
nickname: undefined,
mobile: undefined,
deptId: undefined,
status: undefined
}
handleQuery() handleQuery()
} }
/** 处理部门被点击 */ /** 处理部门被点击 */
const handleDeptNodeClick = async (row) => { const handleDeptNodeClick = async (row) => {
queryParams.value.deptId = row.id queryParams.deptId = row.id
await getList() await getList()
} }

@ -104,14 +104,8 @@
> >
<el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" /> <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="signId" label="成交单号" min-width="150px" />
<el-table-column prop="name" label="线索名称" min-width="150px" /> <el-table-column prop="name" label="线索名称" min-width="200px" />
<el-table-column prop="phone" label="联系方式" min-width="120px" /> <el-table-column prop="phone" label="联系方式" min-width="150px" />
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="area"
label="区域"
min-width="90"
/>
<el-table-column prop="reason" 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="refundAmount" label="退款金额" min-width="90px" />
<el-table-column prop="percentageDeductAmount" label="提成扣款" min-width="90px" /> <el-table-column prop="percentageDeductAmount" label="提成扣款" min-width="90px" />
@ -197,12 +191,10 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
import { removeNullField } from '@/utils' import { removeNullField } from '@/utils'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import { useAppStore } from '@/store/modules/app'
const afterSaleAuditDialog = ref() const afterSaleAuditDialog = ref()
const userStore = useUserStore() const userStore = useUserStore()
const appStore = useAppStore()
const message = useMessage() // const message = useMessage() //
const currentUserId = userStore.getUser.id const currentUserId = userStore.getUser.id

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

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

@ -136,7 +136,7 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" /> <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="name" label="线索名称" width="120px" />
<el-table-column prop="phone" label="联系方式" width="120px" />companyProfit <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
<el-table-column prop="money" label="回款金额" min-width="120px"> <el-table-column prop="money" label="回款金额" min-width="120px">
@ -188,7 +188,7 @@
<div v-else>{{ row.personProfit }}</div> <div v-else>{{ row.personProfit }}</div>
</template> </template>
</el-table-column> </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"> <el-table-column prop="isPayoff" label="是否结清" min-width="90">
<template #default="{ row }"> <template #default="{ row }">
<el-select v-if="row.edit" size="small" v-model="row.isPayoffValue"> <el-select v-if="row.edit" size="small" v-model="row.isPayoffValue">
@ -253,12 +253,11 @@
:formatter="dateFormatter" :formatter="dateFormatter"
/> />
<el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" /> <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 }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"
class="mr-10px" style="padding: 0"
style="padding: 0; margin-left: 0"
text text
v-hasPermi="['clue:order:return-detail']" v-hasPermi="['clue:order:return-detail']"
@click="handleDetail(row)" @click="handleDetail(row)"
@ -267,8 +266,7 @@
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
class="mr-10px" style="padding: 0"
style="padding: 0; margin-left: 0"
text text
v-if="row.state == 1 && currentUserId == row.applyUser" v-if="row.state == 1 && currentUserId == row.applyUser"
v-hasPermi="['clue:order:return']" v-hasPermi="['clue:order:return']"
@ -278,8 +276,7 @@
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
class="mr-10px" style="padding: 0"
style="padding: 0; margin-left: 0"
text text
v-if="row.state == 1" v-if="row.state == 1"
v-hasPermi="['clue:order:update-return-money']" v-hasPermi="['clue:order:update-return-money']"
@ -289,8 +286,7 @@
</el-button> </el-button>
<el-button <el-button
type="primary" type="primary"
class="mr-10px" style="padding: 0"
style="padding: 0; margin-left: 0"
text text
v-if="row.state == 1" v-if="row.state == 1"
v-hasPermi="['clue:order:return-audit']" v-hasPermi="['clue:order:return-audit']"

@ -228,13 +228,11 @@ const followRef = ref()
const loading = ref(true) const loading = ref(true)
const allSchemas = ref({}) const allSchemas = ref({})
const searchFieldList = ref([])
async function getCurdSchemas() { async function getCurdSchemas() {
loading.value = true loading.value = true
try { try {
const data = await getSimpleFieldList() const data = await getSimpleFieldList()
searchFieldList.value = data.filter((it) => it.isCustom)
data.forEach((elem) => { data.forEach((elem) => {
if (['followUser', 'convertPeople'].includes(elem.field)) { if (['followUser', 'convertPeople'].includes(elem.field)) {
elem.search.options = userOptions.value elem.search.options = userOptions.value
@ -292,18 +290,12 @@ async function getTableList() {
getSearchCount() getSearchCount()
try { try {
const queryParams = await searchRef.value.getFormModel() const queryParams = await searchRef.value.getFormModel()
let params = { const params = {
...queryParams, ...queryParams,
pageNo: tableObject.value.pageNo, pageNo: tableObject.value.pageNo,
pageSize: tableObject.value.pageSize, pageSize: tableObject.value.pageSize,
queryType: queryType.value, queryType: queryType.value
diyParams: {}
} }
searchFieldList.value.map((it) => {
if (params[it.field]) {
params.diyParams[it.field] = params[it.field]
}
})
const data = await ClueApi.getCluePage(removeNullField(params)) const data = await ClueApi.getCluePage(removeNullField(params))
tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams })) tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
tableObject.value.total = data.total tableObject.value.total = data.total

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

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

Loading…
Cancel
Save