feat: 添加分析师备注字段并优化代码格式

refactor: 重构文件上传和提交逻辑

style: 调整代码缩进和格式以提高可读性
This commit is contained in:
2026-03-31 15:27:54 +08:00
parent 55695da2fd
commit eba79c71c5
2 changed files with 455 additions and 374 deletions

View File

@@ -24,7 +24,9 @@
<div class="header-right">
<n-button secondary strong type="error" round @click="logout" class="logout-btn">
<template #icon>
<n-icon><LogOutOutline /></n-icon>
<n-icon>
<LogOutOutline />
</n-icon>
</template>
<span>退出系统</span>
</n-button>
@@ -58,7 +60,9 @@
<n-grid-item class="actions-grid">
<n-space justify="end" style="width: 100%">
<n-button type="primary" @click="handleSearch" :loading="loading" class="action-btn">
<template #icon><n-icon><SearchOutline /></n-icon></template>
<template #icon><n-icon>
<SearchOutline />
</n-icon></template>
查询
</n-button>
<n-button secondary @click="resetSearch">重置</n-button>
@@ -79,24 +83,16 @@
</div>
</div>
</template>
<template #header-extra>
<!-- <template #header-extra>
<n-button size="small" strong secondary type="primary" class="export-btn">
<template #icon><n-icon><DownloadOutline /></n-icon></template>
导出报表
</n-button>
</template>
</template> -->
<div class="table-container">
<n-data-table
remote
:columns="columns"
:data="displayData"
:scroll-x="1200"
:bordered="false"
:pagination="pagination"
:loading="loading"
:row-class-name="() => 'table-row-animate'"
/>
<n-data-table remote :columns="columns" :data="displayData" :scroll-x="1200" :bordered="false"
:pagination="pagination" :loading="loading" :row-class-name="() => 'table-row-animate'" />
</div>
</n-card>
</main>
@@ -109,7 +105,9 @@
<!-- 分配任务卡片 -->
<div class="form-section-card highlight">
<div class="section-header">
<n-icon><BrushOutline /></n-icon>
<n-icon>
<BrushOutline />
</n-icon>
<span>执行任务分配</span>
</div>
<n-form label-placement="top" :model="editingRow">
@@ -131,7 +129,9 @@
<!-- 基础信息卡片 -->
<div class="form-section-card">
<div class="section-header">
<n-icon><PersonOutline /></n-icon>
<n-icon>
<PersonOutline />
</n-icon>
<span>核心业务信息</span>
</div>
<n-form label-placement="left" label-width="90" size="small" :model="editingRow">
@@ -144,7 +144,8 @@
</n-grid-item>
<n-grid-item>
<n-form-item label="成交日期">
<n-date-picker v-model:formatted-value="editingRow.transaction_date" value-format="yyyy-MM-dd" type="date" style="width: 100%" />
<n-date-picker v-model:formatted-value="editingRow.transaction_date" value-format="yyyy-MM-dd"
type="date" style="width: 100%" />
</n-form-item>
</n-grid-item>
<n-grid-item>
@@ -160,40 +161,33 @@
<div class="file-grid">
<!-- 1. 附件文档 -->
<div class="file-item">
<div class="file-label"><n-icon><FileTrayOutline /></n-icon> 附件文档</div>
<n-upload
v-model:file-list="editingRow.attachmentFileList"
:max="1"
:custom-request="handleCustomUpload"
>
<div class="file-label"><n-icon>
<FileTrayOutline />
</n-icon> 附件文档</div>
<n-upload v-model:file-list="editingRow.attachmentFileList" :max="1"
:custom-request="handleCustomUpload">
<n-button dashed block>更换附件文档</n-button>
</n-upload>
</div>
<!-- 2. 电子签名 -->
<div class="file-item">
<div class="file-label"><n-icon><CreateOutline /></n-icon> 电子签名</div>
<n-upload
v-model:file-list="editingRow.signatureFileList"
list-type="image-card"
:max="1"
@preview="handlePreview"
:custom-request="handleCustomUpload"
>
<div class="file-label"><n-icon>
<CreateOutline />
</n-icon> 电子签名</div>
<n-upload v-model:file-list="editingRow.signatureFileList" list-type="image-card" :max="1"
@preview="handlePreview" :custom-request="handleCustomUpload">
点击上传
</n-upload>
</div>
<!-- 3. 付款截图 -->
<div class="file-item payment-item">
<div class="file-label"><n-icon><ImagesOutline /></n-icon> 付款截图凭证 (多选)</div>
<n-upload
v-model:file-list="editingRow.paymentFileList"
list-type="image-card"
multiple
@preview="handlePreview"
:custom-request="handleCustomUpload"
/>
<div class="file-label"><n-icon>
<ImagesOutline />
</n-icon> 付款截图凭证 (多选)</div>
<n-upload v-model:file-list="editingRow.paymentFileList" list-type="image-card" multiple
@preview="handlePreview" :custom-request="handleCustomUpload" />
</div>
</div>
</n-space>
@@ -201,7 +195,8 @@
<template #footer>
<div class="drawer-footer">
<n-button @click="showDrawer = false" round px-8>取消</n-button>
<n-button type="primary" :loading="submitLoading" round @click="handleDrawerSubmit" class="submit-btn-glow">
<n-button type="primary" :loading="submitLoading" round @click="handleDrawerSubmit"
class="submit-btn-glow">
确认分配并同步数据
</n-button>
</div>
@@ -238,13 +233,14 @@ const loading = ref(false)
const submitLoading = ref(false)
// 基础信息表单配置(解决模板中 v-for 太长和语法报错的问题)
const baseInfoFields =[
const baseInfoFields = [
{ label: '主管', key: 'analyst_supervisor' },
{ label: '部门', key: 'analyst_department' },
{ label: '分析师', key: 'analyst_name' },
{ label: '家长姓名', key: 'parent_name' },
{ label: '家长电话', key: 'parent_phone' },
{ label: '身份证', key: 'parent_id_card' }
{ label: '身份证', key: 'parent_id_card' },
{ label: '分析师备注', key: 'analyst_remark' }
]
const searchParams = reactive({
@@ -254,7 +250,7 @@ const searchParams = reactive({
status: null
})
const statusOptions =[
const statusOptions = [
{ label: '待处理', value: 'pending' },
{ label: '已处理', value: 'processed' }
]
@@ -266,7 +262,7 @@ const pagination = reactive({
pageSize: 10,
itemCount: 0,
showSizePicker: true,
pageSizes:[10, 20, 50],
pageSizes: [10, 20, 50],
onChange: (page) => {
pagination.page = page
fetchData()
@@ -302,8 +298,8 @@ const fetchData = async () => {
if (res && res.success) {
displayData.value = res.data.map(item => {
// 列表回显处理:为了让 n-upload 正常显示缩略图,仍然必须组装包含 url 字段的对象
const p_names = Array.isArray(item.payment_object_names) ? item.payment_object_names :[]
const p_urls = item.payment_image_url ||[]
const p_names = Array.isArray(item.payment_object_names) ? item.payment_object_names : []
const p_urls = item.payment_image_url || []
const paymentFileList = p_urls.map((url, i) => ({
id: p_names[i] || `pay_${i}`,
name: `付款截图_${i + 1}.png`,
@@ -313,22 +309,22 @@ const fetchData = async () => {
}))
// 处理签名
const signatureFileList = item.signature_image_url ?[{
const signatureFileList = item.signature_image_url ? [{
id: item.signature_object_name || 'sig',
name: '电子签名.png',
status: 'finished',
url: item.signature_image_url,
object_name: item.signature_object_name
}] :[]
}] : []
// 处理附件文档
const attachmentFileList = item.attachment_file_url ?[{
const attachmentFileList = item.attachment_file_url ? [{
id: item.attachment_object_name || 'att',
name: '原始附件文档',
status: 'finished',
url: item.attachment_file_url,
object_name: item.attachment_object_name
}] :[]
}] : []
return {
...item,
@@ -338,7 +334,8 @@ const fetchData = async () => {
paymentFileList,
signatureFileList,
attachmentFileList,
isSubmitting: false
isSubmitting: false,
analyst_remark: item.analyst_remark || ''
}
})
pagination.itemCount = res.pagination?.total || 0
@@ -365,9 +362,9 @@ const handleCustomUpload = async ({ file, onFinish, onError, onProgress }) => {
// 提取接口返回的真实数据对象
const resData = response.data
console.log(24536,resData)
console.log(24536, resData)
// 判断是否成功获取到了关键字段 object_name
if ( resData && resData.object_name) {
if (resData && resData.object_name) {
// 1. 核心业务字段赋值:供后续 submitAssignment 提取上传
file.name = resData.object_name
@@ -419,6 +416,7 @@ const submitAssignment = async (row) => {
const attachment_object_name = row.attachmentFileList[0]?.name || row.attachmentFileList[0]?.object_name || row.attachmentFileList[0]?.name
const payload = {
analyst_remark: row.analyst_remark,
wecom_id: String(row.wecom_id),
payment_object_names,
signature_object_name,
@@ -435,7 +433,7 @@ const submitAssignment = async (row) => {
assignee_name: row.assignee_name,
assignee_phone: row.assignee_phone
}
console.log(24531221126,row)
console.log(24531221126, row)
console.log('提交的数据:', payload)
const res = await http.post('/v1/material/submit', payload)
@@ -482,7 +480,7 @@ const handleDrawerSubmit = async () => {
/**
* 表格列配置
*/
const columns =[
const columns = [
{ title: '分析师', key: 'analyst_name', width: 100, fixed: 'left' },
{ title: '家长姓名', key: 'parent_name', width: 100 },
{
@@ -533,7 +531,7 @@ const columns =[
fixed: 'right',
align: 'center',
render: (row) => h(NSpace, { justify: 'center' }, {
default: () =>[
default: () => [
h(NButton, {
circle: true,
quaternary: true,
@@ -601,8 +599,19 @@ const logout = () => {
filter: blur(40px);
}
.circle-1 { width: 300px; height: 300px; top: -100px; right: -50px; }
.circle-2 { width: 200px; height: 200px; bottom: -50px; left: 10%; }
.circle-1 {
width: 300px;
height: 300px;
top: -100px;
right: -50px;
}
.circle-2 {
width: 200px;
height: 200px;
bottom: -50px;
left: 10%;
}
/* 内容包裹器 */
.content-wrapper {
@@ -779,11 +788,25 @@ const logout = () => {
/* 响应式适配 */
@media (max-width: 768px) {
.header-banner { height: 180px; }
.title-meta h1 { font-size: 18px; }
.title-meta p { display: none; }
.header-right span { display: none; }
.logout-btn { padding: 8px !important; }
.header-banner {
height: 180px;
}
.title-meta h1 {
font-size: 18px;
}
.title-meta p {
display: none;
}
.header-right span {
display: none;
}
.logout-btn {
padding: 8px !important;
}
.file-grid {
grid-template-columns: 1fr;

View File

@@ -18,7 +18,9 @@
</div>
<n-button class="logout-btn" secondary type="error" round @click="logout">
<template #icon>
<n-icon><LogOutOutline /></n-icon>
<n-icon>
<LogOutOutline />
</n-icon>
</template>
退出系统
</n-button>
@@ -33,19 +35,23 @@
<div class="glass-card section-card">
<div class="card-header">
<div class="header-indicator"></div>
<n-icon size="22"><IdCardOutline /></n-icon>
<n-icon size="22">
<IdCardOutline />
</n-icon>
<h3>1. 客户及成交信息</h3>
</div>
<div class="card-body">
<n-grid :x-gap="24" :y-gap="0" cols="1 s:2 m:3" responsive="screen">
<n-grid-item>
<n-form-item label="分析师主管" path="analystSupervisor">
<n-input v-model:value="formData.analystSupervisor" placeholder="输入姓名" clearable />
<n-input v-model:value="formData.analystSupervisor" placeholder="输入姓名"
clearable />
</n-form-item>
</n-grid-item>
<n-grid-item>
<n-form-item label="分析师部门" path="analystDepartment">
<n-input v-model:value="formData.analystDepartment" placeholder="例如:市场一部" clearable />
<n-input v-model:value="formData.analystDepartment" placeholder="例如:市场一部"
clearable />
</n-form-item>
</n-grid-item>
<n-grid-item>
@@ -65,29 +71,34 @@
</n-grid-item>
<n-grid-item>
<n-form-item label="身份证号码" path="parentIdCard">
<n-input v-model:value="formData.parentIdCard" placeholder="18位身份证号" clearable />
<n-input v-model:value="formData.parentIdCard" placeholder="18位身份证号"
clearable />
</n-form-item>
</n-grid-item>
<n-grid-item>
<n-form-item label="成交日期" path="transactionDate">
<n-date-picker v-model:value="formData.transactionDate" type="date" clearable style="width: 100%" />
<n-date-picker v-model:value="formData.transactionDate" type="date" clearable
style="width: 100%" />
</n-form-item>
</n-grid-item>
<n-grid-item>
<n-form-item label="成交金额" path="transactionAmount">
<n-input-number v-model:value="formData.transactionAmount" placeholder="0.00" clearable style="width: 100%">
<n-input-number v-model:value="formData.transactionAmount" placeholder="0.00"
clearable style="width: 100%">
<template #prefix>¥</template>
</n-input-number>
</n-form-item>
</n-grid-item>
<n-grid-item>
<n-form-item label="指导周期" path="guidancePeriod">
<n-input v-model:value="formData.guidancePeriod" placeholder="例如3个月" clearable />
<n-input v-model:value="formData.guidancePeriod" placeholder="例如3个月"
clearable />
</n-form-item>
</n-grid-item>
</n-grid>
<n-form-item label="分析师备注" class="mt-8">
<n-input v-model:value="formData.analystNotes" type="textarea" placeholder="填写备注信息(选填)" :autosize="{ minRows: 2, maxRows: 4 }" />
<n-input v-model:value="formData.analystNotes" type="textarea" placeholder="填写备注信息(选填)"
:autosize="{ minRows: 2, maxRows: 4 }" />
</n-form-item>
</div>
</div>
@@ -98,7 +109,9 @@
<div class="glass-card section-card full-h">
<div class="card-header">
<div class="header-indicator"></div>
<n-icon size="22"><DocumentAttachOutline /></n-icon>
<n-icon size="22">
<DocumentAttachOutline />
</n-icon>
<h3>2. 附件文档 (限1份)</h3>
</div>
<div class="card-body">
@@ -107,7 +120,9 @@
:custom-request="({ file, onFinish, onError, onProgress }) => handleCustomUpload({ file, onFinish, onError, onProgress }, 'documentFileList')">
<n-upload-dragger class="modern-dragger">
<div class="dragger-icon">
<n-icon size="44" depth="3"><CloudUploadOutline /></n-icon>
<n-icon size="44" depth="3">
<CloudUploadOutline />
</n-icon>
</div>
<n-text class="dragger-text">点击或拖拽上传</n-text>
<n-p depth="3" class="dragger-subtext">支持 PDF, DOCX, XLSX (Max 50MB)</n-p>
@@ -120,7 +135,9 @@
<div class="glass-card section-card full-h">
<div class="card-header">
<div class="header-indicator"></div>
<n-icon size="22"><BrushOutline /></n-icon>
<n-icon size="22">
<BrushOutline />
</n-icon>
<h3>4. 电子签名 (限1张)</h3>
</div>
<div class="card-body">
@@ -129,7 +146,9 @@
@preview="handlePreview"
:custom-request="({ file, onFinish, onError, onProgress }) => handleCustomUpload({ file, onFinish, onError, onProgress }, 'signatureFileList')">
<div class="signature-placeholder">
<n-icon size="28" depth="3"><CreateOutline /></n-icon>
<n-icon size="28" depth="3">
<CreateOutline />
</n-icon>
<span>上传手写签名</span>
</div>
</n-upload>
@@ -142,7 +161,9 @@
<div class="glass-card section-card mt-20">
<div class="card-header">
<div class="header-indicator"></div>
<n-icon size="22"><ImagesOutline /></n-icon>
<n-icon size="22">
<ImagesOutline />
</n-icon>
<h3>3. 付款截图凭证 (可多张)</h3>
</div>
<div class="card-body">
@@ -150,7 +171,9 @@
v-model:file-list="paymentFileListLast" @preview="handlePreview"
:custom-request="({ file, onFinish, onError, onProgress }) => handleCustomUpload({ file, onFinish, onError, onProgress }, 'paymentFileList')">
<div class="payment-placeholder">
<n-icon size="32"><CameraOutline /></n-icon>
<n-icon size="32">
<CameraOutline />
</n-icon>
<span>添加凭证</span>
</div>
</n-upload>
@@ -167,7 +190,9 @@
</n-button>
<n-button size="large" type="primary" round @click="handleSubmit" class="btn-submit">
<template #icon>
<n-icon><CheckmarkCircleOutline /></n-icon>
<n-icon>
<CheckmarkCircleOutline />
</n-icon>
</template>
提交材料至中心
</n-button>
@@ -445,6 +470,7 @@ const handleSubmit = async () => {
transaction_date: formatDate(formData.transactionDate),
transaction_amount: String(formData.transactionAmount || ''),
guidance_period: formData.guidancePeriod,
analyst_remark: formData.analystNotes,
payment_object_names: formData.paymentFileList.map(f => f.rawResponse?.data?.object_name).filter(Boolean),
signature_object_name: formData.signatureFileList[0]?.rawResponse?.data?.object_name || null,
attachment_object_name: formData.documentFileList[0]?.rawResponse?.data?.object_name || null,
@@ -471,7 +497,8 @@ const handleCancel = () => router.back()
.page-wrapper {
min-height: 100vh;
background-color: #f5f7fa;
padding-bottom: 120px; /* 为底部悬浮栏留出空间 */
padding-bottom: 120px;
/* 为底部悬浮栏留出空间 */
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
}
@@ -580,9 +607,19 @@ const handleCancel = () => router.back()
}
/* 布局辅助 */
.mt-8 { margin-top: 8px; }
.mt-20 { margin-top: 20px; }
.full-h { height: 100%; display: flex; flex-direction: column; }
.mt-8 {
margin-top: 8px;
}
.mt-20 {
margin-top: 20px;
}
.full-h {
height: 100%;
display: flex;
flex-direction: column;
}
/* 上传组件现代风格 */
.modern-dragger {
@@ -641,6 +678,7 @@ const handleCancel = () => router.back()
height: 120px;
border-radius: 12px;
}
.payment-modern-upload :deep(.n-upload-file.n-upload-file--image-card) {
width: 120px;
height: 120px;
@@ -706,16 +744,26 @@ const handleCancel = () => router.back()
padding: 0 20px;
}
.text-group h1 { font-size: 20px; }
.text-group p { font-size: 11px; }
.logout-btn { scale: 0.9; }
.text-group h1 {
font-size: 20px;
}
.text-group p {
font-size: 11px;
}
.logout-btn {
scale: 0.9;
}
.main-content {
margin-top: -40px;
padding: 0 12px;
}
.card-body { padding: 16px; }
.card-body {
padding: 16px;
}
.footer-actions-wrapper {
bottom: 0;
@@ -724,8 +772,18 @@ const handleCancel = () => router.back()
height: 80px;
}
.footer-blur-bg { border-radius: 20px 20px 0 0; }
.footer-content { justify-content: space-around; padding: 0 16px; }
.btn-cancel, .btn-submit { flex: 1; }
.footer-blur-bg {
border-radius: 20px 20px 0 0;
}
.footer-content {
justify-content: space-around;
padding: 0 16px;
}
.btn-cancel,
.btn-submit {
flex: 1;
}
}
</style>