Merge branch 'dev-td' into master-td

src/views/userManagement/memberEnter.vue

@@ -96,21 +96,19 @@
                      layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
 
-    <!--    新建会员窗口-->
+    <!--    新建、编辑会员窗口-->
     <el-dialog :title="title" :visible.sync="newMemberArea">
       <el-form :model="newMemberObject" :rules="newMemberObjectVerify" ref="nmo" label-width="100px">
-
-				<el-row>
-				  <el-col :span="16">
-				    <el-form-item label="会员类型" prop="memberType">
-								<el-radio-group v-model="memberTypeName">
-								  <!--                <el-radio-button style="margin-bottom: 10px;" label="无"></el-radio-button>-->
-								  <el-radio-button style="margin-bottom: 10px;" label="付费会员" :value="2"></el-radio-button>
-								  <el-radio-button style="margin-bottom: 10px;" label="兑换会员" :value="3"></el-radio-button>
-								</el-radio-group>
-				    </el-form-item>
-				  </el-col>
-				</el-row>
+<!--				<el-row>-->
+<!--				  <el-col :span="16">-->
+<!--				    <el-form-item label="会员类型" prop="memberType">-->
+<!--								<el-radio-group v-model="memberTypeName">-->
+<!--								  <el-radio-button style="margin-bottom: 10px;" label="付费会员" :value="2"></el-radio-button>-->
+<!--								  <el-radio-button style="margin-bottom: 10px;" label="兑换会员" :value="3"></el-radio-button>-->
+<!--								</el-radio-group>-->
+<!--				    </el-form-item>-->
+<!--				  </el-col>-->
+<!--				</el-row>-->
 				<el-row>
           <el-col :span="8">
             <el-form-item label="会员等级">
@@ -573,11 +571,11 @@
        */
       setNewMemberObject(formName) {
        console.log(JSON.stringify(this.newMemberObject))
-			 	if (this.memberTypeName = '付费会员') {
-			 	this.newMemberObject.memberType = 2
-			 } else {
-			 	this.newMemberObject.memberType = 3
-			 }
+			 // 	if (this.memberTypeName = '付费会员') {
+			 // 	this.newMemberObject.memberType = 2
+			 // } else {
+			 // 	this.newMemberObject.memberType = 3
+			 // }
         saveNewMemberObject(this.newMemberObject)
           .then(res => {
               if (res.rel) {

src/views/vehicle/vehicleInfo/oneVehicle.vue

@@ -7,12 +7,12 @@
     width="66%"
     class="flex-aic vehicle-dialog"
   >
+    <div id="chatRecord" style="margin-top: -30px; max-height: 540px; overflow: auto">
       <el-form
         ref="form"
         :model="form"
         :rules="rules"
         label-width="140px"
-      style="margin-top: -30px; max-height: 486px; overflow: auto"
       >
         <p style="padding: 10px; background: #f5f5f5">基础信息</p>
         <el-row>
@@ -446,6 +446,7 @@
           </el-col>
         </el-row>
       </el-form>
+    </div>
     <div slot="footer" class="flex-aic-jcc" style="margin-top: 10px">
       <el-button plain @click="closePop">取消</el-button>
       <el-button
@@ -873,6 +874,16 @@ export default {
         return;
       }
       this.isClick = true;
+      if(!this.form.useType || !this.form.numberPlate || !this.form.code || !this.form.status ||
+        !this.form.parkBranchCompanyId || !this.form.vehicleStatus || !this.form.vehicleBodyStatus || !this.form.vehicleInnerStatus){
+        // 用途
+        let ele = document.getElementById('chatRecord');
+        ele.scrollTop = 0;
+      } else if(!this.form.subordinateBranch || !this.form.brand || !this.form.modelId){
+        // 所属门店/车辆品牌/车型
+        let ele = document.getElementById('chatRecord');
+        ele.scrollTop = 500;
+      }
       set["form"].validate((valid) => {
         if (valid) {
           let params = objDeepCopy(this.form);