From 618f2a5288cb01ee3be552e43528d380a5955e87 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 1 Mar 2022 16:14:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E8=B4=B9=E7=8E=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js                                  |  5 ++
 .../merchant-incoming-parts.vue               | 46 +++++++++++--------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/Utils/Api.js b/Utils/Api.js
index 73f6763..d39de96 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -61,6 +61,11 @@ export const getMerListBySalesman = params => {
 export const getLklMcc = params => {
 	return POST('GET', `${base}/common/getLklMcc`, params).then(res => res.data);
 }
+//业务员查询费率类型
+export const getDictionaryByCodeType = params => {
+	return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data);
+}
+
 //查询商户门店
 export const getStoreListByMer = params => {
 	return POST('GET', `${base}/store/getStoreListByMer`, params).then(res => res.data);
diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index e957018..7ff41ca 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -664,7 +664,8 @@
 		getMerDetail,
 		configMerBasis,
 		configMerSettlement,
-		configMerStore
+		configMerStore,
+		getDictionaryByCodeType
 	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
@@ -759,7 +760,8 @@
 		},
 		onLoad(options) {
 			this.merId = options.id
-			this.getMerDetail(1);
+			this.getMerDetail(1);
+			this.getDictionaryByCodeType();
 		},
 		onShow() {
 			if (app.globalData.businessid) {
@@ -1007,9 +1009,9 @@
 						this.businnum = this.businessLicenselist.creditCode;
 						this.regaddress = this.businessLicenselist.businessAddress;
 						this.start_date = this.businessLicenselist.RegistrationDate;
-						let times = this.businessLicenselist.validPeriod.split('至');
-						if (times == '长期') {
-							this.timetype = '2';
+						let times = this.businessLicenselist.validPeriod.split('至');
+						if (times == '长期') {
+							this.timetype = '2';
 						}
 						if (times[1] == '永久') {
 							this.timetype = '2';
@@ -1181,17 +1183,17 @@
 							this.companyname = res.return_data.blisName;
 							this.businnum = res.return_data.blisNo
 							this.regaddress = res.return_data.blisRegAddress;
-							if(res.return_data.blisPeriodStart){
-								this.start_date = res.return_data.blisPeriodStart;
-							}
-							if(res.return_data.blisPeriodType){
-								this.timetype = res.return_data.blisPeriodType;
-							}
-							if(res.return_data.blisPeriodEnd){
-								this.end_date = res.return_data.blisPeriodEnd;
-							}
-							this.inducateid = res.return_data.merIndustry.childId;
-							this.industrycategory = res.return_data.merIndustry.childName;
+							if (res.return_data.blisPeriodStart) {
+								this.start_date = res.return_data.blisPeriodStart;
+							}
+							if (res.return_data.blisPeriodType) {
+								this.timetype = res.return_data.blisPeriodType;
+							}
+							if (res.return_data.blisPeriodEnd) {
+								this.end_date = res.return_data.blisPeriodEnd;
+							}
+							this.inducateid = res.return_data.merIndustry.childId;
+							this.industrycategory = res.return_data.merIndustry.childName;
 							this.detailsaddress = res.return_data.merRegion.address;
 							if (this.merchart == 2) {
 								this.idcardname = res.return_data.larName;
@@ -1792,9 +1794,17 @@
 						}
 					}
 				});
-
 			},
-
+			//查询费率类型
+			getDictionaryByCodeType() {
+				let params = {
+					codeType: 'MER_PLATFORM_NO_RATE'
+				}
+				getDictionaryByCodeType(params).then(res=>{
+					if(res.return_code == '000000'){
+					}
+				})
+			}
 		}
 	}
 </script>