From 7d7fbe920279c9d7a42268a284427d2c42d8f0f2 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期二, 10 十月 2023 14:45:01 +0800 Subject: [PATCH] 弹出搜索框 公共组件修改 --- src/views/sales/quotation/index.vue | 186 ++++++++++++++++++++++++++++++---------------- 1 files changed, 121 insertions(+), 65 deletions(-) diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue index 721cba3..4ef0aae 100644 --- a/src/views/sales/quotation/index.vue +++ b/src/views/sales/quotation/index.vue @@ -2,41 +2,55 @@ <div class="quotation"> <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" - :label-search="true" - :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 class="filter" v-else> + <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" - :table-list="tableList" - :select-box="!isDetail" - @selClientClick="selClientClick" - @selContactsClick="selContactsClick" - @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" + :table-list="tableList" + :select-box="!isDetail" + @selClientClick="selClientClick" + @selContactsClick="selContactsClick" + @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> <!-- 鏂板缓/缂栬緫 --> <AddQuotationDialog v-if="editConfig.visible" :edit-common-config="editConfig" /> <!-- 鎶ヤ环鍗曡鎯� --> @@ -118,7 +132,20 @@ searchSel: { value: "number", label: "鎶ヤ环鍗曞彿" - } + }, + tableColumn: [ + { label: "鎶ヤ环鍗曞彿", prop: "number", min: 90, isCommonClick: true ,default:true}, // 鎶ヤ环鍗曞彿 + { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О + { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 90, isContactClick: true }, // 鑱旂郴浜哄鍚� + { label: "閿�鍞礋璐d汉", prop: "member_name" }, // 閿�鍞礋璐d汉 + { label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿 + // { label: "灏忚", prop: "subTotal" }, // 灏忚 + // { label: "鍚堣", prop: "total" }, // 鍚堣 + { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true }, + { label: "鏁伴噺", prop: "productNumber", isProductAmount: true }, + { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true } + ], + showCol:["鎶ヤ环鍗曞彿", "瀹㈡埛鍚嶇О", "鑱旂郴浜哄鍚�", "閿�鍞礋璐d汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"] } }, created() { @@ -136,25 +163,29 @@ setTable() { this.tableList = { tableInfomation: [], - tableColumn: [ - { label: "鎶ヤ环鍗曞彿", prop: "number", min: 90, isCommonClick: true }, // 鎶ヤ环鍗曞彿 - { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О - { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 90, isContactClick: true }, // 鑱旂郴浜哄鍚� - { label: "閿�鍞礋璐d汉", prop: "member_name" }, // 閿�鍞礋璐d汉 - { label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿 - // { label: "灏忚", prop: "subTotal" }, // 灏忚 - // { label: "鍚堣", prop: "total" }, // 鍚堣 - { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true }, - { label: "鏁伴噺", prop: "productNumber", isProductAmount: true }, - { label: "浠风◣鍚堣", prop: "priceTax", isProductCommon: 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() { @@ -193,15 +224,9 @@ }) }, // 鎼滅储 - searchClick(val, content) { - console.log(val, content) - this.search_map = { - [val.value]: content - } - this.getData() - }, - resetClick() { - this.search_map = {} + onFilterSearch(searchText){ + this.search_map.number = searchText ?? '' + this.pagerOptions.currPage = 1 this.getData() }, // 鏂板缓 @@ -252,13 +277,18 @@ selClientClick(row) { console.log(row) this.clientDeail.visible = true - this.clientDeail.infomation = { ...row, client_name: row.name } + this.clientDeail.infomation = { + ...row.client, + client_name: row.name, + client_level: row.client.client_level.name, + client_status: row.client.client_status.name + } }, // 鑱旂郴浜鸿鎯� selContactsClick(row) { console.log(row) this.contactsDeail.visible = true - this.contactsDeail.infomation = { ...row } + this.contactsDeail.infomation = { ...row.contact, Client: row.client } }, // 鏈轰細鍚嶇О璇︽儏 selCommonClick(row) { @@ -272,20 +302,46 @@ <!-- Add "scoped" attribute to limit CSS to this component only --> <style lang="scss" scoped> -.quotation { - .top { - margin-bottom: 20px; +.quotation{ + 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; } } } -- Gitblit v1.8.0