From 7e55bfe3cc5989e8b225e4701861106c912291b7 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 20 十二月 2023 17:13:08 +0800
Subject: [PATCH] 销售明细单增加 采购信息模块 样式开发+报价单格式调整为上下结构前端样式开发+报价单列表客户名称和状态
---
src/api/data.js | 25 ++++
src/router/sales/index.js | 10 +
src/views/sales/quotation/index.vue | 179 +++++++++++++++++++++++++++--
src/views/sales/salesDetails/index.vue | 89 +++++++++++---
4 files changed, 267 insertions(+), 36 deletions(-)
diff --git a/src/api/data.js b/src/api/data.js
index 994fab4..f32244b 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -9,9 +9,34 @@
id: 2
}
]
+// 閲囪喘鐘舵��
+const purchaseStatus=[
+ {
+ name:"寰呯‘璁�",
+ id:1,
+ },
+ {
+ name:'寰呭叆搴�',
+ id:2,
+ },
+ {
+ name:'宸插叆搴�',
+ id:3,
+ },
+ {
+ name:'宸插畬鎴�',
+ id:4,
+ },
+ {
+ name:'宸插彇娑�',
+ id:5,
+ },
+]
export const getDataByType = (type) => {
if (type == "deliveryType") {
return deliveryType
+ }else if(type=='purchaseStatus'){
+ return purchaseStatus;
}
}
diff --git a/src/router/sales/index.js b/src/router/sales/index.js
index 48fdcd9..285c06f 100644
--- a/src/router/sales/index.js
+++ b/src/router/sales/index.js
@@ -9,7 +9,7 @@
const refundForm = (resolve) => require(["@/views/sales/refundForm/index"], resolve) // 閿�鍞��娆惧崟
const contractManage = (resolve) => require(["@/views/sales/contractManage/index"], resolve) // 鍚堝悓绠＄悊
const generatePlan = (resolve) => require(["@/views/sales/generatePlan/index"], resolve) // 鐢熸垚璁″垝
-
+const commonSet = (resolve) => require(["@/views/systemSet/commonSet/index"], resolve) // 鎶ヤ环鍗�
const appconfig = [
{
path: "/sales/salesOpportunity",
@@ -82,6 +82,14 @@
meta: {
title: "鐢熸垚璁″垝"
}
+ },
+ {
+ path: "/systemSet/commonSet",
+ name: "commonSet",
+ component: commonSet,
+ meta: {
+ title: "閫氱敤璁剧疆"
+ }
}
]
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index c07c880..0c98ff6 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,9 @@
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: {
@@ -83,6 +105,18 @@
},
computed: {},
data() {
+ // 浜у搧淇℃伅
+ const productColumn = [
+ { label: "浜у搧缂栧彿", prop: "number", default: true },
+ { 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: "valorem", price: true }
+ ]
return {
tableList: {},
queryClassOptions: [
@@ -133,11 +167,21 @@
{ label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿
// { label: "灏忚", prop: "subTotal" }, // 灏忚
// { label: "鍚堣", prop: "total" }, // 鍚堣
- { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
+ { label: "瀹㈡埗鍚嶇О", prop: "client_name", },
{ label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
- { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
+ { label: "鍚堣", prop: "priceTax", isProductTotal: true },
+ { label: "鐘舵��", prop: "priceTax",}
],
- showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "鑱旂郴浜哄鍚�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"]
+ showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О", "鏁伴噺", "鍚堣",'鐘舵��'],
+ selectRow: {},
+ loading:false,
+ // 澧炲姞 浜у搧淇℃伅鍒楄〃
+ TabsIndex:0,
+ tableBottomColumn: [],
+ showBottomCol: [],
+ productTableList: {},
+ productColumn: productColumn,
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�", "浠风◣鍚堣"],
}
},
created() {
@@ -152,24 +196,83 @@
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) {
+ 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 : []
+ })
+ }
+ },
+ // 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)
@@ -202,6 +305,10 @@
})
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 = []
}
@@ -354,9 +461,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;
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 182a229..da26a37 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,8 +72,8 @@
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'
}"
>
搴撳瓨淇℃伅
@@ -82,11 +82,21 @@
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: {
@@ -211,6 +221,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,9 +303,6 @@
showCol: ["璁㈠崟缂栧彿", "閿�鍞礋璐ｄ汉", "绛剧害鏃ユ湡", "浜や粯鏃ユ湡", "璁㈠崟鏉ユ簮", "鍚堣", "鐘舵��"],
tableBottomColumn: [],
showBottomCol: [],
- isClickProduct: true, // 浜у搧淇℃伅
- isClickInventory: false, // 搴撳瓨淇℃伅
- isClickMake: false, // 鍒堕�犱俊鎭�
TabsIndex: "0",
productTableList: {},
productColumn: productColumn,
@@ -278,6 +311,9 @@
showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"],
makeColumn: makeColumn,
showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"],
+ // 閲囪喘
+ purchaseColumn: purchaseColumn,
+ showPurchaseCol: ['閲囪喘鍗曞彿','閲囪喘鍗曞悕绉�',"渚涘簲鍟嗗悕绉�", "閲囪喘鏁伴噺", "鐘舵��"],
selectRow: {},
projectList: [],
projectListShow: false,
@@ -287,7 +323,8 @@
thatRow: {},
rules: {
projectId: [{ required: true, message: "璇烽�夋嫨椤圭洰", trigger: "change" }]
- }
+ },
+ purchaseStatusList: getDataByType("purchaseStatus"),
}
},
created() {
@@ -303,6 +340,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 = {
@@ -570,32 +618,29 @@
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)
}
},
// 鐘舵��
@@ -611,6 +656,9 @@
} 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)
}
},
@@ -733,6 +781,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