From 3e241e58d4379f9b008db5ee3230214f0e642571 Mon Sep 17 00:00:00 2001 From: songshankun <songshankun@foxmail.com> Date: 星期四, 12 十月 2023 20:51:14 +0800 Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style --- src/views/other/payment/receipt/index.vue | 159 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 91 insertions(+), 68 deletions(-) diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue index ff6411b..92cfdd4 100644 --- a/src/views/other/payment/receipt/index.vue +++ b/src/views/other/payment/receipt/index.vue @@ -15,7 +15,9 @@ @searchClick="onFilterSearch" > <template slot="leftButton"> - <el-button size="small" type="primary" @click="addBtnClick">鏂板缓</el-button> + <el-button size="small" type="primary" @click="addBtnClick" + >鏂板缓</el-button + > <!-- <el-button size="small" @click="delClick">鍒犻櫎</el-button>--> </template> </CommonSearch> @@ -43,7 +45,11 @@ </TableCommonView> </div> <div class="btn-pager"> - <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" /> + <PagerView + class="page" + :pager-options="pagerOptions" + v-on="pagerEvents" + /> </div> </div> </div> @@ -53,27 +59,27 @@ </template> <script> -import { getReceiptList } from "@/api/common/payment" -import pageMixin from "@/components/makepager/pager/mixin/pageMixin" -import AddReceipt from "@/views/other/payment/receipt/addReceipt.vue" +import { getReceiptList } from "@/api/common/payment"; +import pageMixin from "@/components/makepager/pager/mixin/pageMixin"; +import AddReceipt from "@/views/other/payment/receipt/addReceipt.vue"; export default { name: "ReceiptView", props: { isDetail: { type: Boolean, - default: false + default: false, }, addConfig: { type: Object, default: () => { - return {} - } + return {}; + }, }, sourceType: { type: Number, - default: 1 - } + default: 1, + }, }, mixins: [pageMixin], components: { AddReceipt }, @@ -88,7 +94,7 @@ { value: "1", label: "鍏ㄩ儴" }, { value: "2", label: "浠婃棩鑱旂郴" }, { value: "3", label: "鏈懆鑱旂郴" }, - { value: "4", label: "鏈湀鑱旂郴" } + { value: "4", label: "鏈湀鑱旂郴" }, ], searchOptions: [], operatesList: [ @@ -99,26 +105,26 @@ { id: "5", name: "鏇存敼鍒涘缓浜�" }, { id: "6", name: "鏍戠粨鏋勮缃�" }, { id: "7", name: "瀹℃壒璁剧疆" }, - { id: "8", name: "鍥炶棰勮鍒楀" } + { id: "8", name: "鍥炶棰勮鍒楀" }, ], editConfig: { visible: false, title: "鏂板缓", - infomation: {} + infomation: {}, }, saleChanceName: "", contactsDeail: { visible: false, - infomation: {} + infomation: {}, }, clientDeail: { visible: false, - infomation: {} + infomation: {}, }, selValueList: [], searchSel: { value: "topic", - label: "" + label: "", }, search_map: {}, keyword: "", @@ -130,21 +136,32 @@ { label: "瀹為檯鏀舵閲戦", prop: "amount" }, { label: "鏀舵鏂瑰紡", prop: "paymentType_name" }, { label: "閿�鍞礋璐d汉", prop: "principal_name" }, - { label: "鏀舵鏃ユ湡", prop: "receiptDate" } + { label: "鏀舵鏃ユ湡", prop: "receiptDate" }, ], - showCol: ["鏀舵鍗曠紪鍙�", "瀹㈡埛鍚嶇О", "閫夋嫨婧愬崟", "瀹為檯鏀舵閲戦", "鏀舵鏂瑰紡", "閿�鍞礋璐d汉", "鏀舵鏃ユ湡"] - } + showCol: [ + "鏀舵鍗曠紪鍙�", + "瀹㈡埛鍚嶇О", + "閫夋嫨婧愬崟", + "瀹為檯鏀舵閲戦", + "鏀舵鏂瑰紡", + "閿�鍞礋璐d汉", + "鏀舵鏃ユ湡", + ], + }; }, created() { - this.setTable() + this.setTable(); if (!this.isDetail) { - this.keyword = "" - this.keywordType = "" + this.keyword = ""; + this.keywordType = ""; } else { - this.keyword = this.addConfig.keyword - this.keywordType = this.addConfig.keywordType + this.keyword = this.addConfig.keyword; + this.keywordType = this.addConfig.keywordType; } - this.getData() + this.getData(); + }, + mounted() { + console.log(this.addConfig, "杩欐槸鍟�"); }, methods: { setTable() { @@ -152,89 +169,95 @@ tableInfomation: [], 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 = [] + 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 }) + 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) - } - }) + isShowColumn: showCol.includes(ele.label), + }; + }); }, selTableCol(val) { - this.showcol = val - this.tableList.tableColumn = this.setColumnVisible(val) + this.showcol = val; + this.tableList.tableColumn = this.setColumnVisible(val); }, // 璇锋眰鏁版嵁 async getData() { - this.loading = true + // console.log() + this.loading = true; await getReceiptList({ keyword: this.keyword, keywordType: this.keywordType, page: this.pagerOptions.currPage, - pageSize: this.pagerOptions.pageSize + pageSize: this.pagerOptions.pageSize, + + sourceId: this.addConfig.salesDetailsId, + sourceIdType: this.addConfig.serviceContractId, }) .then((res) => { if (res.data.code === 200) { - const resList = res?.data?.data?.data ?? [] + const resList = res?.data?.data?.data ?? []; if (resList.length > 0) { const list = resList.map((item) => { return { ...item, client_name: item.client.name, paymentType_name: item.paymentType.name, - principal_name: item.principal.username - } - }) - this.tableList.tableInfomation = list || [] - this.pagerOptions.totalCount = res.data.data.count + principal_name: item.principal.username, + }; + }); + this.tableList.tableInfomation = list || []; + this.pagerOptions.totalCount = res.data.data.count; } else { - this.tableList.tableInfomation = [] + this.tableList.tableInfomation = []; } } else { - this.tableList.tableInfomation = [] + this.tableList.tableInfomation = []; } - this.loading = false + this.loading = false; }) .catch((err) => { - console.log(err) - this.tableList.tableInfomation = [] - this.loading = false - }) + console.log(err); + this.tableList.tableInfomation = []; + this.loading = false; + }); }, // 鎼滅储 onFilterSearch(searchText) { - this.keyword = searchText ?? "" - this.keywordType = "鏀舵鍗曠紪鍙�" - this.pagerOptions.currPage = 1 - this.getData() + this.keyword = searchText ?? ""; + this.keywordType = "鏀舵鍗曠紪鍙�"; + this.pagerOptions.currPage = 1; + this.getData(); }, getSelectArray(val) { - console.log(val) - this.selValueList = [] + console.log(val); + this.selValueList = []; const list = val.map((item) => { - return item.id - }) - this.selValueList = list + return item.id; + }); + this.selValueList = list; }, // 鏂板缓 addBtnClick() { - this.editConfig.visible = true - this.editConfig.title = "鏂板缓" - this.editConfig.sourceType = this.sourceType - this.editConfig.infomation = { ...this.addConfig, number: "" } - } - } -} + this.editConfig.visible = true; + this.editConfig.title = "鏂板缓"; + this.editConfig.sourceType = this.sourceType; + this.editConfig.infomation = { ...this.addConfig, number: "" }; + }, + }, +}; </script> <!-- Add "scoped" attribute to limit CSS to this component only --> -- Gitblit v1.8.0