From bbf59cd0a1c02ebf7974704250ae262f17050c59 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 17 十月 2023 15:24:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/sales/salesReturn/index.vue | 2 +-
src/views/other/payment/receipt/index.vue | 6 +++---
src/views/sales/salesDetails/AddSalesDetailsDialog.vue | 2 +-
src/views/service/clientServiceOrder/index.vue | 24 +++++++++++++++++-------
src/views/other/payment/saleInvoice/index.vue | 2 +-
src/views/sales/refundForm/index.vue | 2 +-
6 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/views/other/payment/receipt/index.vue b/src/views/other/payment/receipt/index.vue
index 98d506c..ec12224 100644
--- a/src/views/other/payment/receipt/index.vue
+++ b/src/views/other/payment/receipt/index.vue
@@ -180,10 +180,10 @@
// console.log()
this.loading = true
let params = {}
- let sourceTyle = (this.addConfig.keywordType === "閿�鍞槑缁嗗崟"||this.addConfig.keywordType ==='瀹㈡埛鍚嶇О') ? 1 : 2
+ let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" || this.addConfig.keywordType === "瀹㈡埛鍚嶇О" ? 1 : 2
if (this.addConfig.id) {
params = {
- sourceID: this.addConfig.id,
+ sourceId: this.addConfig.id,
sourceType: sourceTyle,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize,
@@ -246,7 +246,7 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.sourceType = this.addConfig.keywordType ==='瀹㈡埛鍚嶇О'?1:this.sourceType
+ this.editConfig.sourceType = this.addConfig.keywordType === "瀹㈡埛鍚嶇О" ? 1 : this.sourceType
this.editConfig.infomation = { ...this.addConfig, saleDetailNumber: "" }
}
}
diff --git a/src/views/other/payment/saleInvoice/index.vue b/src/views/other/payment/saleInvoice/index.vue
index b430c93..bd13fb7 100644
--- a/src/views/other/payment/saleInvoice/index.vue
+++ b/src/views/other/payment/saleInvoice/index.vue
@@ -174,7 +174,7 @@
let sourceTyle = this.addConfig.keywordType === "閿�鍞槑缁嗗崟" ? 1 : 2
if (this.addConfig.id) {
params = {
- sourceID: this.addConfig.id,
+ sourceId: this.addConfig.id,
sourceType: sourceTyle,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
diff --git a/src/views/sales/refundForm/index.vue b/src/views/sales/refundForm/index.vue
index 77593ed..c4f7515 100644
--- a/src/views/sales/refundForm/index.vue
+++ b/src/views/sales/refundForm/index.vue
@@ -185,7 +185,7 @@
let params = {}
if (this.addConfig.id) {
params = {
- sourceID: this.addConfig.id,
+ sourceId: this.addConfig.id,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}
diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 11ad76e..53cf0eb 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -497,7 +497,7 @@
infomation: {}
},
clientId: this.editCommonConfig.infomation.client_id,
- saleChanceId: this.editCommonConfig.infomation.saleChanceId,
+ saleChanceId: this.editCommonConfig.infomation.sale_chance_id,
subbillId: this.editCommonConfig.infomation.subbillId,
productId: 1,
isNoProduct: true,
diff --git a/src/views/sales/salesReturn/index.vue b/src/views/sales/salesReturn/index.vue
index 930d4b8..ef076cd 100644
--- a/src/views/sales/salesReturn/index.vue
+++ b/src/views/sales/salesReturn/index.vue
@@ -190,7 +190,7 @@
let params = {}
if (this.addConfig.id) {
params = {
- sourceID: this.addConfig.id,
+ sourceId: this.addConfig.id,
sourceType: 1,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
diff --git a/src/views/service/clientServiceOrder/index.vue b/src/views/service/clientServiceOrder/index.vue
index dcc31aa..c8fd71a 100644
--- a/src/views/service/clientServiceOrder/index.vue
+++ b/src/views/service/clientServiceOrder/index.vue
@@ -179,13 +179,23 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getServiceOrderList({
- keyword: this.keyword,
- keywordType: this.keywordType,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize,
- sourceId: this.addConfig.id
- })
+ console.log(this.addConfig)
+ let params = {}
+ if (this.addConfig.keywordType === "鏈嶅姟鍚堝悓") {
+ params = {
+ serviceContractId: this.addConfig.serviceContractId,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ } else {
+ params = {
+ keyword: this.keyword,
+ keywordType: this.keywordType,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }
+ }
+ await getServiceOrderList(params)
.then((res) => {
console.log(res)
if (res.code === 200) {
--
Gitblit v1.8.0