From 22d81fd4a1a2d9e5d56cd496971893437ef84599 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 10:07:30 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/salesDetails/index.vue | 168 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 116 insertions(+), 52 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 1604200..d6612f7 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -62,8 +62,8 @@
class="tab-pane"
@click="getTab(0)"
:style="{
- background: isClickProduct ? '#2a78fb' : '#F1F3F8',
- color: isClickProduct ? '#fff' : '#666'
+ background: TabsIndex==0 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==0 ? '#fff' : '#666'
}"
>
浜у搧淇℃伅
@@ -72,21 +72,31 @@
class="tab-pane"
@click="getTab(1)"
:style="{
- background: isClickInventory ? '#2a78fb' : '#F1F3F8',
- color: isClickInventory ? '#fff' : '#666'
+ background: TabsIndex==1 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==1 ? '#fff' : '#666'
}"
>
- 搴撳瓨淇℃伅
+ 鍙戣揣淇℃伅
</div>
<div
class="tab-pane"
@click="getTab(2)"
:style="{
- background: isClickMake ? '#2a78fb' : '#F1F3F8',
- color: isClickMake ? '#fff' : '#666'
+ background: TabsIndex==2 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==2 ? '#fff' : '#666'
}"
>
鍒堕�犱俊鎭�
+ </div>
+ <div
+ class="tab-pane"
+ @click="getTab(3)"
+ :style="{
+ background: TabsIndex==3 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex==3 ? '#fff' : '#666'
+ }"
+ >
+ 閲囪喘淇℃伅
</div>
</div>
<div class="list-view">
@@ -151,7 +161,7 @@
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
-
+import { getDataByType } from "@/api/data"
export default {
name: "SalesDetails",
props: {
@@ -185,17 +195,20 @@
{ label: "浜у搧鍚嶇О", prop: "name" },
{ label: "鏁伴噺", prop: "amount" },
{ label: "鍗曚綅", prop: "unit" },
- { label: "鍙戣揣鍗�", prop: "invoice" },
- { label: "鎵胯繍鍟�", prop: "carrier" },
- { label: "杩愬崟鍙�", prop: "waybillNumber" },
{ label: "閿�鍞崟浠�", prop: "salePrice", price: true },
- { label: "浠风◣鍚堣", prop: "valorem", price: true }
+ { label: "鎴愭湰鍗曚环", prop: "cost" },
+ { label: "姣涘埄", prop: "profit" },
+ { label: "姣涘埄鐜�(%)", prop: "margin",},
+ { label: "浠风◣鍚堣", prop: "total", price: true }
]
// 搴撳瓨淇℃伅
const inventoryColumn = [
{ label: "浜у搧缂栧彿", prop: "number", default: true },
{ label: "浜у搧鍚嶇О", prop: "name" },
{ label: "璁㈠崟鏁伴噺", prop: "orderAmount" },
+ { label: "鍙戣揣鍗�", prop: "invoice" },
+ { label: "鎵胯繍鍟�", prop: "carrier" },
+ { label: "杩愬崟鍙�", prop: "waybill" },
{ label: "浠撳簱", prop: "warehouse" },
{ label: "鍦ㄥ簱鏁伴噺", prop: "amount" },
{ label: "鍙敤搴撳瓨", prop: "availableNumber" },
@@ -211,6 +224,32 @@
{ label: "璁″垝寮�濮嬫椂闂�", prop: "startTime" },
{ label: "璁″垝缁撴潫鏃堕棿", prop: "endTime" }
]
+ // 閲囪喘淇℃伅
+ const purchaseColumn=[
+ {
+ label: "閲囪喘鍗曞彿",
+ prop: "purchaseNumber",
+ default: true
+ },
+ {
+ label: "閲囪喘鍗曞悕绉�",
+ prop: "purchaseName",
+ },
+ {
+ label: "渚涘簲鍟嗗悕绉�",
+ prop: "supplierName",
+ },
+ {
+ label: "閲囪喘鏁伴噺",
+ prop: "amount",
+ },
+ {
+ label: "鐘舵��",
+ prop: "status",
+ isCallMethod: true,
+ getCallMethod: this.getpurchaseStatus,
+ },
+ ];
return {
tableList: {},
searchOptions: [],
@@ -267,17 +306,17 @@
showCol: ["璁㈠崟缂栧彿", "閿�鍞礋璐ｄ汉", "绛剧害鏃ユ湡", "浜や粯鏃ユ湡", "璁㈠崟鏉ユ簮", "鍚堣", "鐘舵��"],
tableBottomColumn: [],
showBottomCol: [],
- isClickProduct: true, // 浜у搧淇℃伅
- isClickInventory: false, // 搴撳瓨淇℃伅
- isClickMake: false, // 鍒堕�犱俊鎭�
TabsIndex: "0",
productTableList: {},
productColumn: productColumn,
- showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "鍙戣揣鍗�", "鎵胯繍鍟�", "杩愬崟鍙�", "閿�鍞崟浠�", "浠风◣鍚堣"],
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�","鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)","浠风◣鍚堣"],
inventoryColumn: inventoryColumn,
- showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"],
+ showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "鍙戣揣鍗�", "鎵胯繍鍟�", "杩愬崟鍙�","浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"],
makeColumn: makeColumn,
showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
+ // 閲囪喘
+ purchaseColumn: purchaseColumn,
+ showPurchaseCol: ['閲囪喘鍗曞彿','閲囪喘鍗曞悕绉�',"渚涘簲鍟嗗悕绉�", "閲囪喘鏁伴噺", "鐘舵��"],
selectRow: {},
projectList: [],
projectListShow: false,
@@ -287,7 +326,9 @@
thatRow: {},
rules: {
projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }]
- }
+ },
+ purchaseStatusList: getDataByType("purchaseStatus"),
+ loading:false,
}
},
created() {
@@ -303,6 +344,17 @@
this.getProjectList()
},
methods: {
+ getpurchaseStatus(val) {
+ if (val) {
+ for (let i in this.purchaseStatusList) {
+ if (this.purchaseStatusList[i].id == val) {
+ return this.purchaseStatusList[i].name;
+ }
+ }
+ } else {
+ return "--";
+ }
+ },
setTable() {
// top 鏄庣粏鍗曞垪琛�
this.tableList = {
@@ -359,7 +411,6 @@
},
// 璇锋眰鏁版嵁
async getData() {
- this.loading = true
let params = {}
console.log(this.addConfig)
if (this.addConfig.keywordType === "瀹㈡埛鍚嶇О") {
@@ -388,9 +439,9 @@
pageSize: this.pagerOptions.pageSize
}
}
+ this.loading = true
await getSalesDetailsList(params)
.then((res) => {
- console.log(res)
if (res.code === 200) {
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
@@ -405,8 +456,7 @@
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.getProductInventoryInfo(row)
+ this.tableRowClick(this.selectRow)
}
} else {
this.tableList.tableInfomation = []
@@ -424,22 +474,37 @@
},
// 鑾峰彇浜у搧/搴撳瓨淇℃伅
async getProductInventoryInfo(row) {
- console.log(row.status, "鐘舵��", row)
- if (row.status === 1) {
- this.productTableList.tableInfomation = row.products
+ if (this.TabsIndex == 0||row.status==1) {
+ this.productTableList.tableInfomation = row.products || []
} else {
- await getProductInventoryInfo(row.number).then((res) => {
- console.log(res)
- this.productTableList.tableInfomation = res.data
- })
+ if(row.number){
+ this.loading = true
+ await getProductInventoryInfo(row.number).then((res) => {
+ this.productTableList.tableInfomation = res.data?.length > 0 ? res.data : []
+ this.loading = false
+ }).catch(() => {
+ this.productTableList.tableInfomation = []
+ this.loading = false
+ })
+ }
}
},
// 鑾峰彇鍒堕�犱俊鎭�
async getProductOrderInfo(number) {
- await getProductOrderInfo(number).then((res) => {
- console.log(res)
- this.productTableList.tableInfomation = res.data
- })
+ if(number){
+ this.loading = true
+ await getProductOrderInfo(number).then((res) => {
+ if(this.TabsIndex == 3){
+ this.productTableList.tableInfomation = (res.data&&res.data.purchaseInfo) ? res.data.purchaseInfo : []
+ }else{
+ this.productTableList.tableInfomation = (res.data&&res.data.makeInfo) ? res.data.makeInfo : []
+ }
+ this.loading = false
+ }).catch(() => {
+ this.productTableList.tableInfomation = []
+ this.loading = false
+ })
+ }
},
// 鎼滅储
onFilterSearch(searchText) {
@@ -464,16 +529,16 @@
},
// 鏌ョ湅 缂栬緫
handleClick(row, title) {
- console.log(row, title)
- this.editConfig.visible = true
+ let params = JSON.parse(JSON.stringify(row));
this.editConfig.title = title
this.editConfig.infomation = {
- ...row,
+ ...params,
currency: "浜烘皯甯�",
- sale_chance_name: row.saleChance.name,
- deliverType: row.deliverType === 0 ? "" : row.deliverType,
- quotation_number: row.quotation.number
+ sale_chance_name: params.saleChance.name,
+ deliverType: params.deliverType === 0 ? "" : params.deliverType,
+ quotation_number: params.quotation.number
}
+ this.editConfig.visible = true
},
// 纭鎻愪氦
async submitClick(row) {
@@ -571,30 +636,27 @@
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()
this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 1) {
- this.isClickProduct = false
- this.isClickInventory = true
- this.isClickMake = false
// 搴撳瓨淇℃伅鍒楄〃
this.tableBottomColumn = this.inventoryColumn
this.showBottomCol = this.showInventoryCol
this.setBottomList()
this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 2) {
- this.isClickProduct = false
- this.isClickInventory = false
- this.isClickMake = true
// 鍒堕�犱俊鎭垪琛�
this.tableBottomColumn = this.makeColumn
this.showBottomCol = this.showMakeCol
+ this.setBottomList()
+ this.getProductOrderInfo(this.selectRow.number)
+ } else if (this.TabsIndex == 3) {
+ // 閲囪喘淇℃伅鍒楄〃
+ this.tableBottomColumn = this.purchaseColumn
+ this.showBottomCol = this.showPurchaseCol
this.setBottomList()
this.getProductOrderInfo(this.selectRow.number)
}
@@ -604,14 +666,16 @@
return val === 1 ? "寰呯‘璁�" : val === 2 ? "寰呭嚭搴�" : val === 3 ? "鍑哄簱瀹屾垚" : val === 4 ? "宸插叧闂�" : "--"
},
// top 琛岀偣鍑�
- tableRowClick(row, column, event) {
- console.log(row, column, event)
+ tableRowClick(row) {
this.selectRow = row
if (this.TabsIndex == 0) {
this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 1) {
this.getProductInventoryInfo(this.selectRow)
} else if (this.TabsIndex == 2) {
+ this.getProductOrderInfo(this.selectRow.number)
+ }else if(this.TabsIndex == 3) {
+ // 閲囪喘淇℃伅
this.getProductOrderInfo(this.selectRow.number)
}
},
@@ -621,8 +685,7 @@
page: 1,
pageSize: 100
}).then((res) => {
- console.log(res.data, "椤圭洰鍒楄〃淇℃伅")
- this.projectList = res.data
+ this.projectList = res.data?res.data:[]
})
},
handleClose(done) {
@@ -734,6 +797,7 @@
margin-right: 20px;
font-size: 14px !important;
text-align: center;
+ cursor: pointer;
background: #2a78fb;
border-top-left-radius: 20px;
border-top-right-radius: 20px;
--
Gitblit v1.8.0