车辆管理-添加停靠公司、所属分公司字段。出车弹框代码抽离

src/views/modal/departureDialog.vue

+<template>
+  <!-- 出车弹窗 -->
+  <el-dialog title="出车" :visible.sync="departureDialogVisible">
+    <el-form :model="departureForm" :rules="rules" ref="departureForm" label-width="120px">
+      <el-form-item label="车牌号">
+        <el-input v-model="departureForm.numberPlate" disabled></el-input>
+      </el-form-item>
+      <el-form-item label="出车时间" prop="departureDate">
+        <el-date-picker v-model="departureForm.departureDate" type="date" disabled
+                        format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="出车分公司" prop="departureBranchCompanyName">
+        <el-autocomplete
+          class="inline-input"
+          v-model="departureForm.departureBranchCompanyName"
+          :fetch-suggestions="querySearch"
+          placeholder="请输入内容"
+          @select="handleSelectPark1"
+        ></el-autocomplete>
+      </el-form-item>
+      <el-form-item label="用途" prop="use">
+        <el-input v-model="departureForm.use" placeholder="请输入出车用途"></el-input>
+      </el-form-item>
+      <el-form-item label="使用人" prop="user">
+        <el-input v-model="departureForm.user" placeholder="请输入出车使用人"></el-input>
+      </el-form-item>
+      <el-form-item label="使用人联系方式" prop="userTel">
+        <el-input v-model="departureForm.userTel" placeholder="请输入出车使用人联系方式"></el-input>
+      </el-form-item>
+      <el-form-item label="验车人" prop="checkMan">
+        <el-input v-model="departureForm.checkMan" placeholder="请输入出车验车人"></el-input>
+      </el-form-item>
+      <el-form-item label="验车人联系方式" prop="checkManTel">
+        <el-input v-model="departureForm.checkManTel" placeholder="请输入出车验车人联系方式"></el-input>
+      </el-form-item>
+      <el-form-item label="公里数" prop="mileage">
+        <el-input v-model.number="departureForm.mileage" placeholder="请输入出车时公里数"></el-input>
+      </el-form-item>
+      <el-form-item label="目的地分公司" prop="expectArrivalBranchCompanyName">
+        <el-autocomplete
+          class="inline-input"
+          v-model="departureForm.expectArrivalBranchCompanyName"
+          :fetch-suggestions="querySearch"
+          placeholder="请输入内容"
+          @select="handleSelectExport"
+        ></el-autocomplete>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="cancelDeparture()">取 消</el-button>
+      <el-button type="primary" @click="departureVehicleHandler('departureForm')">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import {
+    page,
+    addObj,
+    getObj,
+    dealObj
+  } from 'api/vehicle/vehicleWarningMsg/';
+
+  import rsCode from '../../utils/rsCode';
+
+  import {mapGetters} from 'vuex';
+  import {
+    getAllCompany,
+    getAll
+  } from 'api/base_info/branch_company/';
+  import {
+    departureVehicle,
+  } from 'api/vehicle/active';
+  export default {
+    props: ["departureRow"],
+    name: 'departureDialog',
+    components: {},
+    data() {
+      return {
+        departureDialogVisible: false,//出车弹框
+        departureForm: {
+          vehicleId: null,
+          numberPlate: null,
+          departureDate: null,
+          departureBranchCompanyId: null,//出车分公司id-默认停靠分公司id
+          departureBranchCompanyName: '',//出车分公司-默认停靠分公司
+          use: null,
+          user: null,
+          userTel: null,
+          checkMan: null,
+          checkManTel: null,
+          expectArrivalBranchCompanyId: null,//目的地分公司
+          expectArrivalBranchCompanyName: '',//目的地分公司名称
+          mileage: null
+        },
+        rules: {
+          departureBranchCompanyName: [
+            {
+              type: 'string',
+              required: true,
+              message: '请选择出车分公司',
+              trigger: 'change'
+            }
+          ],
+          expectArrivalBranchCompanyName: {
+            type: 'string',
+            required: true,
+            message: '请选择目的地分公司',
+            trigger: 'change'
+          },
+          use:{
+            required: true,
+            message: '请输入出车用途',
+            trigger: 'blur'
+          },
+          userTel:{
+            required: true,
+            message: '请输入使用人联系方式',
+            trigger: 'blur'
+          },
+          user:{
+            required: true,
+              message: '请输入出车使用人',
+              trigger: 'blur'
+          },
+          checkMan:{
+            required: true,
+            message: '请输入验车人联系方式',
+            trigger: 'blur'
+          },
+          checkManTel:{
+            required: true,
+            message: '请输入验车人联系方式',
+            trigger: 'blur'
+          },
+          mileage:{
+            type:"number",
+            required: true,
+            message: '请输入公里数',
+            trigger: 'blur'
+          }
+        },
+        allCompanies: {},
+        allCompaniesArr: [],
+        upkeepDialogVisible: false,
+        allUpkeepItems: null,
+        dialogStatus: undefined,
+      }
+    },
+    created() {
+
+    },
+    watch: {
+      departureDialogVisible(newValue, oldValue){
+        if(!newValue){
+          this.cleanDepartureForm();
+          this.$emit("departureDialogEvent", false);
+        }
+      },
+    },
+    mounted() {
+      let row = this.departureRow;
+      this.cleanDepartureForm();
+      //目的地分公司-默认所属分公司
+      this.departureForm.expectArrivalBranchCompanyName = row.subBranchName;
+      this.departureForm.expectArrivalBranchCompanyId = row.subordinateBranch;
+      //出车分公司-默认停靠分公司
+      this.departureForm.departureBranchCompanyId = row.parkBranchCompanyId;
+      this.departureForm.departureBranchCompanyName = row.parkBranchCompanyName;
+      this.departureForm.departureDate = Date();//出车时间
+      this.departureForm.mileage = row.mileage;//公里数
+      this.departureDialogVisible = true;
+      let that = this;
+      let selectArry = [];
+      getAll()
+        .then(response => {
+          this.allCompaniesArr = response.data;
+          response.data.map(function(item){
+            item.value = item.name;
+            selectArry.push(item);
+          });
+        });
+      getAllCompany(codeAndBranchCompany => {
+        this.allCompanies = codeAndBranchCompany;
+      });
+
+      this.departureForm.mileage = row.mileageLastUpdate?row.mileageLastUpdate: row.mileage;
+      this.departureForm.vehicleId = row.vehicleId ? row.vehicleId: row.id;
+      this.departureForm.numberPlate = row.numberPlate;
+      this.upkeepDialogVisible = true;
+    },
+    computed: {
+      ...mapGetters([
+        'elements',
+        'vehicleWarningMsgType'
+      ])
+    },
+    methods: {
+      querySearch(queryString, cb) {
+        let selectArry = [];
+        this.allCompaniesArr.map(function(item){
+          item.value = item.name;
+          selectArry.push(item);
+        });
+        this.selectArry = selectArry;
+        var results = queryString ? selectArry.filter(this.createFilter(queryString)) : selectArry;
+        // 调用 callback 返回建议列表的数据
+        cb(results);
+      },
+      /**
+       * 出车分公司
+       * */
+      handleSelectPark1(item){
+        if(item.value == "全部"){
+          this.departureForm.departureBranchCompanyId = undefined;
+          this.departureForm.departureBranchCompanyName = "";
+        } else {
+          this.departureForm.departureBranchCompanyId = item.id;
+          this.departureForm.departureBranchCompanyName = item.name;
+        }
+      },
+      /**
+       * 目的地分公司
+       * */
+      handleSelectExport(item){
+        if(item.value == "全部"){
+          this.departureForm.expectArrivalBranchCompanyId = undefined;
+          this.departureForm.expectArrivalBranchCompanyName = "";
+        } else {
+          this.departureForm.expectArrivalBranchCompanyId = item.id;
+          this.departureForm.expectArrivalBranchCompanyName = item.name;
+        }
+      },
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.indexOf(queryString.toLowerCase()) != -1);
+        };
+      },
+      getTypeName: function(type) {
+        if (this.$utils.isEmpty(this.vehicleWarningMsgType[type])) {
+          return '未知';
+        }
+        return this.vehicleWarningMsgType[type].val;
+      },
+      /**
+       * 出车-确定
+       * */
+      departureVehicleHandler(formName) {
+        console.log(this.departureForm);
+        const set = this.$refs;
+        set[formName].validate(valid => {
+          if (valid) {
+            departureVehicle(this.departureForm).then(response => {
+              if (response.code === rsCode.RS_CODE_SUC) {
+                this.departureDialogVisible = false;
+                this.$notify({
+                  title: '成功',
+                  message: '出车成功',
+                  type: 'success',
+                  duration: 2000
+                });
+                this.cleanDepartureForm();
+                this.$emit("departureDialogEvent", true);
+//                this.getList();
+              } else {
+                this.$notify({
+                  title: '失败',
+                  message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
+                  type: 'error',
+                  duration: 2000
+                });
+              }
+            });
+          } else {
+            return false;
+          }
+        });
+      },
+      /**
+       * 出车-弹框-取消
+       * */
+      cancelDeparture() {
+        this.cleanDepartureForm();
+        this.$emit("departureDialogEvent", false);
+      },
+      /**
+       * 清空保养弹框数据
+       */
+      cleanDepartureForm() {
+        this.departureForm = {
+          vehicleId: null,
+          numberPlate: null,
+          departureDate: null,
+          departureBranchCompanyId: null,//出发地分公司id
+          departureBranchCompanyName: '',//出发地分公司名称
+          use: null,
+          user: null,
+          userTel: null,
+          checkMan: null,
+          checkManTel: null,
+          expectArrivalBranchCompanyId: null,//目的地分公司id
+          expectArrivalBranchCompanyName: '',//目的地分公司名称
+          mileage: null
+        };
+      }
+    }
+  }
+</script>

src/views/modal/upkeepDialogVisible.vue

@@ -202,7 +202,9 @@
               type: 'success',
               duration: 2000
             });
-            this.getList();
+            this.cleanUpkeepForm();
+            this.$emit("upkeepDialogEvent", true);
+//            this.getList();
           } else {
             this.$notify({
               title: '失败',

src/views/vehicle/vehicleInfo/index.vue

@@ -173,10 +173,14 @@
     <el-table :key='tableKey' :data="list" border fit highlight-current-row
               style="width: 100%">
 
-      <el-table-column align="center" label="编号" width="65">
-        <template scope="scope">
-          <span>{{scope.row.code}}</span>
-        </template>
+      <!--<el-table-column align="center" label="序号" width="65">-->
+        <!--<template scope="scope">-->
+          <!--<span>{{scope.row.code}}</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
+      <el-table-column
+        type="index"
+        align="center" label="序号" width="65">
       </el-table-column>
       <el-table-column width="120" align="center" label="车牌">
         <template scope="scope">
@@ -196,9 +200,15 @@
         </template>
       </el-table-column>
 
-      <el-table-column width="180" align="center" label="分公司">
+      <el-table-column width="180" align="center" label="停靠分公司">
+        <template scope="scope">
+          <span>{{scope.row.parkBranchCompanyName}}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column width="180" align="center" label="目的地分公司">
         <template scope="scope">
-          <span>{{scope.row.subBranchName}}</span>
+          <span>{{scope.row.expectDestinationBranchCompanyName}}</span>
         </template>
       </el-table-column>
 
@@ -478,20 +488,44 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="分公司" prop="subordinateBranch">
+            <el-form-item label="所属分公司" prop="subordinateBranchName">
               <el-autocomplete
                 class="inline-input"
-                v-model="form.state2"
+                v-model="form.subordinateBranchName"
                 :fetch-suggestions="querySearch"
                 placeholder="请输入内容"
-                @select="handleSelect1"
+                @select="handleSelectSubordinate"
               ></el-autocomplete>
-              <!--<el-select class="filter-item" v-model="form.subordinateBranch" 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-col>
+          <el-col :span="12">
+            <el-form-item label="停靠分公司" v-if="dialogStatus=='update'" prop="parkBranchCompanyName">
+              <el-input  v-model="form.parkBranchCompanyName" placeholder="停靠分公司" readonly disabled></el-input>
+            </el-form-item>
+            <el-form-item label="停靠分公司" v-else-if="dialogStatus=='create'" prop="parkBranchCompanyName">
+              <el-autocomplete
+                class="inline-input"
+                v-model="form.parkBranchCompanyName"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelectPark"
+              ></el-autocomplete>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="目的地分公司" prop="expectDestinationBranchCompanyName">-->
+              <!--<el-autocomplete-->
+                <!--class="inline-input"-->
+                <!--v-model="form.expectDestinationBranchCompanyName"-->
+                <!--:fetch-suggestions="querySearch"-->
+                <!--placeholder="请输入内容"-->
+                <!--@select="handleSelectExport"-->
+              <!--&gt;</el-autocomplete>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="12">
             <el-form-item label="用途" prop="useType">
               <el-select class="filter-item" v-model="form.useType" placeholder="请选择用途">
@@ -572,7 +606,6 @@
 
     <!--     申请对话框相关html元素  -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogForm4ApplyVisible">
-
       <el-form :model="form4Apply" :rules="rules4Apply" ref="form4Apply" label-width="120px">
         <el-form-item label="预订日期范围" prop="bookDateRange4Apply">
           <el-date-picker
@@ -585,7 +618,6 @@
           >
           </el-date-picker>
         </el-form-item>
-
         <el-form-item label="提车分公司" prop="liftCompany">
           <el-autocomplete
             class="inline-input"
@@ -594,10 +626,6 @@
             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
@@ -607,10 +635,6 @@
             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>
@@ -635,68 +659,9 @@
       <img :style="{width:'100%'}" :src="licenceSrcUrl">
     </el-dialog>
 
-
     <book-info-viewer ref="bookInfoViewer"></book-info-viewer>
     <acc-item-selector v-on:select="accItemSelected" :selectedAccItem="form4Apply.selectedAccItem"
                        v-on:clear="accItemClear" ref="accItemSelector"></acc-item-selector>
-    <!-- 出车信息弹窗 -->
-    <el-dialog title="出车" :visible.sync="departureDialogVisible">
-      <el-form :model="departureForm" :rules="rules" ref="form" label-width="90px">
-        <el-form-item label="车牌号">
-          <el-input v-model="departureForm.numberPlate" disabled></el-input>
-        </el-form-item>
-        <el-form-item label="出车时间" prop="departureDate">
-          <el-date-picker v-model="departureForm.departureDate" type="date" disabled
-                          format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
-        </el-form-item>
-        <el-form-item label="出车分公司" prop="departureBranchCompanyId">
-          <el-autocomplete
-            class="inline-input"
-            v-model="departureForm.departureBranchCompanyName"
-            :fetch-suggestions="querySearch"
-            placeholder="请输入内容"
-            @select="handleSelectDepartureForm"
-          ></el-autocomplete>
-          <!--<el-select class="filter-item" v-model="departureForm.departureBranchCompanyId" placeholder="请选择分公司">-->
-            <!--<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="use">
-          <el-input v-model="departureForm.use" placeholder="请输入出车用途"></el-input>
-        </el-form-item>
-        <el-form-item label="使用人" prop="user">
-          <el-input v-model="departureForm.user" placeholder="请输入出车使用人"></el-input>
-        </el-form-item>
-        <el-form-item label="使用人联系方式" prop="userTel">
-          <el-input v-model="departureForm.userTel" placeholder="请输入出车使用人联系方式"></el-input>
-        </el-form-item>
-        <el-form-item label="验车人" prop="checkMan">
-          <el-input v-model="departureForm.checkMan" placeholder="请输入出车验车人"></el-input>
-        </el-form-item>
-        <el-form-item label="验车人联系方式" prop="checkManTel">
-          <el-input v-model="departureForm.checkManTel" placeholder="请输入出车验车人联系方式"></el-input>
-        </el-form-item>
-        <el-form-item label="公里数" prop="mileage">
-          <el-input v-model="departureForm.mileage" placeholder="请输入出车时公里数"></el-input>
-        </el-form-item>
-        <el-form-item label="预计还车分公司" prop="expectArrivalBranchCompanyId">
-          <el-autocomplete
-            class="inline-input"
-            v-model="departureForm.expectArrivalBranchCompanyName"
-            :fetch-suggestions="querySearch"
-            placeholder="请输入内容"
-            @select="handleSelectEexpectArrivalCompanyName"
-          ></el-autocomplete>
-          <!--<el-select class="filter-item" v-model="departureForm.expectArrivalBranchCompanyId" placeholder="请选择分公司">-->
-            <!--<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>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelDeparture">取 消</el-button>
-        <el-button type="primary" @click="departureVehicleHandler">确 定</el-button>
-      </div>
-    </el-dialog>
 
     <!-- 收车信息弹窗 -->
     <el-dialog title="收车" :visible.sync="arrivalDialogVisible">
@@ -725,9 +690,6 @@
             placeholder="请输入内容"
             @select="handleSelectArrivalCompanyName"
           ></el-autocomplete>
-          <!--<el-select class="filter-item" v-model="arrivalForm.arrivalBranchCompanyId" placeholder="请选择分公司">-->
-            <!--<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>
       <div slot="footer" class="dialog-footer">
@@ -736,6 +698,8 @@
       </div>
     </el-dialog>
 
+    <!--出车弹框-->
+    <departureDialog v-if="departureDialogVisible" :departureRow="departureRow" v-on:departureDialogEvent = "departureDialogEvent"></departureDialog>
     <!-- 车辆保养弹窗 -->
     <upkeepDialog v-if="upkeepDialogVisible" :upkeepRow="upkeepRow" v-on:upkeepDialogEvent = "upkeepDialogEvent"></upkeepDialog>
   </div>
@@ -743,6 +707,7 @@
 
 <script>
   import upkeepDialog from '../../modal/upkeepDialogVisible'// 保养弹框
+  import departureDialog from '../../modal/departureDialog'// 出车弹框
   import 'static/css/uploadImg.css';// 引入图片上传组件对话框
   import {
     page,
@@ -833,11 +798,13 @@
       Element1,
       bookInfoViewer,
       accItemSelector,
-      upkeepDialog
+      upkeepDialog,
+      departureDialog
   },
     data() {
       return {
         upkeepRow: {},//保养数据
+        departureRow:{},//出车数据
         state1: '',
         BASE_API: process.env.BASE_API,
         dialogForm4LicenceVisible: false,
@@ -845,13 +812,15 @@
         showLoadingBody: false,
         allVehicleList: [],//全部车型
         form: {
-          state2:'',
+          subordinateBranchName : "",
+          subordinateBranch: undefined,
+          parkBranchCompanyName: "",
+          parkBranchCompanyId: undefined,
           modelId:undefined,//车型id
           status: undefined,
           code: undefined,
           numberPlate: undefined,
           brand: undefined,
-          subordinateBranch: undefined,
           useType: undefined,
           vin: undefined,
           insuranceNo: undefined,
@@ -869,12 +838,18 @@
           remark: undefined
         },
         rules: {
-          subordinateBranch: [
+          subordinateBranchName: [
             {
-              type: 'integer',
               required: true,
-              message: '请选择公司',
-              trigger: 'blur'
+              message: '请选择所属分公司',
+              trigger: 'change'
+            }
+          ],
+          parkBranchCompanyName: [
+            {
+              required: true,
+              message: '请选择停靠分公司',
+              trigger: 'change'
             }
           ],
           maintenanceMileage: [this.integerValidator()],
@@ -1097,7 +1072,7 @@
           apply: '预定申请'
         },
         tableKey: 0,
-        departureDialogVisible: false,
+        departureDialogVisible: false,//出车弹框
         departureForm: {
           vehicleId: null,
           numberPlate: null,
@@ -1349,11 +1324,23 @@
         };
         this.getList();
       },
+      /**
+       * 出车modal传递回来的数据
+       * */
+      departureDialogEvent(e){
+        if(e){
+          this.getList();
+        }
+        this.departureDialogVisible = false;
+      },
       /**
        * 保养modal传递回来的数据
        * */
       upkeepDialogEvent(e){
-        this.upkeepDialogVisible = e;
+        if(e){
+          this.getList();
+        }
+        this.upkeepDialogVisible = false;
       },
       querySearch(queryString, cb) {
         let selectArry = [];
@@ -1425,6 +1412,30 @@
         }
         console.log(item);
       },
+      /**
+       * 所属分公司
+       * */
+      handleSelectSubordinate(item){
+        if(item.value == "全部"){
+          this.form.subordinateBranch = undefined;
+//          this.form.subordinateBranchName = "";
+        } else {
+          this.form.subordinateBranch = item.id;
+//          this.form.subordinateBranchName = item.name;
+        }
+      },
+      /**
+       * 停靠分公司
+       * */
+      handleSelectPark(item){
+        if(item.value == "全部"){
+          this.form.parkBranchCompanyId = undefined;
+          this.form.parkBranchCompanyName = "";
+        } else {
+          this.form.parkBranchCompanyId = item.id;
+          this.form.parkBranchCompanyName = item.name;
+        }
+      },
       handleSelect1(item){
         if(item.value == "全部"){
           this.form.subordinateBranch = undefined;
@@ -1441,6 +1452,18 @@
         }
         console.log(item);
       },
+      /**
+       * 出车分公司
+       * */
+      handleSelectPark1(item){
+        if(item.value == "全部"){
+          this.departureForm.departureBranchCompanyId = undefined;
+          this.departureForm.departureBranchCompanyName = "";
+        } else {
+          this.departureForm.departureBranchCompanyId = item.id;
+          this.departureForm.departureBranchCompanyName = item.name;
+        }
+      },
       /**
        * 保养结束
        * */
@@ -1543,78 +1566,14 @@
           arrivalBranchCompanyName: ''
         };
       },
+      /**
+       * 出车-按钮
+       * */
       departureHandler(row) {
-        // open dialog
+        this.departureRow = row;
         this.departureDialogVisible = true;
-        this.clearDepartureForm();
-        let that = this;
-        let selectArry = [];
-        this.allCompaniesArr.map(function(item){
-          item.value = item.name;
-          selectArry.push(item);
-        });
-        this.departureForm.mileage = row.mileage;
-        this.departureForm.expectArrivalBranchCompanyId = row.subordinateBranch;
-        this.departureForm.departureBranchCompanyId = row.subordinateBranch;
-        selectArry.map(function (iitem) {
-          if( row.subordinateBranch == iitem.id){
-            that.departureForm.departureBranchCompanyName = iitem.name;
-            that.departureForm.expectArrivalBranchCompanyName = iitem.name;
-          }
-        });
-        this.departureForm.vehicleId = row.id;
-        this.departureForm.numberPlate = row.numberPlate;
-        this.departureForm.departureDate = Date();
-      },
-      cancelDeparture() {
-        this.departureDialogVisible = false;
-        this.clearDepartureForm();
-      },
-      clearDepartureForm() {
-        this.departureForm = {
-          vehicleId: null,
-          numberPlate: null,
-          departureBranchCompanyName: '',
-          departureDate: null,
-          departureBranchCompanyId: null,
-          use: null,
-          user: null,
-          userTel: null,
-          checkMan: null,
-          checkManTel: null,
-          expectArrivalBranchCompanyId: null,
-          expectArrivalBranchCompanyName: '',
-          mileage: null
-        }
-      },
-      departureVehicleHandler() {
-        console.log(this.departureForm);
-        if(this.departureForm.expectArrivalBranchCompanyName == "全部" || this.departureForm.expectArrivalBranchCompanyName == ''){
-          this.departureForm.expectArrivalBranchCompanyId = undefined;
-        }
-        if(this.departureForm.departureBranchCompanyName == "全部" || this.departureForm.departureBranchCompanyName == ''){
-          this.departureForm.departureBranchCompanyId = undefined;
-        }
-        departureVehicle(this.departureForm).then(response => {
-          if (response.code === rsCode.RS_CODE_SUC) {
-            this.departureDialogVisible = false;
-            this.$notify({
-              title: '成功',
-              message: '出车成功',
-              type: 'success',
-              duration: 2000
-            });
-            this.getList();
-          } else {
-            this.$notify({
-              title: '失败',
-              message: rsCode.msg[response.code] ? rsCode.msg[response.code] : '操作失败！',
-              type: 'error',
-              duration: 2000
-            });
-          }
-        });
       },
+
       getAllBelong2Type: function () {
         return this.belong2Type;
       },
@@ -1827,9 +1786,13 @@
             });
             selectArry.map(function (iitem) {
               if( that.form["subordinateBranch"] == iitem.id){
-                that.form.state2 = iitem.name;
+                that.form.subordinateBranchName = iitem.name;
                 that.form.subordinateBranch = iitem.id;
               }
+              if( that.form["parkBranchCompanyId"] == iitem.id){
+                that.form.parkBranchCompanyName = iitem.name;
+                that.form.parkBranchCompanyId = iitem.id;
+              }
             });
             this.fillDates2Range(this.form, 'insuranceDateRange4form', 'insuranceStartDate', 'insuranceEndDate');
             this.dialogFormVisible = true;
@@ -1866,16 +1829,6 @@
       },
       create(formName) {
         const set = this.$refs;
-        if(!this.form.state2 || this.form.state2 == "全部"){
-          this.form.subordinateBranch = undefined;
-          this.$notify({
-            title: '失败',
-            message: '请选择分公司',
-            type: 'warning',
-            duration: 2000
-          });
-          return;
-        }
         set[formName].validate(valid => {
           if (valid) {
             let formTemp = this.fillDateRange2Object(this.form, 'insuranceDateRange4form', 'insuranceStartDate', 'insuranceEndDate');
@@ -1917,16 +1870,6 @@
       },
       update(formName) {
         const set = this.$refs;
-        if(!this.form.state2 || this.form.state2 == "全部"){
-          this.form.subordinateBranch = undefined;
-          this.$notify({
-            title: '失败',
-            message: '请选择分公司',
-            type: 'warning',
-            duration: 2000
-          });
-          return;
-        }
         set[formName].validate(valid => {
           if (valid) {
             let formTemp = this.fillDateRange2Object(this.form, 'insuranceDateRange4form', 'insuranceStartDate', 'insuranceEndDate');
@@ -2028,10 +1971,12 @@
         this.form = {
           status: undefined,
           code: undefined,
-          state2:undefined,
+          parkBranchCompanyName: "",//停靠分公司名称
+          parkBranchCompanyId: undefined,//停靠分公司id
           modelId:undefined,//车型id
           numberPlate: undefined,
           brand: undefined,
+          subordinateBranchName: "",
           subordinateBranch: undefined,
           useType: undefined,
           vin: undefined,