From ccd67e291e00a2ad9c29ad8df43de6fab5a4afed Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 09 四月 2026 09:30:08 +0800
Subject: [PATCH] feat(协同审批/报价单): 添加附件上传、预览和下载功能
---
src/views/salesManagement/salesQuotation/index.vue | 315 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 258 insertions(+), 57 deletions(-)
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index cbbc4f8..9cf7792 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -51,7 +51,7 @@
height="calc(100vh - 22em)"
>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column prop="quotationNo" label="鎶ヤ环鍗曞彿" width="150" />
+ <el-table-column prop="quotationNo" label="鎶ヤ环鍗曞彿" />
<el-table-column prop="customer" label="瀹㈡埛鍚嶇О" />
<el-table-column prop="salesperson" label="涓氬姟鍛�" width="100" />
<el-table-column prop="quotationDate" label="鎶ヤ环鏃ユ湡" width="120" />
@@ -231,43 +231,52 @@
<el-table :data="form.products" border style="width: 100%" class="product-table" v-if="form.products.length > 0">
<el-table-column prop="product" label="浜у搧鍚嶇О" width="200">
<template #default="scope">
- <el-tree-select
- v-model="scope.row.productId"
- placeholder="璇烽�夋嫨"
- clearable
- check-strictly
- @change="getModels($event, scope.row)"
- :data="productOptions"
- :render-after-expand="false"
- style="width: 100%"
- />
+ <el-form-item :prop="`products.${scope.$index}.productId`" class="product-table-form-item">
+ <el-tree-select
+ v-model="scope.row.productId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ check-strictly
+ @change="getModels($event, scope.row)"
+ :data="productOptions"
+ :render-after-expand="false"
+ style="width: 100%"
+ />
+ </el-form-item>
</template>
</el-table-column>
- <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="150">
+ <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="200">
<template #default="scope">
- <el-select
- v-model="scope.row.specificationId"
- placeholder="璇烽�夋嫨"
- clearable
- @change="getProductModel($event, scope.row)"
- >
- <el-option
- v-for="item in modelOptions"
- :key="item.id"
- :label="item.model"
- :value="item.id"
- />
- </el-select>
+ <el-form-item :prop="`products.${scope.$index}.specificationId`" class="product-table-form-item">
+ <el-select
+ v-model="scope.row.specificationId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="getProductModel($event, scope.row)"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in scope.row.modelOptions || []"
+ :key="item.id"
+ :label="item.model"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
</template>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅">
<template #default="scope">
- <el-input v-model="scope.row.unit" placeholder="鍗曚綅" />
+ <el-form-item :prop="`products.${scope.$index}.unit`" class="product-table-form-item">
+ <el-input v-model="scope.row.unit" placeholder="鍗曚綅" clearable/>
+ </el-form-item>
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
- <el-input-number v-model="scope.row.unitPrice" :min="0" :precision="2" style="width: 100%" />
+ <el-form-item :prop="`products.${scope.$index}.unitPrice`" class="product-table-form-item">
+ <el-input-number v-model="scope.row.unitPrice" :min="0" :precision="2" style="width: 100%" />
+ </el-form-item>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="80" align="center">
@@ -301,6 +310,52 @@
</el-form-item>
</div>
</el-card>
+
+ <el-card class="form-card" shadow="hover">
+ <template #header>
+ <div class="card-header-wrapper">
+ <el-icon class="card-icon"><Paperclip /></el-icon>
+ <span class="card-title">闄勪欢鏉愭枡</span>
+ </div>
+ </template>
+ <div class="form-content">
+ <el-form-item label="闄勪欢">
+ <el-upload
+ v-model:file-list="fileList"
+ :action="upload.url"
+ multiple
+ ref="fileUpload"
+ auto-upload
+ :headers="upload.headers"
+ :before-upload="handleBeforeUpload"
+ :on-error="handleUploadError"
+ :on-success="handleUploadSuccess"
+ :on-remove="handleRemove"
+ :on-preview="handlePreview"
+ >
+ <el-button type="primary">涓婁紶</el-button>
+ <template #file="{ file }">
+ <div style="display:flex; align-items:center; gap: 10px; width: 100%;">
+ <span style="flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+ {{ file.name }}
+ </span>
+ <div style="display:flex; align-items:center; gap: 6px;">
+
+ <el-button link type="success" :icon="Download" @click="handleDownload(file)" />
+ <el-button link type="primary" :icon="View" @click="handlePreview(file)" />
+ <el-button link type="danger" :icon="Delete" @click="triggerRemoveFile(file)" />
+ </div>
+ </div>
+ </template>
+ <template #tip>
+ <div class="el-upload__tip">
+ 鏂囦欢鏍煎紡鏀寔 doc锛宒ocx锛寈ls锛寈lsx锛宲pt锛宲ptx锛宲df锛宼xt锛寈ml锛宩pg锛宩peg锛宲ng锛実if锛宐mp锛宺ar锛寊ip锛�7z
+ </div>
+ </template>
+ </el-upload>
+ </el-form-item>
+ </div>
+ </el-card>
</el-form>
</div>
</FormDialog>
@@ -322,7 +377,7 @@
</el-descriptions-item>
</el-descriptions>
- <div style="margin-top: 20px;">
+ <div style="margin: 20px 0;">
<h4>浜у搧鏄庣粏</h4>
<el-table :data="currentQuotation.products" border style="width: 100%">
<el-table-column prop="product" label="浜у搧鍚嶇О" />
@@ -341,19 +396,25 @@
<p>{{ currentQuotation.remark }}</p>
</div>
</el-dialog>
+
+ <filePreview ref="filePreviewRef" />
</div>
</template>
<script setup>
-import { ref, reactive, computed, onMounted, markRaw, shallowRef } from 'vue'
+import { ref, reactive, computed, onMounted, markRaw, shallowRef, getCurrentInstance } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { Search, Document, UserFilled, Box, EditPen, Plus, ArrowRight, Delete } from '@element-plus/icons-vue'
+import { Search, Document, UserFilled, Box, EditPen, Plus, ArrowRight, Delete, Paperclip, View, Download } from '@element-plus/icons-vue'
import Pagination from '@/components/PIMTable/Pagination.vue'
import FormDialog from '@/components/Dialog/FormDialog.vue'
import {getQuotationList,addQuotation,updateQuotation,deleteQuotation} from '@/api/salesManagement/salesQuotation.js'
import {userListNoPage} from "@/api/system/user.js";
-import {customerList} from "@/api/salesManagement/salesLedger.js";
+import { customerList, delLedgerFile } from "@/api/salesManagement/salesLedger.js";
import {modelList, productTreeList} from "@/api/basicData/product.js";
+import { getToken } from "@/utils/auth";
+import filePreview from "@/components/filePreview/index.vue";
+
+const { proxy } = getCurrentInstance()
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
@@ -375,6 +436,13 @@
const dialogVisible = ref(false)
const viewDialogVisible = ref(false)
const dialogTitle = ref('鏂板鎶ヤ环')
+const fileList = ref([])
+const fileUpload = ref()
+const filePreviewRef = ref()
+const upload = reactive({
+ url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
+ headers: { Authorization: "Bearer " + getToken() },
+})
const form = reactive({
quotationNo: '',
customer: '',
@@ -390,16 +458,34 @@
otherFee: 0,
discountRate: 0,
discountAmount: 0,
- totalAmount: 0
+ totalAmount: 0,
+ tempFileIds: []
})
-const rules = {
+const baseRules = {
customer: [{ required: true, message: '璇烽�夋嫨瀹㈡埛', trigger: 'change' }],
salesperson: [{ required: true, message: '璇烽�夋嫨涓氬姟鍛�', trigger: 'change' }],
quotationDate: [{ required: true, message: '璇烽�夋嫨鎶ヤ环鏃ユ湡', trigger: 'change' }],
validDate: [{ required: true, message: '璇烽�夋嫨鏈夋晥鏈�', trigger: 'change' }],
paymentMethod: [{ required: true, message: '璇疯緭鍏ヤ粯娆炬柟寮�', trigger: 'blur' }]
}
+
+const productRowRules = {
+ productId: [{ required: true, message: '璇烽�夋嫨浜у搧鍚嶇О', trigger: 'change' }],
+ specificationId: [{ required: true, message: '璇烽�夋嫨瑙勬牸鍨嬪彿', trigger: 'change' }],
+ unit: [{ required: true, message: '璇峰～鍐欏崟浣�', trigger: 'blur' }],
+ unitPrice: [{ required: true, message: '璇峰～鍐欏崟浠�', trigger: 'change' }]
+}
+const rules = computed(() => {
+ const r = { ...baseRules }
+ ;(form.products || []).forEach((_, i) => {
+ r[`products.${i}.productId`] = productRowRules.productId
+ r[`products.${i}.specificationId`] = productRowRules.specificationId
+ r[`products.${i}.unit`] = productRowRules.unit
+ r[`products.${i}.unitPrice`] = productRowRules.unitPrice
+ })
+ return r
+})
const userList = ref([]);
const customerOption = ref([]);
@@ -427,15 +513,6 @@
// 璁＄畻灞炴��
const filteredList = computed(() => {
let list = quotationList.value
- if (searchForm.quotationNo) {
- list = list.filter(item => item.quotationNo.includes(searchForm.quotationNo))
- }
- if (searchForm.customer) {
- list = list.filter(item => item.customer === searchForm.customer)
- }
- if (searchForm.status) {
- list = list.filter(item => item.status === searchForm.status)
- }
return list
})
@@ -454,12 +531,33 @@
searchForm.quotationNo = ''
searchForm.customer = ''
searchForm.status = ''
+ // 閲嶇疆鍒扮涓�椤靛苟閲嶆柊鏌ヨ
+ pagination.currentPage = 1
+ handleSearch()
+}
+
+const normalizeQuotationFiles = (raw) => {
+ const list =
+ (raw && Array.isArray(raw.salesLedgerFiles) && raw.salesLedgerFiles) ||
+ (raw && Array.isArray(raw.quotationFiles) && raw.quotationFiles) ||
+ (raw && Array.isArray(raw.fileList) && raw.fileList) ||
+ (raw && Array.isArray(raw.files) && raw.files) ||
+ []
+ return list
+ .map((item) => ({
+ id: item?.id,
+ name: item?.fileName || item?.name || item?.originalName || item?.filename || "闄勪欢",
+ url: item?.fileUrl || item?.url || item?.path || item?.tempPath,
+ tempId: item?.tempId,
+ }))
+ .filter((i) => i.url)
}
const handleAdd = async () => {
dialogTitle.value = '鏂板鎶ヤ环'
isEdit.value = false
resetForm()
+ fileList.value = []
// 閲嶇疆瀹℃壒浜鸿妭鐐�
approverNodes.value = [{ id: 1, userId: null }]
nextApproverId = 2
@@ -521,7 +619,7 @@
if (!value) {
row.productId = '';
row.product = '';
- modelOptions.value = [];
+ row.modelOptions = [];
row.specificationId = '';
row.specification = '';
row.unit = '';
@@ -534,9 +632,9 @@
if (label) {
row.product = label;
}
- // 鑾峰彇瑙勬牸鍨嬪彿鍒楄〃
+ // 鑾峰彇瑙勬牸鍨嬪彿鍒楄〃锛岃缃埌褰撳墠琛岀殑 modelOptions
modelList({ id: value }).then((res) => {
- modelOptions.value = res || [];
+ row.modelOptions = res || [];
});
};
const getProductModel = (value, row) => {
@@ -550,10 +648,11 @@
}
// 鏇存柊 specificationId锛坴-model 宸茬粡鑷姩鏇存柊锛岃繖閲岀‘淇濅竴鑷存�э級
row.specificationId = value;
- const index = modelOptions.value.findIndex((item) => item.id === value);
+ const modelOptions = row.modelOptions || [];
+ const index = modelOptions.findIndex((item) => item.id === value);
if (index !== -1) {
- row.specification = modelOptions.value[index].model;
- row.unit = modelOptions.value[index].unit;
+ row.specification = modelOptions[index].model;
+ row.unit = modelOptions[index].unit;
} else {
row.specification = '';
row.unit = '';
@@ -616,23 +715,46 @@
form.paymentMethod = row.paymentMethod || ''
form.status = row.status || '鑽夌'
form.remark = row.remark || ''
- form.products = row.products ? row.products.map(product => {
+ form.products = row.products ? await Promise.all(row.products.map(async (product) => {
const productName = product.product || product.productName || ''
// 浼樺厛鐢� productId锛涘鏋滃彧鏈夊悕绉帮紝灏濊瘯鍙嶆煡 id 浠ヤ究鏍戦�夋嫨鍣ㄥ弽鏄�
- const resolvedId = product.productId
+ const resolvedProductId = product.productId
? Number(product.productId)
: findNodeIdByLabel(productOptions.value, productName) || ''
+
+ // 濡傛灉鏈変骇鍝両D锛屽姞杞藉搴旂殑瑙勬牸鍨嬪彿鍒楄〃
+ let modelOptions = [];
+ let resolvedSpecificationId = product.specificationId || '';
+
+ if (resolvedProductId) {
+ try {
+ const res = await modelList({ id: resolvedProductId });
+ modelOptions = res || [];
+
+ // 濡傛灉杩斿洖鐨勬暟鎹病鏈� specificationId锛屼絾鏈� specification 鍚嶇О锛屾牴鎹悕绉版煡鎵� ID
+ if (!resolvedSpecificationId && product.specification) {
+ const foundModel = modelOptions.find(item => item.model === product.specification);
+ if (foundModel) {
+ resolvedSpecificationId = foundModel.id;
+ }
+ }
+ } catch (error) {
+ console.error('鍔犺浇瑙勬牸鍨嬪彿澶辫触:', error);
+ }
+ }
+
return {
- productId: resolvedId,
+ productId: resolvedProductId,
product: productName,
- specificationId: product.specificationId || '',
+ specificationId: resolvedSpecificationId,
specification: product.specification || '',
quantity: product.quantity || 0,
unit: product.unit || '',
unitPrice: product.unitPrice || 0,
- amount: product.amount || 0
+ amount: product.amount || 0,
+ modelOptions: modelOptions // 涓烘瘡琛屾坊鍔犵嫭绔嬬殑瑙勬牸鍨嬪彿鍒楄〃
}
- }) : []
+ })) : []
form.subtotal = row.subtotal || 0
form.freight = row.freight || 0
form.otherFee = row.otherFee || 0
@@ -661,6 +783,7 @@
userName: item.userName || ''
}));
+ fileList.value = normalizeQuotationFiles(row)
dialogVisible.value = true
}
@@ -702,6 +825,9 @@
form.discountRate = 0
form.discountAmount = 0
form.totalAmount = 0
+ form.tempFileIds = []
+ form.files = []
+ fileList.value = []
}
const addProduct = () => {
@@ -714,7 +840,8 @@
quantity: 1,
unit: '',
unitPrice: 0,
- amount: 0
+ amount: 0,
+ modelOptions: [] // 涓烘瘡琛屾坊鍔犵嫭绔嬬殑瑙勬牸鍨嬪彿鍒楄〃
})
}
@@ -742,6 +869,57 @@
// 鍙互鏍规嵁瀹㈡埛淇℃伅鑷姩濉厖涓�浜涢粯璁ゅ��
}
+function handleBeforeUpload() {
+ proxy?.$modal?.loading?.("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...")
+ return true
+}
+function handleUploadError() {
+ proxy?.$modal?.closeLoading?.()
+ ElMessage.error("涓婁紶鏂囦欢澶辫触")
+}
+function handleUploadSuccess(res, file) {
+ proxy?.$modal?.closeLoading?.()
+ if (res?.code === 200) {
+ file.tempId = res?.data?.tempId
+ const url = res?.data?.tempPath || res?.data?.url
+ if (url) file.url = url
+ file.name = res?.data?.originalName || file?.name
+ ElMessage.success("涓婁紶鎴愬姛")
+ } else {
+ ElMessage.error(res?.msg || "涓婁紶澶辫触")
+ fileUpload.value?.handleRemove?.(file)
+ }
+}
+function handleRemove(file) {
+ if (!isEdit.value) return
+ if (!file?.id) return
+ delLedgerFile([file.id]).then((res) => {
+ if (res?.code === 200) {
+ ElMessage.success("鍒犻櫎鎴愬姛")
+ } else {
+ ElMessage.error(res?.msg || "鍒犻櫎澶辫触")
+ }
+ }).catch(() => {
+ ElMessage.error("鍒犻櫎澶辫触")
+ })
+}
+
+const handleDownload = (file) => {
+ if (!file?.url) return
+ proxy?.$modal?.loading?.("姝ｅ湪涓嬭浇鏂囦欢锛岃绋嶅��...")
+ proxy.$download.name(file.url);
+ proxy?.$modal?.closeLoading?.()
+}
+
+function handlePreview(file) {
+ const url = file?.url || file?.response?.data?.tempPath || file?.response?.data?.url
+ if (!url) return
+ filePreviewRef.value?.open?.(url)
+}
+function triggerRemoveFile(file) {
+ fileUpload.value?.handleRemove?.(file)
+}
+
const handleSubmit = () => {
formRef.value.validate((valid) => {
if (valid) {
@@ -749,7 +927,7 @@
ElMessage.warning('璇疯嚦灏戞坊鍔犱竴涓骇鍝�')
return
}
-
+
// 瀹℃壒浜哄繀濉牎楠�
const hasEmptyApprover = approverNodes.value.some(node => !node.userId)
if (hasEmptyApprover) {
@@ -759,6 +937,13 @@
// 鏀堕泦鎵�鏈夎妭鐐圭殑瀹℃壒浜篿d
form.approveUserIds = approverNodes.value.map(node => node.userId).join(',')
+
+ form.files = fileList.value.map(f => ({
+ tempId: f.tempId,
+ name: f.name,
+ url: f.url,
+ uid: f.uid,
+ })) || []
// 璁＄畻鎵�鏈変骇鍝佺殑鍗曚环鎬诲拰
form.totalAmount = form.products.reduce((sum, product) => {
@@ -797,10 +982,14 @@
const handleCurrentChange = (val) => {
pagination.currentPage = val.page
pagination.pageSize = val.limit
+ // 鍒嗛〉鍙樺寲鏃堕噸鏂版煡璇㈠垪琛�
+ handleSearch()
}
const handleSearch = ()=>{
const params = {
- ...pagination,
+ // 鍚庣鍒嗛〉鍙傛暟锛歝urrent / size
+ current: pagination.currentPage,
+ size: pagination.pageSize,
...searchForm
}
getQuotationList(params).then(res=>{
@@ -819,6 +1008,7 @@
// 瀹℃壒浜猴紙鐢ㄤ簬缂栬緫鏃跺弽鏄撅級
approveUserIds: item.approveUserIds || '',
remark: item.remark || '',
+ salesLedgerFiles: normalizeQuotationFiles(item),
products: item.products ? item.products.map(product => ({
productId: product.productId || '',
product: product.product || product.productName || '',
@@ -931,6 +1121,17 @@
padding: 8px 0;
}
+.product-table-form-item {
+ margin-bottom: 0;
+ :deep(.el-form-item__content) {
+ margin-left: 0 !important;
+ }
+ :deep(.el-form-item__label) {
+ width: auto;
+ min-width: auto;
+ }
+}
+
.approver-nodes-container {
display: flex;
flex-wrap: wrap;
--
Gitblit v1.9.3