From f80d798b83fabb038cf10d745acd34c9c42fed4c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 22 九月 2025 15:22:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywx' into dev
---
src/views/salesManagement/salesQuotation/index.vue | 137 +++++++++++++++++++++------------------------
1 files changed, 64 insertions(+), 73 deletions(-)
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index b89dad1..4d20405 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -166,9 +166,9 @@
</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-input v-model="scope.row.product" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
</template>
</el-table-column>
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="150">
@@ -284,7 +284,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 +310,11 @@
</template>
<script setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed,onMounted } 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'
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
@@ -323,56 +324,7 @@
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 pagination = reactive({
total: 3,
@@ -384,6 +336,7 @@
const viewDialogVisible = ref(false)
const dialogTitle = ref('鏂板鎶ヤ环')
const form = reactive({
+ quotationNo: '',
customer: '',
salesperson: '',
quotationDate: '',
@@ -441,10 +394,6 @@
return statusMap[status] || 'info'
}
-const handleSearch = () => {
- // 鎼滅储閫昏緫宸插湪computed涓鐞�
-}
-
const resetSearch = () => {
searchForm.quotationNo = ''
searchForm.customer = ''
@@ -480,9 +429,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('鍒犻櫎鎴愬姛')
}
})
}
@@ -552,22 +508,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 +550,23 @@
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
+ pagination.total = res.data.total
+ }
+ })
+}
+
+onMounted(()=>{
+ handleSearch()
+})
</script>
<style scoped>
--
Gitblit v1.9.3