Merge branch 'dev-td' of http://113.105.137.151:22280/youjj/cloud-platform-ui into dev-td

src/views/userManagement/memberEnter.vue

@@ -36,18 +36,18 @@
       <el-button class="filter-item"  style="margin-left: 10px;" @click="bulkUpload"
                  type="primary" icon="edit" v-if="memberEnter_btn_addIn">批量导入会员
       </el-button>
-      <el-button class="filter-item" type="primary" v-waves @click="reloadPage">重置</el-button>
+      <el-button class="filter-item" v-waves @click="reloadPage">重置</el-button>
     </div>
     <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
               style="width: 100%">
     <!--<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row-->
               <!--style="width: 100%">-->
-      <el-table-column width="200" align="center" label="手机号">
+      <el-table-column align="center" label="手机号">
         <template slot-scope="scope">
           <span>{{scope.row.username}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="150" align="center" label="会员名">
+      <el-table-column  align="center" label="会员名">
         <template slot-scope="scope">
           <span>{{scope.row.memberName}}</span>
         </template>
@@ -82,8 +82,9 @@
           <span>{{scope.row.crtName}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="65" fixed="right">
+      <el-table-column align="center" label="操作" fixed="right">
         <template slot-scope="scope">
+          <el-button class="el-button el-button--text el-button--small" size="small" v-if="scope.row.status!=1 && memberEnter_btn_upd" @click="editHandler(scope.row)">编辑</el-button>
           <el-button class="el-button el-button--text el-button--small" style="color:red" size="small" @click="deleteHandler(scope.row)" v-if="memberEnter_btn_del&&scope.row.status!=1">删除</el-button>
         </template>
       </el-table-column>
@@ -95,21 +96,19 @@
                      layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
 
-    <!--    新建会员窗口-->
-    <el-dialog title="新建会员" :visible.sync="newMemberArea" width="10%">
+    <!--    新建、编辑会员窗口-->
+    <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="会员等级">
@@ -193,7 +192,7 @@
   </div>
 </template>
 
-<script>
+<script type="javascript">
   import {
     getMemberEntryList,
     delMemberObj
@@ -249,6 +248,7 @@
         listLoading: true,
         orderListLoading: true,
         newMemberObject: {
+          id: undefined,
           memberName:undefined,
 					memberType:undefined,
           phone: undefined,
@@ -263,6 +263,7 @@
           type: undefined,
           status: undefined
         },
+        title: '新增会员',
         newMemberObjectVerify: {
           phone: [
             {
@@ -310,12 +311,15 @@
         tableKey: 0,
         selectedAccItem: undefined,
         memberEnter_btn_add: false,//添加一条
+        memberEnter_btn_upd: false, // 编辑
         memberEnter_btn_del:false,//删除
         memberEnter_btn_addIn: false,//批量上传
       }
     },
     created() {
       this.memberEnter_btn_add=this.elements['memberEnter:btn_add'];//添加一条
+      this.memberEnter_btn_upd=this.elements['memberEnter:btn_upd'];//编辑一条
+
       this.memberEnter_btn_del=this.elements['memberEnter:btn_del'];//删除
       this.memberEnter_btn_addIn=this.elements['memberEnter:btn_addIn'];//批量上传
 
@@ -378,6 +382,22 @@
             this.getList();
           })
       },
+      /**
+       * 编辑
+       */
+      editHandler(row){
+        this.title = '编辑会员'
+        this.newMemberObject = {
+          id: row.id,
+          memberName: row.memberName,
+          memberType: row.memberType,
+          phone: row.username,
+          memberLevel: row.memberLevel,
+          totalNumber: row.totalNumber,
+          rentFreeDays: row.rentFreeDays
+        }
+        this.newMemberArea = true
+      },
       /**
        * 删除
        * */
@@ -535,28 +555,37 @@
        * @param row
        */
       newMember() {
+        this.title = '新增会员'
+        this.newMemberObject = {
+          memberName:undefined,
+          memberType:undefined,
+          phone: undefined,
+          memberLevel: undefined,
+          totalNumber: undefined,
+          rentFreeDays: undefined
+        }
         this.newMemberArea = true
       },
       /**
-       * 提交新增会员
+       * 提交新增会员/编辑会员
        */
       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) {
                 this.$notify.success({
-                  title: '新增成功',
+                  title: '操作成功',
                   message: `success`
                 })
               } else {
                 this.$notify.warning({
-                  title: '新增失败',
+                  title: '操作失败',
                   message: `failed`
                 })
               }

src/views/userManagement/userList/index.vue

@@ -428,7 +428,7 @@
     </el-dialog>
 
     <!--身份设置窗口-->
-    <el-dialog title="身份设置" :visible.sync="peopleSettingModal" width="10%">
+    <el-dialog title="身份设置" :visible.sync="peopleSettingModal">
       <el-form :model="peopleSettingObject" ref="" label-width="100px">
         <el-form-item label="身份类型">
           <el-radio v-model="peopleSettingObject.positionId" :label='item.id' v-for="(item,index) in settingList"
@@ -443,7 +443,7 @@
     </el-dialog>
 
     <!--    新建会员窗口-->
-    <el-dialog title="新建会员" :visible.sync="newMemberArea" width="10%">
+    <el-dialog title="新建会员" :visible.sync="newMemberArea">
       <el-form :model="newMemberObject" :rules="newMemberObjectVerify" ref="nmo" label-width="100px">
 				    <el-form-item label="会员类型" prop="memberType">
 								<el-radio-group v-model="memberTypeName">

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>
@@ -372,6 +372,7 @@
               <el-date-picker
                 v-model="form.insuranceEndDate"
                 type="date"
+                value-format="yyyy-MM-dd hh:mm:ss"
                 :editable="true"
                 format="yyyy-MM-dd"
                 placeholder="请选择商业险到期时间"
@@ -416,6 +417,7 @@
             <el-form-item label="交强险日期">
               <el-date-picker
                 v-model="form.strongInsuranceEndDate"
+                value-format="yyyy-MM-dd hh:mm:ss"
                 type="date"
                 :editable="true"
                 format="yyyy-MM-dd"
@@ -446,6 +448,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,10 +876,21 @@ 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;
+      }
+      console.log(this.form)
       set["form"].validate((valid) => {
         if (valid) {
           let params = objDeepCopy(this.form);
-          params.registerDate = this.form.vehicleRegisterDate; // 上班时间
+          params.registerDate = this.form.vehicleRegisterDate; // 上牌时间
           params.vehicleRegisterDate = undefined;
           if (this.form.id) {
             // 编辑

src/views/vehicle/vehicleSchedulManage/disableModal.vue

 <!--车辆排班   保养弹框-->
 <template>
-  <el-dialog :title="currentItem.title" :visible.sync="jinyong" width="10%">
+  <el-dialog :title="currentItem.title" :visible.sync="jinyong">
     <el-form :model="currentItem"  ref="currentItem" label-width="120px">
       <el-form-item label="车牌号:">
         <span>{{currentItem.item.numberPlate}}</span>