diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index 9af9d20..3066e51 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -88,6 +88,14 @@
+
+ 业务类型
+
+ {{businessTypeName}}
+
+
+
商户类型
长期有效
-
+
{{start_date}}
@@ -284,7 +292,7 @@
长期有效
-
+
{{cardstart_date}}
@@ -304,6 +312,10 @@
机构类型
{{merDetailInfo.orgName}}
+
+ 业务类型
+ {{merDetailInfo.businessType}}
+
商户类型
个体商户
@@ -451,7 +463,7 @@
长期有效
-
+
{{cardstart_date}}
@@ -921,7 +933,11 @@
merDetailInfo: '', //用户信息
rateCodeList: [], //费率字典
merRateList: [], //提交费率数组
- merPlatformType: '' //渠道ID
+ merPlatformType: '' ,//渠道ID
+
+ businessType:'',//商户业务类型
+ businessTypeName:'',
+ businessTypeList:[],
}
},
computed: {
@@ -1638,6 +1654,7 @@
}
if (res.return_data && this.merchart == 2) {
this.getDictionaryByCodeTypeOrg();
+
this.idcardname = res.return_data.larName;
this.idcard = res.return_data.larIdCard;
@@ -1764,9 +1781,12 @@
} else {
this.currentstatus = 1;
}
+ this.getDictionaryByCodeTypeBusiness();
} else {
this.getDictionaryByCodeType();
this.getDictionaryByCodeTypeOrg();
+ this.getDictionaryByCodeTypeBusiness();
+
}
})
},
@@ -2073,7 +2093,8 @@
"merRegion": {
"address": that.detailsaddress,
"areaCode": that.areaCode
- }
+ },
+ "businessType":that.businessType,
}
configMerBasis(datas).then(res => {
uni.hideLoading();
@@ -2500,6 +2521,33 @@
changefeilvalue(e) {
this.organizationId = this.organizationType[e.target.value].codeValue;
this.organizationName = this.organizationType[e.target.value].codeName;
+ },
+ //查询业务类型数据字典
+ getDictionaryByCodeTypeBusiness() {
+ let params = {
+ codeType: 'MER_BUSINESS_TYPE'
+ }
+ getDictionaryByCodeType(params).then(res => {
+ if (res.return_code == '000000') {
+ this.businessTypeList = res.return_data;
+ if (!this.merDetailInfo.businessType) {
+ this.businessType = res.return_data[0].codeValue;
+ this.businessTypeName = res.return_data[0].codeName;
+ }else{
+ this.businessType = this.merDetailInfo.businessType;
+ let codeName = res.return_data.filter(item=>{
+ return item.codeValue == this.merDetailInfo.businessType
+ })
+ this.businessTypeName = codeName[0].codeName;
+ }
+ }
+ })
+ },
+
+ //选择业务类型
+ changeBusinessvalue(e){
+ this.businessType= this.businessTypeList[e.target.value].codeValue;
+ this.businessTypeName = this.businessTypeList[e.target.value].codeName;
}
}
}