用户管理-编辑用户名，车辆申请预定-提车分公司、还车分公司

src/views/admin/user/index.vue

@@ -43,8 +43,9 @@
         <el-input v-model="form.name" placeholder="请输入姓名"></el-input>
       </el-form-item>
       <el-form-item label="账户" prop="username">
-        <el-input v-if="dialogStatus == 'create'" v-model="form.username" placeholder="请输入账户"></el-input>
-        <el-input v-else v-model="form.username" placeholder="请输入账户" readonly></el-input>
+        <!--v-if="dialogStatus == 'create'"-->
+        <el-input v-model="form.username" placeholder="请输入账户"></el-input>
+        <!--<el-input v-else v-model="form.username" placeholder="请输入账户" readonly></el-input>-->
       </el-form-item>
       <el-form-item v-if="dialogStatus == 'create'" label="密码" placeholder="请输入密码" prop="password">
         <el-input type="password" v-model="form.password"></el-input>
@@ -413,16 +414,6 @@ export default {
       };
     },
     update(formName) {
-      if(!this.form.state2 || this.form.state2 == "全部"){
-        this.form.companyId = undefined;
-//        this.$notify({
-//          title: '失败',
-//          message: '请选择分公司',
-//          type: 'warning',
-//          duration: 2000
-//        });
-//        return;
-      }
       const set = this.$refs;
       set[formName].validate(valid => {
         if (valid) {

src/views/vehicle/vehicleInfo/index.vue

@@ -562,10 +562,30 @@
         </el-form-item>
 
         <el-form-item label="提车分公司" prop="liftCompany">
-          <el-select class="filter-item" v-model.number="form4Apply.liftCompany" placeholder="请选择提车分公司">
-            <el-option :key="undefined" label="无" :value="undefined"></el-option>
-            <el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
+          <el-autocomplete
+            class="inline-input"
+            v-model="form4Apply.state3"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect3"
+          ></el-autocomplete>
+          <!--<el-select class="filter-item" v-model.number="form4Apply.liftCompany" placeholder="请选择提车分公司">-->
+            <!--<el-option :key="undefined" label="无" :value="undefined"></el-option>-->
+            <!--<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
+          <!--</el-select>-->
+        </el-form-item>
+        <el-form-item label="还车分公司" prop="retCompany">
+          <el-autocomplete
+            class="inline-input"
+            v-model="form4Apply.state4"
+            :fetch-suggestions="querySearch"
+            placeholder="请输入内容"
+            @select="handleSelect4"
+          ></el-autocomplete>
+          <!--<el-select class="filter-item" v-model.number="form4Apply.retCompany" placeholder="请选择提车分公司">-->
+          <!--<el-option :key="undefined" label="无" :value="undefined"></el-option>-->
+          <!--<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>-->
+          <!--</el-select>-->
         </el-form-item>
         <el-form-item label="目的地" prop="destination">
           <el-input v-model="form4Apply.destination" placeholder="请输入目的地"></el-input>
@@ -903,6 +923,9 @@
           bookEndDate: undefined,
           vehicle: undefined,
           liftAddr: undefined,
+          state3: '',
+          retCompany: undefined,
+          state4: '',
           liftCompany: undefined,
           destination: undefined,
           selectedAccItem: undefined,
@@ -989,6 +1012,7 @@
                 }
                 callback();
               },
+              required: true,
               trigger: 'blur'
             }
           ],
@@ -1000,6 +1024,14 @@
               type: 'integer'
             }
           ],
+          retCompany: [
+            {
+              required: true,
+              message: '请选择还车分公司',
+              trigger: 'blur',
+              type: 'integer'
+            }
+          ],
           destination: [
             {
               min: 0,
@@ -1339,6 +1371,28 @@
         }
         console.log(item);
       },
+      /**
+       * 提车分公司
+       * */
+      handleSelect3(item){debugger
+        if(item.value == "全部"){
+          this.form4Apply.liftCompany = undefined;
+        } else {
+          this.form4Apply.liftCompany = item.id;
+        }
+        console.log(item);
+      },
+      /**
+       * 还车分公司
+       * */
+      handleSelect4(item){
+        if(item.value == "全部"){
+          this.form4Apply.retCompany = undefined;
+        } else {
+          this.form4Apply.retCompany = item.id;
+        }
+        console.log(item);
+      },
       handleSelect1(item){
         if(item.value == "全部"){
           this.form.subordinateBranch = undefined;
@@ -1781,8 +1835,23 @@
             this.dialogStatus = 'update';
           });
       },
+      /**
+       * 操作-申请预定
+       * */
       handleApply(row) {
         this.resetTemp4Apply();
+        let that = this;
+        let selectArry = [];
+        this.allCompaniesArr.map(function(item){
+          item.value = item.name;
+          selectArry.push(item);
+        });
+        this.form4Apply.liftCompany = row.subordinateBranch;
+        selectArry.map(function (iitem) {
+          if( row.subordinateBranch == iitem.id){
+            that.form4Apply.state3 = iitem.name;
+          }
+        });
         this.form4Apply.vehicle = row.id;
         getBookedInfoIn2Month(row.id)
           .then(response => {
@@ -1886,7 +1955,31 @@
           }
         });
       },
-      apply(formName) {
+      /**
+       * 申请预定-确定
+       * @param formName
+       */
+      apply(formName) {debugger
+        if(!this.form4Apply.state3 || this.form4Apply.state3 == "全部"){
+          this.form4Apply.liftCompany = undefined;
+          this.$notify({
+            title: '失败',
+            message: '请选择提车分公司',
+            type: 'warning',
+            duration: 2000
+          });
+          return;
+        }
+        if(!this.form4Apply.state4 || this.form4Apply.state4 == "全部"){
+          this.form4Apply.retCompany = undefined;
+          this.$notify({
+            title: '失败',
+            message: '请选择还车分公司',
+            type: 'warning',
+            duration: 2000
+          });
+          return;
+        }
         const set = this.$refs;
         set[formName].validate(valid => {
           if (valid) {
@@ -1936,6 +2029,9 @@
         this.form4Apply = {
           bookStartDate: undefined,
           bookEndDate: undefined,
+          state3: '',
+          state4:'',
+          retCompany: undefined,
           vehicle: undefined,
           selectedAccItem: undefined,
           liftCompany: undefined,