From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/salesDetails/index.vue | 234 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 158 insertions(+), 76 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 560a58d..48fcffd 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -2,46 +2,66 @@
<div class="sales-details">
<div v-if="isDetail" class="detail-top">
<DetailListCommonBtn :query-class-options="queryClassOptions" />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
- <div v-else class="top">
- <SearchCommonView
- ref="searchCommonView"
- :query-class-options="queryClassOptions"
- :search-options="searchOptions"
- @searchClick="searchClick"
- @resetClick="resetClick"
- :search-sel="searchSel"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView :submit-approval="true" :operates-list="operatesList" @batchDelete="delClick" />
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+
+ <div v-else class="filter">
+ <div class="filter-card">
+ <CommonSearch
+ :show-add="false"
+ :show-download="false"
+ :amount-view="false"
+ :show-action-btn="false"
+ placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
+ @searchClick="onFilterSearch"
+ >
+ <template slot="leftButton">
+ <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button>
+ <!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button> -->
+ </template>
+ </CommonSearch>
</div>
</div>
- <TableCommonView
- ref="tableListRef"
- :show-summary="showSummary"
- :table-list="tableList"
- :select-box="!isDetail"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- >
- <template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="90">
- <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> -->
- </template>
- </el-table-column>
- </template>
- </TableCommonView>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ ref="tableListRef"
+ :show-summary="showSummary"
+ :table-list="tableList"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ @getSelectArray="getSelectArray"
+ @selTableCol="selTableCol"
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="90">
+ <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>
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
+ </div>
+
+ <div class="btn-pager">
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ </div>
<!-- 鏂板缓/缂栬緫 -->
- <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>
@@ -50,6 +70,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",
@@ -69,7 +90,8 @@
components: {
AddSalesDetailsDialog,
DetailSpecification,
- DetailClientManage: () => import("@/views/client/client/DetailClientManage")
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddCollectionPlan
},
computed: {
searchCommonHeight() {
@@ -112,6 +134,7 @@
"uninvoicedAmount",
"number",
"unOutoundNo",
+ "taxUnitPrice",
"priceTax"
],
mergeNumber: 6
@@ -131,7 +154,29 @@
label: "璁㈠崟缂栧彿"
},
keyword: "",
- keywordType: ""
+ keywordType: "",
+ addCollectionConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ },
+ 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: "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 }
+ ],
+ showCol:["璁㈠崟缂栧彿", "瀹㈡埛鍚嶇О", "绛剧害鏃ユ湡", "閿�鍞礋璐ｄ汉", "宸叉敹鎬婚", "鍚堣", "搴旀敹浣欓", "宸插紑绁ㄩ噾棰�", "鏈紑绁ㄩ噾棰�", "浜у搧鍚嶇О", "鏁伴噺", "閿�鍞崟浠�", "浠风◣鍚堣"]
}
},
created() {
@@ -148,31 +193,31 @@
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
tableInfomation: [],
- tableColumn: [
- { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: 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: "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 }
- ]
+ allcol: [],
+ showcol: this.showCol,
+ tableColumn:this.setColumnVisible(this.showCol)
}
+ 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 })
}
+ },
+ setColumnVisible(showCol){
+ return this.tableColumn.map(ele=>{
+ return {
+ ...ele,
+ isShowColumn:showCol.includes(ele.label)
+ }
+ })
+ },
+ selTableCol(val) {
+ this.showcol = val;
+ this.tableList.tableColumn = this.setColumnVisible(val);
},
// 璇锋眰鏁版嵁
async getData() {
@@ -211,28 +256,24 @@
})
},
// 鎼滅储
- searchClick(val, content) {
- this.keyword = content
- this.keywordType = val.label
- this.getData()
- },
- resetClick() {
- this.keyword = ""
- this.keywordType = ""
+ onFilterSearch(searchText){
+ this.keyword = searchText ?? ''
+ this.keywordType = "璁㈠崟缂栧彿"
+ this.pagerOptions.currPage = 1
this.getData()
},
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig }
+ 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() {
@@ -269,13 +310,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 }
}
}
}
@@ -283,27 +336,56 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
+::v-deep {
+ .el-table .el-table__cell {
+ padding: 0;
+ }
+ .el-table__footer-wrapper tbody td.el-table__cell {
+ height: 48px;
+ }
+}
+
.sales-details {
- .top {
- margin-bottom: 20px;
+ height: 100%;
+ overflow: hidden;
+ .filter{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ padding: 12px 20px 0 20px;
+ &-card{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ box-sizing: border-box;
+ padding: 10px 20px;
+ flex: 1;
+ border-radius: 12px;
+ background-color: #fff;
+ }
+ }
+ .body{
+ box-sizing: border-box;
+ padding: 10px 20px;
+ border-radius: 12px;
+ height: calc(100% - 92px);
+ .body-card {
+ background-color: #fff;
+ border-radius: 12px;
+ height: 100%;
+ overflow: hidden;
+ }
+ .list-view {
+ height: calc(100% - 60px);
+ overflow: hidden;
+ }
.btn-pager {
display: flex;
+ margin-top: 10px;
.page {
margin-left: auto;
}
}
- }
- .detail-top {
- display: flex;
- .page {
- margin-left: auto;
- }
- }
-}
-::v-deep {
- .el-table .cell,
- .el-table th.el-table__cell > .cell {
- padding: 0 2px;
}
}
</style>
--
Gitblit v1.8.0