From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/other/payment/saleInvoice/index.vue | 152 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 99 insertions(+), 53 deletions(-)
diff --git a/src/views/other/payment/saleInvoice/index.vue b/src/views/other/payment/saleInvoice/index.vue
index d03f622..bd13fb7 100644
--- a/src/views/other/payment/saleInvoice/index.vue
+++ b/src/views/other/payment/saleInvoice/index.vue
@@ -2,40 +2,38 @@
<div class="saleInvoice">
<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"
- :search-sel="searchSel"
- @searchClick="searchClick"
- @resetClick="resetClick"
- />
- <div class="btn-pager">
- <PublicFunctionBtnView :statistics="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"
- :table-list="tableList"
- @selClientClick="selClientClick"
- @selCommonClick="selCommonClick"
- @getSelectArray="getSelectArray"
- @selTableCol="selTableCol"
- >
- <!-- <template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="60" fixed="right">
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" 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" @selTableCol="selTableCol"> </TableCommonView>
+ </div>
+ <div class="btn-pager">
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ </div>
<!-- 鏂板缓/缂栬緫 -->
<AddSaleInvoice v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 瀹㈡埛璇︽儏 -->
+ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
</div>
</template>
@@ -63,7 +61,7 @@
}
},
mixins: [pageMixin],
- components: { AddSaleInvoice },
+ components: { AddSaleInvoice, DetailClientManage: () => import("@/views/client/client/DetailClientManage") },
computed: {},
data() {
return {
@@ -94,19 +92,11 @@
infomation: {}
},
saleChanceName: "",
- contactsDeail: {
- visible: false,
- infomation: {}
- },
clientDeail: {
visible: false,
infomation: {}
},
selValueList: [],
- searchSel: {
- value: "topic",
- label: ""
- },
search_map: {},
keyword: "",
keywordType: "",
@@ -179,12 +169,25 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getInvoiceList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- })
+ console.log(this.addConfig)
+ let params = {}
+ let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2
+ if (this.addConfig.id) {
+ params = {
+ sourceId: this.addConfig.id,
+ sourceType: sourceTyle,
+ 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 getInvoiceList(params)
.then((res) => {
if (res.data.code === 200) {
if (res.data.data.data && res.data.data.data.length > 0) {
@@ -197,7 +200,7 @@
}
})
this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.count
+ this.pagerOptions.totalCount = res.data.data.count
} else {
this.tableList.tableInfomation = []
}
@@ -237,6 +240,18 @@
this.editConfig.title = "鏂板缓"
this.editConfig.sourceType = this.sourceType
this.editConfig.infomation = { ...this.addConfig, number: "" }
+ },
+ // 瀹㈡埛鍚嶇О璇︽儏
+ selClientClick(row) {
+ console.log(row)
+ this.clientDeail.visible = true
+ this.clientDeail.infomation = {
+ ...row.Client,
+ client_name: row.Client.name,
+ client_level: row.Client.client_level.name,
+ client_status: row.Client.client_status.name,
+ contact_name: row.contact.name
+ }
}
}
}
@@ -245,20 +260,51 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.saleInvoice {
- .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__body-wrapper .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
}
</style>
--
Gitblit v1.8.0