Skip to content

Commit 56db6bf

Browse files
YunaiVYunaiV
committed
✨ CRM：完善 CRM 相关实现
1 parent c1f507b commit 56db6bf

File tree

10 files changed

+48
-340
lines changed

10 files changed

+48
-340
lines changed

‎src/router/modules/remaining.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -539,18 +539,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
539539
},
540540
component: () => import('@/views/crm/contract/detail/index.vue')
541541
},
542-
{
543-
path: 'contract/detail',
544-
name: 'CrmContractDetail2', // 特殊：用于适配 BPM 打开详情
545-
meta: {
546-
title: '合同详情XXX',
547-
noCache: true,
548-
hidden: true,
549-
canTo: true,
550-
activeMenu: '/crm/contract'
551-
},
552-
component: () => import('@/views/crm/contract/detail/index.vue')
553-
},
554542
{
555543
path: 'contact/detail/:id',
556544
name: 'CrmContactDetail',

‎src/views/bpm/processInstance/detail/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ const getProcessInstance = async () => {
234234
fApi.value?.fapi?.disabled(true)
235235
})
236236
} else {
237+
// 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index.vue
237238
BusinessFormComponent.value = registerComponent(data.processDefinition.formCustomViewPath)
238239
}
239240

‎src/views/crm/backlog/components/CustomerPutPoolRemindList.vue

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,31 @@
2929
</ContentWrap>
3030
<ContentWrap>
3131
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
32-
<el-table-column align="center" label="编号" prop="id" />
33-
<el-table-column align="center" label="客户名称" prop="name" width="160">
32+
<el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160">
3433
<template #default="scope">
3534
<el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
3635
{{ scope.row.name }}
3736
</el-link>
3837
</template>
3938
</el-table-column>
40-
<el-table-column align="center" label="手机" prop="mobile" width="120" />
41-
<el-table-column align="center" label="电话" prop="telephone" width="120" />
4239
<el-table-column align="center" label="客户来源" prop="source" width="100">
4340
<template #default="scope">
4441
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
4542
</template>
4643
</el-table-column>
47-
<el-table-column align="center" label="所属行业" prop="industryId" width="120">
44+
<el-table-column label="手机" align="center" prop="mobile" width="120" />
45+
<el-table-column label="电话" align="center" prop="telephone" width="130" />
46+
<el-table-column label="邮箱" align="center" prop="email" width="180" />
47+
<el-table-column align="center" label="客户级别" prop="level" width="135">
4848
<template #default="scope">
49-
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
49+
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
5050
</template>
5151
</el-table-column>
52-
<el-table-column align="center" label="客户级别" prop="level" width="120">
52+
<el-table-column align="center" label="客户行业" prop="industryId" width="100">
5353
<template #default="scope">
54-
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
54+
<dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
5555
</template>
5656
</el-table-column>
57-
<el-table-column align="center" label="网址" prop="website" width="200" />
5857
<el-table-column
5958
:formatter="dateFormatter"
6059
align="center"
@@ -63,23 +62,34 @@
6362
width="180px"
6463
/>
6564
<el-table-column align="center" label="备注" prop="remark" width="200" />
65+
<el-table-column align="center" label="锁定状态" prop="lockStatus">
66+
<template #default="scope">
67+
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.lockStatus" />
68+
</template>
69+
</el-table-column>
6670
<el-table-column align="center" label="成交状态" prop="dealStatus">
6771
<template #default="scope">
6872
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.dealStatus" />
6973
</template>
7074
</el-table-column>
71-
<el-table-column align="center" label="距进入公海天数" prop="poolDay" width="100px" />
7275
<el-table-column
7376
:formatter="dateFormatter"
7477
align="center"
7578
label="最后跟进时间"
7679
prop="contactLastTime"
7780
width="180px"
7881
/>
82+
<el-table-column align="center" label="最后跟进记录" prop="contactLastContent" width="200" />
83+
<el-table-column label="地址" align="center" prop="detailAddress" width="180" />
84+
<el-table-column align="center" label="距离进入公海天数" prop="poolDay" width="140">
85+
<template #default="scope"> {{ scope.row.poolDay }} 天</template>
86+
</el-table-column>
87+
<el-table-column align="center" label="负责人" prop="ownerUserName" width="100px" />
88+
<el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" />
7989
<el-table-column
8090
:formatter="dateFormatter"
8191
align="center"
82-
label="创建时间"
92+
label="更新时间"
8393
prop="updateTime"
8494
width="180px"
8595
/>
@@ -90,8 +100,6 @@
90100
prop="createTime"
91101
width="180px"
92102
/>
93-
<el-table-column align="center" label="负责人" prop="ownerUserName" width="100px" />
94-
<el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" />
95103
<el-table-column align="center" label="创建人" prop="creatorName" width="100px" />
96104
</el-table>
97105
<!-- 分页 -->

‎src/views/crm/business/detail/index.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
:customer-id="business.customerId"
3232
/>
3333
</el-tab-pane>
34-
<!-- TODO 合同 -->
3534
<el-tab-pane label="产品">
3635
<BusinessProductList :business="business" />
3736
</el-tab-pane>
37+
<!-- TODO 合同 -->
38+
<el-tab-pane label="合同"> 123 </el-tab-pane>
3839
<el-tab-pane label="操作日志">
3940
<OperateLogV2 :log-list="logList" />
4041
</el-tab-pane>
@@ -51,8 +52,8 @@
5152
</el-col>
5253

5354
<!-- 表单弹窗：添加/修改 -->
54-
<ContactForm ref="formRef" @success="getContact(business.id)" />
55-
<BusinessUpdateStatusForm ref="statusFormRef" @success="getContact(business.id)" />
55+
<BusinessForm ref="formRef" @success="getBusiness(business.id)" />
56+
<BusinessUpdateStatusForm ref="statusFormRef" @success="getBusiness(business.id)" />
5657
<CrmTransferForm ref="transferFormRef" @success="close" />
5758
</template>
5859
<script lang="ts" setup>
@@ -65,7 +66,7 @@ import PermissionList from '@/views/crm/permission/components/PermissionList.vue
6566
import { BizTypeEnum } from '@/api/crm/permission'
6667
import { OperateLogV2VO } from '@/api/system/operatelog'
6768
import { getOperateLogPage } from '@/api/crm/operateLog'
68-
import ContactForm from '@/views/crm/contact/ContactForm.vue'
69+
import BusinessForm from '@/views/crm/business/BusinessForm.vue'
6970
import CrmTransferForm from '@/views/crm/permission/components/TransferForm.vue'
7071
import FollowUpList from '@/views/crm/followup/index.vue'
7172
import ContactList from '@/views/crm/contact/components/ContactList.vue'
@@ -81,7 +82,7 @@ const business = ref<ContactApi.ContactVO>({} as ContactApi.ContactVO) // 联系
8182
const permissionListRef = ref<InstanceType<typeof PermissionList>>() // 团队成员列表 Ref
8283
8384
/** 获取详情 */
84-
const getContact = async (id: number) => {
85+
const getBusiness = async (id: number) => {
8586
loading.value = true
8687
try {
8788
business.value = await BusinessApi.getBusiness(id)
@@ -138,6 +139,6 @@ onMounted(async () => {
138139
return
139140
}
140141
businessId.value = params.id as unknown as number
141-
await getContact(businessId.value)
142+
await getBusiness(businessId.value)
142143
})
143144
</script>

‎src/views/crm/contract/detail/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<el-tab-pane label="产品">
2020
<ContractProductList :contract="contract" />
2121
</el-tab-pane>
22+
<!-- TODO 合同 -->
23+
<el-tab-pane label="回款"> 123 </el-tab-pane>
2224
<!-- TODO @puhui999：回款信息 -->
2325
<el-tab-pane label="团队成员">
2426
<PermissionList

‎src/views/crm/contract/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<el-tab-pane label="下属负责的" name="3" />
8080
</el-tabs>
8181
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
82-
<el-table-column align="center" fixed="left" label="合同编号" prop="no" width="130" />
82+
<el-table-column align="center" fixed="left" label="合同编号" prop="no" width="160" />
8383
<el-table-column align="center" fixed="left" label="合同名称" prop="name" width="160">
8484
<template #default="scope">
8585
<el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">

0 commit comments

Comments
 (0)