From f417dc0a44d225d4ed19bcb5207250eb1b669455 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 25 八月 2023 12:45:09 +0800
Subject: [PATCH] bug修复
---
src/views/sales/salesDetails/index.vue | 352 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 257 insertions(+), 95 deletions(-)
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index e82b948..2a551be 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -1,47 +1,83 @@
<template>
<div class="sales-details">
- <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" />
- <div class="btn-pager">
- <PublicFunctionBtnView
- :duplicate-check="true"
- :list-button="true"
- :map-button="true"
- :statistics="true"
- :operates-list="operatesList"
- />
- <PagerView class="page" />
+ <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" :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="100">
+ <el-table-column label="鎿嶄綔" width="90">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">缂栬緫</el-button>
- <el-button 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>
<!-- 鏂板缓/缂栬緫 -->
- <AddSalesLeadDialog v-if="editSalesLeadConfig.visible" :edit-sales-lead-config="editSalesLeadConfig" />
+ <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 AddSalesLeadDialog from "@/views/custom/salesLead/AddSalesLeadDialog"
+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,
- AddSalesLeadDialog
+ AddSalesDetailsDialog,
+ DetailSpecification,
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
+ AddCollectionPlan
},
computed: {
searchCommonHeight() {
@@ -53,9 +89,10 @@
tableList: {},
queryClassOptions: [
{ value: "1", label: "鍏ㄩ儴" },
- { value: "2", label: "骞垮憡瀹ｄ紶" },
- { value: "3", label: "璺熻繘涓�" },
- { value: "4", label: "澶辫触鍏抽棴" }
+ { value: "2", label: "宸插彂璐�" },
+ { value: "3", label: "寰呴噰璐�" },
+ { value: "4", label: "鏈湀浜や粯" },
+ { value: "5", label: "宸蹭綔搴�" }
],
searchOptions: [],
operatesList: [
@@ -66,9 +103,45 @@
{ id: "5", name: "鏇存敼鍒涘缓浜�" },
{ id: "6", name: "鏍戠粨鏋勮缃�" },
{ id: "7", name: "瀹℃壒璁剧疆" },
- { id: "8", name: "鍏捣鍙傛暟璁剧疆" }
+ { id: "8", name: "鎭㈠棰勮鍒楀" }
],
- editSalesLeadConfig: {
+ editConfig: {
+ visible: false,
+ title: "鏂板缓",
+ infomation: {}
+ },
+ showSummary: {
+ show: true,
+ sumProp: [
+ "receiveTotalAmount",
+ "total",
+ "amountReceivable",
+ "invoicedAmount",
+ "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: {}
@@ -77,89 +150,157 @@
},
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: [
- {
- customName: "123123",
- customType: "鏅�氬鎴�",
- salesHead: "绯荤粺绠＄悊鍛�",
- modifyTime: "2023-0703 11:22:12",
- customerSize: "499浠ヤ笂",
- importantLevel: "A绫诲鎴�",
- customNumber: "AC651",
- customStatus: "娼滃湪瀹㈡埛",
- productName: "鑷姩鎵撳嵃鏈�",
- startDate: "2023-06-27",
- endDate: "2024-07-15"
- }
- ],
+ tableInfomation: [],
tableColumn: [
- { label: "瀹㈡埛鍚嶇О", prop: "customName", min: 120 }, // 瀹㈡埛鍚嶇О
- { label: "瀹㈡埛绫诲瀷", prop: "customType", min: 90 }, // 瀹㈡埛绫诲瀷
- { label: "閿�鍞礋璐ｄ汉", prop: "salesHead" }, // 閿�鍞礋璐ｄ汉
- { label: "淇敼鏃堕棿", prop: "modifyTime", min: 100 }, // 淇敼鏃堕棿
- { label: "瀹㈡埛瑙勬ā", prop: "customerSize" }, // 瀹㈡埛瑙勬ā
- { label: "閲嶈绾у埆", prop: "importantLevel" }, // 閲嶈绾у埆
- { label: "瀹㈡埛缂栧彿", prop: "customNumber" }, // 瀹㈡埛缂栧彿
- { label: "瀹㈡埛鐘舵��", prop: "customStatus" }, // 瀹㈡埛鐘舵��
- { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
- { label: "鏈嶅姟寮�濮嬫棩鏈�", prop: "startDate" }, // 鏈嶅姟寮�濮嬫棩鏈�
- { label: "鏈嶅姟鍒版湡鏃�", prop: "endDate" } // 鏈嶅姟鍒版湡鏃�
+ { label: "璁㈠崟缂栧彿", prop: "number", isCommonClick: 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 }
]
}
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: 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
+ })
+ },
+ // 鎼滅储
+ searchClick(val, content) {
+ this.keyword = content
+ this.keywordType = val.label
+ this.getData()
+ },
+ resetClick() {
+ this.keyword = ""
+ this.keywordType = ""
+ this.getData()
},
// 鏂板缓
addBtnClick() {
- this.editSalesLeadConfig.visible = true
- this.editSalesLeadConfig.title = "鏂板缓"
- this.editSalesLeadConfig.infomation = {
- customName: "",
- saleLeadNumber: "LEA50",
- contactName: "",
- contactDuties: "",
- phoneNumber: "",
- businessStatus: "鏂板缓",
- businessSource: "1",
- owner: "",
- position: "",
- map: "",
- country: "1",
- province: "1",
- city: "1",
- region: "1",
- address: ""
- }
+ this.editConfig.visible = true
+ this.editConfig.title = "鏂板缓"
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
- this.editSalesLeadConfig.visible = true
- this.editSalesLeadConfig.title = "缂栬緫"
- this.editSalesLeadConfig.infomation = {
- customName: row.customName,
- saleLeadNumber: row.saleLeadNumber,
- contactName: row.contactName,
- contactDuties: row.contactDuties,
- phoneNumber: row.phoneNumber,
- businessStatus: "鏂板缓",
- businessSource: row.businessSource,
- owner: row.owner,
- position: "",
- map: "",
- country: "1",
- province: "1",
- city: "1",
- region: "1",
- address: ""
+ this.editConfig.visible = true
+ this.editConfig.title = "缂栬緫"
+ 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 }
}
}
}
@@ -168,11 +309,32 @@
<!-- 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;
}
}
}
+::v-deep {
+ .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