feat: 采购单导入自动填充采购人/邮箱/详情链接 + 实时搜索
- PurchaseRequest.to_dict() 新增 requester_email - 导入时自动填入: 采购人(requester_name) + 邮箱(requester_email) + 详情链接(supplier_link) - 移除原始链接/详情链接的历史 autocomplete, 改为纯输入框+权限守卫 - 采购单导入搜索改为实时输入搜索(300ms防抖), 保留搜索按钮
This commit is contained in:
@ -64,6 +64,16 @@ class PurchaseRequest(db.Model):
|
||||
except Exception:
|
||||
return f"用户({user_id})"
|
||||
|
||||
def _get_user_email(self, user_id):
|
||||
if not user_id:
|
||||
return ""
|
||||
from app.models.system import SysUser
|
||||
try:
|
||||
user = db.session.get(SysUser, user_id)
|
||||
return user.email or "" if user else ""
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
'id': self.id,
|
||||
@ -82,6 +92,7 @@ class PurchaseRequest(db.Model):
|
||||
'status_text': ['待审批', '已通过', '已驳回', '已完成'][self.status] if self.status in [0, 1, 2, 3] else '未知',
|
||||
'requester_id': self.requester_id,
|
||||
'requester_name': self._get_user_name(self.requester_id),
|
||||
'requester_email': self._get_user_email(self.requester_id),
|
||||
'approver_id': self.approver_id,
|
||||
'approver_name': self._get_user_name(self.approver_id) if self.approver_id else None,
|
||||
'approved_at': self.approved_at.strftime('%Y-%m-%d %H:%M:%S') if self.approved_at else None,
|
||||
|
||||
@ -17,6 +17,7 @@ export interface PurchaseItem {
|
||||
status_text?: string
|
||||
requester_id?: number
|
||||
requester_name?: string
|
||||
requester_email?: string
|
||||
approver_id?: number
|
||||
approver_name?: string
|
||||
approved_at?: string
|
||||
|
||||
@ -621,31 +621,13 @@
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="原始链接">
|
||||
<el-autocomplete
|
||||
v-model="form.source_link"
|
||||
:fetch-suggestions="(qs, cb) => querySearchLinks(qs, cb, 'original')"
|
||||
placeholder="http://"
|
||||
style="width: 100%"
|
||||
clearable
|
||||
:trigger-on-focus="true"
|
||||
>
|
||||
<template #default="{ item }"><div style="font-size: 12px; line-height: 1.2; padding: 4px 0;">{{ item.value }}</div></template>
|
||||
</el-autocomplete>
|
||||
<el-form-item v-if="hasFormFieldPermission('source_link')" label="原始链接">
|
||||
<el-input v-model="form.source_link" placeholder="http://" style="width: 100%" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="详情链接">
|
||||
<el-autocomplete
|
||||
v-model="form.detail_link"
|
||||
:fetch-suggestions="(qs, cb) => querySearchLinks(qs, cb, 'detail')"
|
||||
placeholder="http://"
|
||||
style="width: 100%"
|
||||
clearable
|
||||
:trigger-on-focus="true"
|
||||
>
|
||||
<template #default="{ item }"><div style="font-size: 12px; line-height: 1.2; padding: 4px 0;">{{ item.value }}</div></template>
|
||||
</el-autocomplete>
|
||||
<el-form-item v-if="hasFormFieldPermission('detail_link')" label="详情链接">
|
||||
<el-input v-model="form.detail_link" placeholder="http://" style="width: 100%" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -678,18 +660,18 @@
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div style="margin-bottom: 15px;">
|
||||
<div style="margin-bottom: 15px; display: flex; gap: 10px;">
|
||||
<el-input
|
||||
v-model="purchaseImportKeyword"
|
||||
placeholder="搜索采购单号 / 名称 / 规格..."
|
||||
placeholder="输入关键字实时搜索..."
|
||||
clearable
|
||||
style="width: 300px;"
|
||||
@keyup.enter="fetchPurchaseImportList"
|
||||
style="flex: 1;"
|
||||
@input="debouncedPurchaseImportSearch"
|
||||
@clear="fetchPurchaseImportList"
|
||||
>
|
||||
<template #prefix><el-icon><Search /></el-icon></template>
|
||||
</el-input>
|
||||
<el-button type="primary" style="margin-left: 10px;" @click="fetchPurchaseImportList">搜索</el-button>
|
||||
<el-button type="primary" @click="fetchPurchaseImportList">搜索</el-button>
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
@ -798,7 +780,6 @@ import {
|
||||
deleteFile,
|
||||
getSupplierSuggestions,
|
||||
getUserSuggestions,
|
||||
getLinkSuggestions,
|
||||
getLocationSuggestions,
|
||||
getFilterOptions
|
||||
} from '@/api/inbound/buy'
|
||||
@ -1206,19 +1187,6 @@ const fetchUserSuggestions = async (query: string, cb: any) => {
|
||||
const querySearchPurchaser = (qs: string, cb: any) => fetchUserSuggestions(qs, cb)
|
||||
const handlePurchaserSelect = (item: any) => { form.purchaser = item.value; if (item.email) form.purchaser_email = item.email }
|
||||
|
||||
const fetchLinkSuggestions = async (query: string, cb: any, type: 'original' | 'detail') => {
|
||||
if (!form.base_id) { cb([]); return }
|
||||
try {
|
||||
const res: any = await getLinkSuggestions({ base_id: form.base_id, type })
|
||||
if (res.code === 200) {
|
||||
const links = res.data.map((link: string) => ({ value: link }))
|
||||
const filtered = query ? links.filter((item:any) => item.value.toLowerCase().includes(query.toLowerCase())) : links
|
||||
cb(filtered)
|
||||
} else { cb([]) }
|
||||
} catch(e) { cb([]) }
|
||||
}
|
||||
const querySearchLinks = (qs: string, cb: any, type: 'original' | 'detail') => fetchLinkSuggestions(qs, cb, type)
|
||||
|
||||
const fetchLocationSuggestions = async (query: string, cb: any) => {
|
||||
if (!form.base_id) { cb([]); return }
|
||||
try {
|
||||
@ -1805,6 +1773,13 @@ const fetchPurchaseImportList = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
// 防抖实时搜索(输入即搜,无需点按钮)
|
||||
const debouncedPurchaseImportSearch = debounce(() => {
|
||||
purchaseImportPage.value = 1
|
||||
purchaseImportSelected.value = null
|
||||
fetchPurchaseImportList()
|
||||
}, 300)
|
||||
|
||||
// 表格选中行变化(点击已选中行可取消)
|
||||
const onPurchaseImportSelect = (row: any) => {
|
||||
if (purchaseImportSelected.value?.id === row.id) {
|
||||
@ -1882,7 +1857,15 @@ const confirmPurchaseImport = () => {
|
||||
}
|
||||
}
|
||||
if (po.supplier_link) {
|
||||
form.source_link = po.supplier_link
|
||||
form.detail_link = po.supplier_link
|
||||
}
|
||||
|
||||
// 从采购申请人自动填充采购人信息
|
||||
if (po.requester_name) {
|
||||
form.purchaser = po.requester_name
|
||||
}
|
||||
if (po.requester_email) {
|
||||
form.purchaser_email = po.requester_email
|
||||
}
|
||||
|
||||
// 3. 关联采购单号
|
||||
|
||||
Reference in New Issue
Block a user