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 | 183 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 160 insertions(+), 23 deletions(-)
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 38ae9fc..05e9396 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -16,7 +16,7 @@
</div>
<div class="body">
- <div class="body-card">
+ <div class="content-top">
<div class="list-view">
<TableCommonView
ref="tableListRef"
@@ -26,6 +26,8 @@
@selCommonClick="selCommonClick"
@getSelectArray="getSelectArray"
@selTableCol="selTableCol"
+ @tableRowClick="tableRowClick"
+ :selectClassRow="selectRow"
>
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="90">
@@ -40,6 +42,24 @@
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ <div class="content-bottom">
+ <div class="bottom-tabs bgcGrey">
+ <div
+ class="tab-pane"
+ @click="getTab(0)"
+ :style="{
+ background: TabsIndex==0 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==0 ? '#fff' : '#666'
+ }"
+ >
+ 浜у搧淇℃伅
+ </div>
+ </div>
+ <div class="list-view">
+ <TableCommonView :loading="loading" :table-list="productTableList" @selTableCol="selBottomTableCol">
+ </TableCommonView>
</div>
</div>
</div>
@@ -59,7 +79,6 @@
import { getQuotationList, getDelQuotation } from "@/api/sales/quotation"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailQuotation from "@/views/sales/quotation/DetailQuotation"
-
export default {
name: "QuotationView",
props: {
@@ -83,6 +102,18 @@
},
computed: {},
data() {
+ // 浜у搧淇℃伅
+ const productColumn = [
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "閿�鍞崟浠�", prop: "price" },
+ { label: "鎴愭湰鍗曚环", prop: "cost" },
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�", prop: "margin",},
+ { label: "浠风◣鍚堣", prop: "valorem", price: true }
+ ]
return {
tableList: {},
queryClassOptions: [
@@ -133,11 +164,19 @@
{ label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿
// { label: "灏忚", prop: "subTotal" }, // 灏忚
// { label: "鍚堣", prop: "total" }, // 鍚堣
- { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
- { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
- { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
+ { label: "瀹㈡埗鍚嶇О", prop: "client_name",min: 120,},
+ { label: "鐘舵��", prop: "quotationStatus",}
],
- showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "鑱旂郴浜哄鍚�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"]
+ showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О","鐘舵��"],
+ selectRow: {},
+ loading:false,
+ // 澧炲姞 浜у搧淇℃伅鍒楄〃
+ TabsIndex:0,
+ tableBottomColumn: [],
+ showBottomCol: [],
+ productTableList: {},
+ productColumn: productColumn,
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�", "浠风◣鍚堣"],
}
},
created() {
@@ -152,24 +191,76 @@
this.getData(this.search_map)
},
methods: {
+ //鑾峰彇褰撳墠閫変腑璧勬簮鐨刬d
+ getTab(tab) {
+ this.TabsIndex = tab
+ if (this.TabsIndex == 0) {
+ // 浜у搧淇℃伅鍒楄〃
+ this.tableBottomColumn = this.productColumn
+ this.showBottomCol = this.showProductCol
+ this.setBottomList()
+ this.getProductInventoryInfo(this.selectRow)
+ }
+ },
+ // 鑾峰彇浜у搧/搴撳瓨淇℃伅
+ async getProductInventoryInfo(row) {
+ this.productTableList.tableInfomation = row.products || []
+ },
+ // top 琛岀偣鍑�
+ tableRowClick(row) {
+ this.selectRow = row
+ if (this.TabsIndex == 0) {
+ this.getProductInventoryInfo(this.selectRow)
+ }
+ },
setTable() {
this.tableList = {
selectIndex: true,
tableInfomation: [],
allcol: [],
showcol: this.showCol,
- tableColumn: this.setColumnVisible(this.showCol)
+ tableColumn: this.setColumnVisible(this.showCol, this.tableColumn)
}
- this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
+ // this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
+ // this.searchOptions = []
+ // for (let i = 0; i < this.tableList.tableColumn.length; i++) {
+ // const label = this.tableList.tableColumn[i].label
+ // const value = this.tableList.tableColumn[i].prop
+ // this.searchOptions.push({ value: value, label: label })
+ // }
+ this.setTableList(this.tableList)
+ // bottom 浜у搧淇℃伅
+ this.tableBottomColumn = this.productColumn
+ this.showBottomCol = this.showProductCol
+ this.setBottomList()
+ },
+ // bom 鍒楄〃
+ setBottomList() {
+ this.productTableList = {
+ selectIndex: true,
+ tableInfomation: [],
+ allcol: [],
+ showcol: this.showBottomCol,
+ tableColumn: this.setColumnVisible(this.showBottomCol, this.tableBottomColumn)
+ }
+ this.setTableList(this.productTableList)
+ },
+ setTableList(tableList) {
+ tableList.allcol = tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
this.searchOptions = []
- for (let i = 0; i < this.tableList.tableColumn.length; i++) {
- const label = this.tableList.tableColumn[i].label
- const value = this.tableList.tableColumn[i].prop
+ for (let i = 0; i < tableList.tableColumn.length; i++) {
+ const label = tableList.tableColumn[i].label
+ const value = tableList.tableColumn[i].prop
this.searchOptions.push({ value: value, label: label })
}
},
- setColumnVisible(showCol) {
- return this.tableColumn.map((ele) => {
+ // bottom 浜у搧淇℃伅
+ selBottomTableCol(val) {
+ this.showcol = val
+ this.productTableList.tableColumn = this.setColumnVisible(val, this.tableBottomColumn)
+ },
+ setColumnVisible(showCol, tableColumn) {
+ return tableColumn.map((ele) => {
return {
...ele,
isShowColumn: showCol.includes(ele.label)
@@ -197,11 +288,16 @@
...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 || []
this.pagerOptions.totalCount = res.data.count
+ if (res.data.count > 0) {
+ this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
+ this.getProductInventoryInfo(this.selectRow)
+ }
} else {
this.tableList.tableInfomation = []
}
@@ -224,18 +320,17 @@
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
+ this.editConfig.visible = true
},
// 缂栬緫
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() {
@@ -354,9 +449,51 @@
height: 100%;
overflow: hidden;
}
- .list-view {
- height: calc(100% - 60px);
- overflow: hidden;
+ .content-top {
+ background-color: #fff;
+ border-radius: 12px;
+ min-height: 70px;
+ height: 48%;
+ position: relative;
+ .list-view {
+ height: calc(100% - 60px);
+ }
+ }
+ .content-bottom {
+ .bottom-tabs {
+ height: 40px;
+ line-height: 40px;
+ background: #e6ecf2;
+ display: flex;
+ .tab-pane {
+ width: 100px;
+ margin-right: 20px;
+ font-size: 14px !important;
+ text-align: center;
+ cursor: pointer;
+ background: #2a78fb;
+ border-top-left-radius: 20px;
+ border-top-right-radius: 20px;
+ }
+ }
+ .lable-view {
+ background: #e6ecf2;
+ height: 40px;
+ line-height: 40px;
+ .name {
+ border-left: 4px solid #2a78fb;
+ padding-left: 10px;
+ }
+ }
+ background-color: #fff;
+ border-radius: 12px;
+ min-height: 70px;
+ height: calc(52% - 60px);
+ margin-top: 10px;
+ // padding: 10px 20px;
+ .list-view {
+ height: calc(100% - 10px);
+ }
}
.btn-pager {
display: flex;
--
Gitblit v1.8.0