From 100e814e0b699ef8973bc4ca9c47e3800c77356f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 03 十一月 2025 13:54:32 +0800
Subject: [PATCH] 销售报价-产品和规格型号改成选择下拉框
---
src/views/salesManagement/salesQuotation/index.vue | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 215 insertions(+), 15 deletions(-)
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index 0b4897c..cefc769 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -154,7 +154,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="浜よ揣鏈�" prop="deliveryPeriod">
- <el-input v-model="form.deliveryPeriod" placeholder="璇疯緭鍏ヤ氦璐ф湡" />
+ <el-date-picker
+ v-model="form.deliveryPeriod"
+ type="date"
+ placeholder="閫夋嫨浜よ揣鏈�"
+ style="width: 100%"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -171,12 +178,33 @@
<el-table :data="form.products" border style="width: 100%">
<el-table-column prop="product" label="浜у搧鍚嶇О" width="200">
<template #default="scope">
- <el-input v-model="scope.row.product" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <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%"
+ />
</template>
</el-table-column>
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="150">
<template #default="scope">
- <el-input v-model="scope.row.specification" placeholder="瑙勬牸鍨嬪彿" />
+ <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>
</template>
</el-table-column>
<el-table-column prop="quantity" label="鏁伴噺">
@@ -313,13 +341,14 @@
</template>
<script setup>
-import { ref, reactive, computed,onMounted } from 'vue'
+import { ref, reactive, computed, onMounted, markRaw, shallowRef } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Search } from '@element-plus/icons-vue'
-// import Pagination from '@/components/PIMTable/Pagination.vue'
+import Pagination from '@/components/PIMTable/Pagination.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 {modelList, productTreeList} from "@/api/basicData/product.js";
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
@@ -330,11 +359,12 @@
})
const quotationList = ref([])
-
+const productOptions = ref([]);
+const modelOptions = ref([]);
const pagination = reactive({
total: 3,
currentPage: 1,
- pageSize: 10
+ pageSize: 100
})
const dialogVisible = ref(false)
@@ -365,7 +395,7 @@
quotationDate: [{ required: true, message: '璇烽�夋嫨鎶ヤ环鏃ユ湡', trigger: 'change' }],
validDate: [{ required: true, message: '璇烽�夋嫨鏈夋晥鏈�', trigger: 'change' }],
paymentMethod: [{ required: true, message: '璇烽�夋嫨浠樻鏂瑰紡', trigger: 'change' }],
- deliveryPeriod: [{ required: true, message: '璇疯緭鍏ヤ氦璐ф湡', trigger: 'blur' }]
+ deliveryPeriod: [{ required: true, message: '璇烽�夋嫨浜よ揣鏈�', trigger: 'change' }]
}
const userList = ref([]);
const customerOption = ref([]);
@@ -413,14 +443,123 @@
resetForm()
dialogVisible.value = true
let userLists = await userListNoPage();
- userList.value = userLists.data;
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+ userList.value = (userLists.data || []).map(item => ({
+ userId: item.userId,
+ nickName: item.nickName || '',
+ userName: item.userName || ''
+ }));
+ getProductOptions();
customerList().then((res) => {
- customerOption.value = res;
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+ customerOption.value = (Array.isArray(res) ? res : []).map(item => ({
+ id: item.id,
+ customerName: item.customerName || '',
+ taxpayerIdentificationNumber: item.taxpayerIdentificationNumber || ''
+ }))
});
}
-
+const getProductOptions = () => {
+ productTreeList().then((res) => {
+ productOptions.value = convertIdToValue(res);
+ });
+};
+function convertIdToValue(data) {
+ return data.map((item) => {
+ const { id, children, ...rest } = item;
+ const newItem = {
+ ...rest,
+ value: id, // 灏� id 鏀逛负 value
+ };
+ if (children && children.length > 0) {
+ newItem.children = convertIdToValue(children);
+ }
+
+ return newItem;
+ });
+}
+const getModels = (value, row) => {
+ if (!row) return;
+ // 濡傛灉娓呯┖閫夋嫨锛屽垯娓呯┖鐩稿叧瀛楁
+ if (!value) {
+ row.productId = '';
+ row.product = '';
+ modelOptions.value = [];
+ row.specificationId = '';
+ row.specification = '';
+ row.unit = '';
+ return;
+ }
+ // 鏇存柊 productId锛坴-model 宸茬粡鑷姩鏇存柊锛岃繖閲岀‘淇濅竴鑷存�э級
+ row.productId = value;
+ // 鎵惧埌瀵瑰簲鐨� label 骞惰祴鍊肩粰 row.product
+ const label = findNodeById(productOptions.value, value);
+ if (label) {
+ row.product = label;
+ }
+ // 鑾峰彇瑙勬牸鍨嬪彿鍒楄〃
+ modelList({ id: value }).then((res) => {
+ modelOptions.value = res || [];
+ });
+};
+const getProductModel = (value, row) => {
+ if (!row) return;
+ // 濡傛灉娓呯┖閫夋嫨锛屽垯娓呯┖鐩稿叧瀛楁
+ if (!value) {
+ row.specificationId = '';
+ row.specification = '';
+ row.unit = '';
+ return;
+ }
+ // 鏇存柊 specificationId锛坴-model 宸茬粡鑷姩鏇存柊锛岃繖閲岀‘淇濅竴鑷存�э級
+ row.specificationId = value;
+ const index = modelOptions.value.findIndex((item) => item.id === value);
+ if (index !== -1) {
+ row.specification = modelOptions.value[index].model;
+ row.unit = modelOptions.value[index].unit;
+ } else {
+ row.specification = '';
+ row.unit = '';
+ }
+};
+const findNodeById = (nodes, productId) => {
+ for (let i = 0; i < nodes.length; i++) {
+ if (nodes[i].value === productId) {
+ return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥� label
+ }
+ if (nodes[i].children && nodes[i].children.length > 0) {
+ const foundLabel = findNodeById(nodes[i].children, productId);
+ if (foundLabel) {
+ return foundLabel; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖 label
+ }
+ }
+ }
+ return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+};
const handleView = (row) => {
- currentQuotation.value = row
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+ currentQuotation.value = {
+ quotationNo: row.quotationNo || '',
+ customer: row.customer || '',
+ salesperson: row.salesperson || '',
+ quotationDate: row.quotationDate || '',
+ validDate: row.validDate || '',
+ paymentMethod: row.paymentMethod || '',
+ deliveryPeriod: row.deliveryPeriod || '',
+ status: row.status || '',
+ remark: row.remark || '',
+ products: row.products ? row.products.map(product => ({
+ productId: product.productId || '',
+ product: product.product || product.productName || '',
+ specificationId: product.specificationId || '',
+ specification: product.specification || '',
+ quantity: product.quantity || 0,
+ unit: product.unit || '',
+ unitPrice: product.unitPrice || 0,
+ amount: product.amount || 0
+ })) : [],
+ totalAmount: row.totalAmount || 0
+ }
viewDialogVisible.value = true
}
@@ -428,7 +567,32 @@
dialogTitle.value = '缂栬緫鎶ヤ环'
isEdit.value = true
editId.value = row.id
- Object.assign(form, row)
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+ form.quotationNo = row.quotationNo || ''
+ form.customer = row.customer || ''
+ form.salesperson = row.salesperson || ''
+ form.quotationDate = row.quotationDate || ''
+ form.validDate = row.validDate || ''
+ form.paymentMethod = row.paymentMethod || ''
+ form.deliveryPeriod = row.deliveryPeriod || ''
+ form.status = row.status || '鑽夌'
+ form.remark = row.remark || ''
+ form.products = row.products ? row.products.map(product => ({
+ productId: product.productId || '',
+ product: product.product || product.productName || '',
+ specificationId: product.specificationId || '',
+ specification: product.specification || '',
+ quantity: product.quantity || 0,
+ unit: product.unit || '',
+ unitPrice: product.unitPrice || 0,
+ amount: product.amount || 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
}
@@ -475,7 +639,10 @@
const addProduct = () => {
form.products.push({
+ productId: '',
+ product: '',
productName: '',
+ specificationId: '',
specification: '',
quantity: 1,
unit: '',
@@ -570,12 +737,45 @@
getQuotationList(params).then(res=>{
// console.log(res)
if(res.code===200){
- quotationList.value = res.data.records
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鎴栧叾浠栧璞℃斁鍏ュ搷搴斿紡瀵硅薄
+ quotationList.value = (res.data.records || []).map(item => ({
+ id: item.id,
+ quotationNo: item.quotationNo || '',
+ customer: item.customer || '',
+ salesperson: item.salesperson || '',
+ quotationDate: item.quotationDate || '',
+ validDate: item.validDate || '',
+ paymentMethod: item.paymentMethod || '',
+ deliveryPeriod: item.deliveryPeriod || '',
+ status: item.status || '鑽夌',
+ remark: item.remark || '',
+ products: item.products ? item.products.map(product => ({
+ productId: product.productId || '',
+ product: product.product || product.productName || '',
+ specificationId: product.specificationId || '',
+ 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;
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+ customerOption.value = (Array.isArray(res) ? res : []).map(item => ({
+ id: item.id,
+ customerName: item.customerName || '',
+ taxpayerIdentificationNumber: item.taxpayerIdentificationNumber || ''
+ }))
});
}
--
Gitblit v1.9.3