From d5ed072db0c236ba505971471460e24789c58562 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 17 十月 2023 20:22:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/client/contacts/index.vue | 2 +-
src/views/other/payment/receipt/addReceipt.vue | 1 +
src/views/sales/salesDetails/DetailSpecification.vue | 2 +-
src/views/sales/salesReturn/index.vue | 2 +-
src/views/other/payment/receipt/index.vue | 1 +
src/views/sales/salesReturn/AddSalesReturnDialog.vue | 14 +++++++-------
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/views/client/contacts/index.vue b/src/views/client/contacts/index.vue
index bc0eeb4..3712433 100644
--- a/src/views/client/contacts/index.vue
+++ b/src/views/client/contacts/index.vue
@@ -148,7 +148,7 @@
this.search_map = {}
} else {
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.client_name
+ [this.addConfig.id_name]: this.addConfig.client_id
}
}
this.getData(this.search_map)
diff --git a/src/views/other/payment/receipt/addReceipt.vue b/src/views/other/payment/receipt/addReceipt.vue
index c38fffc..a778fdb 100644
--- a/src/views/other/payment/receipt/addReceipt.vue
+++ b/src/views/other/payment/receipt/addReceipt.vue
@@ -391,6 +391,7 @@
}
},
created() {
+ console.log()
this.$store.dispatch("geClient")
this.$store.dispatch("geServiceContract")
this.$store.dispatch("geSalesDetails")
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index ec12224..5649bb0 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -247,6 +247,7 @@
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
this.editConfig.sourceType = this.addConfig.keywordType === "瀹㈡埛鍚嶇О" ? 1 : this.sourceType
+ console.log(this.addConfig)
this.editConfig.infomation = { ...this.addConfig, saleDetailNumber: "" }
}
}
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index e4f1699..b7e5b9b 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -274,7 +274,7 @@
common_name: this.detailConfig.infomation.name,
client_name: this.detailConfig.infomation.client.name,
contact_name: this.detailConfig.infomation.contact_name,
- client_id: this.detailConfig.infomation.client_id,
+ client_id: this.detailConfig.infomation.clientId,
contact_id: this.detailConfig.infomation.contact_id,
amountTotal: this.detailConfig.infomation.amountTotal
}
diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index fc4697f..2661ea9 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -480,7 +480,7 @@
} else if (value === "contract") {
this.editSelCommonConfig.title = "閿�鍞槑缁嗗崟"
this.editSelCommonConfig.editVisible = true
- this.editSelCommonConfig.client_name = this.editConfig.infomation.client_name
+ // this.editSelCommonConfig.salesDetailNumber = this.editConfig.infomation.salesDetailNumber
}
},
async selClient(row, value) {
@@ -504,14 +504,14 @@
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
clearupClient(value) {
if (value === "client") {
- this.editConfig.infomation = {}
- // this.editConfig.infomation.client_name = ""
- // this.clientId = 0
+ // this.editConfig.infomation = {}
+ this.editConfig.infomation.client_name = ""
+ this.clientId = 0
} else if (value === "contract") {
this.editConfig.infomation.salesDetailNumber = ""
- this.productTableList.tableData = []
- this.tableData = []
- this.SalesDetailsId = 0
+ // this.productTableList.tableData = []
+ // this.tableData = []
+ // this.SalesDetailsId = 0
}
},
// 娣诲姞闄勪欢
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index ef076cd..9850bf9 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -243,7 +243,7 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { currency: "浜烘皯甯�", salesDetailNumber: "" }
+ this.editConfig.infomation = { currency: "浜烘皯甯�",salesDetailNumber:"",client_name:""}
},
// 缂栬緫
handleClick(row) {
--
Gitblit v1.8.0