From d05d95424986dc6e8defefb24fab6dc62e37ee08 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期六, 21 十月 2023 16:23:05 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/client/followupRecords/AddFollowupRecordsDialog.vue | 13 +++++++++----
src/views/other/payment/collectionPlan/AddCollectionPlan.vue | 6 +++++-
src/views/other/payment/collectionPlan/index.vue | 4 +++-
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 10 ++++++++--
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 7 +++----
src/views/sales/salesDetails/index.vue | 2 +-
6 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
index 8fdce8a..da6f687 100644
--- a/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
+++ b/src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -632,7 +632,9 @@
},
async handleSelectClient(value, item) {
if (value === "client") {
- console.log(item, "item")
+ this.editConfig.infomation.contact_name = ""
+ this.editConfig.infomation.sales_leads_name=""
+ this.editConfig.infomation.sale_chance_name=""
this.editSelectContactConfig.search_map.client_id = item.id
this.editSelectChanceConfig.search_map.client_id = item.id
this.editSelectLeadConfig.search_map.name = item.name
@@ -669,9 +671,9 @@
this.editConfig.infomation.contact_name = row.name
this.contactId = row.id
} else if (value === "client") {
- // this.editConfig.infomation.client_name = row.name;
- // this.clientId = row.id;
- // this.isChance = false;
+ this.editConfig.infomation.contact_name = ""
+ this.editConfig.infomation.sales_leads_name=""
+ this.editConfig.infomation.sale_chance_name=""
this.editSelectContactConfig.search_map.client_id = row.id
this.editSelectChanceConfig.search_map.client_id = row.id
this.editSelectLeadConfig.search_map.name = row.name
@@ -692,6 +694,9 @@
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
+ this.editConfig.infomation.contact_name = ""
+ this.editConfig.infomation.sales_leads_name=""
+ this.editConfig.infomation.sale_chance_name=""
this.editConfig.infomation.client_name = ""
this.clientId = 0
this.isChance = true
diff --git a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
index f3d9da6..879de0b 100644
--- a/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
+++ b/src/views/other/payment/collectionPlan/AddCollectionPlan.vue
@@ -142,7 +142,7 @@
</div>
<div class="btn-view">
<el-button type="primary" size="small" @click="saveClick">淇濆瓨</el-button>
- <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
+ <el-button size="small" @click="droppedClick">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
@@ -247,6 +247,10 @@
}
}
},
+ droppedClick(){
+ this.editConfig.visible = false
+ this.$parent.getData()
+ },
// 璁＄畻璁″垝鎬婚
sumTotalAmount() {
this.planAmount = 0
diff --git a/src/views/other/payment/collectionPlan/index.vue b/src/views/other/payment/collectionPlan/index.vue
index 0751b85..b0a43d2 100644
--- a/src/views/other/payment/collectionPlan/index.vue
+++ b/src/views/other/payment/collectionPlan/index.vue
@@ -178,8 +178,10 @@
if (res.code === 200) {
if (res.data.data && res.data.data.length > 0) {
const list = res.data.data.map((item) => {
+ item.client_name=this.addConfig.client_name
+ item.number=item.term
return {
- ...item
+ ...item,
}
})
this.tableList.tableInfomation = list || []
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 53cf0eb..6de4c84 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -24,7 +24,7 @@
<div class="basic-info-view">
<el-row>
<el-col :span="12">
- <el-form-item label="璁㈠崟缂栧彿" prop="number">
+ <el-form-item label="鏄庣粏鍗曠紪鍙�" prop="number">
<WordInput
v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
:codenumer="codenumer"
@@ -701,13 +701,15 @@
},
handleSelectClient(value, item) {
if (value === "client") {
+ this.editConfig.infomation.subbill_name =""
+ this.editConfig.infomation.sale_chance_name=""
this.clientId = item.id
this.editConfig.infomation.client_name = item.name
this.getSaleChanceList(item)
this.getSubOrderList(item)
} else if (value === "chance") {
this.saleChanceId = item.id
- this.editConfig.infomation.client_name = item.name
+ this.editConfig.infomation.sale_chance_name = item.name
} else if (value === "subbill") {
console.log("涓嬫媺妗嗙偣鍑�", item)
this.subbillId = item.id
@@ -728,6 +730,8 @@
},
selClient(row, value) {
if (value === "client") {
+ this.editConfig.infomation.sale_chance_name=""
+ this.editConfig.infomation.subbill_name=""
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.getSaleChanceList(row)
@@ -743,7 +747,9 @@
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
+ this.editConfig.infomation.sale_chance_name=""
this.editConfig.infomation.client_name = ""
+ this.editConfig.infomation.subbill_name =""
this.clientId = 0
} else if (value === "chance") {
this.editConfig.infomation.sale_chance_name = ""
diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index ba6058b..1df9ab4 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -318,7 +318,7 @@
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" }
+ this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�",sale_chance_name:row.saleChance.name,}
},
// 鍒犻櫎
delClick(rowID) {
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 2661ea9..396ee9a 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -460,6 +460,7 @@
},
async handleSelectClient(value, item) {
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.clientId = item.id
this.editSelCommonConfig.clientId = item.id
await getSalesDetailsList({
@@ -486,6 +487,7 @@
async selClient(row, value) {
console.log(row, value)
if (value === "client") {
+ this.editConfig.infomation.salesDetailNumber = ""
this.editConfig.infomation.client_name = row.name
this.clientId = row.id
this.editSelCommonConfig.clientId = row.id
@@ -504,14 +506,11 @@
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
- // this.editConfig.infomation = {}
+ this.editConfig.infomation.salesDetailNumber = ""
this.editConfig.infomation.client_name = ""
this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
- // this.productTableList.tableData = []
- // this.tableData = []
- // this.SalesDetailsId = 0
}
},
// 娣诲姞闄勪欢
--
Gitblit v1.8.0