From 2fb4239e828bcfa9711ce4cecc4b942767621d62 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 06 十一月 2023 17:20:20 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev
---
src/views/sales/salesDetails/index.vue | 321 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 251 insertions(+), 70 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index bc8ae32..ba89cdc 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="sales-details">
<div v-if="isDetail" class="detail-top">
- <DetailListCommonBtn :query-class-options="queryClassOptions" />
+ <DetailListCommonBtn />
</div>
<div v-else class="filter">
@@ -23,7 +23,8 @@
</div>
<div class="body">
- <div class="body-card">
+ <!-- <div class="body-card"> -->
+ <div class="content-top">
<div class="list-view">
<TableCommonView
ref="tableListRef"
@@ -33,20 +34,71 @@
@selCommonClick="selCommonClick"
@getSelectArray="getSelectArray"
@selTableCol="selTableCol"
+ @tableRowClick="tableRowClick"
+ :selectClassRow="selectRow"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="90">
+ <el-table-column label="鎿嶄綔" width="180">
<template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button>
+ <el-button @click="handleClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
+ <template v-if="scope.row.status === 1">
+ <el-button @click="handleClick(scope.row, '缂栬緫')" type="text" size="small">缂栬緫</el-button>
+ <el-button @click="submitClick(scope.row)" type="text" size="small">纭鎻愪氦</el-button>
+ <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> -->
+ <el-button @click="closeClick(scope.row.id)" type="text" size="small">鍏抽棴</el-button>
+ </template>
</template>
</el-table-column>
</template>
</TableCommonView>
</div>
-
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ <div class="content-bottom">
+ <div class="bottom-tabs" :class="!isDetail ? 'bgcGrey' : 'bgcWhite'">
+ <div
+ class="tab-pane"
+ @click="getTab(0)"
+ :style="{
+ background: isClickProduct ? '#2a78fb' : '#F1F3F8',
+ color: isClickProduct ? '#fff' : '#666'
+ }"
+ >
+ 浜у搧淇℃伅
+ </div>
+ <div
+ class="tab-pane"
+ @click="getTab(1)"
+ :style="{
+ background: isClickInventory ? '#2a78fb' : '#F1F3F8',
+ color: isClickInventory ? '#fff' : '#666'
+ }"
+ >
+ 搴撳瓨淇℃伅
+ </div>
+ <div
+ class="tab-pane"
+ @click="getTab(2)"
+ :style="{
+ background: isClickMake ? '#2a78fb' : '#F1F3F8',
+ color: isClickMake ? '#fff' : '#666'
+ }"
+ >
+ 鍒堕�犱俊鎭�
+ </div>
+ </div>
+ <div class="list-view">
+ <TableCommonView :loading="loading" :table-list="productTableList" @selTableCol="selBottomTableCol">
+ <!-- <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="160" fixed="right">
+ <template slot-scope="scope">
+ <el-button @click="viewClick(scope.row)" type="text" size="small">鏌ョ湅</el-button>
+ </template>
+ </el-table-column>
+ </template> -->
+ </TableCommonView>
</div>
</div>
</div>
@@ -99,26 +151,41 @@
}
},
data() {
+ // 浜у搧淇℃伅
+ const productColumn = [
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "client_name" },
+ { label: "鏁伴噺", prop: "signTime" },
+ { label: "鍗曚綅", prop: "member_name" },
+ { label: "鍙戣揣鍗�", prop: "outboundStatus" },
+ { label: "鎵胯繍鍟�", prop: "receiveTotalAmount", price: true },
+ { label: "杩愬崟鍙�", prop: "total", price: true },
+ { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
+ { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
+ ]
+ // 搴撳瓨淇℃伅
+ const inventoryColumn = [
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "client_name" },
+ { label: "璁㈠崟鏁伴噺", prop: "signTime" },
+ { label: "浠撳簱", prop: "member_name" },
+ { label: "鍦ㄥ簱鏁伴噺", prop: "outboundStatus" },
+ { label: "鍙敤搴撳瓨", prop: "receiveTotalAmount", price: true },
+ { label: "鍗曚綅", prop: "total", price: true }
+ ]
+ // 鍒堕�犱俊鎭�
+ const makeColumn = [
+ { label: "鐢熶骇璁㈠崟", prop: "number", default: true },
+ { label: "浜у搧鍚嶇О", prop: "client_name" },
+ { label: "璁㈠崟鐘舵��", prop: "signTime" },
+ { label: "宸ュ崟缂栧彿", prop: "member_name" },
+ { label: "宸ュ崟鐘舵��", prop: "outboundStatus" },
+ { label: "璁″垝寮�濮嬫椂闂�", prop: "receiveTotalAmount", price: true },
+ { label: "璁″垝缁撴潫鏃堕棿", prop: "total", price: true }
+ ]
return {
tableList: {},
- queryClassOptions: [
- { value: "1", label: "鍏ㄩ儴" },
- { value: "2", label: "宸插彂璐�" },
- { value: "3", label: "寰呴噰璐�" },
- { value: "4", label: "鏈湀浜や粯" },
- { value: "5", label: "宸蹭綔搴�" }
- ],
searchOptions: [],
- operatesList: [
- { id: "1", name: "鍏变韩" },
- { id: "2", name: "鎵归噺缂栬緫" },
- { id: "3", name: "瀵煎嚭" },
- { id: "4", name: "涓嬭浇鍏ㄩ儴闄勪欢" },
- { id: "5", name: "鏇存敼鍒涘缓浜�" },
- { id: "6", name: "鏍戠粨鏋勮缃�" },
- { id: "7", name: "瀹℃壒璁剧疆" },
- { id: "8", name: "鎭㈠棰勮鍒楀" }
- ],
editConfig: {
visible: false,
title: "鏂板缓",
@@ -162,35 +229,28 @@
},
tableColumn: [
{ label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true, default: true },
- { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
- { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
- // { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
- { label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
+ { label: "绛剧害鏃ユ湡", prop: "signTime" },
+ { label: "浜や粯鏃ユ湡", prop: "deliveryDate" },
+ { label: "璁㈠崟鏉ユ簮", prop: "source" },
{ label: "鍚堣", prop: "total", price: true },
- { label: "搴旀敹浣欓", prop: "amountReceivable", price: true },
- { label: "宸插紑绁ㄩ噾棰�", prop: "invoicedAmount", price: true },
- { label: "鏈紑绁ㄩ噾棰�", prop: "uninvoicedAmount", price: true },
- { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
- { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
- { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
- { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getStatus }
],
- showCol: [
- "璁㈠崟缂栧彿",
- "瀹㈡埛鍚嶇О",
- "绛剧害鏃ユ湡",
- "閿�鍞礋璐ｄ汉",
- "宸叉敹鎬婚",
- "鍚堣",
- "搴旀敹浣欓",
- "宸插紑绁ㄩ噾棰�",
- "鏈紑绁ㄩ噾棰�",
- "浜у搧鍚嶇О",
- "鏁伴噺",
- "閿�鍞崟浠�",
- "浠风◣鍚堣"
- ]
+ showCol: ["璁㈠崟缂栧彿", "閿�鍞礋璐ｄ汉", "绛剧害鏃ユ湡", "浜や粯鏃ユ湡", "璁㈠崟鏉ユ簮", "鍚堣", "鐘舵��"],
+ tableBottomColumn: [],
+ showBottomCol: [],
+ isClickProduct: true, // 浜у搧淇℃伅
+ isClickInventory: false, // 搴撳瓨淇℃伅
+ isClickMake: false, // 鍒堕�犱俊鎭�
+ TabsIndex: "0",
+ productTableList: {},
+ productColumn: productColumn,
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "鍙戣揣鍗�", "鎵胯繍鍟�", "杩愬崟鍙�", "閿�鍞崟浠�", "浠风◣鍚堣"],
+ inventoryColumn: inventoryColumn,
+ showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"],
+ makeColumn: makeColumn,
+ showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
+ selectRow: {}
}
},
created() {
@@ -206,38 +266,63 @@
},
methods: {
setTable() {
+ // top 鏄庣粏鍗曞垪琛�
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.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) => {
+ setColumnVisible(showCol, tableColumn) {
+ return tableColumn.map((ele) => {
return {
...ele,
isShowColumn: showCol.includes(ele.label)
}
})
},
+ // top 鏄庣粏鍗�
selTableCol(val) {
this.showcol = val
- this.tableList.tableColumn = this.setColumnVisible(val)
+ this.tableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
+ },
+ // bottom 浜у搧淇℃伅
+ selBottomTableCol(val) {
+ this.showcol = val
+ this.productTableList.tableColumn = this.setColumnVisible(val, this.tableBottomColumn)
},
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
let params = {}
- console.log("ssssssssssss")
console.log(this.addConfig)
if (this.addConfig.keywordType === "瀹㈡埛鍚嶇О") {
params = {
@@ -274,11 +359,18 @@
return {
...item,
client_name: item.client.name,
- member_name: item.Member.username
+ member_name: item.Member.username,
+ source: "CRM鍚屾",
+ status: 2
}
})
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] : {}
+ // let row = this.tableList.tableInfomation[0];
+ // this.getPointinspectionRecord(row.id);
+ }
} else {
this.tableList.tableInfomation = []
}
@@ -314,11 +406,11 @@
quotation_number: ""
}
},
- // 缂栬緫
- handleClick(row) {
- console.log(row)
+ // 鏌ョ湅 缂栬緫
+ handleClick(row, title) {
+ console.log(row, title)
this.editConfig.visible = true
- this.editConfig.title = "缂栬緫"
+ this.editConfig.title = title
this.editConfig.infomation = {
...row,
currency: "浜烘皯甯�",
@@ -326,6 +418,14 @@
deliverType: row.deliverType === 0 ? "" : row.deliverType,
quotation_number: row.quotation.number
}
+ },
+ // 纭鎻愪氦
+ submitClick(row) {
+ console.log(row, "纭鎻愪氦")
+ },
+ // 鍏抽棴
+ closeClick(row) {
+ console.log(row, "鍏抽棴")
},
// 鍒犻櫎
delClick(rowID) {
@@ -381,6 +481,45 @@
this.addCollectionConfig.title = "鏂板缓"
this.addCollectionConfig.sourceType = 1
this.addCollectionConfig.infomation = { ...row }
+ },
+ //鑾峰彇褰撳墠閫変腑璧勬簮鐨刬d
+ getTab(tab) {
+ this.TabsIndex = tab
+ if (this.TabsIndex == 0) {
+ this.isClickProduct = true
+ this.isClickInventory = false
+ this.isClickMake = false
+ // 浜у搧淇℃伅鍒楄〃
+ this.tableBottomColumn = this.productColumn
+ this.showBottomCol = this.showProductCol
+ this.setBottomList()
+ } else if (this.TabsIndex == 1) {
+ this.isClickProduct = false
+ this.isClickInventory = true
+ this.isClickMake = false
+ // 搴撳瓨淇℃伅鍒楄〃
+ this.tableBottomColumn = this.inventoryColumn
+ this.showBottomCol = this.showInventoryCol
+ this.setBottomList()
+ } else if (this.TabsIndex == 2) {
+ this.isClickProduct = false
+ this.isClickInventory = false
+ this.isClickMake = true
+ // 鍒堕�犱俊鎭垪琛�
+ this.tableBottomColumn = this.makeColumn
+ this.showBottomCol = this.showMakeCol
+ this.setBottomList()
+ }
+ },
+ // 鐘舵��
+ getStatus(val) {
+ return val === 1 ? "寰呯‘璁�" : val === 2 ? "寰呭嚭搴�" : val === 3 ? "鍑哄簱瀹屾垚" : val === 4 ? "宸插叧闂�" : "--"
+ },
+ // top 琛岀偣鍑�
+ tableRowClick(row, column, event) {
+ console.log(row, column, event)
+ this.selectRow = row
+ // this.getPointinspectionRecord(row.id);
}
}
}
@@ -420,16 +559,51 @@
box-sizing: border-box;
padding: 10px 20px;
border-radius: 12px;
- height: calc(100% - 92px);
- .body-card {
+ height: calc(100% - 70px);
+ .content-top {
background-color: #fff;
border-radius: 12px;
- height: 100%;
- overflow: hidden;
+ min-height: 70px;
+ height: 48%;
+ position: relative;
+ .list-view {
+ height: calc(100% - 60px);
+ }
}
- .list-view {
- height: calc(100% - 60px);
- overflow: hidden;
+ .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;
+ 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;
@@ -440,4 +614,11 @@
}
}
}
+
+.bgcGrey {
+ background: #e6ecf2;
+}
+.bgcWhite {
+ background: #fff !important;
+}
</style>
--
Gitblit v1.8.0