From 3d04f62e6c9124e2d37b5d09191a02fc6390d16f Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 13 十月 2023 17:07:10 +0800
Subject: [PATCH] bug修复
---
src/views/sales/quotation/index.vue | 240 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 166 insertions(+), 74 deletions(-)
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index b75379a..2d78b7a 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -2,40 +2,47 @@
<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"
- />
- <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" :amount-view="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"
+ @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="deleteItem(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" />
<!-- 鎶ヤ环鍗曡鎯� -->
@@ -59,6 +66,12 @@
isDetail: {
type: Boolean,
default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
}
},
mixins: [pageMixin],
@@ -68,11 +81,7 @@
DetailContacts: () => import("@/views/client/contacts/DetailContacts"),
DetailClientManage: () => import("@/views/client/client/DetailClientManage")
},
- computed: {
- searchCommonHeight() {
- return this.$refs.searchCommonView.offsetHeight
- }
- },
+ computed: {},
data() {
return {
tableList: {},
@@ -111,35 +120,65 @@
infomation: {}
},
selValueList: [],
- search_map: {}
+ search_map: {},
+ searchSel: {
+ value: "number",
+ label: "鎶ヤ环鍗曞彿"
+ },
+ tableColumn: [
+ { label: "鎶ヤ环鍗曞彿", prop: "number", min: 90, isCommonClick: true, default: true }, // 鎶ヤ环鍗曞彿
+ { label: "鎶ヤ环鍗曞悕绉�", prop: "quotationName", min: 120, isClientClick: true }, // 鎶ヤ环鍗曞悕绉�
+ // { label: "鑱旂郴浜哄鍚�", prop: "contact_name", min: 90, isContactClick: true }, // 鑱旂郴浜哄鍚�
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
+ { 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: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "鑱旂郴浜哄鍚�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "浜у搧鍚嶇О", "鏁伴噺", "浠风◣鍚堣"]
}
},
created() {
this.setTable()
- this.getData()
+ if (!this.isDetail) {
+ this.search_map = {}
+ } else {
+ this.search_map = {
+ [this.addConfig.id_name]: this.addConfig.id
+ }
+ }
+ this.getData(this.search_map)
},
methods: {
setTable() {
this.tableList = {
+ selectIndex: true,
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: "閿�鍞礋璐ｄ汉", prop: "member_id" }, // 閿�鍞礋璐ｄ汉
- { label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿
- { label: "灏忚", prop: "subTotal" }, // 灏忚
- { label: "鍚堣", prop: "total" }, // 鍚堣
- { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
- { label: "鏁伴噺", prop: "number" }, // 鏁伴噺
- { label: "浠风◣鍚堣", prop: "priceTax" } // 浠风◣鍚堣
- ]
+ 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
- this.searchOptions.push({ value: (i + 1).toString(), label: 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() {
@@ -157,7 +196,8 @@
return {
...item,
client_name: item.client.name,
- contact_name: item.contact.name
+ contact_name: item.contact.name,
+ member_name: item.member.username
}
})
this.tableList.tableInfomation = list || []
@@ -177,31 +217,25 @@
})
},
// 鎼滅储
- 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()
},
// 鏂板缓
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, currency: "浜烘皯甯�" }
},
- // 鍒犻櫎
+ // 鎵归噺鍒犻櫎
delClick() {
if (this.selValueList && this.selValueList.length > 0) {
this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
@@ -224,6 +258,33 @@
this.$message.warning("璇疯嚦灏戦�夋嫨涓�鏉¤褰�")
}
},
+ /**
+ * 鍗曚釜鍒犻櫎
+ * @param id 鎶ヤ环鍗昳d
+ */
+ deleteItem(id) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ getDelQuotation({ ids: [id] }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .catch((err) => {
+ if (err !== "cancel") {
+ console.error(err)
+ this.$message.warning("鍒犻櫎澶辫触")
+ }
+ })
+ },
getSelectArray(val) {
console.log(val)
this.selValueList = []
@@ -236,13 +297,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) {
@@ -257,19 +323,45 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.quotation {
- .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;
}
}
}
--
Gitblit v1.8.0