From eed27d3000e127c433fd45609d0d5e5d06b7868c Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 26 十二月 2023 11:14:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/quotation/index.vue | 40 ++++++++++++++--------------------------
1 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 0c98ff6..05e9396 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -79,9 +79,6 @@
import { getQuotationList, getDelQuotation } from "@/api/sales/quotation"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailQuotation from "@/views/sales/quotation/DetailQuotation"
-import {
- getProductInventoryInfo,
-} from "@/api/sales/salesDetails"
export default {
name: "QuotationView",
props: {
@@ -111,10 +108,10 @@
{ label: "浜у搧鍚嶇О", prop: "name" },
{ label: "鏁伴噺", prop: "amount" },
{ label: "鍗曚綅", prop: "unit" },
- { label: "閿�鍞崟浠�", prop: "salePrice" },
- { label: "鎴愭湰鍗曚环", prop: "carrier" },
- { label: "姣涘埄", prop: "waybillNumber" },
- { label: "姣涘埄鐜�", prop: "salePrice", price: true },
+ { label: "閿�鍞崟浠�", prop: "price" },
+ { label: "鎴愭湰鍗曚环", prop: "cost" },
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�", prop: "margin",},
{ label: "浠风◣鍚堣", prop: "valorem", price: true }
]
return {
@@ -167,12 +164,10 @@
{ label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿
// { label: "灏忚", prop: "subTotal" }, // 灏忚
// { label: "鍚堣", prop: "total" }, // 鍚堣
- { label: "瀹㈡埗鍚嶇О", prop: "client_name", },
- { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
- { label: "鍚堣", prop: "priceTax", isProductTotal: true },
- { label: "鐘舵��", prop: "priceTax",}
+ { label: "瀹㈡埗鍚嶇О", prop: "client_name",min: 120,},
+ { label: "鐘舵��", prop: "quotationStatus",}
],
- showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О", "鏁伴噺", "鍚堣",'鐘舵��'],
+ showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О","鐘舵��"],
selectRow: {},
loading:false,
// 澧炲姞 浜у搧淇℃伅鍒楄〃
@@ -209,14 +204,7 @@
},
// 鑾峰彇浜у搧/搴撳瓨淇℃伅
async getProductInventoryInfo(row) {
- if (row.status === 1) {
- this.productTableList.tableInfomation = row.products || []
- } else {
- await getProductInventoryInfo(row.number).then((res) => {
- console.log(res)
- this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
- })
- }
+ this.productTableList.tableInfomation = row.products || []
},
// top 琛岀偣鍑�
tableRowClick(row) {
@@ -300,7 +288,8 @@
...item,
client_name: item.client.name,
contact_name: item.contact.name,
- member_name: item.member.username
+ member_name: item.member.username,
+ quotationStatus:item.quotation_status.name,
}
})
this.tableList.tableInfomation = list || []
@@ -337,12 +326,11 @@
},
// 缂栬緫
handleClick(row) {
- console.log(row)
- this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- console.log("dddddddd")
- console.log(row)
- this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
+ let params = JSON.parse(JSON.stringify(row));
+ this.editConfig.infomation = { ...params, currency: "浜烘皯甯�" }
+ console.log(this.editConfig.infomation.products,'===products')
+ this.editConfig.visible = true
},
// 鎵归噺鍒犻櫎
delClick() {
--
Gitblit v1.8.0