CRM:合同的 code review

(cherry picked from commit 956f19d9d0)
This commit is contained in:
YunaiV 2024-02-01 13:38:14 +08:00 committed by shizhong
parent 82fbaa16a3
commit ff84ef64a5
15 changed files with 75 additions and 28 deletions

View File

@ -5,11 +5,13 @@ export interface BiContractRanKingRespVO {
nickname: string
deptName: string
}
export interface BiReceivablesRanKingRespVO {
price: number
nickname: string
deptName: string
}
export interface BiRankReqVO {
deptId: number
orderDate: Date[]

View File

@ -73,6 +73,7 @@ export const getBusinessListByIds = async (val: number[]) => {
}
// 商机转移
// TODO @puhui999transferBusiness
export const transfer = async (data: TransferReqVO) => {
return await request.put({ url: '/crm/business/transfer', data })
}

View File

@ -71,6 +71,7 @@ export const handleApprove = async (id: number) => {
}
// 合同转移
// TODO @puhui999transfer 相关方法,这块要补充下;
export const transfer = async (data: TransferReqVO) => {
return await request.put({ url: '/crm/contract/transfer', data })
}

View File

@ -1,3 +1,4 @@
<!-- TODO @puhui999这个最好加个注释哈 -->
<template>
<Dialog v-model="dialogVisible" :appendToBody="true" :scroll="true" :title="title" width="60%">
<el-table

View File

@ -96,8 +96,8 @@ const leftSides = ref([
const sideClick = (item) => {
leftType.value = item.infoType
}
// TODO @dhb52:
</script>
<style lang="scss" scoped>
.side-item-list {
top: 0;

View File

@ -38,12 +38,12 @@
</ContentWrap>
<el-col>
<el-tabs v-model="activeTab">
<!-- 合同金额排行 -->
<el-tab-pane label="合同金额排行" name="contractAmountRanking">
<!-- 合同金额排行 -->
<RankingContractStatistics :queryParams="queryParams" ref="rankingContractStatisticsRef" />
</el-tab-pane>
<!-- 回款金额排行 -->
<el-tab-pane label="回款金额排行" name="receivablesRanKing" lazy>
<!-- 回款金额排行 -->
<RankingReceivablesStatistics
:queryParams="queryParams"
ref="rankingReceivablesStatisticsRef"
@ -93,6 +93,7 @@ const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
//
onMounted(async () => {
deptList.value = handleTree(await DeptApi.getSimpleDeptList())

View File

@ -57,6 +57,7 @@ const message = useMessage()
const id = Number(route.params.id) //
const loading = ref(true) //
const contact = ref<ContactApi.ContactVO>({} as ContactApi.ContactVO) //
const permissionListRef = ref<InstanceType<typeof PermissionList>>() // Ref
/** 获取详情 */
const getContactData = async (id: number) => {
@ -68,22 +69,20 @@ const getContactData = async (id: number) => {
loading.value = false
}
}
/** 编辑 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 联系人转移 */
const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // ref
const transfer = () => {
crmTransferFormRef.value?.open('联系人转移', contact.value.id, ContactApi.transfer)
}
const permissionListRef = ref<InstanceType<typeof PermissionList>>() // Ref
/**
* 获取操作日志
*/
/** 获取操作日志 */
const logList = ref<OperateLogV2VO[]>([]) //
const getOperateLog = async (contactId: number) => {
if (!contactId) {
@ -95,9 +94,12 @@ const getOperateLog = async (contactId: number) => {
})
logList.value = data.list
}
/** 关闭窗口 */
const close = () => {
delView(unref(currentRoute))
}
/** 初始化 */
const { delView } = useTagsViewStore() //
const { currentRoute } = useRouter() //

View File

@ -144,6 +144,7 @@
<el-col :span="24">
<CardTitle class="mb-10px" title="审批信息" />
</el-col>
<!-- TODO 芋艿需要后面在 review 目前看不到信息 -->
<el-col :span="12">
<el-button
class="m-20px"
@ -188,7 +189,9 @@ const formRules = reactive({
no: [{ required: true, message: '合同编号不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>()
const BPMLModelRef = ref<InstanceType<typeof BPMLModel>>() // TODO @puhui999 bpm model
// TODO @puhui999
watch(
() => formData.value.productItems,
(val) => {
@ -196,7 +199,7 @@ watch(
formData.value.productPrice = 0
return
}
// 使reduce
// 使 reduce
formData.value.productPrice = val.reduce(
(accumulator, currentValue) =>
isNaN(accumulator + currentValue.totalPrice) ? 0 : accumulator + currentValue.totalPrice,
@ -205,13 +208,13 @@ watch(
},
{ deep: true }
)
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
await getAllApi()
//
if (id) {
formLoading.value = true
@ -221,10 +224,9 @@ const open = async (type: string, id?: number) => {
formLoading.value = false
}
}
await getAllApi()
}
const getAllApi = async () => {
await Promise.all([getCustomerList(), getUserList(), getContactListList(), getBusinessList()])
}
defineExpose({ open }) // open
/** 提交表单 */
@ -252,32 +254,42 @@ const submitForm = async () => {
formLoading.value = false
}
}
const customerList = ref<CustomerApi.CustomerVO[]>([])
/** 重置表单 */
const resetForm = () => {
formData.value = {} as ContractApi.ContractVO
formRef.value?.resetFields()
}
/** 获取其它相关数据 */
const getAllApi = async () => {
await Promise.all([getCustomerList(), getUserList(), getContactListList(), getBusinessList()])
}
/** 获取客户 */
const customerList = ref<CustomerApi.CustomerVO[]>([])
const getCustomerList = async () => {
customerList.value = await CustomerApi.getSimpleCustomerList()
}
const contactList = ref<ContactApi.ContactVO[]>([])
/** 动态获取客户联系人 */
const contactList = ref<ContactApi.ContactVO[]>([])
const getContactOptions = computed(() =>
contactList.value.filter((item) => item.customerId === formData.value.customerId)
)
const getContactListList = async () => {
contactList.value = await ContactApi.getSimpleContactList()
}
const userList = ref<UserApi.UserVO[]>([])
/** 获取用户列表 */
const userList = ref<UserApi.UserVO[]>([])
const getUserList = async () => {
userList.value = await UserApi.getSimpleUserList()
}
const businessList = ref<BusinessApi.BusinessVO[]>([])
/** 获取商机 */
const businessList = ref<BusinessApi.BusinessVO[]>([])
const getBusinessList = async () => {
businessList.value = await BusinessApi.getSimpleBusinessList()
}
/** 重置表单 */
const resetForm = () => {
formData.value = {} as ContractApi.ContractVO
formRef.value?.resetFields()
}
</script>

View File

@ -1,3 +1,4 @@
<!-- 合同 Form 表单下的 Product 列表 -->
<template>
<el-row justify="end">
<el-button plain type="primary" @click="openForm">添加产品</el-button>
@ -71,23 +72,32 @@ withDefaults(defineProps<{ modelValue: any[] }>(), { modelValue: () => [] })
const emits = defineEmits<{
(e: 'update:modelValue', v: any[]): void
}>()
const list = ref<ProductApi.ProductExpandVO[]>([])
const list = ref<ProductApi.ProductExpandVO[]>([]) // TODO @puhui999
const multipleSelection = ref<ProductApi.ProductExpandVO[]>([]) //
/** 处理删除 */
const handleDelete = (id: number) => {
const index = list.value.findIndex((item) => item.id === id)
if (index !== -1) {
list.value.splice(index, 1)
}
}
/** 打开 Product 弹窗 */
const tableSelectFormRef = ref<InstanceType<typeof TableSelectForm>>()
const multipleSelection = ref<ProductApi.ProductExpandVO[]>([])
const openForm = () => {
tableSelectFormRef.value?.open(ProductApi.getProductPage)
}
/** 计算 totalPrice */
const getTotalPrice = computed(() => (row: ProductApi.ProductExpandVO) => {
const totalPrice = (row.price * row.count * row.discountPercent) / 100
row.totalPrice = isNaN(totalPrice) ? 0 : totalPrice
return isNaN(totalPrice) ? 0 : totalPrice
})
// TODO @puhui999
watch(
list,
(val) => {
@ -98,6 +108,8 @@ watch(
},
{ deep: true }
)
// TODO @puhui999
watch(
multipleSelection,
(val) => {

View File

@ -1,3 +1,4 @@
<!-- TODO @puhui999这个组件的注释加下方便大家打开就知道哈 -->
<template>
<div>
<div class="flex items-start justify-between">

View File

@ -1,3 +1,4 @@
<!-- TODO @puhui999这个组件的注释加下方便大家打开就知道哈 -->
<template>
<ContentWrap>
<el-collapse v-model="activeNames">

View File

@ -1,3 +1,4 @@
<!-- TODO @puhui999这个组件的注释加下方便大家打开就知道哈 -->
<template>
<ContractDetailsHeader v-loading="loading" :contract="contract">
<el-button v-if="permissionListRef?.validateWrite" @click="openForm('update', contract.id)">
@ -57,11 +58,14 @@ const message = useMessage()
const contractId = ref(0) //
const loading = ref(true) //
const contract = ref<ContractApi.ContractVO>({} as ContractApi.ContractVO) //
const permissionListRef = ref<InstanceType<typeof PermissionList>>() // Ref
/** 编辑 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 获取详情 */
const getContractData = async () => {
loading.value = true
@ -86,18 +90,21 @@ const getOperateLog = async (contractId: number) => {
logList.value = data.list
}
/** 转移 */
// TODO @puhui999transferFormRef
const crmTransferFormRef = ref<InstanceType<typeof CrmTransferForm>>() // ref
const transfer = () => {
crmTransferFormRef.value?.open('合同转移', contract.value.id, ContractApi.transfer)
}
const permissionListRef = ref<InstanceType<typeof PermissionList>>() // Ref
/** 初始化 */
/** 关闭 */
const { delView } = useTagsViewStore() //
const { currentRoute } = useRouter() //
const close = () => {
delView(unref(currentRoute))
}
/** 初始化 */
onMounted(async () => {
const id = route.params.id
if (!id) {

View File

@ -1,3 +1,4 @@
<!-- TODO @puhui999这个好像和 detail 重复了 -->
<template>
<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="110px">
<el-row>

View File

@ -1,3 +1,4 @@
<!-- 客户导入窗口 -->
<template>
<Dialog v-model="dialogVisible" title="客户导入" width="400">
<el-upload
@ -20,7 +21,7 @@
<div class="el-upload__tip text-center">
<div class="el-upload__tip">
<el-checkbox v-model="updateSupport" />
是否更新已经存在的客户数据
是否更新已经存在的客户数据客户名称重复
</div>
<span>仅允许导入 xlsxlsx 格式文件</span>
<el-link

View File

@ -339,10 +339,14 @@ const handleDelete = async (id: number) => {
await getList()
} catch {}
}
/** 导入按钮操作 */
// TODO @puhui999importFormRef
const customerImportFormRef = ref<InstanceType<typeof CustomerImportForm>>()
const handleImport = () => {
customerImportFormRef.value?.open()
}
/** 导出按钮操作 */
const handleExport = async () => {
try {