商户进件新增：业务类型:businessType

pages/index/merchant-incoming-parts/merchant-incoming-parts.vue

@@ -88,6 +88,14 @@
 				</picker>
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
 			</view>
+			<view class="username">
+				<view class="namecont">业务类型</view>
+				<picker mode="selector" style="width: 70%;" :range="businessTypeList" range-key="codeName"
+					@change="changeBusinessvalue">
+					<view class="text1">{{businessTypeName}}</view>
+				</picker>
+				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
+			</view>
 			<view class="username">
 				<view class="namecont">商户类型</view>
 				<input placeholder="请选择商户类型" v-model="merchantType" style="width: 70%;" disabled="true"
@@ -139,7 +147,7 @@
 					<radio class="checbox" :checked="timetype == '2'" color="#0083f5" /> 长期有效
 				</view>
 			</view>
-			<view class="username width80" v-if="merchantId != 3">
+			<view class="username alijusend" v-if="merchantId != 3">
 				<picker mode="date" class="width40 fotct" :value="start_date" :start="startDate" :end="endDate"
 					@change="bindDateChange">
 					<view class="date">{{start_date}}</view>
@@ -284,7 +292,7 @@
 					<radio class="checbox" :checked="idcardtime =='2'" color="#0083f5" /> 长期有效
 				</view>
 			</view>
-			<view class="username width80">
+			<view class="username alijusend">
 				<picker mode="date" class="width40 fotct" :value="cardstart_date" :start="startDate" :end="endDate"
 					@change="bindCardDateChange">
 					<view class="date">{{cardstart_date}}</view>
@@ -304,6 +312,10 @@
 				<view class="namecont">机构类型</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.orgName}}</view>
 			</view>
+			<view class="username">
+				<view class="namecont">业务类型</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.businessType}}</view>
+			</view>
 			<view class="username">
 				<view class="namecont">商户类型</view>
 				<view class="font14 fcor333 text2 width75 fotrt" v-if="merDetailInfo.merType == 1">个体商户</view>
@@ -451,7 +463,7 @@
 					<radio class="checbox" :checked="idcardtime=='2'" color="#0083f5" /> 长期有效
 				</view>
 			</view>
-			<view class="username width80" v-if="lementId == 3">
+			<view class="username alijusend" v-if="lementId == 3">
 				<picker mode="date" class="width40 fotct" :value="cardstart_date" :start="startDate" :end="endDate"
 					@change="bindDateChange">
 					<view class="date">{{cardstart_date}}</view>
@@ -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;
 			}
 		}
 	}