From 6bea4a03b32c48d72cee59e46c90accdf07b8b35 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 四月 2026 17:59:22 +0800
Subject: [PATCH] 阳光彩印 1.协同审批管理不再需要选择审批人 2.审批管理添加审批流联调 3.销售发货、采购台账、销售报价不再需要选择审批人
---
src/views/salesManagement/salesQuotation/index.vue | 368 +++++++++++++++++++++++-----------------------------
1 files changed, 164 insertions(+), 204 deletions(-)
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index 5bd5cef..dc4e2ca 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -65,7 +65,7 @@
</el-table-column>
<el-table-column prop="totalAmount" label="鎶ヤ环閲戦" width="120">
<template #default="scope">
- 楼{{ scope.row.totalAmount.toFixed(2) }}
+ 楼{{ scope.row.totalAmount.toFixed(3) }}
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="200" fixed="right" align="center">
@@ -103,18 +103,14 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="瀹㈡埛鍚嶇О" prop="customer">
- <el-select v-model="form.customer" placeholder="璇烽�夋嫨瀹㈡埛" style="width: 100%" @change="handleCustomerChange" clearable>
- <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.customerName">
- {{
- item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
- }}
- </el-option>
+ <el-select v-model="form.customer" placeholder="璇烽�夋嫨瀹㈡埛" style="width: 100%" clearable filterable>
+ <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涓氬姟鍛�" prop="salesperson">
- <el-select v-model="form.salesperson" placeholder="璇烽�夋嫨涓氬姟鍛�" style="width: 100%" clearable>
+ <el-select v-model="form.salesperson" placeholder="璇烽�夋嫨涓氬姟鍛�" style="width: 100%" clearable filterable>
<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
:value="item.nickName" />
</el-select>
@@ -153,62 +149,6 @@
<el-col :span="12">
<el-form-item label="浠樻鏂瑰紡" prop="paymentMethod">
<el-input v-model="form.paymentMethod" placeholder="璇疯緭鍏ヤ粯娆炬柟寮�" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- </div>
- </el-card>
-
- <!-- 瀹℃壒浜轰俊鎭� -->
- <el-card class="form-card" shadow="hover">
- <template #header>
- <div class="card-header-wrapper">
- <el-icon class="card-icon"><UserFilled /></el-icon>
- <span class="card-title">瀹℃壒浜洪�夋嫨</span>
- <el-button type="primary" size="small" @click="addApproverNode" class="header-btn">
- <el-icon><Plus /></el-icon>
- 鏂板鑺傜偣
- </el-button>
- </div>
- </template>
- <div class="form-content">
- <el-row>
- <el-col :span="24">
- <el-form-item>
- <div class="approver-nodes-container">
- <div
- v-for="(node, index) in approverNodes"
- :key="node.id"
- class="approver-node-item"
- >
- <div class="approver-node-label">
- <span class="node-step">{{ index + 1 }}</span>
- <span class="node-text">瀹℃壒浜�</span>
- <el-icon class="arrow-icon"><ArrowRight /></el-icon>
- </div>
- <el-select
- v-model="node.userId"
- placeholder="閫夋嫨浜哄憳"
- class="approver-select"
- clearable
- >
- <el-option
- v-for="user in userList"
- :key="user.userId"
- :label="user.nickName"
- :value="user.userId"
- />
- </el-select>
- <el-button
- type="danger"
- size="small"
- :icon="Delete"
- @click="removeApproverNode(index)"
- v-if="approverNodes.length > 1"
- class="remove-btn"
- >鍒犻櫎</el-button>
- </div>
- </div>
</el-form-item>
</el-col>
</el-row>
@@ -275,7 +215,7 @@
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
<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-input-number v-model="scope.row.unitPrice" :min="0" :precision="3" style="width: 100%" />
</el-form-item>
</template>
</el-table-column>
@@ -310,6 +250,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>
@@ -327,7 +313,7 @@
<!-- <el-tag :type="getStatusType(currentQuotation.status)">{{ currentQuotation.status }}</el-tag>-->
<!-- </el-descriptions-item>-->
<el-descriptions-item label="鎶ヤ环鎬婚" :span="2">
- <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">楼{{ currentQuotation.totalAmount?.toFixed(2) }}</span>
+ <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">楼{{ currentQuotation.totalAmount?.toFixed(3) }}</span>
</el-descriptions-item>
</el-descriptions>
@@ -339,7 +325,7 @@
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
- 楼{{ scope.row.unitPrice.toFixed(2) }}
+ 楼{{ scope.row.unitPrice.toFixed(3) }}
</template>
</el-table-column>
</el-table>
@@ -350,19 +336,26 @@
<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, Box, EditPen, Plus, 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 {getQuotationList,addQuotation,updateQuotation,deleteQuotation,deleteFile} from '@/api/salesManagement/salesQuotation.js'
import {userListNoPage} from "@/api/system/user.js";
-import {customerList} from "@/api/salesManagement/salesLedger.js";
+import { customerList } from "@/api/salesManagement/salesLedger.js";
import {modelList, productTreeList} from "@/api/basicData/product.js";
+import {listCustomerPrivatePool} from "@/api/basicData/customerFile.js";
+import { getToken } from "@/utils/auth";
+import filePreview from "@/components/filePreview/index.vue";
+
+const { proxy } = getCurrentInstance()
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
@@ -384,6 +377,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: '',
@@ -399,7 +399,8 @@
otherFee: 0,
discountRate: 0,
discountAmount: 0,
- totalAmount: 0
+ totalAmount: 0,
+ tempFileIds: []
})
const baseRules = {
@@ -429,26 +430,11 @@
const userList = ref([]);
const customerOption = ref([]);
-// 瀹℃壒浜鸿妭鐐圭浉鍏�
-const approverNodes = ref([
- { id: 1, userId: null }
-])
-let nextApproverId = 2
const isEdit = ref(false)
const editId = ref(null)
const currentQuotation = ref({})
const formRef = ref()
-
-// 娣诲姞瀹℃壒浜鸿妭鐐�
-function addApproverNode() {
- approverNodes.value.push({ id: nextApproverId++, userId: null })
-}
-
-// 鍒犻櫎瀹℃壒浜鸿妭鐐�
-function removeApproverNode(index) {
- approverNodes.value.splice(index, 1)
-}
// 璁＄畻灞炴��
const filteredList = computed(() => {
@@ -476,13 +462,28 @@
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()
- // 閲嶇疆瀹℃壒浜鸿妭鐐�
- approverNodes.value = [{ id: 1, userId: null }]
- nextApproverId = 2
+ fileList.value = []
dialogVisible.value = true
let userLists = await userListNoPage();
// 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
@@ -492,13 +493,8 @@
userName: item.userName || ''
}));
getProductOptions();
- customerList().then((res) => {
- // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
- customerOption.value = (Array.isArray(res) ? res : []).map(item => ({
- id: item.id,
- customerName: item.customerName || '',
- taxpayerIdentificationNumber: item.taxpayerIdentificationNumber || ''
- }))
+ listCustomerPrivatePool({current: -1,size:-1}).then((res) => {
+ customerOption.value = res.data.records;
});
}
const getProductOptions = () => {
@@ -684,19 +680,6 @@
form.discountAmount = row.discountAmount || 0
form.totalAmount = row.totalAmount || 0
- // 鍙嶆樉瀹℃壒浜�
- if (row.approveUserIds) {
- const userIds = row.approveUserIds.split(',')
- approverNodes.value = userIds.map((userId, idx) => ({
- id: idx + 1,
- userId: parseInt(userId.trim())
- }))
- nextApproverId = userIds.length + 1
- } else {
- approverNodes.value = [{ id: 1, userId: null }]
- nextApproverId = 2
- }
-
// 鍔犺浇鐢ㄦ埛鍒楄〃
let userLists = await userListNoPage();
userList.value = (userLists.data || []).map(item => ({
@@ -705,6 +688,7 @@
userName: item.userName || ''
}));
+ fileList.value = normalizeQuotationFiles(row)
dialogVisible.value = true
}
@@ -746,6 +730,9 @@
form.discountRate = 0
form.discountAmount = 0
form.totalAmount = 0
+ form.tempFileIds = []
+ form.files = []
+ fileList.value = []
}
const addProduct = () => {
@@ -779,12 +766,68 @@
}
const calculateTotal = () => {
- form.discountAmount = form.subtotal * (form.discountRate / 100)
- form.totalAmount = form.subtotal + form.freight + form.otherFee - form.discountAmount
+ const rate = Number(form.discountRate)
+ const hasRate = Number.isFinite(rate) && rate > 0
+ const subtotal = Number(form.subtotal) || 0
+ const freight = Number(form.freight) || 0
+ const otherFee = Number(form.otherFee) || 0
+ form.discountAmount = hasRate ? subtotal * (rate / 100) : 0
+ form.totalAmount = subtotal + freight + otherFee - form.discountAmount
}
const handleCustomerChange = () => {
// 鍙互鏍规嵁瀹㈡埛淇℃伅鑷姩濉厖涓�浜涢粯璁ゅ��
+}
+
+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
+ deleteFile([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 = () => {
@@ -795,22 +838,19 @@
return
}
- // 瀹℃壒浜哄繀濉牎楠�
- const hasEmptyApprover = approverNodes.value.some(node => !node.userId)
- if (hasEmptyApprover) {
- ElMessage.error('璇蜂负鎵�鏈夊鎵硅妭鐐归�夋嫨瀹℃壒浜猴紒')
- return
- }
-
- // 鏀堕泦鎵�鏈夎妭鐐圭殑瀹℃壒浜篿d
- form.approveUserIds = approverNodes.value.map(node => node.userId).join(',')
+ form.files = fileList.value.map(f => ({
+ id: f.id,
+ tempId: f.tempId,
+ name: f.name,
+ url: f.url,
+ uid: f.uid,
+ })) || []
// 璁＄畻鎵�鏈変骇鍝佺殑鍗曚环鎬诲拰
form.totalAmount = form.products.reduce((sum, product) => {
const price = Number(product.unitPrice) || 0
return sum + price
}, 0)
-
if (isEdit.value) {
// 缂栬緫
const index = quotationList.value.findIndex(item => item.id === editId.value)
@@ -865,9 +905,8 @@
validDate: item.validDate || '',
paymentMethod: item.paymentMethod || '',
status: item.status || '鑽夌',
- // 瀹℃壒浜猴紙鐢ㄤ簬缂栬緫鏃跺弽鏄撅級
- approveUserIds: item.approveUserIds || '',
remark: item.remark || '',
+ salesLedgerFiles: normalizeQuotationFiles(item),
products: item.products ? item.products.map(product => ({
productId: product.productId || '',
product: product.product || product.productName || '',
@@ -889,12 +928,7 @@
}
})
customerList().then((res) => {
- // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
- customerOption.value = (Array.isArray(res) ? res : []).map(item => ({
- id: item.id,
- customerName: item.customerName || '',
- taxpayerIdentificationNumber: item.taxpayerIdentificationNumber || ''
- }))
+ customerOption.value = res;
});
}
@@ -991,71 +1025,6 @@
}
}
-.approver-nodes-container {
- display: flex;
- flex-wrap: wrap;
- gap: 24px;
- padding: 12px 0;
-}
-
-.approver-node-item {
- display: flex;
- flex-direction: column;
- align-items: center;
- gap: 12px;
- padding: 16px;
- background: #f8f9fa;
- border-radius: 8px;
- border: 1px solid #e4e7ed;
- transition: all 0.3s ease;
- min-width: 180px;
-
- &:hover {
- border-color: #409eff;
- background: #f0f7ff;
- box-shadow: 0 2px 8px rgba(64, 158, 255, 0.1);
- }
-}
-
-.approver-node-label {
- display: flex;
- align-items: center;
- gap: 8px;
- font-size: 14px;
- color: #606266;
-
- .node-step {
- display: inline-flex;
- align-items: center;
- justify-content: center;
- width: 24px;
- height: 24px;
- background: #409eff;
- color: #fff;
- border-radius: 50%;
- font-size: 12px;
- font-weight: 600;
- }
-
- .node-text {
- font-weight: 500;
- }
-
- .arrow-icon {
- color: #909399;
- font-size: 14px;
- }
-}
-
-.approver-select {
- width: 100%;
- min-width: 150px;
-}
-
-.remove-btn {
- margin-top: 4px;
-}
-
.product-table {
:deep(.el-table__header) {
background-color: #f5f7fa;
@@ -1083,13 +1052,4 @@
}
// 鍝嶅簲寮忎紭鍖�
-@media (max-width: 1200px) {
- .approver-nodes-container {
- gap: 16px;
- }
-
- .approver-node-item {
- min-width: 160px;
- }
-}
</style>
--
Gitblit v1.9.3