Skip to content

phsl / admin

Go to a project
Commit 2f37232f by YunaiV
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 6e9e9e88 a0497a64
Showing with 657 additions and 33 deletions
src/api/crm/backlog/index.ts
...@@ -3,7 +3,6 @@ import request from '@/config/axios' ...@@ -3,7 +3,6 @@ import request from '@/config/axios'
import { type CustomerVO } from '../customer' import { type CustomerVO } from '../customer'
import { type ClueVO } from '../clue' import { type ClueVO } from '../clue'
// 查询客户列表 // 查询客户列表
// TODO @芋艿：看看是不是后续融合到 getCustomerPage 里； // TODO @芋艿：看看是不是后续融合到 getCustomerPage 里；
export const getTodayCustomerPage = async (params) => { export const getTodayCustomerPage = async (params) => {
......
src/views/crm/backlog/tables/CheckContract.vue
<!-- 待审核合同 --> <!-- 待审核合同 -->
<!-- TODO: 后续再统一改名字 -->
<template> <template>
<div> <ContentWrap>
TODO: 待审核合同 <div class="pb-5 text-xl">待审核合同</div>
</div> <!-- 搜索工作栏 -->
<el-form
ref="queryFormRef"
:inline="true"
:model="queryParams"
class="-mb-15px"
label-width="68px"
>
<el-form-item label="合同状态" prop="auditStatus">
<el-select
v-model="queryParams.auditStatus"
class="!w-240px"
placeholder="状态"
@change="handleQuery"
>
<el-option
v-for="(option, index) in AUDIT_STATUS"
:label="option.label"
:value="option.value"
:key="index"
/>
</el-select>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
<el-table-column align="center" fixed="left" label="合同编号" prop="no" width="130" />
<el-table-column align="center" label="合同名称" prop="name" width="130" />
<el-table-column align="center" label="客户名称" prop="customerName" width="120">
<template #default="scope">
<el-link
:underline="false"
type="primary"
@click="openCustomerDetail(scope.row.customerId)"
>
{{ scope.row.customerName }}
</el-link>
</template>
</el-table-column>
<!-- TODO @puhui999：做了商机详情后，可以把这个超链接加上 -->
<el-table-column align="center" label="商机名称" prop="businessName" width="130" />
<el-table-column
align="center"
label="下单时间"
prop="orderDate"
width="120"
:formatter="dateFormatter2"
/>
<el-table-column
align="center"
label="合同金额"
prop="price"
width="130"
:formatter="fenToYuanFormat"
/>
<el-table-column
align="center"
label="合同开始时间"
prop="startTime"
width="120"
:formatter="dateFormatter2"
/>
<el-table-column
align="center"
label="合同结束时间"
prop="endTime"
width="120"
:formatter="dateFormatter2"
/>
<el-table-column align="center" label="客户签约人" prop="contactName" width="130">
<template #default="scope">
<el-link
:underline="false"
type="primary"
@click="openContactDetail(scope.row.contactId)"
>
{{ scope.row.contactName }}
</el-link>
</template>
</el-table-column>
<el-table-column align="center" label="公司签约人" prop="signUserName" width="130" />
<el-table-column align="center" label="备注" prop="remark" width="130" />
<!-- TODO @puhui999：后续可加 【已收款金额】、【未收款金额】 -->
<el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
<el-table-column align="center" label="创建人" prop="creatorName" width="120" />
<el-table-column
:formatter="dateFormatter"
align="center"
label="更新时间"
prop="updateTime"
width="180px"
/>
<el-table-column
:formatter="dateFormatter"
align="center"
label="创建时间"
prop="createTime"
width="180px"
/>
<el-table-column align="center" fixed="right" label="合同状态" prop="auditStatus" width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNo"
:total="total"
@pagination="getList"
/>
</ContentWrap>
</template> </template>
<script setup lang="ts" name="CheckContract"> <script setup lang="ts" name="CheckContract">
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import * as ContractApi from '@/api/crm/contract'
import { fenToYuanFormat } from '@/utils/formatter'
import { DICT_TYPE } from '@/utils/dict'
import { AUDIT_STATUS } from './common'
</script> const { push } = useRouter() // 路由
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
auditStatus: 20
})
const queryFormRef = ref() // 搜索的表单
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ContractApi.getContractPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
<style scoped> /** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 打开客户详情 */
const openCustomerDetail = (id: number) => {
push({ name: 'CrmCustomerDetail', params: { id } })
}
/** 打开联系人详情 */
const openContactDetail = (id: number) => {
push({ name: 'CrmContactDetail', params: { id } })
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
</style> <style scoped></style>
src/views/crm/backlog/tables/CheckReceivables.vue
<!-- 待审核回款 --> <!-- 待审核回款 -->
<!-- TODO: 后续再统一改名字 -->
<template> <template>
<div> <ContentWrap>
TODO: 待审核回款 <div class="pb-5 text-xl"> 待审核回款 </div>
</div> <!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="合同状态" prop="auditStatus">
<el-select
v-model="queryParams.auditStatus"
class="!w-240px"
placeholder="状态"
@change="handleQuery"
>
<el-option
v-for="(option, index) in AUDIT_STATUS"
:label="option.label"
:value="option.value"
:key="index"
/>
</el-select>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="回款编号" align="center" prop="no" />
<!-- <el-table-column label="回款计划ID" align="center" prop="planId" />-->
<el-table-column label="客户" align="center" prop="customerId" />
<el-table-column label="合同" align="center" prop="contractId" />
<el-table-column label="审批状态" align="center" prop="checkStatus" width="130px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.checkStatus" />
</template>
</el-table-column>
<!-- <el-table-column label="工作流编号" align="center" prop="processInstanceId" />-->
<el-table-column
label="回款日期"
align="center"
prop="returnTime"
:formatter="dateFormatter2"
width="150px"
/>
<el-table-column label="回款方式" align="center" prop="returnType" width="130px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_RECEIVABLE_RETURN_TYPE" :value="scope.row.returnType" />
</template>
</el-table-column>
<el-table-column label="回款金额(元)" align="center" prop="price" />
<el-table-column label="负责人" align="center" prop="ownerUserId" />
<el-table-column label="批次" align="center" prop="batchId" />
<!--<el-table-column label="显示顺序" align="center" prop="sort" />-->
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</template> </template>
<script setup lang="ts" name="CheckReceivables"> <script setup lang="ts" name="CheckReceivables">
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import * as ReceivableApi from '@/api/crm/receivable'
import { AUDIT_STATUS } from './common'
</script> const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
auditStatus: 20
})
const queryFormRef = ref() // 搜索的表单
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ReceivableApi.getReceivablePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
<style scoped> /** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
</style> <style scoped></style>
src/views/crm/backlog/tables/EndContract.vue
<!-- 分配给我的客户 --> <!-- 即将到期的合同 -->
<!-- TODO: 即将到期的合同 -->
<template> <template>
<div> <ContentWrap>
TODO: 即将到期的合同 <div class="pb-5 text-xl"> 即将到期的合同 </div>
</div> <!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="到期状态" prop="expiryType">
<el-select
v-model="queryParams.expiryType"
class="!w-240px"
placeholder="状态"
@change="handleQuery"
>
<el-option
v-for="(option, index) in CONTRACT_EXPIRY_TYPE"
:label="option.label"
:value="option.value"
:key="index"
/>
</el-select>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
<el-table-column align="center" fixed="left" label="合同编号" prop="no" width="130" />
<el-table-column align="center" label="合同名称" prop="name" width="130" />
<el-table-column align="center" label="客户名称" prop="customerName" width="120">
<template #default="scope">
<el-link
:underline="false"
type="primary"
@click="openCustomerDetail(scope.row.customerId)"
>
{{ scope.row.customerName }}
</el-link>
</template>
</el-table-column>
<!-- TODO @puhui999：做了商机详情后，可以把这个超链接加上 -->
<el-table-column align="center" label="商机名称" prop="businessName" width="130" />
<el-table-column
align="center"
label="下单时间"
prop="orderDate"
width="120"
:formatter="dateFormatter2"
/>
<el-table-column
align="center"
label="合同金额"
prop="price"
width="130"
:formatter="fenToYuanFormat"
/>
<el-table-column
align="center"
label="合同开始时间"
prop="startTime"
width="120"
:formatter="dateFormatter2"
/>
<el-table-column
align="center"
label="合同结束时间"
prop="endTime"
width="120"
:formatter="dateFormatter2"
/>
<el-table-column align="center" label="客户签约人" prop="contactName" width="130">
<template #default="scope">
<el-link
:underline="false"
type="primary"
@click="openContactDetail(scope.row.contactId)"
>
{{ scope.row.contactName }}
</el-link>
</template>
</el-table-column>
<el-table-column align="center" label="公司签约人" prop="signUserName" width="130" />
<el-table-column align="center" label="备注" prop="remark" width="130" />
<!-- TODO @puhui999：后续可加 【已收款金额】、【未收款金额】 -->
<el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
<el-table-column align="center" label="创建人" prop="creatorName" width="120" />
<el-table-column
:formatter="dateFormatter"
align="center"
label="更新时间"
prop="updateTime"
width="180px"
/>
<el-table-column
:formatter="dateFormatter"
align="center"
label="创建时间"
prop="createTime"
width="180px"
/>
<el-table-column align="center" fixed="right" label="合同状态" prop="auditStatus" width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNo"
:total="total"
@pagination="getList"
/>
</ContentWrap>
</template> </template>
<script setup lang="ts" name="EndContract"> <script setup lang="ts" name="EndContract">
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import * as ContractApi from '@/api/crm/contract'
import { fenToYuanFormat } from '@/utils/formatter'
import { DICT_TYPE } from '@/utils/dict'
import { CONTRACT_EXPIRY_TYPE } from './common'
</script> const { push } = useRouter() // 路由
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
expiryType: 1
})
const queryFormRef = ref() // 搜索的表单
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ContractApi.getContractPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
<style scoped> /** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 打开客户详情 */
const openCustomerDetail = (id: number) => {
push({ name: 'CrmCustomerDetail', params: { id } })
}
/** 打开联系人详情 */
const openContactDetail = (id: number) => {
push({ name: 'CrmContactDetail', params: { id } })
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>
</style> <style scoped></style>
src/views/crm/backlog/tables/FollowCustomer.vue
...@@ -114,7 +114,6 @@ import { DICT_TYPE } from '@/utils/dict' ...@@ -114,7 +114,6 @@ import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import { FOLLOWUP_STATUS } from './common' import { FOLLOWUP_STATUS } from './common'
const { push } = useRouter() const { push } = useRouter()
const loading = ref(true) // 列表的加载中 const loading = ref(true) // 列表的加载中
......
src/views/crm/backlog/tables/PutInPoolRemind.vue
...@@ -119,7 +119,7 @@ const queryParams = ref({ ...@@ -119,7 +119,7 @@ const queryParams = ref({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
sceneType: 1, // 我负责的 sceneType: 1, // 我负责的
pool: true, // 固定 公海参数为 true pool: true // 固定 公海参数为 true
}) })
const queryFormRef = ref() // 搜索的表单 const queryFormRef = ref() // 搜索的表单
......
src/views/crm/backlog/tables/RemindReceivables.vue
<!-- 待回款提醒 --> <!-- 待回款提醒 -->
<!-- TODO: 后续再统一改名字 -->
<template> <template>
<div> <ContentWrap>
TODO: 待回款提醒 <div class="pb-5 text-xl">待回款提醒</div>
</div> <!-- 搜索工作栏 -->
<el-form
ref="queryFormRef"
:inline="true"
:model="queryParams"
class="-mb-15px"
label-width="68px"
>
<el-form-item label="合同状态" prop="remindType">
<el-select
v-model="queryParams.remindType"
class="!w-240px"
placeholder="状态"
@change="handleQuery"
>
<el-option
v-for="(option, index) in RECEIVABLE_REMIND_TYPE"
:label="option.label"
:value="option.value"
:key="index"
/>
</el-select>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!--<el-table-column label="ID" align="center" prop="id" />-->
<el-table-column label="客户名称" align="center" prop="customerId" width="150px" />
<el-table-column label="合同名称" align="center" prop="contractId" width="150px" />
<el-table-column label="期数" align="center" prop="period" />
<el-table-column label="计划回款" align="center" prop="price" />
<el-table-column
label="计划回款日期"
align="center"
prop="returnTime"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="提前几天提醒" align="center" prop="remindDays" />
<el-table-column label="完成状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="审批状态" align="center" prop="checkStatus" width="130px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.checkStatus" />
</template>
</el-table-column>
<!--<el-table-column label="工作流编号" align="center" prop="processInstanceId" />-->
<el-table-column prop="ownerUserId" label="负责人" width="120">
<template #default="scope">
{{ userList.find((user) => user.id === scope.row.ownerUserId)?.nickname }}
</template>
</el-table-column>
<el-table-column label="显示顺序" align="center" prop="sort" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="130px">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['crm:receivable-plan:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['crm:receivable-plan:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</template> </template>
<script setup lang="ts" name="RemindReceivables"> <script setup lang="ts" name="RemindReceivables">
import { DICT_TYPE } from '@/utils/dict'
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import download from '@/utils/download'
import * as ReceivablePlanApi from '@/api/crm/receivable/plan'
import * as UserApi from '@/api/system/user'
import { RECEIVABLE_REMIND_TYPE } from './common'
</script> defineOptions({ name: 'ReceivablePlan' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
remindType: 1
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ReceivablePlanApi.getReceivablePlanPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
<style scoped> /** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await ReceivablePlanApi.deleteReceivablePlan(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await ReceivablePlanApi.exportReceivablePlan(queryParams)
download.excel(data, '回款计划.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
await getList()
// 获取用户列表
userList.value = await UserApi.getSimpleUserList()
})
</script>
</style> <style scoped></style>
src/views/crm/backlog/tables/common.ts
...@@ -17,3 +17,22 @@ export const CONTACT_STATUS = [ ...@@ -17,3 +17,22 @@ export const CONTACT_STATUS = [
{ label: '已逾期', value: 2 }, { label: '已逾期', value: 2 },
{ label: '已联系', value: 3 } { label: '已联系', value: 3 }
] ]
/** 审批状态 */
export const AUDIT_STATUS = [
{ label: '已审批', value: 20 },
{ label: '待审批', value: 10 }
]
/** 回款提醒类型 */
export const RECEIVABLE_REMIND_TYPE = [
{ label: '待回款', value: 1 },
{ label: '已逾期', value: 2 },
{ label: '已回款', value: 3 }
]
/** 合同过期状态 */
export const CONTRACT_EXPIRY_TYPE = [
{ label: '即将过期', value: 1 },
{ label: '已过期', value: 2 }
]
src/views/mall/promotion/bargain/activity/bargainActivity.data.ts
...@@ -133,7 +133,7 @@ const crudSchemas = reactive<CrudSchema[]>([ ...@@ -133,7 +133,7 @@ const crudSchemas = reactive<CrudSchema[]>([
} }
}, },
{ {
label: '拼团商品', label: '砍价商品',
field: 'spuId', field: 'spuId',
isSearch: false, isSearch: false,
form: { form: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment