修改车辆信息和会员信息

src/views/userManagement/memberEnter.vue

@@ -108,6 +108,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+				 <el-row>
+				  <el-col :span="8">
+				    <el-form-item label="会员类型" prop="memberLevel">
+				      <el-select class="filter-item" v-model="newMemberObject.memberType" placeholder="请选择会员类型">
+				                       <el-option key="2" label="充值会员" :value="2"></el-option>
+															 <el-option key="3" label="兑换会员" :value="3"></el-option>
+				      </el-select>
+				    </el-form-item>
+				  </el-col>
 				</el-row>
         <el-row>
           <el-col :span="8">
@@ -236,6 +246,7 @@
         orderListLoading: true,
         newMemberObject: {
           memberName:undefined,
+					memberType:undefined,
           phone: undefined,
           memberLevel: undefined,
           totalNumber: undefined,

src/views/userManagement/userList/index.vue

@@ -272,9 +272,15 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="会员类型:">
+            <el-form-item label="会员名称:">
               <span>{{userDetails.memberName}}</span>
             </el-form-item>
+          </el-col>
+					  <el-col :span="6">
+					  <el-form-item label="会员类型:">
+					    <span v-if="userDetails.memberType == '2' && userDetails.memberType != undefined">充值会员</span>
+							<span v-if="userDetails.memberType == '3' && userDetails.memberType != undefined">兑换会员</span>
+					  </el-form-item>
 					</el-col>
           <el-col :span="6">
             <el-form-item label="有效期:">
@@ -357,6 +363,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+				 <el-row>
+				  <el-col :span="16">
+				    <el-form-item label="会员类型" prop="memberLevel">
+				      <el-select class="filter-item" v-model="userMembershipInformation.memberType" placeholder="请选择会员类型">
+				                       <el-option key="2" label="充值会员" :value="2"></el-option>
+															 <el-option key="3" label="兑换会员" :value="3"></el-option>
+				      </el-select>
+				    </el-form-item>
+				  </el-col>
 				</el-row>
         <el-row>
           <el-col :span="24">
@@ -433,6 +449,12 @@
                        :value="val.id"></el-option>
           </el-select>
         </el-form-item>
+				<el-form-item label="会员类型">
+				  <el-select class="filter-item" v-model="newMemberObject.memberLevel" placeholder="选择会员类型">
+				    <el-option :key="2" label="充值会员" :value="2"></el-option>
+				   <el-option :key="3" label="兑换会员" :value="3"></el-option>
+				  </el-select>
+				</el-form-item>
         <el-form-item label="手机号" placeholder="手机号" prop="phone">
           <el-input size="small " type="text" v-model="newMemberObject.phone"></el-input>
         </el-form-item>
@@ -598,6 +620,7 @@
           buyCount: undefined,
           totalNumber: undefined,
           rentFreeDays: undefined,
+					memberType: undefined,
           id: undefined,
           userId: undefined
         },
@@ -1194,6 +1217,7 @@
       setMember(row) {
         this.userMembershipInformation = {
           memberLevel: undefined,
+					memberType: undefined,
           validTime: '',
           buyCount: undefined,
           totalNumber: undefined,
@@ -1222,6 +1246,7 @@
             this.userMembershipInformation.rentFreeDays = response.data.rentFreeDays;
             this.userMembershipInformation.buyCount = response.data.buyCount;
             this.userMembershipInformation.id = response.data.id;
+						 this.userMembershipInformation.memberType = response.data.memberType
             // this.userMembershipInformation.memberLevel= this.userMembershipInformation.memberLevel?this.userMembershipInformation.memberLevel:undefined
           }
           this.setMemberArea = true

src/views/vehicle/vehicleInfo/index.vue

@@ -791,6 +791,26 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
+				
+				<el-row>
+					<el-col>
+						<el-form-item label="可使用会员" prop="memberUse">
+							<el-select
+								class="filter-item"
+								v-model="form.memberUse"
+								placeholder="请选择会员类型"
+								style="width:30%"
+								@change="handlerChange()"
+							>
+								<el-option key="1" label="所有会员" :value="1"></el-option>
+								<el-option key="2" label="充值会员" :value="2"></el-option>
+								<el-option key="3" label="兑换会员" :value="3"></el-option>
+								<el-option key="4" label="禁用会员" :value="4"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				
 				<el-row>
 					<el-col :span="24">
 						<el-form-item label="备注" prop="remark">
@@ -1095,6 +1115,7 @@ export default {
 				strongInsuranceCompany: undefined,
 				strongInsuranceEndDate: undefined,
 				strongInsuranceNo: undefined,
+				memberUse: undefined,
 				strongInsuranceCompany: undefined,
 				insurancePDF:undefined
 			},
@@ -1863,7 +1884,9 @@ export default {
 		}
 	},
 	methods: {
-		
+		handlerChange(e) {
+			console.log(e)
+		},
 		handleInput(e){
 				this.form.strongInsuranceNo=e.target.value.replace(/[^\d]/g,'');
 		},
@@ -3087,6 +3110,7 @@ export default {
 				drivingLicensePath: undefined,
 				drivingLicenseDuplicatePath: undefined,
 				remark: undefined,
+				memberUse: undefined,
 				strongInsuranceEndDate: undefined,
 				strongInsuranceNo: undefined,
 				strongInsuranceCompany: undefined,