From 682b704f5f0d98fe0247a1aff5bf56a42470629f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 22 五月 2026 11:10:23 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_天津_宝东
---
src/views/salesManagement/salesQuotation/index.vue | 618 +++++++++++++++++++++++++++----------------------------
1 files changed, 301 insertions(+), 317 deletions(-)
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index c5ef3ea..fce764f 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -5,18 +5,35 @@
<el-row :gutter="20" class="search-row">
<el-col :span="8">
<el-input
- v-model="searchForm.product"
- placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
+ v-model="searchForm.quotationNo"
+ placeholder="璇疯緭鍏ユ姤浠峰崟鍙�"
clearable
- @keyup.enter="handleSearch(true)"
+ @keyup.enter="handleSearch"
>
<template #prefix>
<el-icon><Search /></el-icon>
</template>
</el-input>
</el-col>
- <el-col :span="4">
- <el-button type="primary" @click="handleSearch(true)">鎼滅储</el-button>
+ <el-col :span="8">
+ <el-select v-model="searchForm.customerId" placeholder="璇烽�夋嫨瀹㈡埛" clearable>
+ <el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.id">
+ {{
+ item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
+ }}
+ </el-option>
+ </el-select>
+ </el-col>
+<!-- <el-col :span="6">-->
+<!-- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鎶ヤ环鐘舵��" clearable>-->
+<!-- <el-option label="鑽夌" value="鑽夌"></el-option>-->
+<!-- <el-option label="宸插彂閫�" value="宸插彂閫�"></el-option>-->
+<!-- <el-option label="瀹㈡埛纭" value="瀹㈡埛纭"></el-option>-->
+<!-- <el-option label="宸茶繃鏈�" value="宸茶繃鏈�"></el-option>-->
+<!-- </el-select>-->
+<!-- </el-col>-->
+ <el-col :span="8">
+ <el-button type="primary" @click="handleSearch">鎼滅储</el-button>
<el-button @click="resetSearch">閲嶇疆</el-button>
<el-button style="float: right;" type="primary" @click="handleAdd">
鏂板鎶ヤ环
@@ -33,27 +50,27 @@
stripe
height="calc(100vh - 22em)"
>
- <el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column prop="product" label="浜у搧鍚嶇О" min-width="180" show-overflow-tooltip />
- <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" min-width="140" show-overflow-tooltip />
- <el-table-column prop="paper" label="绾稿紶" min-width="120" show-overflow-tooltip />
- <el-table-column prop="paperWeight" label="瀹氶噺" min-width="100" show-overflow-tooltip />
- <el-table-column prop="unitPrice" label="鍗曚环" width="120" align="right">
- <template #default="{ row }">{{ formatMoney(row.unitPrice) }}</template>
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <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" />
+ <el-table-column prop="validDate" label="鏈夋晥鏈熻嚦" width="120" />
+ <el-table-column prop="status" label="瀹℃壒鐘舵��" width="120" align="center">
+ <template #default="{ row }">
+ <el-tag :type="getStatusType(row.status)" disable-transitions>
+ {{ row.status || '--' }}
+ </el-tag>
+ </template>
</el-table-column>
- <el-table-column prop="printingFee" label="鍗扮増璐�" width="120" align="right">
- <template #default="{ row }">{{ formatMoney(row.printingFee) }}</template>
+ <el-table-column prop="totalAmount" label="鎶ヤ环閲戦" width="120">
+ <template #default="scope">
+ 楼{{ scope.row.totalAmount.toFixed(2) }}
+ </template>
</el-table-column>
- <el-table-column prop="dieCuttingFee" label="鍒�鐗堣垂" width="120" align="right">
- <template #default="{ row }">{{ formatMoney(row.dieCuttingFee) }}</template>
- </el-table-column>
- <el-table-column prop="grindingFee" label="纾ㄥ叿璐�" width="120" align="right">
- <template #default="{ row }">{{ formatMoney(row.grindingFee) }}</template>
- </el-table-column>
- <el-table-column prop="quantity" label="鏁伴噺" width="90" align="right" />
<el-table-column label="鎿嶄綔" width="200" fixed="right" align="center">
<template #default="scope">
- <el-button link type="primary" @click="handleEdit(scope.row)">缂栬緫</el-button>
+ <el-button link type="primary" @click="handleEdit(scope.row)" :disabled="!['寰呭鎵�','鎷掔粷'].includes(scope.row.status)">缂栬緫</el-button>
<el-button link type="primary" @click="handleView(scope.row)" style="color: #67C23A">鏌ョ湅</el-button>
<el-button link type="danger" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
@@ -74,13 +91,77 @@
<FormDialog v-model="dialogVisible" :title="dialogTitle" width="85%" :close-on-click-modal="false" @close="dialogVisible = false" @confirm="handleSubmit" @cancel="dialogVisible = false">
<div class="quotation-form-container">
<el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="quotation-form">
+ <!-- 鍩烘湰淇℃伅 -->
+ <el-card class="form-card" shadow="hover">
+ <template #header>
+ <div class="card-header-wrapper">
+ <el-icon class="card-icon"><Document /></el-icon>
+ <span class="card-title">鍩烘湰淇℃伅</span>
+ </div>
+ </template>
+ <div class="form-content">
+ <el-row :gutter="24">
+ <el-col :span="12">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="customerId">
+ <el-select v-model="form.customerId" 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 filterable>
+ <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
+ :value="item.nickName" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24">
+ <el-col :span="12">
+ <el-form-item label="鎶ヤ环鏃ユ湡" prop="quotationDate">
+ <el-date-picker
+ v-model="form.quotationDate"
+ type="date"
+ placeholder="閫夋嫨鎶ヤ环鏃ユ湡"
+ style="width: 100%"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏈夋晥鏈熻嚦" prop="validDate">
+ <el-date-picker
+ v-model="form.validDate"
+ type="date"
+ placeholder="閫夋嫨鏈夋晥鏈�"
+ style="width: 100%"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="24">
+ <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"><Box /></el-icon>
<span class="card-title">浜у搧淇℃伅</span>
- <el-button type="primary" size="small" @click="addProduct" class="header-btn" :disabled="isEdit">
+ <el-button type="primary" size="small" @click="addProduct" class="header-btn">
<el-icon><Plus /></el-icon>
娣诲姞浜у搧
</el-button>
@@ -106,9 +187,9 @@
</el-table-column>
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="200">
<template #default="scope">
- <el-form-item :prop="`products.${scope.$index}.specificationId`" class="product-table-form-item">
+ <el-form-item :prop="`products.${scope.$index}.productModelId`" class="product-table-form-item">
<el-select
- v-model="scope.row.specificationId"
+ v-model="scope.row.productModelId"
placeholder="璇烽�夋嫨"
clearable
@change="getProductModel($event, scope.row)"
@@ -131,45 +212,10 @@
</el-form-item>
</template>
</el-table-column>
- <el-table-column prop="paper" label="绾稿紶" width="180">
- <template #default="scope">
- <el-form-item :prop="`products.${scope.$index}.paper`" class="product-table-form-item">
- <el-input v-model="scope.row.paper" placeholder="绾稿紶" clearable />
- </el-form-item>
- </template>
- </el-table-column>
- <el-table-column prop="paperWeight" label="瀹氶噺" width="140">
- <template #default="scope">
- <el-form-item :prop="`products.${scope.$index}.paperWeight`" class="product-table-form-item">
- <el-input v-model="scope.row.paperWeight" placeholder="瀹氶噺" clearable />
- </el-form-item>
- </template>
- </el-table-column>
<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-form-item>
- </template>
- </el-table-column>
- <el-table-column prop="printingFee" label="鍗扮増璐�" width="140">
- <template #default="scope">
- <el-form-item :prop="`products.${scope.$index}.printingFee`" class="product-table-form-item">
- <el-input-number v-model="scope.row.printingFee" :min="0" :precision="2" style="width: 100%" />
- </el-form-item>
- </template>
- </el-table-column>
- <el-table-column prop="dieCuttingFee" label="鍒�鐗堣垂" width="140">
- <template #default="scope">
- <el-form-item :prop="`products.${scope.$index}.dieCuttingFee`" class="product-table-form-item">
- <el-input-number v-model="scope.row.dieCuttingFee" :min="0" :precision="2" style="width: 100%" />
- </el-form-item>
- </template>
- </el-table-column>
- <el-table-column prop="grindingFee" label="纾ㄥ叿璐�" width="140">
- <template #default="scope">
- <el-form-item :prop="`products.${scope.$index}.grindingFee`" class="product-table-form-item">
- <el-input-number v-model="scope.row.grindingFee" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</template>
</el-table-column>
@@ -193,10 +239,10 @@
</template>
<div class="form-content">
<el-form-item label="澶囨敞" prop="remark">
- <el-input
- type="textarea"
- v-model="form.remark"
- placeholder="璇疯緭鍏ュ娉ㄤ俊鎭紙閫夊～锛�"
+ <el-input
+ type="textarea"
+ v-model="form.remark"
+ placeholder="璇疯緭鍏ュ娉ㄤ俊鎭紙閫夊～锛�"
:rows="4"
maxlength="500"
show-word-limit
@@ -210,37 +256,36 @@
<!-- 鏌ョ湅璇︽儏瀵硅瘽妗� -->
<el-dialog v-model="viewDialogVisible" title="鎶ヤ环璇︽儏" width="800px">
+ <el-descriptions :column="2" border>
+ <el-descriptions-item label="鎶ヤ环鍗曞彿">{{ currentQuotation.quotationNo }}</el-descriptions-item>
+ <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentQuotation.customer }}</el-descriptions-item>
+ <el-descriptions-item label="涓氬姟鍛�">{{ currentQuotation.salesperson }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ currentQuotation.quotationDate }}</el-descriptions-item>
+ <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ currentQuotation.validDate }}</el-descriptions-item>
+ <el-descriptions-item label="浠樻鏂瑰紡">{{ currentQuotation.paymentMethod }}</el-descriptions-item>
+<!-- <el-descriptions-item label="鎶ヤ环鐘舵��">-->
+<!-- <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>
+ </el-descriptions-item>
+ </el-descriptions>
+
<div style="margin: 20px 0;">
<h4>浜у搧鏄庣粏</h4>
<el-table :data="currentQuotation.products" border style="width: 100%">
<el-table-column prop="product" label="浜у搧鍚嶇О" />
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
<el-table-column prop="unit" label="鍗曚綅" />
- <el-table-column prop="paper" label="绾稿紶" />
- <el-table-column prop="paperWeight" label="瀹氶噺" />
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
楼{{ scope.row.unitPrice.toFixed(2) }}
</template>
</el-table-column>
- <el-table-column prop="printingFee" label="鍗扮増璐�">
- <template #default="scope">
- 楼{{ Number(scope.row.printingFee || 0).toFixed(2) }}
- </template>
- </el-table-column>
- <el-table-column prop="dieCuttingFee" label="鍒�鐗堣垂">
- <template #default="scope">
- 楼{{ Number(scope.row.dieCuttingFee || 0).toFixed(2) }}
- </template>
- </el-table-column>
- <el-table-column prop="grindingFee" label="纾ㄥ叿璐�">
- <template #default="scope">
- 楼{{ Number(scope.row.grindingFee || 0).toFixed(2) }}
- </template>
- </el-table-column>
</el-table>
</div>
- <div v-if="currentQuotation.remark" style="margin-top: 12px;">
+
+ <div v-if="currentQuotation.remark" style="margin-top: 20px;">
<h4>澶囨敞</h4>
<p>{{ currentQuotation.remark }}</p>
</div>
@@ -251,30 +296,26 @@
<script setup>
import { ref, reactive, computed, onMounted, markRaw, shallowRef } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { Search, Box, EditPen, Plus } from '@element-plus/icons-vue'
+import { Search, Document, Box, EditPen, Plus } from '@element-plus/icons-vue'
import Pagination from '@/components/PIMTable/Pagination.vue'
import FormDialog from '@/components/Dialog/FormDialog.vue'
-import {
- quotationProductListPage,
- getQuotationProductInfo,
- addOrUpdateQuotationProduct,
- editQuotationProduct,
- deleteQuotationProduct
-} from '@/api/salesManagement/salesQuotationProduct.js'
+import {getQuotationList,addQuotation,updateQuotation,deleteQuotation} from '@/api/salesManagement/salesQuotation.js'
import {modelList, productTreeList} from "@/api/basicData/product.js";
-// import {listCustomerPrivatePool} from "@/api/basicData/customerFile.js";
+import {listCustomer} from "@/api/basicData/customer.js";
import { userListNoPage } from "@/api/system/user.js";
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
const searchForm = reactive({
- product: ''
+ quotationNo: '',
+ customerId: '',
+ status: ''
})
const quotationList = ref([])
const userList = ref([])
const productOptions = ref([]);
-const modelOptions = ref([]);
+const modelOptions = ref([]);
const pagination = reactive({
total: 3,
currentPage: 1,
@@ -286,6 +327,7 @@
const dialogTitle = ref('鏂板鎶ヤ环')
const form = reactive({
quotationNo: '',
+ customerId: undefined,
customer: '',
salesperson: '',
quotationDate: '',
@@ -302,11 +344,17 @@
totalAmount: 0
})
-const baseRules = {}
+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' }],
+ productModelId: [{ required: true, message: '璇烽�夋嫨瑙勬牸鍨嬪彿', trigger: 'change' }],
unit: [{ required: true, message: '璇峰～鍐欏崟浣�', trigger: 'blur' }],
unitPrice: [{ required: true, message: '璇峰～鍐欏崟浠�', trigger: 'change' }]
}
@@ -314,7 +362,7 @@
const r = { ...baseRules }
;(form.products || []).forEach((_, i) => {
r[`products.${i}.productId`] = productRowRules.productId
- r[`products.${i}.specificationId`] = productRowRules.specificationId
+ r[`products.${i}.productModelId`] = productRowRules.productModelId
r[`products.${i}.unit`] = productRowRules.unit
r[`products.${i}.unitPrice`] = productRowRules.unitPrice
})
@@ -329,19 +377,25 @@
// 璁＄畻灞炴��
const filteredList = computed(() => {
- const keyword = String(searchForm.product || '').trim()
- if (!keyword) return quotationList.value
- return quotationList.value.filter((row) => {
- const p = String(row?.product || '').toLowerCase()
- return p.includes(keyword.toLowerCase())
- })
+ let list = quotationList.value
+ return list
})
// 鏂规硶
-const formatMoney = (value) => `楼${Number(value || 0).toFixed(2)}`
+const getStatusType = (status) => {
+ const statusMap = {
+ '寰呭鎵�': 'info',
+ '瀹℃牳涓�': 'primary',
+ '閫氳繃': 'success',
+ '鎷掔粷': 'danger'
+ }
+ return statusMap[status] || 'info'
+}
const resetSearch = () => {
- searchForm.product = ''
+ searchForm.quotationNo = ''
+ searchForm.customer = ''
+ searchForm.status = ''
// 閲嶇疆鍒扮涓�椤靛苟閲嶆柊鏌ヨ
pagination.currentPage = 1
handleSearch()
@@ -353,9 +407,14 @@
resetForm()
dialogVisible.value = true
getProductOptions();
- // listCustomerPrivatePool({current: -1,size:-1}).then((res) => {
- // customerOption.value = res.data.records;
- // });
+ fetchCustomerOptions()
+}
+
+const fetchCustomerOptions = () => {
+ if (customerOption.value.length > 0) return
+ listCustomer({current: -1,size:-1, type: 0}).then((res) => {
+ customerOption.value = res.data.records;
+ });
}
const getProductOptions = () => {
// 杩斿洖 Promise锛屼究浜庣紪杈戞椂 await 纭繚鑳藉弽鏄�
@@ -374,7 +433,7 @@
if (children && children.length > 0) {
newItem.children = convertIdToValue(children);
}
-
+
return newItem;
});
}
@@ -398,7 +457,7 @@
row.productId = '';
row.product = '';
row.modelOptions = [];
- row.specificationId = '';
+ row.productModelId = '';
row.specification = '';
row.unit = '';
return;
@@ -419,13 +478,13 @@
if (!row) return;
// 濡傛灉娓呯┖閫夋嫨锛屽垯娓呯┖鐩稿叧瀛楁
if (!value) {
- row.specificationId = '';
+ row.productModelId = '';
row.specification = '';
row.unit = '';
return;
}
- // 鏇存柊 specificationId锛坴-model 宸茬粡鑷姩鏇存柊锛岃繖閲岀‘淇濅竴鑷存�э級
- row.specificationId = value;
+ // 鏇存柊 productModelId锛坴-model 宸茬粡鑷姩鏇存柊锛岃繖閲岀‘淇濅竴鑷存�э級
+ row.productModelId = value;
const modelOptions = row.modelOptions || [];
const index = modelOptions.findIndex((item) => item.id === value);
if (index !== -1) {
@@ -450,105 +509,29 @@
}
return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
};
-const mapProductItem = (product) => ({
- id: product?.id || '',
- salesQuotationId: product?.salesQuotationId || '',
- productId: product?.productId || '',
- product: product?.product || product?.productName || '',
- specificationId: product?.specificationId || '',
- specification: product?.specification || '',
- quantity: product?.quantity || 0,
- unit: product?.unit || '',
- paper: product?.paper || '',
- paperWeight: product?.paperWeight || '',
- unitPrice: product?.unitPrice || 0,
- printingFee: Number(product?.printingFee || 0),
- dieCuttingFee: Number(product?.dieCuttingFee || 0),
- grindingFee: Number(product?.grindingFee || 0),
- amount: product?.amount || 0
-})
-
-const mapQuotationItem = (item) => ({
- id: item?.id,
- salesQuotationId: item?.salesQuotationId || '',
- product: item?.product || '',
- specification: item?.specification || '',
- unit: item?.unit || '',
- paper: item?.paper || '',
- paperWeight: item?.paperWeight || '',
- unitPrice: Number(item?.unitPrice || 0),
- printingFee: Number(item?.printingFee || 0),
- dieCuttingFee: Number(item?.dieCuttingFee || 0),
- grindingFee: Number(item?.grindingFee || 0),
- quantity: Number(item?.quantity || 0),
- amount: Number(item?.amount || 0),
- createTime: item?.createTime || '',
- quotationNo: item?.quotationNo || '',
- customer: item?.customer || '',
- salesperson: item?.salesperson || '',
- quotationDate: item?.quotationDate || '',
- validDate: item?.validDate || '',
- paymentMethod: item?.paymentMethod || '',
- status: item?.status || '鑽夌',
- approveUserIds: item?.approveUserIds || '',
- remark: item?.remark || '',
- products: Array.isArray(item?.products) && item.products.length > 0
- ? item.products.map(mapProductItem)
- : [mapProductItem(item)],
- subtotal: item?.subtotal || 0,
- freight: item?.freight || 0,
- otherFee: item?.otherFee || 0,
- discountRate: item?.discountRate || 0,
- discountAmount: item?.discountAmount || 0,
- totalAmount: item?.totalAmount || 0
-})
-
-const calcTotalAmountFromProducts = (products) => {
- return (products || []).reduce((sum, product) => {
- const price = Number(product.unitPrice) || 0
- const printingFee = Number(product.printingFee) || 0
- const dieCuttingFee = Number(product.dieCuttingFee) || 0
- const grindingFee = Number(product.grindingFee) || 0
- return sum + price + printingFee + dieCuttingFee + grindingFee
- }, 0)
-}
-
-const buildProductPayload = (product) => {
- const quantity = Number(product?.quantity || 0)
- const unitPrice = Number(product?.unitPrice || 0)
- const printingFee = Number(product?.printingFee || 0)
- const dieCuttingFee = Number(product?.dieCuttingFee || 0)
- const grindingFee = Number(product?.grindingFee || 0)
- return {
- id: product?.id || undefined,
- salesQuotationId: product?.salesQuotationId || form.salesQuotationId || null,
- product: product?.product || '',
- specification: product?.specification || '',
- unit: product?.unit || '',
- paper: product?.paper || '',
- paperWeight: product?.paperWeight || '',
- unitPrice,
- printingFee,
- dieCuttingFee,
- grindingFee,
- quantity,
- amount: Number(product?.amount ?? quantity * unitPrice),
- remark: product?.remark ?? form.remark ?? ''
+const handleView = (row) => {
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+ currentQuotation.value = {
+ quotationNo: row.quotationNo || '',
+ customer: row.customer || '',
+ salesperson: row.salesperson || '',
+ quotationDate: row.quotationDate || '',
+ validDate: row.validDate || '',
+ paymentMethod: row.paymentMethod || '',
+ status: row.status || '',
+ remark: row.remark || '',
+ products: row.products ? row.products.map(product => ({
+ productId: product.productId || '',
+ product: product.product || product.productName || '',
+ productModelId: product.productModelId || '',
+ specification: product.specification || '',
+ quantity: product.quantity || 0,
+ unit: product.unit || '',
+ unitPrice: product.unitPrice || 0,
+ amount: product.amount || 0
+ })) : [],
+ totalAmount: row.totalAmount || 0
}
-}
-
-const handleView = async (row) => {
- let source = row
- if (row?.id) {
- try {
- const res = await getQuotationProductInfo(row.id)
- source = res?.data || row
- } catch (error) {
- source = row
- }
- }
- source.totalAmount = source.totalAmount || calcTotalAmountFromProducts(source?.products || [source])
- currentQuotation.value = mapQuotationItem(source)
viewDialogVisible.value = true
}
@@ -559,81 +542,64 @@
form.id = row.id || form.id || null
// 鍏堝姞杞戒骇鍝佹爲鏁版嵁锛屽惁鍒� el-tree-select 鏃犳硶鍙嶆樉浜у搧鍚嶇О
await getProductOptions()
- let source = row
- if (row?.id) {
- try {
- const res = await getQuotationProductInfo(row.id)
- source = res?.data || row
- } catch (error) {
- source = row
- }
- }
- source.totalAmount = source.totalAmount || calcTotalAmountFromProducts(source?.products || [source])
-
- const sourceProducts = Array.isArray(source?.products) && source.products.length > 0
- ? source.products
- : [source]
+ await fetchCustomerOptions()
// 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
- form.quotationNo = source.quotationNo || ''
- form.customer = source.customer || ''
- form.salesperson = source.salesperson || ''
- form.quotationDate = source.quotationDate || ''
- form.validDate = source.validDate || ''
- form.paymentMethod = source.paymentMethod || ''
- form.status = source.status || '鑽夌'
- form.remark = source.remark || ''
- form.products = await Promise.all(sourceProducts.map(async (product) => {
+ form.quotationNo = row.quotationNo || ''
+ form.customer = row.customer || ''
+ form.customerId = row.customerId || undefined
+ form.salesperson = row.salesperson || ''
+ form.quotationDate = row.quotationDate || ''
+ form.validDate = row.validDate || ''
+ form.paymentMethod = row.paymentMethod || ''
+ form.status = row.status || '鑽夌'
+ form.remark = row.remark || ''
+ form.products = row.products ? await Promise.all(row.products.map(async (product) => {
const productName = product.product || product.productName || ''
// 浼樺厛鐢� productId锛涘鏋滃彧鏈夊悕绉帮紝灏濊瘯鍙嶆煡 id 浠ヤ究鏍戦�夋嫨鍣ㄥ弽鏄�
const resolvedProductId = product.productId
? Number(product.productId)
: findNodeIdByLabel(productOptions.value, productName) || ''
-
+
// 濡傛灉鏈変骇鍝両D锛屽姞杞藉搴旂殑瑙勬牸鍨嬪彿鍒楄〃
let modelOptions = [];
- let resolvedSpecificationId = product.specificationId || '';
-
+ let resolvedProductModelId = product.productModelId || '';
+
if (resolvedProductId) {
try {
const res = await modelList({ id: resolvedProductId });
modelOptions = res || [];
-
- // 濡傛灉杩斿洖鐨勬暟鎹病鏈� specificationId锛屼絾鏈� specification 鍚嶇О锛屾牴鎹悕绉版煡鎵� ID
- if (!resolvedSpecificationId && product.specification) {
+
+ // 濡傛灉杩斿洖鐨勬暟鎹病鏈� productModelId锛屼絾鏈� specification 鍚嶇О锛屾牴鎹悕绉版煡鎵� ID
+ if (!resolvedProductModelId && product.specification) {
const foundModel = modelOptions.find(item => item.model === product.specification);
if (foundModel) {
- resolvedSpecificationId = foundModel.id;
+ resolvedProductModelId = foundModel.id;
}
}
} catch (error) {
console.error('鍔犺浇瑙勬牸鍨嬪彿澶辫触:', error);
}
}
-
+
return {
productId: resolvedProductId,
product: productName,
- specificationId: resolvedSpecificationId,
+ productModelId: resolvedProductModelId,
specification: product.specification || '',
quantity: product.quantity || 0,
unit: product.unit || '',
- paper: product.paper || '',
- paperWeight: product.paperWeight || '',
unitPrice: product.unitPrice || 0,
- printingFee: Number(product.printingFee || 0),
- dieCuttingFee: Number(product.dieCuttingFee || 0),
- grindingFee: Number(product.grindingFee || 0),
amount: product.amount || 0,
modelOptions: modelOptions // 涓烘瘡琛屾坊鍔犵嫭绔嬬殑瑙勬牸鍨嬪彿鍒楄〃
}
- }))
- form.subtotal = source.subtotal || 0
- form.freight = source.freight || 0
- form.otherFee = source.otherFee || 0
- form.discountRate = source.discountRate || 0
- form.discountAmount = source.discountAmount || 0
- form.totalAmount = source.totalAmount || 0
+ })) : []
+ form.subtotal = row.subtotal || 0
+ form.freight = row.freight || 0
+ form.otherFee = row.otherFee || 0
+ form.discountRate = row.discountRate || 0
+ form.discountAmount = row.discountAmount || 0
+ form.totalAmount = row.totalAmount || 0
dialogVisible.value = true
}
@@ -645,21 +611,23 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- if (!row?.id) {
- ElMessage.warning('鏈幏鍙栧埌鍙垹闄ょ殑浜у搧ID')
- return
+ const index = quotationList.value.findIndex(item => item.id === row.id)
+ if (index > -1) {
+ deleteQuotation(row.id).then(res=>{
+ // console.log(res)
+ if(res.code===200){
+ ElMessage.success('鍒犻櫎鎴愬姛')
+ handleSearch()
+ }
+ })
+ // quotationList.value.splice(index, 1)
+ // pagination.total--
+ // ElMessage.success('鍒犻櫎鎴愬姛')
}
- deleteQuotationProduct([row.id]).then(res=>{
- if(res.code===200){
- ElMessage.success('鍒犻櫎鎴愬姛')
- handleSearch()
- }
- })
})
}
const resetForm = () => {
- form.id = null
form.customer = ''
form.salesperson = ''
form.quotationDate = ''
@@ -677,24 +645,14 @@
}
const addProduct = () => {
- if (isEdit.value) {
- ElMessage.warning('缂栬緫鏃朵笉鍏佽鏂板浜у搧')
- return
- }
form.products.push({
productId: '',
product: '',
productName: '',
- specificationId: '',
- specification: '',
+ productModelId: '',
quantity: 1,
unit: '',
- paper: '',
- paperWeight: '',
unitPrice: 0,
- printingFee: 0,
- dieCuttingFee: 0,
- grindingFee: 0,
amount: 0,
modelOptions: [] // 涓烘瘡琛屾坊鍔犵嫭绔嬬殑瑙勬牸鍨嬪彿鍒楄〃
})
@@ -731,28 +689,27 @@
// 璁＄畻鎵�鏈変骇鍝佺殑鍗曚环鎬诲拰
form.totalAmount = form.products.reduce((sum, product) => {
const price = Number(product.unitPrice) || 0
- const printingFee = Number(product.printingFee) || 0
- const dieCuttingFee = Number(product.dieCuttingFee) || 0
- const grindingFee = Number(product.grindingFee) || 0
- return sum + price + printingFee + dieCuttingFee + grindingFee
+ return sum + price
}, 0)
+
+ form.customer = customerOption.value.find(item => item.id === form.customerId)?.customerName || ''
if (isEdit.value) {
- const editingItem = form.products[0] || {}
- const payload = buildProductPayload({
- ...editingItem,
- id: editingItem.id || form.id
- })
- editQuotationProduct(payload).then((res) => {
- if (res?.code === 200) {
- ElMessage.success('缂栬緫鎴愬姛')
- dialogVisible.value = false
- handleSearch()
- }
- })
+ // 缂栬緫
+ const index = quotationList.value.findIndex(item => item.id === editId.value)
+ if (index > -1) {
+ updateQuotation(form).then(res=>{
+ // console.log(res)
+ if(res.code===200){
+ ElMessage.success('缂栬緫鎴愬姛')
+ dialogVisible.value = false
+ handleSearch()
+ }
+ })
+ }
} else {
- const payloadList = form.products.map((item) => buildProductPayload(item))
- addOrUpdateQuotationProduct(payloadList).then((res) => {
- if (res?.code === 200) {
+ // 鏂板
+ addQuotation(form).then(res=>{
+ if(res.code===200){
ElMessage.success('鏂板鎴愬姛')
dialogVisible.value = false
handleSearch()
@@ -770,27 +727,53 @@
// 鍒嗛〉鍙樺寲鏃堕噸鏂版煡璇㈠垪琛�
handleSearch()
}
-const handleSearch = (resetPage = false)=>{
- if (resetPage) {
- pagination.currentPage = 1
- }
+const handleSearch = ()=>{
const params = {
// 鍚庣鍒嗛〉鍙傛暟锛歝urrent / size
current: pagination.currentPage,
size: pagination.pageSize,
...searchForm
}
- quotationProductListPage(params).then(res=>{
+ getQuotationList(params).then(res=>{
+ // console.log(res)
if(res.code===200){
- const records = res.data.records || []
- quotationList.value = records.map((item) => {
- const mapped = mapQuotationItem(item)
- mapped.totalAmount = calcTotalAmountFromProducts(mapped.products)
- return mapped
- })
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鎴栧叾浠栧璞℃斁鍏ュ搷搴斿紡瀵硅薄
+ quotationList.value = (res.data.records || []).map(item => ({
+ id: item.id,
+ quotationNo: item.quotationNo || '',
+ customer: item.customer || '',
+ customerId: item.customerId || undefined,
+ salesperson: item.salesperson || '',
+ quotationDate: item.quotationDate || '',
+ validDate: item.validDate || '',
+ paymentMethod: item.paymentMethod || '',
+ status: item.status || '鑽夌',
+ // 瀹℃壒浜猴紙鐢ㄤ簬缂栬緫鏃跺弽鏄撅級
+ approveUserIds: item.approveUserIds || '',
+ remark: item.remark || '',
+ products: item.products ? item.products.map(product => ({
+ productId: product.productId || '',
+ product: product.product || product.productName || '',
+ productModelId: product.productModelId || '',
+ specification: product.specification || '',
+ quantity: product.quantity || 0,
+ unit: product.unit || '',
+ unitPrice: product.unitPrice || 0,
+ amount: product.amount || 0
+ })) : [],
+ subtotal: item.subtotal || 0,
+ freight: item.freight || 0,
+ otherFee: item.otherFee || 0,
+ discountRate: item.discountRate || 0,
+ discountAmount: item.discountAmount || 0,
+ totalAmount: item.totalAmount || 0
+ }))
pagination.total = res.data.total
}
})
+ // customerList().then((res) => {
+ // customerOption.value = res;
+ // });
}
const getUserList = async () => {
@@ -806,6 +789,7 @@
onMounted(()=>{
getUserList()
handleSearch()
+ fetchCustomerOptions()
})
</script>
@@ -818,16 +802,16 @@
padding: 10px 0;
max-height: calc(100vh - 200px);
overflow-y: auto;
-
+
&::-webkit-scrollbar {
width: 6px;
height: 6px;
}
-
+
&::-webkit-scrollbar-thumb {
background: #c1c1c1;
border-radius: 3px;
-
+
&:hover {
background: #a8a8a8;
}
@@ -844,17 +828,17 @@
margin-bottom: 24px;
border-radius: 8px;
transition: all 0.3s ease;
-
+
&:hover {
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08) !important;
}
-
+
:deep(.el-card__header) {
padding: 16px 20px;
background: linear-gradient(135deg, #f5f7fa 0%, #ffffff 100%);
border-bottom: 1px solid #ebeef5;
}
-
+
:deep(.el-card__body) {
padding: 20px;
}
@@ -864,19 +848,19 @@
display: flex;
align-items: center;
gap: 8px;
-
+
.card-icon {
font-size: 18px;
color: #409eff;
}
-
+
.card-title {
font-weight: 600;
font-size: 16px;
color: #303133;
flex: 1;
}
-
+
.header-btn {
margin-left: auto;
}
@@ -900,20 +884,20 @@
.product-table {
:deep(.el-table__header) {
background-color: #f5f7fa;
-
+
th {
background-color: #f5f7fa !important;
color: #606266;
font-weight: 600;
}
}
-
+
:deep(.el-table__row) {
&:hover {
background-color: #f5f7fa;
}
}
-
+
:deep(.el-table__cell) {
padding: 12px 0;
}
--
Gitblit v1.9.3