From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/salesDetails/index.vue | 403 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 295 insertions(+), 108 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 9bc9112..48fcffd 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -1,40 +1,97 @@
<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" />
- <PagerView class="page" />
+ <div v-if="isDetail" class="detail-top">
+ <DetailListCommonBtn :query-class-options="queryClassOptions" />
</div>
- <TableCommonView ref="tableListRef" :show-summary="showSummary" :table-list="tableList">
- <template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="60">
- <template slot-scope="scope">
- <el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
+
+ <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>
- </el-table-column>
- </template>
- </TableCommonView>
+ </CommonSearch>
+ </div>
+ </div>
+
+ <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>
<script>
-import SearchCommonView from "@/components/makepager/SearchCommonView"
-import PublicFunctionBtnView from "@/components/makepager/PublicFunctionBtnView"
-import PagerView from "@/components/makepager/PagerView"
-import TableCommonView from "@/components/makepager/TableCommonView"
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"
+import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
export default {
name: "SalesDetails",
- props: {},
+ props: {
+ isDetail: {
+ type: Boolean,
+ default: false
+ },
+ addConfig: {
+ type: Object,
+ default: () => {
+ return {}
+ }
+ }
+ },
+ mixins: [pageMixin],
components: {
- SearchCommonView,
- PublicFunctionBtnView,
- PagerView,
- TableCommonView,
- AddSalesDetailsDialog
+ AddSalesDetailsDialog,
+ DetailSpecification,
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddCollectionPlan
},
computed: {
searchCommonHeight() {
@@ -77,109 +134,201 @@
"uninvoicedAmount",
"number",
"unOutoundNo",
+ "taxUnitPrice",
"priceTax"
],
mergeNumber: 6
- }
+ },
+ specificationDetail: {
+ visible: false,
+ infomation: {}
+ },
+ clientDeail: {
+ visible: false,
+ infomation: {}
+ },
+ selValueList: [],
+ search_map: {},
+ searchSel: {
+ value: "number",
+ label: "璁㈠崟缂栧彿"
+ },
+ keyword: "",
+ 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: "閿�鍞礋璐ｄ汉", 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:["璁㈠崟缂栧彿", "瀹㈡埛鍚嶇О", "绛剧害鏃ユ湡", "閿�鍞礋璐ｄ汉", "宸叉敹鎬婚", "鍚堣", "搴旀敹浣欓", "宸插紑绁ㄩ噾棰�", "鏈紑绁ㄩ噾棰�", "浜у搧鍚嶇О", "鏁伴噺", "閿�鍞崟浠�", "浠风◣鍚堣"]
}
},
created() {
this.setTable()
+ if (!this.isDetail) {
+ this.keyword = ""
+ this.keywordType = ""
+ } else {
+ this.keyword = this.addConfig.keyword
+ this.keywordType = this.addConfig.keywordType
+ }
+ this.getData()
},
methods: {
setTable() {
this.tableList = {
- tableInfomation: [
- {
- orderNumber: "XSHT265",
- customName: "55555",
- signDate: "2023-06-25",
- salesHead: "绯荤粺绠＄悊鍛�",
- outboundStatus: "鏈嚭搴�",
- receiveTotalAmount: "8000.00",
- total: "8000.00",
- amountReceivable: "8000.00",
- invoicedAmount: "8000.00",
- uninvoicedAmount: "8000.00",
- productName: "鑷姩鎵撳嵃鏈�",
- number: "1.00",
- taxUnitPrice: "8000.00",
- unOutoundNo: "1.00",
- priceTax: "8000.00"
- }
- ],
- tableColumn: [
- { label: "璁㈠崟缂栧彿", prop: "orderNumber" },
- { label: "瀹㈡埛鍚嶇О", prop: "customName" },
- { label: "绛剧害鏃ユ湡", prop: "signDate" },
- { label: "閿�鍞礋璐ｄ汉", prop: "salesHead" },
- { 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: "number" },
- { label: "鍚◣鍗曚环", prop: "taxUnitPrice", price: true },
- { label: "鏈嚭搴撴暟閲�", prop: "unOutoundNo" },
- { label: "浠风◣鍚堣", prop: "priceTax", price: true }
- ]
+ selectIndex: true,
+ tableInfomation: [],
+ 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() {
+ this.loading = true
+ await getSalesDetailsList({
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ .then((res) => {
+ console.log(res)
+ if (res.code === 200) {
+ if (res.data.list && res.data.list.length > 0) {
+ const list = res.data.list.map((item) => {
+ return {
+ ...item,
+ client_name: item.client.name,
+ member_name: item.Member.username
+ }
+ })
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ this.loading = false
+ })
+ .catch((err) => {
+ console.log(err)
+ this.tableList.tableInfomation = []
+ this.loading = false
+ })
+ },
+ // 鎼滅储
+ onFilterSearch(searchText){
+ this.keyword = searchText ?? ''
+ this.keywordType = "璁㈠崟缂栧彿"
+ this.pagerOptions.currPage = 1
+ this.getData()
},
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = {
- customName: "",
- orderNumber: "XSHT521",
- salesOpportunity: "",
- selSourceOrder: "",
- signDate: "",
- salesHead: "",
- deliveryDate: "",
- wechatOrderStatus: "",
- consignee: "",
- consigneeContactInfo: "",
- shippingAddress: "",
- termsTreaty: "",
- notes: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalOpinion: ""
- }
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = {
- customName: "",
- orderNumber: "XSHT521",
- salesOpportunity: "",
- selSourceOrder: "",
- signDate: "",
- salesHead: "",
- deliveryDate: "",
- wechatOrderStatus: "",
- consignee: "",
- consigneeContactInfo: "",
- shippingAddress: "",
- termsTreaty: "",
- notes: "",
- approvalWorkflow: "",
- approvalSteps: "",
- approvalPerson: "",
- approvalOpinion: ""
+ this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" }
+ },
+ // 鍒犻櫎
+ 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("鍒犻櫎澶辫触")
+ }
+ })
+ })
+ .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 }
+ },
+ addCollectionPlanClick(row) {
+ this.addCollectionConfig.visible = true
+ this.addCollectionConfig.title = "鏂板缓"
+ this.addCollectionConfig.sourceType = 1
+ this.addCollectionConfig.infomation = { ...row }
}
}
}
@@ -187,18 +336,56 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.sales-details {
- .btn-pager {
- display: flex;
- .page {
- margin-left: auto;
- }
+::v-deep {
+ .el-table .el-table__cell {
+ padding: 0;
+ }
+ .el-table__footer-wrapper tbody td.el-table__cell {
+ height: 48px;
}
}
-::v-deep {
- .el-table .cell,
- .el-table th.el-table__cell > .cell {
- padding: 0 2px;
+
+.sales-details {
+ 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;
+ }
+ }
}
}
</style>
--
Gitblit v1.8.0