From b7968858014ab02aa91e52e63c2a266963d3a8f9 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期四, 24 八月 2023 18:06:22 +0800 Subject: [PATCH] 4807 4812) --- src/views/sales/salesDetails/index.vue | 205 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 161 insertions(+), 44 deletions(-) diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue index 6e7cb5f..fad5aa4 100644 --- a/src/views/sales/salesDetails/index.vue +++ b/src/views/sales/salesDetails/index.vue @@ -1,22 +1,47 @@ <template> <div class="sales-details"> - <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" /> - <div class="btn-pager"> - <PublicFunctionBtnView :submit-approval="true" :operates-list="operatesList" /> + <div v-if="isDetail" class="detail-top"> + <DetailListCommonBtn :query-class-options="queryClassOptions" /> <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" /> </div> - <TableCommonView ref="tableListRef" :show-summary="showSummary" :table-list="tableList"> + <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> + </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> + <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">鍒犻櫎</el-button> --> </template> </el-table-column> </template> </TableCommonView> <!-- 鏂板缓/缂栬緫 --> <AddSalesDetailsDialog v-if="editConfig.visible" :edit-common-config="editConfig" /> + <!-- 閿�鍞槑缁嗚鎯� --> + <DetailSpecification v-if="specificationDetail.visible" :specification-detail="specificationDetail" /> + <!-- 瀹㈡埛璇︽儏 --> + <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" /> </div> </template> @@ -24,13 +49,27 @@ import AddSalesDetailsDialog from "@/views/sales/salesDetails/AddSalesDetailsDialog" import { getSalesDetailsList, getDelSalesDetails } from "@/api/sales/salesDetails" import pageMixin from "@/components/makepager/pager/mixin/pageMixin" +import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification" export default { name: "SalesDetails", - props: {}, + props: { + isDetail: { + type: Boolean, + default: false + }, + addConfig: { + type: Object, + default: () => { + return {} + } + } + }, mixins: [pageMixin], components: { - AddSalesDetailsDialog + AddSalesDetailsDialog, + DetailSpecification, + DetailClientManage: () => import("@/views/client/client/DetailClientManage") }, computed: { searchCommonHeight() { @@ -73,14 +112,38 @@ "uninvoicedAmount", "number", "unOutoundNo", + "taxUnitPrice", "priceTax" ], mergeNumber: 6 - } + }, + specificationDetail: { + visible: false, + infomation: {} + }, + clientDeail: { + visible: false, + infomation: {} + }, + selValueList: [], + search_map: {}, + searchSel: { + value: "number", + label: "璁㈠崟缂栧彿" + }, + keyword: "", + keywordType: "" } }, created() { this.setTable() + if (!this.isDetail) { + this.keyword = "" + this.keywordType = "" + } else { + this.keyword = this.addConfig.keyword + this.keywordType = this.addConfig.keywordType + } this.getData() }, methods: { @@ -88,34 +151,35 @@ this.tableList = { tableInfomation: [], tableColumn: [ - { label: "璁㈠崟缂栧彿", prop: "number" }, - { label: "瀹㈡埛鍚嶇О", prop: "client_name" }, - { label: "绛剧害鏃ユ湡", prop: "signTime", isTime: true, width: 150 }, - { label: "閿�鍞礋璐d汉", prop: "memberId" }, - { label: "鍑哄簱鐘舵��", prop: "outboundStatus" }, + { 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 } + { 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({ - keyword: "", + keyword: this.keyword, + keywordType: this.keywordType, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize }) @@ -126,7 +190,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 || [] @@ -145,41 +210,78 @@ this.loading = false }) }, + // 鎼滅储 + searchClick(val, content) { + this.keyword = content + this.keywordType = val.label + this.getData() + }, + resetClick() { + 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 } + this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" } }, // 鍒犻櫎 - delClick(id) { - this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning" - }) - .then(function () { - return getDelSalesDetails({ id: id }) + delClick() { + if (this.selValueList && this.selValueList.length > 0) { + this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning" }) - .then((response) => { - if (response.code === 200) { - this.$message.success("鍒犻櫎鎴愬姛") - this.getData() - } else { - this.$message.warning("鍒犻櫎澶辫触") - } - }) - .catch(function () {}) + .then(() => { + getDelSalesDetails({ ids: this.selValueList }).then((response) => { + if (response.code === 200) { + this.$message.success("鍒犻櫎鎴愬姛") + this.getData() + } else { + this.$message.warning("鍒犻櫎澶辫触") + } + }) + }) + .catch(() => {}) + } else { + this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�") + } }, getSelectArray(val) { console.log(val) + this.selValueList = [] + const list = val.map((item) => { + return item.id + }) + this.selValueList = list + }, + // 瀹㈡埛鍚嶇О璇︽儏 + selClientClick(row) { + console.log(row) + this.clientDeail.visible = true + 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 } } } } @@ -188,7 +290,16 @@ <!-- Add "scoped" attribute to limit CSS to this component only --> <style lang="scss" scoped> .sales-details { - .btn-pager { + .top { + margin-bottom: 20px; + .btn-pager { + display: flex; + .page { + margin-left: auto; + } + } + } + .detail-top { display: flex; .page { margin-left: auto; @@ -196,9 +307,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