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 |  438 ++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 322 insertions(+), 116 deletions(-)

diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index b89dad1..cefc769 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -3,7 +3,7 @@
     <el-card class="box-card">
       <!-- 鎼滅储鍖哄煙 -->
       <el-row :gutter="20" class="search-row">
-        <el-col :span="6">
+        <el-col :span="8">
           <el-input
             v-model="searchForm.quotationNo"
             placeholder="璇疯緭鍏ユ姤浠峰崟鍙�"
@@ -15,22 +15,24 @@
             </template>
           </el-input>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-select v-model="searchForm.customer" placeholder="璇烽�夋嫨瀹㈡埛" clearable>
-            <el-option label="涓婃捣绉戞妧鏈夐檺鍏徃" value="涓婃捣绉戞妧鏈夐檺鍏徃"></el-option>
-            <el-option label="娣卞湷鐢靛瓙鏈夐檺鍏徃" value="娣卞湷鐢靛瓙鏈夐檺鍏徃"></el-option>
-            <el-option label="鍖椾含璐告槗鍏徃" value="鍖椾含璐告槗鍏徃"></el-option>
+						<el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.customerName">
+							{{
+								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="6">
+<!--        <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">
@@ -48,7 +50,7 @@
         stripe
         height="calc(100vh - 22em)"
       >
-        <el-table-column prop="id" label="ID" width="80" align="center"/>
+				<el-table-column align="center" label="搴忓彿" type="index" width="60" />
         <el-table-column prop="quotationNo" label="鎶ヤ环鍗曞彿" width="150" />
         <el-table-column prop="customer" label="瀹㈡埛鍚嶇О" />
         <el-table-column prop="salesperson" label="涓氬姟鍛�" width="100" />
@@ -59,13 +61,13 @@
             楼{{ scope.row.totalAmount.toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="鎶ヤ环鐘舵��" width="100">
-          <template #default="scope">
-            <el-tag :type="getStatusType(scope.row.status)">
-              {{ scope.row.status }}
-            </el-tag>
-          </template>
-        </el-table-column>
+<!--        <el-table-column prop="status" label="鎶ヤ环鐘舵��" width="100">-->
+<!--          <template #default="scope">-->
+<!--            <el-tag :type="getStatusType(scope.row.status)">-->
+<!--              {{ scope.row.status }}-->
+<!--            </el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="鎿嶄綔" width="250" fixed="right" align="center">
           <template #default="scope">
             <el-button link type="primary" @click="handleView(scope.row)">鏌ョ湅</el-button>
@@ -86,7 +88,7 @@
     </el-card>
 
     <!-- 鏂板/缂栬緫瀵硅瘽妗� -->
-    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="900px" :close-on-click-modal="false">
+    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="1300px" :close-on-click-modal="false">
       <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
         <!-- 鍩烘湰淇℃伅 -->
         <el-card class="form-card" shadow="never">
@@ -97,18 +99,19 @@
             <el-col :span="12">
               <el-form-item label="瀹㈡埛鍚嶇О" prop="customer">
                 <el-select v-model="form.customer" placeholder="璇烽�夋嫨瀹㈡埛" style="width: 100%" @change="handleCustomerChange">
-                  <el-option label="涓婃捣绉戞妧鏈夐檺鍏徃" value="涓婃捣绉戞妧鏈夐檺鍏徃"></el-option>
-                  <el-option label="娣卞湷鐢靛瓙鏈夐檺鍏徃" value="娣卞湷鐢靛瓙鏈夐檺鍏徃"></el-option>
-                  <el-option label="鍖椾含璐告槗鍏徃" value="鍖椾含璐告槗鍏徃"></el-option>
+									<el-option v-for="item in customerOption" :key="item.id" :label="item.customerName" :value="item.customerName">
+										{{
+											item.customerName + "鈥斺��" + item.taxpayerIdentificationNumber
+										}}
+									</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%">
-                  <el-option label="闄堝織寮�" value="闄堝織寮�"></el-option>
-                  <el-option label="鍒橀泤濠�" value="鍒橀泤濠�"></el-option>
-                  <el-option label="鐜嬪缓鍥�" value="鐜嬪缓鍥�"></el-option>
+									<el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
+														 :value="item.nickName" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -151,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>
@@ -166,27 +176,48 @@
             </div>
           </template>
           <el-table :data="form.products" border style="width: 100%">
-            <el-table-column prop="productName" label="浜у搧鍚嶇О" width="200">
+            <el-table-column prop="product" label="浜у搧鍚嶇О" width="200">
               <template #default="scope">
-                <el-input v-model="scope.row.productName" 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="鏁伴噺" width="100">
+            <el-table-column prop="quantity" label="鏁伴噺">
               <template #default="scope">
                 <el-input-number v-model="scope.row.quantity" :min="1" :precision="0" style="width: 100%" />
               </template>
             </el-table-column>
-            <el-table-column prop="unit" label="鍗曚綅" width="80">
+            <el-table-column prop="unit" label="鍗曚綅">
               <template #default="scope">
                 <el-input v-model="scope.row.unit" placeholder="鍗曚綅" />
               </template>
             </el-table-column>
-            <el-table-column prop="unitPrice" label="鍗曚环" width="120">
+            <el-table-column prop="unitPrice" label="鍗曚环">
               <template #default="scope">
                 <el-input-number v-model="scope.row.unitPrice" :min="0" :precision="2" style="width: 100%" @change="calculateAmount(scope.row)" />
               </template>
@@ -273,9 +304,9 @@
         <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ currentQuotation.validDate }}</el-descriptions-item>
         <el-descriptions-item label="浠樻鏂瑰紡">{{ currentQuotation.paymentMethod }}</el-descriptions-item>
         <el-descriptions-item label="浜よ揣鏈�">{{ currentQuotation.deliveryPeriod }}</el-descriptions-item>
-        <el-descriptions-item label="鎶ヤ环鐘舵��">
-          <el-tag :type="getStatusType(currentQuotation.status)">{{ currentQuotation.status }}</el-tag>
-        </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>
@@ -284,7 +315,7 @@
       <div style="margin-top: 20px;">
         <h4>浜у搧鏄庣粏</h4>
         <el-table :data="currentQuotation.products" border style="width: 100%">
-          <el-table-column prop="productName" label="浜у搧鍚嶇О" />
+          <el-table-column prop="product" label="浜у搧鍚嶇О" />
           <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
           <el-table-column prop="quantity" label="鏁伴噺" />
           <el-table-column prop="unit" label="鍗曚綅" />
@@ -310,10 +341,14 @@
 </template>
 
 <script setup>
-import { ref, reactive, computed } 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 {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)
@@ -323,67 +358,20 @@
   status: ''
 })
 
-const quotationList = ref([
-  {
-    id: 1,
-    quotationNo: 'QT202312001',
-    customer: '涓婃捣绉戞妧鏈夐檺鍏徃',
-    salesperson: '闄堝織寮�',
-    quotationDate: '2023-12-01',
-    validDate: '2023-12-31',
-    totalAmount: 50000.00,
-    paymentMethod: '鍏ㄦ鍒颁粯',
-    deliveryPeriod: '30澶�',
-    status: '宸插彂閫�',
-    remark: '閲嶈瀹㈡埛鎶ヤ环',
-    products: [
-      { productName: '宸ヤ笟浼犳劅鍣�', specification: 'SEN-001', quantity: 10, unit: '涓�', unitPrice: 5000, amount: 50000 }
-    ]
-  },
-  {
-    id: 2,
-    quotationNo: 'QT202312002',
-    customer: '娣卞湷鐢靛瓙鏈夐檺鍏徃',
-    salesperson: '鍒橀泤濠�',
-    quotationDate: '2023-12-02',
-    validDate: '2023-12-31',
-    totalAmount: 35000.00,
-    paymentMethod: '鍒嗘湡浠樻',
-    deliveryPeriod: '20澶�',
-    status: '瀹㈡埛纭',
-    remark: '甯歌鎶ヤ环',
-    products: [
-      { productName: '鎺у埗妯″潡', specification: 'CTL-002', quantity: 5, unit: '涓�', unitPrice: 7000, amount: 35000 }
-    ]
-  },
-  {
-    id: 3,
-    quotationNo: 'QT202312003',
-    customer: '鍖椾含璐告槗鍏徃',
-    salesperson: '鐜嬪缓鍥�',
-    quotationDate: '2023-12-03',
-    validDate: '2023-12-31',
-    totalAmount: 28000.00,
-    paymentMethod: '鏈堢粨',
-    deliveryPeriod: '15澶�',
-    status: '鑽夌',
-    remark: '鏂板鎴锋姤浠�',
-    products: [
-      { productName: '鏁版嵁閲囬泦鍣�', specification: 'DAQ-003', quantity: 4, unit: '涓�', unitPrice: 7000, amount: 28000 }
-    ]
-  }
-])
-
+const quotationList = ref([])
+const productOptions = ref([]);
+const modelOptions = ref([]);
 const pagination = reactive({
   total: 3,
   currentPage: 1,
-  pageSize: 10
+  pageSize: 100
 })
 
 const dialogVisible = ref(false)
 const viewDialogVisible = ref(false)
 const dialogTitle = ref('鏂板鎶ヤ环')
 const form = reactive({
+  quotationNo: '',
   customer: '',
   salesperson: '',
   quotationDate: '',
@@ -407,8 +395,10 @@
   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([]);
 
 const isEdit = ref(false)
 const editId = ref(null)
@@ -441,25 +431,135 @@
   return statusMap[status] || 'info'
 }
 
-const handleSearch = () => {
-  // 鎼滅储閫昏緫宸插湪computed涓鐞�
-}
-
 const resetSearch = () => {
   searchForm.quotationNo = ''
   searchForm.customer = ''
   searchForm.status = ''
 }
 
-const handleAdd = () => {
+const handleAdd = async () => {
   dialogTitle.value = '鏂板鎶ヤ环'
   isEdit.value = false
   resetForm()
   dialogVisible.value = true
+	let userLists = await userListNoPage();
+	// 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+	userList.value = (userLists.data || []).map(item => ({
+    userId: item.userId,
+    nickName: item.nickName || '',
+    userName: item.userName || ''
+  }));
+	getProductOptions();
+	customerList().then((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
 }
 
@@ -467,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
 }
 
@@ -480,9 +605,16 @@
   }).then(() => {
     const index = quotationList.value.findIndex(item => item.id === row.id)
     if (index > -1) {
-      quotationList.value.splice(index, 1)
-      pagination.total--
-      ElMessage.success('鍒犻櫎鎴愬姛')
+      deleteQuotation(row.id).then(res=>{
+        // console.log(res)
+        if(res.code===200){
+          ElMessage.success('鍒犻櫎鎴愬姛')
+          handleSearch()
+        }
+      })
+      // quotationList.value.splice(index, 1)
+      // pagination.total--
+      // ElMessage.success('鍒犻櫎鎴愬姛')
     }
   })
 }
@@ -507,7 +639,10 @@
 
 const addProduct = () => {
   form.products.push({
+    productId: '',
+    product: '',
     productName: '',
+    specificationId: '',
     specification: '',
     quantity: 1,
     unit: '',
@@ -552,22 +687,40 @@
         // 缂栬緫
         const index = quotationList.value.findIndex(item => item.id === editId.value)
         if (index > -1) {
-          quotationList.value[index] = { ...form, id: editId.value }
-          ElMessage.success('缂栬緫鎴愬姛')
+          updateQuotation(form).then(res=>{
+            // console.log(res)
+            if(res.code===200){
+              ElMessage.success('缂栬緫鎴愬姛')
+              dialogVisible.value = false
+              handleSearch()
+            }
+          })
+          // quotationList.value[index] = { ...form, id: editId.value }
+          // ElMessage.success('缂栬緫鎴愬姛')
         }
       } else {
         // 鏂板
-        const newId = Math.max(...quotationList.value.map(item => item.id)) + 1
-        const quotationNo = `QT${new Date().getFullYear()}${String(new Date().getMonth() + 1).padStart(2, '0')}${String(new Date().getDate()).padStart(2, '0')}${String(newId).padStart(3, '0')}`
-        quotationList.value.push({
-          ...form,
-          id: newId,
-          quotationNo: quotationNo
+        // const newId = Math.max(...quotationList.value.map(item => item.id)) + 1
+        form.quotationNo = `QT${new Date().getFullYear()}${String(new Date().getMonth() + 1).padStart(2, '0')}${String(new Date().getDate()).padStart(2, '0')}`
+
+        addQuotation(form).then(res=>{
+          // console.log(res)
+          if(res.code===200){
+            ElMessage.success('鏂板鎴愬姛')
+            dialogVisible.value = false
+            handleSearch()
+          }
         })
-        pagination.total++
-        ElMessage.success('鏂板鎴愬姛')
+
+        // quotationList.value.push({
+        //   ...form,
+        //   // id: newId,
+        //   quotationNo: quotationNo
+        // })
+        // pagination.total++
+        // ElMessage.success('鏂板鎴愬姛')
       }
-      dialogVisible.value = false
+      
     }
   })
 }
@@ -576,6 +729,59 @@
   pagination.currentPage = val.page
   pagination.pageSize = val.limit
 }
+const handleSearch = ()=>{
+  const params = {
+    page:pagination,
+    ...searchForm
+  }
+  getQuotationList(params).then(res=>{
+    // console.log(res)
+    if(res.code===200){
+      // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鎴栧叾浠栧璞℃斁鍏ュ搷搴斿紡瀵硅薄
+      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 = (Array.isArray(res) ? res : []).map(item => ({
+      id: item.id,
+      customerName: item.customerName || '',
+      taxpayerIdentificationNumber: item.taxpayerIdentificationNumber || ''
+    }))
+	});
+}
+
+onMounted(()=>{
+  handleSearch()
+})
 </script>
 
 <style scoped>

--
Gitblit v1.9.3