From 7979474ca5570945126d7f087fa4363272d964b4 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 28 二月 2024 14:34:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/quotation/AddQuotationDialog.vue | 2 +
src/components/layout/components/appHeader/index.vue | 5 ++
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 44 +++++++++++++++++-----
src/views/other/commonDialog/SelectCommonDialog.vue | 19 +++++++--
4 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/src/components/layout/components/appHeader/index.vue b/src/components/layout/components/appHeader/index.vue
index 3426f59..389d527 100644
--- a/src/components/layout/components/appHeader/index.vue
+++ b/src/components/layout/components/appHeader/index.vue
@@ -24,7 +24,10 @@
export default {
name: "SalesLeads",
props: {
- headerTitle: String
+ headerTitle: {
+ type:String,
+ default:''
+ }
},
components:{
UpdatePassWord,
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index f7d6074..3603f67 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -177,9 +177,14 @@
} else if (this.editConfig.title === "鎶ヤ环鍗�") {
this.tableColumn = [
{ label: "鎶ヤ环鍗曞彿", prop: "number", isClick: true, default: true }, // 鎶ヤ环鍗曞彿
- { label: "閿�鍞礋璐ｄ汉", prop: "member_name" } // 閿�鍞礋璐ｄ汉
+ { label: "鎶ヤ环鍚嶇О", prop: "quotationName" },
+ { label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name" },
+ { label: "鎵�灞炰笟鍔℃満浼�", prop: "sale_chance_name" },
+ { label: "鎶ヤ环鍗曠姸鎬�", prop: "quotationStatus" },
+ { label: "鍚堣", prop: "amountTotal" }
]
- this.showCol = ["鎶ヤ环鍗曞彿", "閿�鍞礋璐ｄ汉"]
+ this.showCol = ["鎶ヤ环鍗曞彿", "鎶ヤ环鍚嶇О", "閿�鍞礋璐ｄ汉", "瀹㈡埛鍚嶇О", "鎵�灞炰笟鍔℃満浼�", "鎶ヤ环鍗曠姸鎬�", "鍚堣"]
this.tableList = {
selectIndex: true,
@@ -363,7 +368,10 @@
this.tableList.tableInfomation = this.editConfig.tableInfomation.map((item) => {
return {
...item,
- member_name: item.member.username
+ client_name: item.client.name,
+ sale_chance_name: item.sale_chance.name,
+ member_name: item.member.username,
+ quotationStatus: item.quotation_status.name
}
})
this.pagerOptions.totalCount = this.editConfig.count ? this.editConfig.count : 0
@@ -379,7 +387,10 @@
const list = res.data.list.map((item) => {
return {
...item,
- member_name: item.member.username
+ client_name: item.client.name,
+ sale_chance_name: item.sale_chance.name,
+ member_name: item.member.username,
+ quotationStatus: item.quotation_status.name
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 8684bc1..7d8067e 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -638,6 +638,8 @@
this.contactId = row.id
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
+ this.editConfig.infomation.client_name=row.client.name
+ this.clientId = row.client.id
this.saleChanceId = row.id
} else {
this.editConfig.infomation.client_name = row.name
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 7bcbdaf..53e1390 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -115,8 +115,9 @@
@select="handleSelectClient('chance', $event)"
:disabled="isNameChanceEdit || isView"
></el-autocomplete>
+ <!-- &&editConfig.infomation.client_name -->
<div
- v-if="!isNameChanceEdit && !isView&&editConfig.infomation.client_name"
+ v-if="!isNameChanceEdit && !isView"
class="common-select-btn"
@click="selClientClick('chance')"
>
@@ -181,6 +182,7 @@
}
]"
>
+ <!-- isAddQuatation || -->
<div class="custom-name">
<el-autocomplete
v-model="editConfig.infomation.quotation_number"
@@ -192,21 +194,22 @@
value-key="number"
@select="handleSelectClient('quotation', $event)"
style="width: 100%"
- placeholder="璇峰厛閫夋嫨閿�鍞満浼�"
- :disabled="isAddQuatation || isView"
+ placeholder="璇烽�夋嫨閿�鍞姤浠峰崟"
+ :disabled=" isView"
></el-autocomplete>
+ <!-- !isAddQuatation && editConfig.infomation.sale_chance_name &&-->
<div
- v-if="!isAddQuatation && !isView&&editConfig.infomation.sale_chance_name"
+ v-if=" !isView"
class="common-select-btn"
@click="selClientClick('quotation')"
>
<i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
</div>
+ <!-- !isAddQuatation && -->
<div
v-if="
editConfig.infomation.quotation_number &&
editConfig.infomation.quotation_number.length > 0 &&
- !isAddQuatation &&
!isView
"
class="common-select-btn"
@@ -927,7 +930,9 @@
if (value === "client") {
this.editSelectClientConfig.editVisible = true
} else if (value === "chance") {
- this.editSelectChanceConfig.clientId = this.clientId
+ if(this.clientId){
+ this.editSelectChanceConfig.clientId = this.clientId
+ }
this.editSelectChanceConfig.editVisible = true
} else if (value === "subbill") {
this.editSelCommonConfig.title = "閿�鍞瓙鍗�"
@@ -935,24 +940,37 @@
this.editSelCommonConfig.clientId = this.clientId
} else if (value === "quotation") {
this.editSelCommonConfig.title = "鎶ヤ环鍗�"
+ if(this.saleChanceId&&this.clientId){
+ this.editSelCommonConfig.clientId = this.clientId
+ // 姝ｅ悜閫夋嫨瀹㈡埛 閿�鍞満浼� 鎶ヤ环鍗�
+ this.editSelCommonConfig.isRequest = false
+ this.editSelCommonConfig.count=this.count
+ this.editSelCommonConfig.tableInfomation = [...this.quotationList]
+ }else{
+ // 鍙嶅悜閫夋嫨
+ this.editSelCommonConfig.isRequest = true;
+ }
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.clientId = this.clientId
- this.editSelCommonConfig.isRequest = false
- this.editSelCommonConfig.count=this.count
- this.editSelCommonConfig.tableInfomation = [...this.quotationList]
}
},
selClient(row, value) {
if (value === "client") {
this.editConfig.infomation.sale_chance_name = ""
+ this.saleChanceId=''
this.editConfig.infomation.subbill_name = ""
+ // 娓呯┖鎶ヤ环鍗�
+ this.editConfig.infomation.quotation_number =''
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.getSaleChanceList(row)
this.getSubOrderList(row)
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = row.name
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
this.saleChanceId = row.id
+ // 娓呯┖鎶ヤ环鍗�
+ this.editConfig.infomation.quotation_number =''
this.isAddQuatation = false
this.getQuotation(row.id)
} else if (value === "subbill") {
@@ -962,6 +980,12 @@
this.productTableList.tableData = row.products
// this.tableData = row.products
this.editConfig.infomation.quotation_number = row.number
+ //鍙嶅悜 瀹㈡埛鍚嶇О
+ this.editConfig.infomation.client_name = row.client.name
+ this.clientId = row.client.id
+ //鍙嶅悜 閿�鍞満浼�
+ this.editConfig.infomation.sale_chance_name = row.sale_chance.name
+ this.saleChanceId = row.sale_chance.id
this.quotationId = row.id
}
},
--
Gitblit v1.8.0