feat(shopDealerApply):优化客户跟进记录功能

- 在 shopDealerApply model 中新增 comments 字段用于存储最后跟进内容
- 重构编辑页面的跟进记录展示方式,分为历史记录和新增记录两部分
- 历史记录支持按时间倒序展示并可删除单条记录
- 新增独立的跟进内容输入框和保存按钮,提升用户体验
- 保存新的跟进记录时同步更新主表的 comments 字段
- 调整列表页展示逻辑,在备注列同时显示最后跟进内容和更新时间
- 将列表页的"跟进情况"标题更改为"最后跟进情况"以准确表达含义
- 移除原有的限制最多10条跟进信息的逻辑- 优化代码结构和组件交互逻辑,提高可维护性
This commit is contained in:
2025-10-02 14:15:37 +08:00
parent 645d987f3b
commit 398737d46d
3 changed files with 371 additions and 400 deletions

View File

@@ -34,6 +34,7 @@ export interface ShopDealerApply {
auditTime?: string | number | Date; auditTime?: string | number | Date;
// 驳回原因 // 驳回原因
rejectReason?: string; rejectReason?: string;
comments?: string;
// 商城ID // 商城ID
tenantId?: number; tenantId?: number;
// 创建时间 // 创建时间

View File

@@ -160,442 +160,409 @@
<span style="color: #1890ff; font-weight: 600;">跟进情况</span> <span style="color: #1890ff; font-weight: 600;">跟进情况</span>
</a-divider> </a-divider>
<!-- 跟进情况列表 --> <!-- 历史跟进记录 -->
<div v-if="form.applyStatus == 10"> <div v-if="form.applyStatus == 10 && historyRecords.length > 0">
<a-row :gutter="16" style="margin-bottom: 16px;"> <a-divider orientation="left" style="font-size: 14px; color: #666;">
<a-col :span="24"> 历史跟进记录
<a-button </a-divider>
type="primary" <div v-for="(record, index) in historyRecords" :key="record.id" style="margin-bottom: 16px; padding: 12px; background-color: #f5f5f5; border-radius: 4px;">
@click="addFollowUp" <div class="flex justify-between" style="font-weight: 500; margin-bottom: 8px;">
:disabled="followUpList.length >= 10" <div>跟进 #{{ historyRecords.length - index }} <span class="text-gray-400 px-4">{{ record.createTime }}</span></div>
size="small" <a-tag color="#f50" class="cursor-pointer" @click="remove(record)">删除</a-tag>
> </div>
新增 <div style="white-space: pre-wrap;">
</a-button> {{ record.content }}
<span style="margin-left: 12px; color: #999; font-size: 12px;"> </div>
最多可添加10条跟进信息当前已添加{{ followUpList.length }}
</span>
</a-col>
</a-row>
<div v-for="(item, index) in followUpList" :key="index"
style="margin-bottom: 16px; border: 1px solid #f0f0f0; padding: 12px; border-radius: 4px;">
<a-row :gutter="16">
<a-col :span="20">
<a-form-item
:label="`跟进内容${index + 1}`"
:name="['followUpList', index, 'content']"
>
<div v-if="item.status == 1" v-html="item.content"></div>
<a-textarea
v-else
v-model:value="item.content"
:disabled="!isUpdate"
placeholder="请输入跟进内容"
:rows="2"
:maxlength="500"
show-count
/>
</a-form-item>
</a-col>
<a-col :span="4" style="text-align: right;">
<a-button
type="link"
danger
@click="removeFollowUp(index)"
:disabled="followUpList.length <= 1"
>
删除
</a-button>
</a-col>
</a-row>
</div> </div>
</div> </div>
<!-- 新增跟进记录 -->
<div v-if="form.applyStatus == 10">
<a-divider orientation="left" style="font-size: 14px; color: #666;">
新增跟进记录
</a-divider>
<a-form-item :wrapper-col="{ span: 24 }">
<div class="flex flex-col gap-2">
<a-textarea
v-model:value="newFollowUpContent"
placeholder="请输入本次跟进内容"
:rows="4"
:maxlength="500"
style="width: 80%"
show-count
/>
<div class="btn">
<a-button
type="primary"
@click="saveFollowUpRecord"
:loading="followUpLoading"
:disabled="!newFollowUpContent.trim()"
>
保存跟进记录
</a-button>
</div>
</div>
</a-form-item>
</div>
</a-form> </a-form>
</ele-modal> </ele-modal>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import {ref, reactive, watch} from 'vue'; import { ref, reactive, watch } from 'vue';
import {Form, message} from 'ant-design-vue'; import { Form, message } from 'ant-design-vue';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import {assignObject} from 'ele-admin-pro'; import { assignObject } from 'ele-admin-pro';
import {addShopDealerApply, updateShopDealerApply} from '@/api/shop/shopDealerApply'; import { addShopDealerApply, updateShopDealerApply } from '@/api/shop/shopDealerApply';
import {listShopDealerRecord, addShopDealerRecord} from '@/api/shop/shopDealerRecord'; import {listShopDealerRecord, addShopDealerRecord, removeShopDealerRecord} from '@/api/shop/shopDealerRecord';
import {ShopDealerApply} from '@/api/shop/shopDealerApply/model'; import { ShopDealerApply } from '@/api/shop/shopDealerApply/model';
import {ShopDealerRecord} from '@/api/shop/shopDealerRecord/model'; import { ShopDealerRecord } from '@/api/shop/shopDealerRecord/model';
import {FormInstance, RuleObject} from 'ant-design-vue/es/form'; import { FormInstance, RuleObject } from 'ant-design-vue/es/form';
import {hasRole} from "@/utils/permission"; import { messageLoading } from 'ele-admin-pro';
import {hasRole} from "@/utils/permission";
// 是否是修改 // 是否是修改
const isUpdate = ref(false); const isUpdate = ref(false);
const useForm = Form.useForm; const useForm = Form.useForm;
const props = defineProps<{ const props = defineProps<{
// 弹窗是否打开 // 弹窗是否打开
visible: boolean; visible: boolean;
// 修改回显的数据 // 修改回显的数据
data?: ShopDealerApply | null; data?: ShopDealerApply | null;
}>(); }>();
const emit = defineEmits<{ const emit = defineEmits<{
(e: 'done'): void; (e: 'done'): void;
(e: 'update:visible', visible: boolean): void; (e: 'update:visible', visible: boolean): void;
}>(); }>();
// 提交状态 // 提交状态
const loading = ref(false); const loading = ref(false);
// 是否显示最大化切换按钮 // 跟进记录保存状态
const maxable = ref(true); const followUpLoading = ref(false);
// 表格选中数据 // 是否显示最大化切换按钮
const formRef = ref<FormInstance | null>(null); const maxable = ref(true);
// 表格选中数据
const formRef = ref<FormInstance | null>(null);
// 跟进情况列表 // 历史跟进记录
const followUpList = ref<ShopDealerRecord[]>([ const historyRecords = ref<ShopDealerRecord[]>([]);
{
content: '',
status: 0,
sortNumber: 0
}
]);
// 表单数据 // 新的跟进内容
const form = reactive<ShopDealerApply>({ const newFollowUpContent = ref('');
applyId: undefined,
userId: undefined,
nickName: undefined,
realName: '',
mobile: '',
dealerName: '',
rate: 0.007,
refereeId: undefined,
refereeName: undefined,
applyType: 10,
applyTime: undefined,
applyStatus: 10,
auditTime: undefined,
rejectReason: '',
tenantId: undefined,
createTime: undefined,
updateTime: undefined
});
/* 更新visible */ // 表单数据
const updateVisible = (value: boolean) => { const form = reactive<ShopDealerApply>({
emit('update:visible', value); applyId: undefined,
}; userId: undefined,
nickName: undefined,
// 表单验证规则 realName: '',
const rules = reactive({ mobile: '',
userId: [ dealerName: '',
{ rate: 0.007,
required: true, refereeId: undefined,
message: '请输入用户ID', refereeName: undefined,
trigger: 'blur' applyType: 10,
} as RuleObject applyTime: undefined,
], applyStatus: 10,
realName: [ auditTime: undefined,
{ rejectReason: '',
required: true, tenantId: undefined,
message: '请输入客户名称', createTime: undefined,
trigger: 'blur' updateTime: undefined
} as RuleObject,
{
min: 2,
max: 20,
message: '姓名长度应在2-20个字符之间',
trigger: 'blur'
} as RuleObject
],
rate: [
{
required: true,
message: '请输入收益基数',
trigger: 'blur'
} as RuleObject
],
mobile: [
{
required: true,
message: '请输入手机号码',
trigger: 'blur'
} as RuleObject,
{
pattern: /^1[3-9]\d{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
} as RuleObject
],
applyType: [
{
required: true,
message: '请选择申请方式',
trigger: 'change'
} as RuleObject
],
applyStatus: [
{
required: true,
message: '请选择审核状态',
trigger: 'change'
} as RuleObject
],
rejectReason: [
{
required: true,
message: '驳回时必须填写驳回原因',
trigger: 'blur'
} as RuleObject
],
auditTime: [
{
required: true,
message: '审核时请选择审核时间',
trigger: 'change'
} as RuleObject
]
});
/* 添加跟进 */
const addFollowUp = () => {
if (followUpList.value.length >= 10) {
message.warning('最多只能添加10条跟进信息');
return;
}
followUpList.value.push({
content: '',
status: 0,
sortNumber: followUpList.value.length
}); });
};
/* 删除跟进 */ /* 更新visible */
const removeFollowUp = (index: number) => { const updateVisible = (value: boolean) => {
if (followUpList.value.length <= 1) { emit('update:visible', value);
message.warning('至少保留一条跟进信息'); };
return;
}
followUpList.value.splice(index, 1); // 表单验证规则
}; const rules = reactive({
userId: [
/* 获取跟进记录 */
const fetchFollowUpRecords = async (dealerId: number) => {
try {
// 先通过list接口获取所有记录然后过滤
const allRecords = await listShopDealerRecord({});
const records = allRecords.filter(record => record.dealerId === dealerId);
if (records && records.length > 0) {
followUpList.value = records.map(record => ({
...record,
status: record.status || 0,
sortNumber: record.sortNumber || 0
}));
} else {
// 如果没有记录,初始化一条空记录
followUpList.value = [
{
content: '',
status: 0,
sortNumber: 0
}
];
}
} catch (error) {
console.error('获取跟进记录失败:', error);
message.error('获取跟进记录失败');
// 初始化一条空记录
followUpList.value = [
{ {
content: '', required: true,
status: 0, message: '请输入用户ID',
sortNumber: 0 trigger: 'blur'
} } as RuleObject
]; ],
} realName: [
}; {
required: true,
message: '请输入客户名称',
trigger: 'blur'
} as RuleObject,
{
min: 2,
max: 20,
message: '姓名长度应在2-20个字符之间',
trigger: 'blur'
} as RuleObject
],
rate: [
{
required: true,
message: '请输入收益基数',
trigger: 'blur'
} as RuleObject
],
mobile: [
{
required: true,
message: '请输入手机号码',
trigger: 'blur'
} as RuleObject,
{
pattern: /^1[3-9]\d{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
} as RuleObject
],
applyType: [
{
required: true,
message: '请选择申请方式',
trigger: 'change'
} as RuleObject
],
applyStatus: [
{
required: true,
message: '请选择审核状态',
trigger: 'change'
} as RuleObject
],
rejectReason: [
{
required: true,
message: '驳回时必须填写驳回原因',
trigger: 'blur'
} as RuleObject
],
auditTime: [
{
required: true,
message: '审核时请选择审核时间',
trigger: 'change'
} as RuleObject
]
});
/* 保存跟进记录 */ /* 获取历史跟进记录 */
const saveFollowUpRecords = async (dealerId: number) => { const fetchHistoryRecords = async (dealerId: number) => {
try { try {
// 保存每条跟进记录 // 先通过list接口获取所有记录然后过滤
for (const record of followUpList.value) { const allRecords = await listShopDealerRecord({});
const records = allRecords.filter(record => record.dealerId === dealerId);
// 按创建时间倒序排列(最新的在前面)
historyRecords.value = records.sort((a, b) => {
if (a.createTime && b.createTime) {
return new Date(b.createTime).getTime() - new Date(a.createTime).getTime();
}
return 0;
});
} catch (error) {
console.error('获取历史跟进记录失败:', error);
message.error('获取历史跟进记录失败');
historyRecords.value = [];
}
};
/* 保存新的跟进记录 */
const saveFollowUpRecord = async () => {
// 检查是否有客户ID
if (!form.applyId) {
message.warning('请先保存客户信息');
return;
}
// 检查是否有跟进内容
if (!newFollowUpContent.value.trim()) {
message.warning('请输入跟进内容');
return;
}
try {
followUpLoading.value = true;
const recordData: any = { const recordData: any = {
...record, content: newFollowUpContent.value.trim(),
dealerId: dealerId, dealerId: form.applyId,
userId: form.userId, userId: form.userId,
status: 1 status: 1, // 默认设置为已完成
sortNumber: 0
}; };
// 如果有ID则更新否则新增 // 新增逻辑
if (record.id) { await addShopDealerRecord(recordData);
// 更新逻辑如果API支持 message.success('跟进记录保存成功');
await addShopDealerRecord(recordData); // 保存最后跟进内容到主表
} else { await updateShopDealerApply({
// 新增逻辑 ...form,
await addShopDealerRecord(recordData); comments: newFollowUpContent.value.trim()
} })
// 清空输入框
newFollowUpContent.value = '';
// 重新加载历史记录
await fetchHistoryRecords(form.applyId);
} catch (error) {
console.error('保存跟进记录失败:', error);
message.error('保存跟进记录失败');
} finally {
followUpLoading.value = false;
} }
};
// message.success('跟进记录保存成功'); const { resetFields } = useForm(form, rules);
} catch (error) {
console.error('保存跟进记录失败:', error);
message.error('保存跟进记录失败');
throw error;
}
};
const {resetFields} = useForm(form, rules); /* 处理审核状态变化 */
const handleStatusChange = (value: number) => {
// 当状态改为审核通过或驳回时,自动设置审核时间为当前时间
if ((value === 20 || value === 30) && !form.auditTime) {
form.auditTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
}
// 当状态改为待审核时,清空审核时间和驳回原因
if (value === 10) {
form.auditTime = undefined;
form.rejectReason = '';
}
};
/* 处理审核状态变化 */ /* 删除单个 */
const handleStatusChange = (value: number) => { const remove = (row: ShopDealerRecord) => {
// 当状态改为审核通过或驳回时,自动设置审核时间为当前时间 const hide = messageLoading('请求中..', 0);
if ((value === 20 || value === 30) && !form.auditTime) { removeShopDealerRecord(row.id)
form.auditTime = dayjs().format('YYYY-MM-DD HH:mm:ss'); .then((msg) => {
} hide();
// 当状态改为待审核时,清空审核时间和驳回原因
if (value === 10) {
form.auditTime = undefined;
form.rejectReason = '';
}
};
/* 保存编辑 */
const save = () => {
if (!formRef.value) {
return;
}
// 动态验证规则
const validateFields: string[] = ['userId', 'realName', 'mobile', 'applyStatus'];
// 如果是驳回状态,需要验证驳回原因
if (form.applyStatus === 30) {
validateFields.push('rejectReason');
}
// 如果是审核通过或驳回状态,需要验证审核时间
if (form.applyStatus === 20 || form.applyStatus === 30) {
validateFields.push('auditTime');
}
// 如果是跟进中状态,需要验证跟进内容
if (form.applyStatus === 10) {
// 构造跟进内容的验证字段
const followUpFields: string[] = [];
followUpList.value.forEach((_, index) => {
followUpFields.push(`followUpList.${index}.content`);
});
validateFields.push(...followUpFields);
}
formRef.value
.validate(validateFields)
.then(async () => {
loading.value = true;
const formData = {
...form
};
// 处理时间字段转换 - 转换为ISO字符串格式
if (formData.applyTime) {
if (dayjs.isDayjs(formData.applyTime)) {
formData.applyTime = formData.applyTime.format('YYYY-MM-DD HH:mm:ss');
} else if (typeof formData.applyTime === 'number') {
formData.applyTime = dayjs(formData.applyTime).format('YYYY-MM-DD HH:mm:ss');
}
}
if (formData.auditTime) {
if (dayjs.isDayjs(formData.auditTime)) {
formData.auditTime = formData.auditTime.format('YYYY-MM-DD HH:mm:ss');
} else if (typeof formData.auditTime === 'number') {
formData.auditTime = dayjs(formData.auditTime).format('YYYY-MM-DD HH:mm:ss');
}
}
// 当审核状态为通过或驳回时,确保有审核时间
if ((formData.applyStatus === 20 || formData.applyStatus === 30) && !formData.auditTime) {
formData.auditTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
}
// 当状态为待审核时,清空审核时间
if (formData.applyStatus === 10) {
formData.auditTime = undefined;
}
const saveOrUpdate = isUpdate.value ? updateShopDealerApply : addShopDealerApply;
try {
const msg = await saveOrUpdate(formData);
message.success(msg); message.success(msg);
// 重新加载历史记录
if(props.data?.applyId){
fetchHistoryRecords(props.data?.applyId);
}
})
.catch((e) => {
hide();
message.error(e.message);
});
};
// 如果是跟进中状态,保存跟进记录 /* 保存编辑 */
if (formData.applyStatus === 10 && formData.applyId) { const save = () => {
await saveFollowUpRecords(formData.applyId); if (!formRef.value) {
return;
}
// 动态验证规则
const validateFields: string[] = ['userId', 'realName', 'mobile', 'applyStatus'];
// 如果是驳回状态,需要验证驳回原因
if (form.applyStatus === 30) {
validateFields.push('rejectReason');
}
// 如果是审核通过或驳回状态,需要验证审核时间
if (form.applyStatus === 20 || form.applyStatus === 30) {
validateFields.push('auditTime');
}
formRef.value
.validate(validateFields)
.then(async () => {
loading.value = true;
const formData = {
...form
};
// 处理时间字段转换 - 转换为ISO字符串格式
if (formData.applyTime) {
if (dayjs.isDayjs(formData.applyTime)) {
formData.applyTime = formData.applyTime.format('YYYY-MM-DD HH:mm:ss');
} else if (typeof formData.applyTime === 'number') {
formData.applyTime = dayjs(formData.applyTime).format('YYYY-MM-DD HH:mm:ss');
}
} }
updateVisible(false); if (formData.auditTime) {
emit('done'); if (dayjs.isDayjs(formData.auditTime)) {
} catch (e: any) { formData.auditTime = formData.auditTime.format('YYYY-MM-DD HH:mm:ss');
message.error(e.message); } else if (typeof formData.auditTime === 'number') {
} finally { formData.auditTime = dayjs(formData.auditTime).format('YYYY-MM-DD HH:mm:ss');
}
}
// 当审核状态为通过或驳回时,确保有审核时间
if ((formData.applyStatus === 20 || formData.applyStatus === 30) && !formData.auditTime) {
formData.auditTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
}
// 当状态为待审核时,清空审核时间
if (formData.applyStatus === 10) {
formData.auditTime = undefined;
}
const saveOrUpdate = isUpdate.value ? updateShopDealerApply : addShopDealerApply;
try {
const msg = await saveOrUpdate(formData);
message.success(msg);
updateVisible(false);
emit('done');
} catch (e: any) {
message.error(e.message);
} finally {
loading.value = false;
}
})
.catch(() => {
loading.value = false; loading.value = false;
} });
}) };
.catch(() => {
loading.value = false;
});
};
watch( watch(
() => props.visible, () => props.visible,
async (visible) => { async (visible) => {
if (visible) { if (visible) {
if (props.data) { if (props.data) {
assignObject(form, props.data); assignObject(form, props.data);
isUpdate.value = true; isUpdate.value = true;
// 如果是修改且状态为跟进中,获取跟进记录 // 如果是修改且状态为跟进中,获取历史跟进记录
if (props.data.applyId && props.data.applyStatus === 10) { if (props.data.applyId && props.data.applyStatus === 10) {
await fetchFollowUpRecords(props.data.applyId); await fetchHistoryRecords(props.data.applyId);
}
} else {
// 重置为默认值
Object.assign(form, {
applyId: undefined,
userId: undefined,
realName: '',
mobile: '',
refereeId: undefined,
applyType: 10,
applyTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
applyStatus: 10,
auditTime: undefined,
rejectReason: '',
tenantId: undefined,
createTime: undefined,
updateTime: undefined
});
isUpdate.value = false;
// 重置历史记录和新内容
historyRecords.value = [];
newFollowUpContent.value = '';
} }
} else { } else {
// 重置为默认值 resetFields();
Object.assign(form, {
applyId: undefined,
userId: undefined,
realName: '',
mobile: '',
refereeId: undefined,
applyType: 10,
applyTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
applyStatus: 10,
auditTime: undefined,
rejectReason: '',
tenantId: undefined,
createTime: undefined,
updateTime: undefined
});
isUpdate.value = false;
// 重置跟进列表
followUpList.value = [
{
content: '',
status: 0,
sortNumber: 0
}
];
} }
} else { },
resetFields(); { immediate: true }
} );
},
{immediate: true}
);
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

View File

@@ -37,7 +37,10 @@
<div class="text-gray-600">{{ record.nickName }}</div> <div class="text-gray-600">{{ record.nickName }}</div>
<div class="text-gray-400">{{ record.phone }}</div> <div class="text-gray-400">{{ record.phone }}</div>
<div class="text-gray-400">{{ record.rate }}</div> <div class="text-gray-400">{{ record.rate }}</div>
</template>
<template v-if="column.key === 'comments'">
<div class="text-gray-400">{{ record.comments }}</div>
<div class="text-gray-400" v-if="record.comments">{{ record.updateTime }}</div>
</template> </template>
<template v-if="column.key === 'createTime'"> <template v-if="column.key === 'createTime'">
<div class="flex flex-col"> <div class="flex flex-col">
@@ -159,7 +162,7 @@ const columns = ref<ColumnItem[]>([
key: 'customer' key: 'customer'
}, },
{ {
title: '跟进情况', title: '最后跟进情况',
dataIndex: 'comments', dataIndex: 'comments',
key: 'comments', key: 'comments',
align: 'left' align: 'left'