From c25c96c5dd793c999b2796c0d00f662ce98317f3 Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期二, 24 十月 2023 17:56:27 +0800 Subject: [PATCH] 修改编码的 trigger设置 --- src/views/sales/salesDetails/index.vue | 337 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 232 insertions(+), 105 deletions(-) diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue index 560a58d..ccf54eb 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() { @@ -103,7 +125,7 @@ infomation: {} }, showSummary: { - show: true, + show: false, sumProp: [ "receiveTotalAmount", "total", @@ -112,6 +134,7 @@ "uninvoicedAmount", "number", "unOutoundNo", + "taxUnitPrice", "priceTax" ], mergeNumber: 6 @@ -131,7 +154,43 @@ 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: "閿�鍞礋璐d汉", 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: [ + "璁㈠崟缂栧彿", + "瀹㈡埛鍚嶇О", + "绛剧害鏃ユ湡", + "閿�鍞礋璐d汉", + "宸叉敹鎬婚", + "鍚堣", + "搴旀敹浣欓", + "宸插紑绁ㄩ噾棰�", + "鏈紑绁ㄩ噾棰�", + "浜у搧鍚嶇О", + "鏁伴噺", + "閿�鍞崟浠�", + "浠风◣鍚堣" + ] } }, created() { @@ -148,25 +207,13 @@ 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: "閿�鍞礋璐d汉", 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 @@ -174,15 +221,51 @@ 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() { this.loading = true - await getSalesDetailsList({ - keyword: this.keyword, - keywordType: this.keywordType, - page: this.pagerOptions.currPage, - pageSize: this.pagerOptions.pageSize - }) + let params = {} + console.log("ssssssssssss") + console.log(this.addConfig) + if (this.addConfig.keywordType === "瀹㈡埛鍚嶇О") { + params = { + clientId: this.addConfig.client_id, + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + } + } else if (this.addConfig.keywordType === "閿�鍞満浼�") { + params = { + saleChanceId: this.addConfig.sale_chance_id, + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + } + } else if (this.addConfig.keywordType === "閿�鍞瓙鍗�") { + params = { + number: this.addConfig.subbill_name, + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + } + } else { + params = { + keyword: this.keyword, + keywordType: this.keywordType, + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + } + } + await getSalesDetailsList(params) .then((res) => { console.log(res) if (res.code === 200) { @@ -211,51 +294,55 @@ }) }, // 鎼滅储 - 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 } + console.log(this.addConfig) + this.editConfig.infomation = { + ...this.addConfig, + currency: "浜烘皯甯�", + sale_chance_name:"", + subbill_name:"", + client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name + } }, // 缂栬緫 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: "浜烘皯甯�",sale_chance_name:row.saleChance.name,} }, // 鍒犻櫎 - delClick() { - if (this.selValueList && this.selValueList.length > 0) { - this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning" - }) - .then(() => { - getDelSalesDetails({ ids: this.selValueList }).then((response) => { - if (response.code === 200) { - this.$message.success("鍒犻櫎鎴愬姛") - this.getData() - } else { - this.$message.warning("鍒犻櫎澶辫触") - } - }) + delClick(rowID) { + console.log(rowID, "xxxxshanchu") + // if (this.selValueList && this.selValueList.length > 0) { + this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning" + }) + .then(() => { + getDelSalesDetails({ ids: [rowID] }).then((response) => { + if (response.code === 200) { + this.$message.success("鍒犻櫎鎴愬姛") + this.getData() + } else { + this.$message.warning("鍒犻櫎澶辫触") + } }) - .catch(() => {}) - } else { - this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�") - } + }) + .catch(() => {}) + // } else { + // this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�") + // } }, getSelectArray(val) { console.log(val) @@ -269,13 +356,24 @@ 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 } + this.specificationDetail.visible = true + }, + addCollectionPlanClick(row) { + this.addCollectionConfig.visible = true + this.addCollectionConfig.title = "鏂板缓" + this.addCollectionConfig.sourceType = 1 + this.addCollectionConfig.infomation = { ...row } } } } @@ -283,27 +381,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