From 90943dd32237e9e1c9f0cd66e33b2145c26883ff Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期一, 25 九月 2023 14:14:47 +0800
Subject: [PATCH] feat: 侧边栏样式调整; 表格组件样式调整; 新增搜索组件; 销售线索模块布局样式调整
---
src/views/sales/salesDetails/index.vue | 103 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 78 insertions(+), 25 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 61f25db..2a551be 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -11,6 +11,7 @@
:search-options="searchOptions"
@searchClick="searchClick"
@resetClick="resetClick"
+ :search-sel="searchSel"
/>
<div class="btn-pager">
<PublicFunctionBtnView :submit-approval="true" :operates-list="operatesList" @batchDelete="delClick" />
@@ -36,11 +37,17 @@
</template>
</TableCommonView>
<!-- 鏂板缓/缂栬緫 -->
- <AddSalesDetailsDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <AddSalesDetailsDialog
+ v-if="editConfig.visible"
+ :edit-common-config="editConfig"
+ @addCollectionPlanClick="addCollectionPlanClick"
+ />
<!-- 閿�鍞槑缁嗚鎯� -->
<DetailSpecification v-if="specificationDetail.visible" :specification-detail="specificationDetail" />
<!-- 瀹㈡埛璇︽儏 -->
<DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
+ <!-- 鏂板缓 鏀舵璁″垝 -->
+ <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
</div>
</template>
@@ -49,6 +56,7 @@
import { getSalesDetailsList, getDelSalesDetails } from "@/api/sales/salesDetails"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
+import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
export default {
name: "SalesDetails",
@@ -56,13 +64,20 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
components: {
AddSalesDetailsDialog,
DetailSpecification,
- DetailClientManage: () => import("@/views/client/client/DetailClientManage")
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddCollectionPlan
},
computed: {
searchCommonHeight() {
@@ -105,6 +120,7 @@
"uninvoicedAmount",
"number",
"unOutoundNo",
+ "taxUnitPrice",
"priceTax"
],
mergeNumber: 6
@@ -118,11 +134,29 @@
infomation: {}
},
selValueList: [],
- search_map: {}
+ search_map: {},
+ searchSel: {
+ value: "number",
+ label: "璁㈠崟缂栧彿"
+ },
+ keyword: "",
+ keywordType: "",
+ addCollectionConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ }
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.keyword = ""
+ this.keywordType = ""
+ } else {
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
this.getData()
},
methods: {
@@ -132,32 +166,33 @@
tableColumn: [
{ label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: true },
{ label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
- { label: "绛剧害鏃ユ湡", prop: "signTime", isTime: true, width: 150 },
- { label: "閿�鍞礋璐ｄ汉", prop: "memberId" },
- { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
+ { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" },
+ // { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
{ label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
{ label: "鍚堣", prop: "total", price: true },
{ label: "搴旀敹浣欓", prop: "amountReceivable", price: true },
{ label: "宸插紑绁ㄩ噾棰�", prop: "invoicedAmount", price: true },
{ label: "鏈紑绁ㄩ噾棰�", prop: "uninvoicedAmount", price: true },
- { label: "浜у搧鍚嶇О", prop: "productName" },
- { label: "鏁伴噺", prop: "number1" },
- { label: "鍚◣鍗曚环", prop: "taxUnitPrice", price: true },
- { label: "鏈嚭搴撴暟閲�", prop: "unOutoundNo" },
- { label: "浠风◣鍚堣", prop: "priceTax", price: true }
+ { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
+ { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
+ { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
+ { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
]
}
this.searchOptions = []
for (let i = 0; i < this.tableList.tableColumn.length; i++) {
const label = this.tableList.tableColumn[i].label
- this.searchOptions.push({ value: (i + 1).toString(), label: label })
+ const value = this.tableList.tableColumn[i].prop
+ this.searchOptions.push({ value: value, label: label })
}
},
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
await getSalesDetailsList({
- search_map: this.search_map,
+ keyword: this.keyword,
+ keywordType: this.keywordType,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
@@ -168,7 +203,8 @@
const list = res.data.list.map((item) => {
return {
...item,
- client_name: item.client.name
+ client_name: item.client.name,
+ member_name: item.Member.username
}
})
this.tableList.tableInfomation = list || []
@@ -189,28 +225,27 @@
},
// 鎼滅储
searchClick(val, content) {
- console.log(val, content)
- this.search_map = {
- [val.value]: content
- }
+ this.keyword = content
+ this.keywordType = val.label
this.getData()
},
resetClick() {
- this.search_map = {}
+ this.keyword = ""
+ this.keywordType = ""
this.getData()
},
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {}
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, sale_chance_name: "" }
+ this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick() {
@@ -247,13 +282,25 @@
selClientClick(row) {
console.log(row)
this.clientDeail.visible = true
- this.clientDeail.infomation = { ...row, client_name: row.name }
+ this.clientDeail.infomation = {
+ ...row.client,
+ member: row.Member,
+ client_name: row.client.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name
+ }
},
// 鑱旂郴浜鸿鎯�
selCommonClick(row) {
console.log(row)
this.specificationDetail.visible = true
this.specificationDetail.infomation = { ...row }
+ },
+ addCollectionPlanClick(row) {
+ this.addCollectionConfig.visible = true
+ this.addCollectionConfig.title = "鏂板缓"
+ this.addCollectionConfig.sourceType = 1
+ this.addCollectionConfig.infomation = { ...row }
}
}
}
@@ -279,9 +326,15 @@
}
}
::v-deep {
- .el-table .cell,
- .el-table th.el-table__cell > .cell {
- padding: 0 2px;
+ .el-table .el-table__cell {
+ padding: 0;
+ }
+ .el-table__header tr,
+ .el-table__header th {
+ height: 48px;
+ }
+ .el-table__footer-wrapper tbody td.el-table__cell {
+ height: 48px;
}
}
</style>
--
Gitblit v1.8.0