From ac021d9f2fb5ecc9ac291df5cc03fd20b0a3b243 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Tue, 11 Feb 2025 11:15:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D](pet=5F?=
 =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81):=20=20-=20=E9=97=A8?=
 =?UTF-8?q?=E5=8F=A3=E9=97=A8=E7=A6=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carInfoManagement/components/carList.vue  |   2 +-
 .../jgCarMessage/components/List.vue          |   1 +
 .../jgCarMessage/components/car_view.vue      | 364 +++++++----------
 .../vehiclemessage/components/index_view.vue  |  68 ++--
 .../xgfCarMessage/components/car_view.vue     | 343 ++--------------
 .../zgCarMessage/components/car_view.vue      | 368 +++---------------
 .../blacklist/components/list.vue             |   2 +-
 .../records/components/list.vue               |  15 +-
 8 files changed, 278 insertions(+), 885 deletions(-)

diff --git a/src/views/freightVehicles/carInfoManagement/components/carList.vue b/src/views/freightVehicles/carInfoManagement/components/carList.vue
index a52b1d1..181d24a 100644
--- a/src/views/freightVehicles/carInfoManagement/components/carList.vue
+++ b/src/views/freightVehicles/carInfoManagement/components/carList.vue
@@ -401,7 +401,7 @@ export default{
             this.ISCHECK = false
           })
         } else {
-          this.$message.success('车牌号不规范')
+          this.$message.error('车牌号不规范')
           this.ISCHECK = false
         }
       }
diff --git a/src/views/longtermvehicle/jgCarMessage/components/List.vue b/src/views/longtermvehicle/jgCarMessage/components/List.vue
index 435410d..5063925 100644
--- a/src/views/longtermvehicle/jgCarMessage/components/List.vue
+++ b/src/views/longtermvehicle/jgCarMessage/components/List.vue
@@ -105,6 +105,7 @@ export default {
       console.log('--------------------------')
       this.$parent.activeName = 'CarView'
       this.$parent.CORPINFO_ID = row.CORPINFO_ID
+      this.$parent.DEPARTMENT_ID = row.DEPARTMENT_ID
     },
     goKeyReset() {
       this.searchForm = {
diff --git a/src/views/longtermvehicle/jgCarMessage/components/car_view.vue b/src/views/longtermvehicle/jgCarMessage/components/car_view.vue
index 26346c0..58b968f 100644
--- a/src/views/longtermvehicle/jgCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/jgCarMessage/components/car_view.vue
@@ -1,18 +1,6 @@
 <template>
   <div class="icons-container">
     <el-container>
-<!--      <el-aside width="200px" style="background-color:#fff">-->
-<!--        <div class="filter-btn-group">-->
-<!--          <el-tree-->
-<!--            v-loading="treeLoading"-->
-<!--            ref="tree"-->
-<!--            :data="treeData"-->
-<!--            :props="defaultProps"-->
-<!--            :filter-node-method="filterNode"-->
-<!--            class="filter-tree"-->
-<!--            @node-click="handleNodeClick"/>-->
-<!--        </div>-->
-<!--      </el-aside>-->
       <el-main>
         <el-form label-width="60px">
           <el-row>
@@ -23,7 +11,7 @@
             </el-col>
             <el-col :span="3">
               <el-form-item label="车牌号">
-                <el-input v-model="searchForm.LICENCE_NO" placeholder="请输入车牌号..." />
+                <el-input v-model="searchForm.LICENCE_NO" placeholder="请输入车牌号..."/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="m-l-10">
@@ -37,20 +25,9 @@
                   placeholder="请选择车辆类型"/>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="4" class="m-l-10">-->
-<!--              <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID" label-width="100px">-->
-<!--                <SelectTree-->
-<!--                  ref="selectTree_Search2"-->
-<!--                  :clearable="false"-->
-<!--                  :options="treeData"-->
-<!--                  :props="defaultProps"-->
-<!--                  v-model="searchForm.VEHICLE_DEPARTMENT_ID"-->
-<!--                  placeholder="请选择车辆所属部门"/>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
             <el-col :span="4" class="m-l-10">
               <el-form-item label="车辆责任人" label-width="100px">
-                <el-input v-model="searchForm.USER_NAME" placeholder="请输入车辆责任人..." />
+                <el-input v-model="searchForm.USER_NAME" placeholder="请输入车辆责任人..."/>
               </el-form-item>
             </el-col>
             <el-col :span="4">
@@ -84,9 +61,8 @@
             type="selection"
             width="55"
             align="center"/>
-          <el-table-column type="index" label="序号" width="50" align="center" />
-          <el-table-column prop="CORPINFO_NAME" label="分公司名称" align="center" />
-          <el-table-column prop="LICENCE_NO" label="车牌号" align="center" />
+          <el-table-column type="index" label="序号" width="50" align="center"/>
+          <el-table-column prop="LICENCE_NO" label="车牌号" align="center"/>
           <el-table-column label="车牌类型" align="center">
             <template slot-scope="{row}">
               {{ translateLicenceType(row.LICENCE_TYPE) }}
@@ -97,28 +73,38 @@
               {{ translateVehicleType(row.VEHICLE_TYPE) }}
             </template>
           </el-table-column>
-          <el-table-column prop="DEPARTMENT_NAME" label="车辆所属部门" align="center" />
-          <el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
+          <el-table-column prop="JG_DEPT_NAME" label="车辆所属部门" align="center"/>
+          <el-table-column prop="JG_USER_NAME" label="车辆责任人" align="center"/>
           <el-table-column label="操作" align="center" width="480">
             <template slot-scope="{row}">
-              <el-button type="warning" icon="el-icon-more" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
+              <el-button type="warning" icon="el-icon-more" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">
+                车辆进出记录
+              </el-button>
               <el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)">查看</el-button>
-              <el-button type="primary" icon="el-icon-edit" size="mini" @click="openEditDialogEditBtn(row.VEHICLE_ID)">修改</el-button>
-              <el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteSingleDataDeleteBtn(row.VEHICLE_ID, row.USER_ID, row.EMPLOYEE_VEHICLE_USER_ID)">删除</el-button>
+              <el-button type="primary" icon="el-icon-edit" size="mini" @click="openEditDialogEditBtn(row.VEHICLE_ID)">
+                修改
+              </el-button>
+              <el-button type="danger" icon="el-icon-delete" size="mini"
+                         @click="deleteSingleDataDeleteBtn(row.VEHICLE_ID, row.USER_ID, row.EMPLOYEE_VEHICLE_USER_ID)">
+                删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
         <div class="page-btn-group">
           <div>
-<!--            <el-button type="primary" icon="el-icon-plus" @click="openAddDialogAddBtn">新增</el-button>-->
+            <el-button type="primary" icon="el-icon-plus" @click="openAddDialogAddBtn">新增</el-button>
           </div>
-          <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getPageList" />
+          <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit"
+                      @pagination="getPageList"/>
         </div>
         <!--  添加车辆信息  -->
         <el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px">
-          <el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;">
+          <el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px"
+                   style="padding:0 20px; width: 500px;">
             <el-form-item :rules="[{required: true}]" label="车牌号">
-              <el-input v-model="addForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/>
+              <el-input v-model="addForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300"
+                        placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/>
             </el-form-item>
             <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
             <el-form-item :rules="[{required: true}]" label="车牌类型" prop="LICENCE_TYPE">
@@ -142,33 +128,24 @@
                 placeholder="请选择车辆类型"
                 style="width: 300px"/>
             </el-form-item>
-            <!-- 员工车辆、单位车辆、外部车辆 下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
-              <SelectTree
-                ref="selectTree_add4"
-                :clearable="false"
-                :options="vehicleBelongTypeList"
-                :props="vehicleDefaultProps"
-                v-model="addForm.VEHICLE_BELONG_TYPE"
-                placeholder="请选择车辆所属类型"
-                style="width: 300px"/>
-            </el-form-item>
-            <!-- 车辆所属部门下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
-              <SelectTree
-                ref="selectTree_add1"
-                :clearable="false"
-                :options="treeData"
-                :props="defaultProps"
-                v-model="addForm.VEHICLE_DEPARTMENT_ID"
-                placeholder="请选择车辆所属部门"
-                style="width: 300px"
-                @change="addUserList"/>
+            <el-form-item label="车辆所属部门">
+              <el-input
+                v-model="DEPARTMENT_NAME"
+                :autosize="{ minRows: 1 }"
+                type="text"
+                maxlength="300"
+                :disabled="true"
+              />
             </el-form-item>
             <!-- 车辆责任人下拉框 -->
             <el-form-item :rules="[{required: true}]" label="车辆责任人" prop="USER_ID">
-              <el-select :value="addForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdAddChange">
-                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
+              <el-select v-model="addForm.USER_ID" clearable placeholder="请选择">
+                <el-option
+                  v-for="item in userList"
+                  :key="item.USER_ID"
+                  :label="item.USERNAME"
+                  :value="item.USER_ID"
+                />
               </el-select>
             </el-form-item>
           </el-form>
@@ -178,41 +155,32 @@
           </div>
         </el-dialog>
         <el-dialog :visible.sync="editDialogVisible" title="修改" width="600px">
-          <el-form ref="editForm" :model="editForm" label-width="170px" style="width: 500px;">
-            <el-form-item :rules="[{required: true}]" label="车牌号">
-              <el-input v-model="editForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoUpdate()"/>
+          <el-form ref="editForm" :model="editForm" :rules="rules" label-width="170px" style="width: 500px;">
+            <el-form-item prop="LICENCE_NO" label="车牌号">
+              <el-input v-model="editForm.LICENCE_NO" @blur="validateLicenceNo" />
             </el-form-item>
             <el-form-item label="车牌类型" prop="LICENCE_TYPE">
-              <el-select :value="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
-                <el-option v-for="item in licenceTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+              <el-select v-model="editForm.LICENCE_TYPE" clearable placeholder="请选择"
+                         @visible-change="$forceUpdate()">
+                <el-option v-for="item in licenceTypeList" :key="item.ID" :label="item.NAME" :value="item.ID"/>
               </el-select>
             </el-form-item>
             <el-form-item label="车辆类型" prop="VEHICLE_TYPE">
-              <el-select :value="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
-                <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
-              <el-select :value="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
-                <el-option v-for="item in vehicleBelongTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+              <el-select v-model="editForm.VEHICLE_TYPE" clearable placeholder="请选择"
+                         @visible-change="$forceUpdate()">
+                <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID"/>
               </el-select>
             </el-form-item>
             <!-- 车辆所属部门下拉框 -->
-            <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
-              <SelectTree
-                ref="selectTree_edit"
-                :clearable="true"
-                :options="treeData"
-                :props="defaultProps"
-                v-model="editForm.VEHICLE_DEPARTMENT_ID"
-                placeholder="请选择车辆所属部门"
-                style="width: 300px"
-                @change="updateUserList"/>
+            <el-form-item label="车辆所属部门">
+              <el-input v-model="editForm.JG_DEPT_NAME" :disabled="true" :autosize="{ minRows: 1}"
+                        type="text" maxlength="300"/>
             </el-form-item>
             <!-- 车辆责任人下拉框 -->
             <el-form-item label="车辆责任人" prop="USER_ID">
-              <el-select :value="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdUpdateChange">
-                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
+              <el-select v-model="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()"
+                         @change="userIdUpdateChange">
+                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
               </el-select>
             </el-form-item>
           </el-form>
@@ -224,22 +192,24 @@
         <el-dialog :visible.sync="detailDialogVisible" title="详情" width="600px">
           <el-form ref="form" :model="detailForm" label-width="170px" style="width: 500px;">
             <el-form-item label="车牌号">
-              <el-input v-model="detailForm.LICENCE_NO" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
+              <el-input v-model="detailForm.LICENCE_NO" :disabled="true" :autosize="{ minRows: 1}" type="text"
+                        maxlength="300"/>
             </el-form-item>
             <el-form-item label="车牌类型">
-              <el-input v-model="detailForm.LICENCE_TYPE" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
+              <el-input v-model="detailForm.LICENCE_TYPE" :disabled="true" :autosize="{ minRows: 1}" type="text"
+                        maxlength="300"/>
             </el-form-item>
             <el-form-item label="车辆类型">
-              <el-input v-model="detailForm.VEHICLE_TYPE" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
-            </el-form-item>
-            <el-form-item label="车辆所属类型">
-              <el-input v-model="detailForm.VEHICLE_BELONG_TYPE" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
+              <el-input v-model="detailForm.VEHICLE_TYPE" :disabled="true" :autosize="{ minRows: 1}" type="text"
+                        maxlength="300"/>
             </el-form-item>
             <el-form-item label="车辆所属部门">
-              <el-input v-model="detailForm.VEHICLE_DEPARTMENT_ID" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
+              <el-input v-model="detailForm.VEHICLE_DEPARTMENT_ID" :disabled="true" :autosize="{ minRows: 1}"
+                        type="text" maxlength="300"/>
             </el-form-item>
             <el-form-item label="车辆责任人">
-              <el-input v-model="detailForm.USER_ID" :disabled="true" :autosize="{ minRows: 1}" type="text" maxlength="300"/>
+              <el-input v-model="detailForm.USER_ID" :disabled="true" :autosize="{ minRows: 1}" type="text"
+                        maxlength="300"/>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -256,11 +226,14 @@
 <script>
 import SelectTree from '@/components/SelectTree'
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
-import { requestFN } from '@/utils/request'
-import waves from '@/directive/waves' // waves directive
+import {requestFN} from '@/utils/request'
+import waves from '@/directive/waves'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
 export default {
-  components: { Pagination, SelectTree },
-  directives: { waves },
+  components: {Treeselect, Pagination, SelectTree},
+  directives: {waves},
   data() {
     return {
       config: config,
@@ -280,6 +253,19 @@ export default {
         children: 'nodes',
         label: 'name'
       },
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      rules: {
+        LICENCE_NO: [
+          { required: true, message: '车牌号不能为空' },
+          { pattern: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/, message: '车牌号格式不正确' }
+        ]
+      },
       treeData: [],
       // 从此处开始写自己的属性
       loginUserCorpInfoId: '', // 从接口获取用户所属企业
@@ -287,27 +273,28 @@ export default {
       DEPARTMENT_ID: '', // 部门ID
       KEYWORDS: '',
       loginUserId: '', // 登录人ID
+      DEPARTMENT_NAME: '',
       // 车牌类型列表
       licenceTypeList: [
         // { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '白牌' },
-        { ID: '1', NAME: '蓝牌' },
-        { ID: '2', NAME: '黄牌' },
-        { ID: '3', NAME: '绿牌' },
-        { ID: '4', NAME: '黑牌' }
+        {ID: '0', NAME: '白牌'},
+        {ID: '1', NAME: '蓝牌'},
+        {ID: '2', NAME: '黄牌'},
+        {ID: '3', NAME: '绿牌'},
+        {ID: '4', NAME: '黑牌'}
       ],
       // 车辆类型列表
       vehicleTypeList: [
         // { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '货车' },
-        { ID: '1', NAME: '轿车' },
-        { ID: '2', NAME: '大巴客车' }
+        {ID: '0', NAME: '货车'},
+        {ID: '1', NAME: '轿车'},
+        {ID: '2', NAME: '大巴客车'}
       ],
       // 车辆所属类型列表
       vehicleBelongTypeList: [
         // { ID: '', NAME: '请选择' },
-        { ID: '0', NAME: '员工车辆' },
-        { ID: '1', NAME: '单位车辆' }
+        {ID: '0', NAME: '员工车辆'},
+        {ID: '1', NAME: '单位车辆'}
         // { ID: '2', NAME: '外部车辆' }
       ],
       // 车辆下拉树默认属性
@@ -357,7 +344,8 @@ export default {
         EMPLOYEE_VEHICLE_USER_ID: '', // 车辆所属人
         EMPLOYEE_VEHICLE_USER_NAME: '', // 车辆所属人姓名
         VEHICLE_DEPARTMENT_ID: '', // 车辆所属部门
-        VEHICLE_DEPARTMENT_NAME: '' // 车辆所属部门名称
+        VEHICLE_DEPARTMENT_NAME: '', // 车辆所属部门名称
+        JG_DEPT_NAME: ''
       },
       // 详情表单的数据
       detailForm: {
@@ -380,11 +368,21 @@ export default {
     // 调用自己的方法
     this.getLoginUserInfo() // 获取当前登陆用户的信息
     this.CORPINFO_ID = this.$parent.CORPINFO_ID
-    this.updateBranchName(this.CORPINFO_ID)
+    this.DEPARTMENT_ID = this.$parent.DEPARTMENT_ID
+    this.updateBranchName(this.DEPARTMENT_ID)
+    this.customGetUserList(this.DEPARTMENT_ID)
     this.getPageList() // 获取分页列表要展示的数据
-
+    console.log(this.DEPARTMENT_ID)
+    console.log(this.CORPINFO_ID)
   },
   methods: {
+    validateLicenceNo() {
+      this.$refs.editForm.validateField('LICENCE_NO', errorMessage => {
+        if (errorMessage) {
+          this.$message.error(errorMessage);
+        }
+      });
+    },
     // 之前旧的
     filterNode(value, data) {
       if (!value) return true
@@ -396,13 +394,12 @@ export default {
     },
     updateBranchName(ID) {
       requestFN(
-        '/department/listTreeCorpInfo',
-        // '/department/listTree',
+        '/department/getJgDeptInfoById',
         {
-          CORPINFO_ID: ID
+          DEPARTMENT_ID: ID
         }
       ).then((data) => {
-        this.treeData = JSON.parse(data.zTreeNodes)
+        this.DEPARTMENT_NAME = data.deptInfo.NAME
       }).catch((e) => {
       })
     },
@@ -456,13 +453,12 @@ export default {
     },
     // 获取列表
     getPageList() {
-      console.log('22222222222222222222222222222')
       this.listLoading = true
       requestFN(
         'vehiclemessage/getPageList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           ...this.searchForm,
-          'CORPINFO_ID': this.CORPINFO_ID,
+          DEPARTMENT_ID: this.DEPARTMENT_ID,
           CAR_FROM: 0
         }
       ).then((data) => {
@@ -498,82 +494,34 @@ export default {
       this.addForm.VEHICLE_TYPE = ''
       this.addForm.VEHICLE_BELONG_TYPE = ''
       this.addForm.EMPLOYEE_VEHICLE_USER_ID = ''
-      this.userList = []
       this.addForm.DEPARTMENT_NAME = ''
       this.addForm.DEPARTMENT_ID = ''
     },
     // 添加弹窗的确定按钮
     addDialogConfirmBtn() {
-      if (this.addForm.LICENCE_NO !== null && this.addForm.LICENCE_NO === '') {
-        this.$message({
-          message: '车牌号不能为空',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.LICENCE_TYPE !== null && this.addForm.LICENCE_TYPE === '') {
-        this.$message({
-          message: '请选择车牌类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_TYPE !== null && this.addForm.VEHICLE_TYPE === '') {
-        this.$message({
-          message: '请选择车辆类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_BELONG_TYPE !== null && this.addForm.VEHICLE_BELONG_TYPE === '') {
-        this.$message({
-          message: '请选择车辆所属类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_DEPARTMENT_ID !== null && this.addForm.VEHICLE_DEPARTMENT_ID === '') {
-        this.$message({
-          message: '请选择车辆所属部门',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.USER_ID !== null && this.addForm.USER_ID === '') {
-        this.$message({
-          message: '请选择车辆责任人',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_BELONG_TYPE === '0') {
-        this.addForm.EMPLOYEE_VEHICLE_USER_ID = this.addForm.USER_ID // 车辆所属人id
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = this.addForm.USER_NAME // 车辆所属人姓名
-      } else {
-        this.addForm.EMPLOYEE_VEHICLE_USER_ID = '' // 车辆所属人id
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = '' // 车辆所属人姓名
-      }
-      this.addRequest()
-    },
-    addRequest() {
-      requestFN(
-        'vehiclemessage/addVehicleMessage',
-        {
-          ...this.addForm,
-          'CORPINFO_ID': this.CORPINFO_ID
-        }
-      ).then((data) => {
-        if (data.result === 'fail') {
-          this.$message({
-            message: data.msg,
-            type: 'error'
+      this.$refs.addForm.validate(valid => {
+        if (valid) {
+          requestFN(
+            'vehiclemessage/addJgCar',
+            {
+              ...this.addForm,
+              CORPINFO_ID: this.CORPINFO_ID,
+              DEPARTMENT_ID: this.DEPARTMENT_ID
+            }
+          ).then((data) => {
+            if (data.result === 'fail') {
+              this.$message({
+                message: data.msg,
+                type: 'error'
+              })
+            } else {
+              this.$message.success('车辆信息添加成功')
+              this.getPageList() // 重新加载列表
+              this.addDialogVisible = false
+            }
+          }).catch((e) => {
           })
-        } else {
-          this.$message.success('车辆信息添加成功')
-          this.getPageList() // 重新加载列表
-          this.addDialogVisible = false
         }
-      }).catch((e) => {
       })
     },
     // 打开编辑弹窗的编辑按钮
@@ -602,15 +550,9 @@ export default {
           this.editForm.LICENCE_TYPE = String(data.pd.LICENCE_TYPE) // 车牌类型
           this.editForm.VEHICLE_TYPE = String(data.pd.VEHICLE_TYPE) // 车辆类型
           this.editForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : data.pd.VEHICLE_BELONG_TYPE // 车辆所属类型
-          if ('VEHICLE_DEPARTMENT_ID' in data.pd) { // 存在车辆归属部门id
-            const node = {}
-            node.id = data.pd.VEHICLE_DEPARTMENT_ID
-            // this.$refs.selectTree_edit.clearHandle() // 这句代码会报错，注释掉了
-            this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
-            this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
-              this.$refs.selectTree_edit.handleNodeClick(node)
-            })
-          }
+          this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
+          this.editForm.JG_DEPT_NAME = data.pd.JG_DEPT_NAME
+          this.getUserList(data.pd.VEHICLE_DEPARTMENT_ID)
         } else {
           this.$message({
             message: '数据回显失败',
@@ -637,18 +579,18 @@ export default {
       this.detailDialogVisible = true
       // 提供查询接口回显数据
       requestFN(
-        'vehiclemessage/detailVehicleMessage',
+        'vehiclemessage/updateShowVehicleMessage',
         {
           VEHICLE_ID: VEHICLE_ID
         }
       ).then((data) => {
         if (data.result === 'success') {
           this.detailForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
-          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME // 车辆所属部门
+          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.JG_DEPT_NAME // 车辆所属部门
           this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) // 车牌类型
           this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) // 车辆类型
           this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)
-          this.detailForm.USER_ID = data.pd.USER_NAME // 车辆责任人
+          this.detailForm.USER_ID = data.pd.JG_USER_NAME // 车辆责任人
         } else {
           this.$message({
             message: '数据回显失败',
@@ -744,41 +686,32 @@ export default {
       this.$refs.selectTree_Search1.clearHandle() // 清空
       this.$refs.selectTree_Search2.clearHandle()
     },
-    addUserList(DEPARTMENT_ID) {
-      // this.getUserList(DEPARTMENT_ID)
-      this.customGetUserList(DEPARTMENT_ID)
-      this.handleDepartmentAddChange(DEPARTMENT_ID)
-    },
     updateUserList(DEPARTMENT_ID) {
       this.getUserList(DEPARTMENT_ID)
       this.handleDepartmentUpdateChange(DEPARTMENT_ID)
     },
     getUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
-      this.userList = []
-      console.info(DEPARTMENT_ID)
       requestFN(
         '/user/listAll',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: DEPARTMENT_ID
         }
       ).then((data) => {
         console.info(data)
         this.userList = data.userList
-      }).catch((e) => {
-        // this.listLoading = false
       })
     },
     customGetUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
       this.userList = []
       requestFN(
-        'vehiclemessage/selectTreeByDepartmentId',
+        'department/getUserInfoByDeptId',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: DEPARTMENT_ID
         }
       ).then((data) => {
-        this.userList = data.list
+        this.userList = data.userInfoList
+        console.log('---------------')
+        console.log(this.userList)
       }).catch((e) => {
         // this.listLoading = false
       })
@@ -867,7 +800,7 @@ export default {
             this.ISCHECK = false
           })
         } else {
-          this.$message.success('车牌号不规范')
+          this.$message.error('车牌号不规范')
           this.ISCHECK = false
         }
       }
@@ -898,7 +831,7 @@ export default {
               this.ISCHECK = false
             })
           } else {
-            this.$message.success('车牌号不规范')
+            this.$message.error('车牌号不规范')
             this.ISCHECK = false
           }
         }
@@ -916,7 +849,8 @@ export default {
 .m-l-10 {
   margin-left: 10px;
 }
-.q-f-w-v-200{
+
+.q-f-w-v-200 {
   width: 200px;
 }
 </style>
diff --git a/src/views/longtermvehicle/vehiclemessage/components/index_view.vue b/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
index 84f864c..19e41e1 100644
--- a/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
+++ b/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
@@ -99,7 +99,6 @@
         </el-table>
         <div class="page-btn-group">
           <div>
-<!--            <el-button type="primary" icon="el-icon-plus" @click="openAddDialogAddBtn">新增</el-button>-->
           </div>
           <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getPageList" />
         </div>
@@ -172,36 +171,34 @@
               <el-input v-model="editForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoUpdate()"/>
             </el-form-item>
             <el-form-item label="车牌类型" prop="LICENCE_TYPE">
-              <el-select :value="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in licenceTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <el-form-item label="车辆类型" prop="VEHICLE_TYPE">
-              <el-select :value="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <el-form-item label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
-              <el-select :value="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in vehicleBelongTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <!-- 车辆所属部门下拉框 -->
-            <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
-              <SelectTree
-                :key="editForm.VEHICLE_DEPARTMENT_ID"
-                ref="selectTree_edit"
-                :clearable="true"
+            <el-form-item label="车辆所属部门">
+              <Treeselect
                 :options="treeData"
-                :props="defaultProps"
+                :normalizer="normalizer"
                 v-model="editForm.VEHICLE_DEPARTMENT_ID"
                 placeholder="请选择车辆所属部门"
                 style="width: 300px"
-                @change="updateUserList"/>
+                @select="getUserList($event)"
+              />
             </el-form-item>
             <!-- 车辆责任人下拉框 -->
             <el-form-item label="车辆责任人" prop="USER_ID">
-              <el-select :value="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdUpdateChange">
+              <el-select v-model="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdUpdateChange">
                 <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
               </el-select>
             </el-form-item>
@@ -252,9 +249,11 @@
 import SelectTree from '@/components/SelectTree'
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
-import waves from '@/directive/waves' // waves directive
+import waves from '@/directive/waves'
+import Treeselect from "@riophae/vue-treeselect"; // waves directive
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  components: { Pagination, SelectTree },
+  components: {Treeselect, Pagination, SelectTree },
   directives: { waves },
   data() {
     return {
@@ -275,6 +274,13 @@ export default {
         children: 'nodes',
         label: 'name'
       },
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
       treeData: [],
       // 从此处开始写自己的属性
       loginUserCorpInfoId: '', // 从接口获取用户所属企业
@@ -491,7 +497,7 @@ export default {
         {
           ...this.searchForm,
           'CORPINFO_ID': this.CORPINFO_ID,
-          CAR_FROM: 1
+          IS_AUDIT: 1
         }
       ).then((data) => {
         this.listLoading = false
@@ -626,11 +632,12 @@ export default {
         if (data.result === 'success') {
           this.editForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
           this.editForm.OLD_LICENCE_NO = data.pd.LICENCE_NO // 车牌号
-          this.editForm.USER_ID = data.pd.QC_USER_NAME // 车辆责任人
-          this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.QC_DEPT_NAME
+          this.editForm.USER_ID = data.pd.USER_ID // 车辆责任人
+          this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
           this.editForm.LICENCE_TYPE = String(data.pd.LICENCE_TYPE) // 车牌类型
           this.editForm.VEHICLE_TYPE = String(data.pd.VEHICLE_TYPE) // 车辆类型
           this.editForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : data.pd.VEHICLE_BELONG_TYPE // 车辆所属类型
+          this.getQYUserList(data.pd.VEHICLE_DEPARTMENT_ID)
         } else {
           this.$message({
             message: '数据回显失败',
@@ -793,20 +800,27 @@ export default {
       this.getUserList(DEPARTMENT_ID)
       this.handleDepartmentUpdateChange(DEPARTMENT_ID)
     },
-    getUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
-      this.userList = []
-      console.info(DEPARTMENT_ID)
+    getUserList(e) { // 根据部门获取部门内的人员
       requestFN(
         '/user/listAll',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: e.id,
         }
       ).then((data) => {
         console.info(data)
-        this.userList = data.userList
-      }).catch((e) => {
-        // this.listLoading = false
+        this.userList = data.qyUserList
+      })
+    },
+    getQYUserList(DEPARTMENT_ID) {
+      console.log('----------------------')
+      requestFN(
+        '/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID
+        }
+      ).then((data) => {
+        console.info(data)
+        this.userList = data.qyUserList
       })
     },
     customGetUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
@@ -907,7 +921,7 @@ export default {
             this.ISCHECK = false
           })
         } else {
-          this.$message.success('车牌号不规范')
+          this.$message.error('车牌号不规范')
           this.ISCHECK = false
         }
       }
@@ -938,7 +952,7 @@ export default {
               this.ISCHECK = false
             })
           } else {
-            this.$message.success('车牌号不规范')
+            this.$message.error('车牌号不规范')
             this.ISCHECK = false
           }
         }
diff --git a/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue b/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
index 0dd8d7d..2883b5b 100644
--- a/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
@@ -37,17 +37,6 @@
                   placeholder="请选择车辆类型"/>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="4" class="m-l-10">-->
-<!--              <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID" label-width="100px">-->
-<!--                <SelectTree-->
-<!--                  ref="selectTree_Search2"-->
-<!--                  :clearable="false"-->
-<!--                  :options="treeData"-->
-<!--                  :props="defaultProps"-->
-<!--                  v-model="searchForm.VEHICLE_DEPARTMENT_ID"-->
-<!--                  placeholder="请选择车辆所属部门"/>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
             <el-col :span="4" class="m-l-10">
               <el-form-item label="车辆责任人" label-width="100px">
                 <el-input v-model="searchForm.USER_NAME" placeholder="请输入车辆责任人..." />
@@ -110,109 +99,43 @@
         </el-table>
         <div class="page-btn-group">
           <div>
-<!--            <el-button type="primary" icon="el-icon-plus" @click="openAddDialogAddBtn">新增</el-button>-->
           </div>
           <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getPageList" />
         </div>
-        <!--  添加车辆信息  -->
-        <el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px">
-          <el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;">
-            <el-form-item :rules="[{required: true}]" label="车牌号">
-              <el-input v-model="addForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/>
-            </el-form-item>
-            <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
-            <el-form-item :rules="[{required: true}]" label="车牌类型" prop="LICENCE_TYPE">
-              <SelectTree
-                ref="selectTree_add2"
-                :clearable="false"
-                :options="licenceTypeList"
-                :props="vehicleDefaultProps"
-                v-model="addForm.LICENCE_TYPE"
-                placeholder="请选择车牌类型"
-                style="width: 300px"/>
-            </el-form-item>
-            <!-- 货车、轿车、大巴客车  下拉框-->
-            <el-form-item :rules="[{required: true}]" label="车辆类型" prop="VEHICLE_TYPE">
-              <SelectTree
-                ref="selectTree_add3"
-                :clearable="false"
-                :options="vehicleTypeList"
-                :props="vehicleDefaultProps"
-                v-model="addForm.VEHICLE_TYPE"
-                placeholder="请选择车辆类型"
-                style="width: 300px"/>
-            </el-form-item>
-            <!-- 员工车辆、单位车辆、外部车辆 下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
-              <SelectTree
-                ref="selectTree_add4"
-                :clearable="false"
-                :options="vehicleBelongTypeList"
-                :props="vehicleDefaultProps"
-                v-model="addForm.VEHICLE_BELONG_TYPE"
-                placeholder="请选择车辆所属类型"
-                style="width: 300px"/>
-            </el-form-item>
-            <!-- 车辆所属部门下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
-              <SelectTree
-                ref="selectTree_add1"
-                :clearable="false"
-                :options="treeData"
-                :props="defaultProps"
-                v-model="addForm.VEHICLE_DEPARTMENT_ID"
-                placeholder="请选择车辆所属部门"
-                style="width: 300px"
-                @change="addUserList"/>
-            </el-form-item>
-            <!-- 车辆责任人下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆责任人" prop="USER_ID">
-              <el-select :value="addForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdAddChange">
-                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="addDialogCancelBtn">取 消</el-button>
-            <el-button type="primary" @click="addDialogConfirmBtn">确 定</el-button>
-          </div>
-        </el-dialog>
         <el-dialog :visible.sync="editDialogVisible" title="修改" width="600px">
           <el-form ref="editForm" :model="editForm" label-width="170px" style="width: 500px;">
             <el-form-item :rules="[{required: true}]" label="车牌号">
               <el-input v-model="editForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoUpdate()"/>
             </el-form-item>
             <el-form-item label="车牌类型" prop="LICENCE_TYPE">
-              <el-select :value="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in licenceTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <el-form-item label="车辆类型" prop="VEHICLE_TYPE">
-              <el-select :value="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <el-form-item label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
-              <el-select :value="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in vehicleBelongTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <!-- 车辆所属部门下拉框 -->
-            <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
-              <SelectTree
-                ref="selectTree_edit"
-                :clearable="false"
+            <el-form-item label="车辆所属部门">
+              <Treeselect
                 :options="treeData"
-                :props="defaultProps"
+                :normalizer="normalizer"
                 v-model="editForm.VEHICLE_DEPARTMENT_ID"
                 placeholder="请选择车辆所属部门"
                 style="width: 300px"
-                @change="updateUserList"
+                @select="getUserList($event)"
               />
             </el-form-item>
             <!-- 车辆责任人下拉框 -->
             <el-form-item label="车辆责任人" prop="USER_ID">
-              <el-select :value="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdUpdateChange">
+              <el-select v-model="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdUpdateChange">
                 <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
               </el-select>
             </el-form-item>
@@ -259,8 +182,10 @@ import SelectTree from '@/components/SelectTree'
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  components: { Pagination, SelectTree },
+  components: { Pagination, SelectTree, Treeselect },
   directives: { waves },
   data() {
     return {
@@ -281,6 +206,13 @@ export default {
         children: 'nodes',
         label: 'name'
       },
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
       treeData: [],
       // 从此处开始写自己的属性
       loginUserCorpInfoId: '', // 从接口获取用户所属企业
@@ -329,21 +261,6 @@ export default {
         VEHICLE_TYPE: '', // 车辆类型
         VEHICLE_DEPARTMENT_ID: '' // 车辆所属部门ID
       },
-      // 添加表单的数据
-      addForm: {
-        LICENCE_NO: '', // 车牌号
-        VEHICLE_DEPARTMENT_ID: '', // 车辆所属部门id
-        VEHICLE_DEPARTMENT_NAME: '', // 车辆所属部门名称
-        USER_ID: '', // 车辆责任人
-        LICENCE_TYPE: '', // 车牌类型
-        VEHICLE_TYPE: '', // 车辆类型
-        VEHICLE_BELONG_TYPE: '', // 车辆所属类型
-        EMPLOYEE_VEHICLE_USER_ID: '', // 车辆所属人id
-        EMPLOYEE_VEHICLE_USER_NAME: '', // 车辆所属人姓名
-        DEPARTMENT_NAME: '', // 部门名称
-        DEPARTMENT_ID: '',
-        USER_NAME: '' // 车辆责任人姓名
-      },
       // 修改表单的数据
       editForm: {
         VEHICLE_ID: '', // 车辆id(基础属性)
@@ -398,7 +315,6 @@ export default {
     updateBranchName(ID) {
       requestFN(
         '/xgf/department/listzTree',
-        // '/department/listTree',
         {
           CORPINFO_ID: ID
         }
@@ -437,12 +353,8 @@ export default {
         ).then((data) => {
           console.info(data.pd)
           this.loginUserId = data.pd.USER_ID
-          // this.loginUserName = data.pd.NAME
           this.loginUserCorpInfoId = data.pd.CORPINFO_ID
-          // this.loginUserDepartmentName = data.pd.DEPARTMENT_NAME
           resolve('ok')
-        }).catch((e) => {
-
         })
       })
     },
@@ -470,113 +382,15 @@ export default {
         this.listLoading = false
         this.varList = data.carInfoList
         this.total = data.page.totalResult
-        // this.hasButton()
         this.pd = data.pd
       }).catch((e) => {
         this.listLoading = false
       })
     },
-    // 打开新增弹窗的新增按钮
-    openAddDialogAddBtn() {
-      this.addDialogVisible = true
-      this.reSetAddDialog()
-      this.ISCHECK = false
-    },
-    // 添加弹窗的取消按钮
-    addDialogCancelBtn() {
-      this.addDialogVisible = false
-    },
     // 查看弹窗的返回按钮
     detailDialogReturnBtn() {
       this.detailDialogVisible = false
     },
-    // 置空添加弹窗
-    reSetAddDialog() {
-      this.addForm.LICENCE_NO = ''
-      this.addForm.USER_ID = ''
-      this.addForm.VEHICLE_DEPARTMENT_ID = ''
-      this.addForm.LICENCE_TYPE = ''
-      this.addForm.VEHICLE_TYPE = ''
-      this.addForm.VEHICLE_BELONG_TYPE = ''
-      this.addForm.EMPLOYEE_VEHICLE_USER_ID = ''
-      this.userList = []
-      this.addForm.DEPARTMENT_NAME = ''
-      this.addForm.DEPARTMENT_ID = ''
-    },
-    // 添加弹窗的确定按钮
-    addDialogConfirmBtn() {
-      if (this.addForm.LICENCE_NO !== null && this.addForm.LICENCE_NO === '') {
-        this.$message({
-          message: '车牌号不能为空',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.LICENCE_TYPE !== null && this.addForm.LICENCE_TYPE === '') {
-        this.$message({
-          message: '请选择车牌类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_TYPE !== null && this.addForm.VEHICLE_TYPE === '') {
-        this.$message({
-          message: '请选择车辆类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_BELONG_TYPE !== null && this.addForm.VEHICLE_BELONG_TYPE === '') {
-        this.$message({
-          message: '请选择车辆所属类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_DEPARTMENT_ID !== null && this.addForm.VEHICLE_DEPARTMENT_ID === '') {
-        this.$message({
-          message: '请选择车辆所属部门',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.USER_ID !== null && this.addForm.USER_ID === '') {
-        this.$message({
-          message: '请选择车辆责任人',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_BELONG_TYPE === '0') {
-        this.addForm.EMPLOYEE_VEHICLE_USER_ID = this.addForm.USER_ID // 车辆所属人id
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = this.addForm.USER_NAME // 车辆所属人姓名
-      } else {
-        this.addForm.EMPLOYEE_VEHICLE_USER_ID = '' // 车辆所属人id
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = '' // 车辆所属人姓名
-      }
-      this.addRequest()
-    },
-    addRequest() {
-      requestFN(
-        'vehiclemessage/addVehicleMessage',
-        {
-          ...this.addForm,
-          'CORPINFO_ID': this.CORPINFO_ID
-        }
-      ).then((data) => {
-        if (data.result === 'fail') {
-          this.$message({
-            message: data.msg,
-            type: 'error'
-          })
-        } else {
-          this.$message.success('车辆信息添加成功')
-          this.getPageList() // 重新加载列表
-          this.addDialogVisible = false
-        }
-      }).catch((e) => {
-      })
-    },
     // 打开编辑弹窗的编辑按钮
     openEditDialogEditBtn(VEHICLE_ID) {
       this.editForm = {
@@ -587,7 +401,6 @@ export default {
         EMPLOYEE_VEHICLE_USER_ID: '', // 车辆所属人
         VEHICLE_DEPARTMENT_ID: '' // 车辆归属公司或责任公司（车辆所属部门）
       }
-      this.userList = []
       this.editDialogVisible = true
       // 提供查询接口回显数据
       requestFN(
@@ -600,12 +413,20 @@ export default {
           this.editForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
           this.editForm.OLD_LICENCE_NO = data.pd.LICENCE_NO // 车牌号
           this.editForm.USER_ID = data.pd.USER_ID // 车辆责任人
-          this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
+          if ('VEHICLE_DEPARTMENT_ID' in data.pd) { // 存在车辆归属部门id
+            const node = {}
+            node.id = data.pd.VEHICLE_DEPARTMENT_ID
+            this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
+            this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+              this.$refs.selectTree_edit.handleNodeClick(node)
+            })
+          }
           this.editForm.LICENCE_TYPE = String(data.pd.LICENCE_TYPE) // 车牌类型
           this.editForm.VEHICLE_TYPE = String(data.pd.VEHICLE_TYPE) // 车辆类型
           this.editForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : data.pd.VEHICLE_BELONG_TYPE // 车辆所属类型
           console.log('------------------')
           console.log(this.editForm)
+          this.getXgfUserList(data.pd.VEHICLE_DEPARTMENT_ID)
         } else {
           this.$message({
             message: '数据回显失败',
@@ -732,102 +553,38 @@ export default {
       }).catch(() => {
       })
     },
-
     resetSearch() {
       this.searchForm.LICENCE_NO = ''
       this.$refs.selectTree_Search1.clearHandle() // 清空
       this.searchForm.USER_NAME = ''
     },
-    addUserList(DEPARTMENT_ID) {
-      // this.getUserList(DEPARTMENT_ID)
-      this.customGetUserList(DEPARTMENT_ID)
-      this.handleDepartmentAddChange(DEPARTMENT_ID)
-    },
-    updateUserList(DEPARTMENT_ID) {
-      this.getUserList(DEPARTMENT_ID)
-      this.handleDepartmentUpdateChange(DEPARTMENT_ID)
-    },
-    getUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
-      this.userList = []
-      console.info(DEPARTMENT_ID)
+    getUserList(e) {
       requestFN(
         '/user/listAll',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: e.id
         }
       ).then((data) => {
         console.info(data)
         this.userList = data.xgfUserList
-      }).catch((e) => {
-        // this.listLoading = false
       })
     },
-    customGetUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
-      this.userList = []
+    getXgfUserList(DEPARTMENT_ID) {
       requestFN(
-        'vehiclemessage/selectTreeByDepartmentId',
+        '/user/listAll',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: DEPARTMENT_ID
         }
       ).then((data) => {
-        this.userList = data.list
-      }).catch((e) => {
-        // this.listLoading = false
+        console.info(data)
+        this.userList = data.xgfUserList
       })
     },
-    // 添加弹窗中的车辆责任人
-    userIdAddChange(event) {
-      this.addForm.USER_ID = event
-      this.handleUserAddChange(event)
-    },
-    // 添加弹窗中的车辆所属人
-    employeeUserIdAddChange(event) {
-      this.addForm.EMPLOYEE_VEHICLE_USER_ID = event
-      this.handleEmployeeUserAddChange(event)
-    },
     // 修改弹窗中的车辆责任人
     userIdUpdateChange(event) {
       this.editForm.USER_ID = event
       this.handleUserUpdateChange(event)
     },
-    handleDepartmentAddChange(value) {
-      this.addForm.VEHICLE_DEPARTMENT_NAME = this.findLabelByValue(this.treeData, value)
-    },
-    handleDepartmentUpdateChange(value) {
-      this.editForm.VEHICLE_DEPARTMENT_NAME = this.findLabelByValue(this.treeData, value)
-    },
-    findLabelByValue(tree, value) {
-      for (const node of tree) {
-        if (node.id === value) {
-          return node.name
-        }
-        if (node.nodes && node.nodes.length > 0) {
-          const result = this.findLabelByValue(node.nodes, value)
-          if (result) {
-            return result
-          }
-        }
-      }
-      return ''
-    },
-    handleUserAddChange(value) {
-      const selectedUser = this.userList.find(user => user.USER_ID === value)
-      if (selectedUser) {
-        this.addForm.USER_NAME = selectedUser.NAME
-      } else {
-        this.addForm.USER_NAME = ''
-      }
-    },
-    handleEmployeeUserAddChange(value) {
-      const selectedUser = this.userList.find(user => user.USER_ID === value)
-      if (selectedUser) {
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = selectedUser.NAME
-      } else {
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = ''
-      }
-    },
     handleUserUpdateChange(value) {
       const selectedUser = this.userList.find(user => user.USER_ID === value)
       if (selectedUser) {
@@ -836,36 +593,6 @@ export default {
         this.editForm.USER_NAME = ''
       }
     },
-    goCheckLicenceNoAdd() {
-      if (this.addForm.LICENCE_NO) {
-        const regex = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/
-        const result = regex.test(this.addForm.LICENCE_NO)
-        if (result) {
-          console.log('格式校验通过')
-          requestFN(
-            'vehiclemessage/goCheckLicenceNo',
-            {
-              'LICENCE_NO': this.addForm.LICENCE_NO
-            }
-          ).then((data) => {
-            if (data.result === 'success') {
-              this.$message.success('验证通过')
-              this.ISCHECK = true
-            } else {
-              this.$message.error('车牌号已存在,请重新输入')
-              this.ISCHECK = false
-            }
-          }).catch((e) => {
-            console.info(e)
-            this.listLoading = false
-            this.ISCHECK = false
-          })
-        } else {
-          this.$message.success('车牌号不规范')
-          this.ISCHECK = false
-        }
-      }
-    },
     goCheckLicenceNoUpdate() {
       if (this.editForm.LICENCE_NO) {
         if (this.editForm.LICENCE_NO !== this.editForm.OLD_LICENCE_NO) {
@@ -892,7 +619,7 @@ export default {
               this.ISCHECK = false
             })
           } else {
-            this.$message.success('车牌号不规范')
+            this.$message.error('车牌号不规范')
             this.ISCHECK = false
           }
         }
diff --git a/src/views/longtermvehicle/zgCarMessage/components/car_view.vue b/src/views/longtermvehicle/zgCarMessage/components/car_view.vue
index c5f840c..13143fb 100644
--- a/src/views/longtermvehicle/zgCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/zgCarMessage/components/car_view.vue
@@ -37,17 +37,6 @@
                   placeholder="请选择车辆类型"/>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="4" class="m-l-10">-->
-<!--              <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID" label-width="100px">-->
-<!--                <SelectTree-->
-<!--                  ref="selectTree_Search2"-->
-<!--                  :clearable="false"-->
-<!--                  :options="treeData"-->
-<!--                  :props="defaultProps"-->
-<!--                  v-model="searchForm.VEHICLE_DEPARTMENT_ID"-->
-<!--                  placeholder="请选择车辆所属部门"/>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
             <el-col :span="4" class="m-l-10">
               <el-form-item label="车辆责任人" label-width="100px">
                 <el-input v-model="searchForm.USER_NAME" placeholder="请输入车辆责任人..." />
@@ -85,7 +74,7 @@
             width="55"
             align="center"/>
           <el-table-column type="index" label="序号" width="50" align="center" />
-          <el-table-column prop="CORPINFO_NAME" label="分公司名称" align="center" />
+          <el-table-column prop="RELEVANT_UNIT_NAME" label="相关方单位名称" align="center" />
           <el-table-column prop="LICENCE_NO" label="车牌号" align="center" />
           <el-table-column label="车牌类型" align="center">
             <template slot-scope="{row}">
@@ -97,11 +86,11 @@
               {{ translateVehicleType(row.VEHICLE_TYPE) }}
             </template>
           </el-table-column>
-          <el-table-column prop="DEPARTMENT_NAME" label="车辆所属部门" align="center" />
-          <el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
+          <el-table-column prop="DEPT_NAME" label="车辆所属部门" align="center" />
+          <el-table-column prop="U_NAME" label="车辆责任人" align="center"/>
           <el-table-column label="操作" align="center" width="480">
             <template slot-scope="{row}">
-              <el-button type="warning" icon="el-icon-more" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
+              <el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
               <el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)">查看</el-button>
               <el-button type="primary" icon="el-icon-edit" size="mini" @click="openEditDialogEditBtn(row.VEHICLE_ID)">修改</el-button>
               <el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteSingleDataDeleteBtn(row.VEHICLE_ID, row.USER_ID, row.EMPLOYEE_VEHICLE_USER_ID)">删除</el-button>
@@ -110,108 +99,43 @@
         </el-table>
         <div class="page-btn-group">
           <div>
-<!--            <el-button type="primary" icon="el-icon-plus" @click="openAddDialogAddBtn">新增</el-button>-->
           </div>
           <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getPageList" />
         </div>
-        <!--  添加车辆信息  -->
-        <el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px">
-          <el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;">
-            <el-form-item :rules="[{required: true}]" label="车牌号">
-              <el-input v-model="addForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/>
-            </el-form-item>
-            <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
-            <el-form-item :rules="[{required: true}]" label="车牌类型" prop="LICENCE_TYPE">
-              <SelectTree
-                ref="selectTree_add2"
-                :clearable="false"
-                :options="licenceTypeList"
-                :props="vehicleDefaultProps"
-                v-model="addForm.LICENCE_TYPE"
-                placeholder="请选择车牌类型"
-                style="width: 300px"/>
-            </el-form-item>
-            <!-- 货车、轿车、大巴客车  下拉框-->
-            <el-form-item :rules="[{required: true}]" label="车辆类型" prop="VEHICLE_TYPE">
-              <SelectTree
-                ref="selectTree_add3"
-                :clearable="false"
-                :options="vehicleTypeList"
-                :props="vehicleDefaultProps"
-                v-model="addForm.VEHICLE_TYPE"
-                placeholder="请选择车辆类型"
-                style="width: 300px"/>
-            </el-form-item>
-            <!-- 员工车辆、单位车辆、外部车辆 下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
-              <SelectTree
-                ref="selectTree_add4"
-                :clearable="false"
-                :options="vehicleBelongTypeList"
-                :props="vehicleDefaultProps"
-                v-model="addForm.VEHICLE_BELONG_TYPE"
-                placeholder="请选择车辆所属类型"
-                style="width: 300px"/>
-            </el-form-item>
-            <!-- 车辆所属部门下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
-              <SelectTree
-                ref="selectTree_add1"
-                :clearable="false"
-                :options="treeData"
-                :props="defaultProps"
-                v-model="addForm.VEHICLE_DEPARTMENT_ID"
-                placeholder="请选择车辆所属部门"
-                style="width: 300px"
-                @change="addUserList"/>
-            </el-form-item>
-            <!-- 车辆责任人下拉框 -->
-            <el-form-item :rules="[{required: true}]" label="车辆责任人" prop="USER_ID">
-              <el-select :value="addForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdAddChange">
-                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="addDialogCancelBtn">取 消</el-button>
-            <el-button type="primary" @click="addDialogConfirmBtn">确 定</el-button>
-          </div>
-        </el-dialog>
         <el-dialog :visible.sync="editDialogVisible" title="修改" width="600px">
           <el-form ref="editForm" :model="editForm" label-width="170px" style="width: 500px;">
             <el-form-item :rules="[{required: true}]" label="车牌号">
               <el-input v-model="editForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoUpdate()"/>
             </el-form-item>
             <el-form-item label="车牌类型" prop="LICENCE_TYPE">
-              <el-select :value="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in licenceTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <el-form-item label="车辆类型" prop="VEHICLE_TYPE">
-              <el-select :value="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <el-form-item label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
-              <el-select :value="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
+              <el-select v-model="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
                 <el-option v-for="item in vehicleBelongTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
               </el-select>
             </el-form-item>
             <!-- 车辆所属部门下拉框 -->
-            <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
-              <SelectTree
-                ref="selectTree_edit"
-                :clearable="true"
+            <el-form-item label="车辆所属部门">
+              <Treeselect
                 :options="treeData"
-                :props="defaultProps"
+                :normalizer="normalizer"
                 v-model="editForm.VEHICLE_DEPARTMENT_ID"
                 placeholder="请选择车辆所属部门"
                 style="width: 300px"
-                @change="updateUserList"/>
+                @select="getUserList($event)"
+              />
             </el-form-item>
             <!-- 车辆责任人下拉框 -->
             <el-form-item label="车辆责任人" prop="USER_ID">
-              <el-select :value="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdUpdateChange">
+              <el-select v-model="editForm.USER_ID" clearable placeholder="请选择" @visible-change="$forceUpdate()" @change="userIdUpdateChange">
                 <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
               </el-select>
             </el-form-item>
@@ -258,8 +182,10 @@ import SelectTree from '@/components/SelectTree'
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  components: { Pagination, SelectTree },
+  components: { Pagination, SelectTree, Treeselect },
   directives: { waves },
   data() {
     return {
@@ -280,6 +206,13 @@ export default {
         children: 'nodes',
         label: 'name'
       },
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
       treeData: [],
       // 从此处开始写自己的属性
       loginUserCorpInfoId: '', // 从接口获取用户所属企业
@@ -328,21 +261,6 @@ export default {
         VEHICLE_TYPE: '', // 车辆类型
         VEHICLE_DEPARTMENT_ID: '' // 车辆所属部门ID
       },
-      // 添加表单的数据
-      addForm: {
-        LICENCE_NO: '', // 车牌号
-        VEHICLE_DEPARTMENT_ID: '', // 车辆所属部门id
-        VEHICLE_DEPARTMENT_NAME: '', // 车辆所属部门名称
-        USER_ID: '', // 车辆责任人
-        LICENCE_TYPE: '', // 车牌类型
-        VEHICLE_TYPE: '', // 车辆类型
-        VEHICLE_BELONG_TYPE: '', // 车辆所属类型
-        EMPLOYEE_VEHICLE_USER_ID: '', // 车辆所属人id
-        EMPLOYEE_VEHICLE_USER_NAME: '', // 车辆所属人姓名
-        DEPARTMENT_NAME: '', // 部门名称
-        DEPARTMENT_ID: '',
-        USER_NAME: '' // 车辆责任人姓名
-      },
       // 修改表单的数据
       editForm: {
         VEHICLE_ID: '', // 车辆id(基础属性)
@@ -396,8 +314,7 @@ export default {
     },
     updateBranchName(ID) {
       requestFN(
-        '/department/listTreeCorpInfo',
-        // '/department/listTree',
+        '/xgf/department/listzTree',
         {
           CORPINFO_ID: ID
         }
@@ -436,12 +353,8 @@ export default {
         ).then((data) => {
           console.info(data.pd)
           this.loginUserId = data.pd.USER_ID
-          // this.loginUserName = data.pd.NAME
           this.loginUserCorpInfoId = data.pd.CORPINFO_ID
-          // this.loginUserDepartmentName = data.pd.DEPARTMENT_NAME
           resolve('ok')
-        }).catch((e) => {
-
         })
       })
     },
@@ -459,7 +372,7 @@ export default {
       console.log('22222222222222222222222222222')
       this.listLoading = true
       requestFN(
-        'vehiclemessage/getPageList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        'mkmjManagement/zgCarInfoList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           ...this.searchForm,
           'CORPINFO_ID': this.CORPINFO_ID,
@@ -467,115 +380,17 @@ export default {
         }
       ).then((data) => {
         this.listLoading = false
-        this.varList = data.varList
+        this.varList = data.carInfoList
         this.total = data.page.totalResult
-        // this.hasButton()
         this.pd = data.pd
       }).catch((e) => {
         this.listLoading = false
       })
     },
-    // 打开新增弹窗的新增按钮
-    openAddDialogAddBtn() {
-      this.addDialogVisible = true
-      this.reSetAddDialog()
-      this.ISCHECK = false
-    },
-    // 添加弹窗的取消按钮
-    addDialogCancelBtn() {
-      this.addDialogVisible = false
-    },
     // 查看弹窗的返回按钮
     detailDialogReturnBtn() {
       this.detailDialogVisible = false
     },
-    // 置空添加弹窗
-    reSetAddDialog() {
-      this.addForm.LICENCE_NO = ''
-      this.addForm.USER_ID = ''
-      this.addForm.VEHICLE_DEPARTMENT_ID = ''
-      this.addForm.LICENCE_TYPE = ''
-      this.addForm.VEHICLE_TYPE = ''
-      this.addForm.VEHICLE_BELONG_TYPE = ''
-      this.addForm.EMPLOYEE_VEHICLE_USER_ID = ''
-      this.userList = []
-      this.addForm.DEPARTMENT_NAME = ''
-      this.addForm.DEPARTMENT_ID = ''
-    },
-    // 添加弹窗的确定按钮
-    addDialogConfirmBtn() {
-      if (this.addForm.LICENCE_NO !== null && this.addForm.LICENCE_NO === '') {
-        this.$message({
-          message: '车牌号不能为空',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.LICENCE_TYPE !== null && this.addForm.LICENCE_TYPE === '') {
-        this.$message({
-          message: '请选择车牌类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_TYPE !== null && this.addForm.VEHICLE_TYPE === '') {
-        this.$message({
-          message: '请选择车辆类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_BELONG_TYPE !== null && this.addForm.VEHICLE_BELONG_TYPE === '') {
-        this.$message({
-          message: '请选择车辆所属类型',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_DEPARTMENT_ID !== null && this.addForm.VEHICLE_DEPARTMENT_ID === '') {
-        this.$message({
-          message: '请选择车辆所属部门',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.USER_ID !== null && this.addForm.USER_ID === '') {
-        this.$message({
-          message: '请选择车辆责任人',
-          type: 'error'
-        })
-        return false
-      }
-      if (this.addForm.VEHICLE_BELONG_TYPE === '0') {
-        this.addForm.EMPLOYEE_VEHICLE_USER_ID = this.addForm.USER_ID // 车辆所属人id
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = this.addForm.USER_NAME // 车辆所属人姓名
-      } else {
-        this.addForm.EMPLOYEE_VEHICLE_USER_ID = '' // 车辆所属人id
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = '' // 车辆所属人姓名
-      }
-      this.addRequest()
-    },
-    addRequest() {
-      requestFN(
-        'vehiclemessage/addVehicleMessage',
-        {
-          ...this.addForm,
-          'CORPINFO_ID': this.CORPINFO_ID
-        }
-      ).then((data) => {
-        if (data.result === 'fail') {
-          this.$message({
-            message: data.msg,
-            type: 'error'
-          })
-        } else {
-          this.$message.success('车辆信息添加成功')
-          this.getPageList() // 重新加载列表
-          this.addDialogVisible = false
-        }
-      }).catch((e) => {
-      })
-    },
     // 打开编辑弹窗的编辑按钮
     openEditDialogEditBtn(VEHICLE_ID) {
       this.editForm = {
@@ -586,7 +401,6 @@ export default {
         EMPLOYEE_VEHICLE_USER_ID: '', // 车辆所属人
         VEHICLE_DEPARTMENT_ID: '' // 车辆归属公司或责任公司（车辆所属部门）
       }
-      this.userList = []
       this.editDialogVisible = true
       // 提供查询接口回显数据
       requestFN(
@@ -599,18 +413,20 @@ export default {
           this.editForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
           this.editForm.OLD_LICENCE_NO = data.pd.LICENCE_NO // 车牌号
           this.editForm.USER_ID = data.pd.USER_ID // 车辆责任人
-          this.editForm.LICENCE_TYPE = String(data.pd.LICENCE_TYPE) // 车牌类型
-          this.editForm.VEHICLE_TYPE = String(data.pd.VEHICLE_TYPE) // 车辆类型
-          this.editForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : data.pd.VEHICLE_BELONG_TYPE // 车辆所属类型
           if ('VEHICLE_DEPARTMENT_ID' in data.pd) { // 存在车辆归属部门id
             const node = {}
             node.id = data.pd.VEHICLE_DEPARTMENT_ID
-            // this.$refs.selectTree_edit.clearHandle() // 这句代码会报错，注释掉了
             this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
             this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
               this.$refs.selectTree_edit.handleNodeClick(node)
             })
           }
+          this.editForm.LICENCE_TYPE = String(data.pd.LICENCE_TYPE) // 车牌类型
+          this.editForm.VEHICLE_TYPE = String(data.pd.VEHICLE_TYPE) // 车辆类型
+          this.editForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : data.pd.VEHICLE_BELONG_TYPE // 车辆所属类型
+          console.log('------------------')
+          console.log(this.editForm)
+          this.getXgfUserList(data.pd.VEHICLE_DEPARTMENT_ID)
         } else {
           this.$message({
             message: '数据回显失败',
@@ -622,6 +438,7 @@ export default {
     },
     editDialogCancelBtn() {
       this.editDialogVisible = false
+      this.$refs["editForm"].resetFields()
     },
     // 查看按钮(展示详情)
     showDetail(VEHICLE_ID) {
@@ -644,11 +461,11 @@ export default {
       ).then((data) => {
         if (data.result === 'success') {
           this.detailForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
-          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME // 车辆所属部门
+          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPT_NAME // 车辆所属部门
           this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) // 车牌类型
           this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) // 车辆类型
           this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)
-          this.detailForm.USER_ID = data.pd.USER_NAME // 车辆责任人
+          this.detailForm.USER_ID = data.pd.U_NAME // 车辆责任人
         } else {
           this.$message({
             message: '数据回显失败',
@@ -736,102 +553,38 @@ export default {
       }).catch(() => {
       })
     },
-
     resetSearch() {
       this.searchForm.LICENCE_NO = ''
       this.$refs.selectTree_Search1.clearHandle() // 清空
       this.searchForm.USER_NAME = ''
     },
-    addUserList(DEPARTMENT_ID) {
-      // this.getUserList(DEPARTMENT_ID)
-      this.customGetUserList(DEPARTMENT_ID)
-      this.handleDepartmentAddChange(DEPARTMENT_ID)
-    },
-    updateUserList(DEPARTMENT_ID) {
-      this.getUserList(DEPARTMENT_ID)
-      this.handleDepartmentUpdateChange(DEPARTMENT_ID)
-    },
-    getUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
-      this.userList = []
-      console.info(DEPARTMENT_ID)
+    getUserList(e) {
       requestFN(
         '/user/listAll',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: e.id
         }
       ).then((data) => {
         console.info(data)
-        this.userList = data.userList
-      }).catch((e) => {
-        // this.listLoading = false
+        this.userList = data.xgfUserList
       })
     },
-    customGetUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
-      this.userList = []
+    getXgfUserList(DEPARTMENT_ID) {
       requestFN(
-        'vehiclemessage/selectTreeByDepartmentId',
+        '/user/listAll',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: DEPARTMENT_ID
         }
       ).then((data) => {
-        this.userList = data.list
-      }).catch((e) => {
-        // this.listLoading = false
+        console.info(data)
+        this.userList = data.xgfUserList
       })
     },
-    // 添加弹窗中的车辆责任人
-    userIdAddChange(event) {
-      this.addForm.USER_ID = event
-      this.handleUserAddChange(event)
-    },
-    // 添加弹窗中的车辆所属人
-    employeeUserIdAddChange(event) {
-      this.addForm.EMPLOYEE_VEHICLE_USER_ID = event
-      this.handleEmployeeUserAddChange(event)
-    },
     // 修改弹窗中的车辆责任人
     userIdUpdateChange(event) {
       this.editForm.USER_ID = event
       this.handleUserUpdateChange(event)
     },
-    handleDepartmentAddChange(value) {
-      this.addForm.VEHICLE_DEPARTMENT_NAME = this.findLabelByValue(this.treeData, value)
-    },
-    handleDepartmentUpdateChange(value) {
-      this.editForm.VEHICLE_DEPARTMENT_NAME = this.findLabelByValue(this.treeData, value)
-    },
-    findLabelByValue(tree, value) {
-      for (const node of tree) {
-        if (node.id === value) {
-          return node.name
-        }
-        if (node.nodes && node.nodes.length > 0) {
-          const result = this.findLabelByValue(node.nodes, value)
-          if (result) {
-            return result
-          }
-        }
-      }
-      return ''
-    },
-    handleUserAddChange(value) {
-      const selectedUser = this.userList.find(user => user.USER_ID === value)
-      if (selectedUser) {
-        this.addForm.USER_NAME = selectedUser.NAME
-      } else {
-        this.addForm.USER_NAME = ''
-      }
-    },
-    handleEmployeeUserAddChange(value) {
-      const selectedUser = this.userList.find(user => user.USER_ID === value)
-      if (selectedUser) {
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = selectedUser.NAME
-      } else {
-        this.addForm.EMPLOYEE_VEHICLE_USER_NAME = ''
-      }
-    },
     handleUserUpdateChange(value) {
       const selectedUser = this.userList.find(user => user.USER_ID === value)
       if (selectedUser) {
@@ -840,36 +593,6 @@ export default {
         this.editForm.USER_NAME = ''
       }
     },
-    goCheckLicenceNoAdd() {
-      if (this.addForm.LICENCE_NO) {
-        const regex = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/
-        const result = regex.test(this.addForm.LICENCE_NO)
-        if (result) {
-          console.log('格式校验通过')
-          requestFN(
-            'vehiclemessage/goCheckLicenceNo',
-            {
-              'LICENCE_NO': this.addForm.LICENCE_NO
-            }
-          ).then((data) => {
-            if (data.result === 'success') {
-              this.$message.success('验证通过')
-              this.ISCHECK = true
-            } else {
-              this.$message.error('车牌号已存在,请重新输入')
-              this.ISCHECK = false
-            }
-          }).catch((e) => {
-            console.info(e)
-            this.listLoading = false
-            this.ISCHECK = false
-          })
-        } else {
-          this.$message.success('车牌号不规范')
-          this.ISCHECK = false
-        }
-      }
-    },
     goCheckLicenceNoUpdate() {
       if (this.editForm.LICENCE_NO) {
         if (this.editForm.LICENCE_NO !== this.editForm.OLD_LICENCE_NO) {
@@ -896,7 +619,7 @@ export default {
               this.ISCHECK = false
             })
           } else {
-            this.$message.success('车牌号不规范')
+            this.$message.error('车牌号不规范')
             this.ISCHECK = false
           }
         }
@@ -914,7 +637,8 @@ export default {
 .m-l-10 {
   margin-left: 10px;
 }
-.q-f-w-v-200{
+
+.q-f-w-v-200 {
   width: 200px;
 }
 </style>
diff --git a/src/views/vehiclebreakrules/blacklist/components/list.vue b/src/views/vehiclebreakrules/blacklist/components/list.vue
index 69b5aff..9cc93c4 100644
--- a/src/views/vehiclebreakrules/blacklist/components/list.vue
+++ b/src/views/vehiclebreakrules/blacklist/components/list.vue
@@ -444,7 +444,7 @@ export default {
           this.$message.success('验证通过')
           this.ISCHECK = true
         } else {
-          this.$message.success('车牌号不规范')
+          this.$message.error('车牌号不规范')
           this.ISCHECK = false
         }
       }
diff --git a/src/views/vehiclebreakrules/records/components/list.vue b/src/views/vehiclebreakrules/records/components/list.vue
index e28d3e1..d898cd9 100644
--- a/src/views/vehiclebreakrules/records/components/list.vue
+++ b/src/views/vehiclebreakrules/records/components/list.vue
@@ -93,8 +93,6 @@
         :formatter="(row) => formatUserName(row)"
       />
       <el-table-column prop="VIOLATION_COUNT" label="违规次数" align="center"/>
-      <!--      <el-table-column prop="ISEXIST" label="是否存在" align="center" />-->
-
       <el-table-column label="操作" align="center" width="480">
         <template slot-scope="{row}">
           <el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)">查看违规记录</el-button>
@@ -150,11 +148,11 @@
         <el-form-item label="违规图片" label-width="110px" prop="FFILE">
           <el-upload
             ref="violationImageUpload"
-            :class="{hide:violationUpload}"
             :on-preview="handlePictureCardPreview"
             :before-upload="beforeFileUpload"
             :on-remove="handleRemove"
             :on-change="handleChangeIMG"
+            :on-exceed="handleExceed"
             :limit="4"
             :auto-upload="false"
             action="#"
@@ -297,7 +295,6 @@ export default {
         children: 'nodes'
       },
       addDialogVisible: false,
-      violationUpload: false, // 违规照片
       dialogImageVisible: false, // 放大照片的显示和隐藏
       violation_files: [], // 违规照片
       dialogImageUrl: '' // 照片的地址
@@ -306,7 +303,6 @@ export default {
   created() {
     this.getLoginUserInfo() // 获取当前登陆用户的信息
     this.getDepartmentTreeData() // 获取部门树的数据
-    // this.getDict() // 获取字典
     this.getPageList() // 获取分页列表要展示的数据
   },
   methods: {
@@ -371,13 +367,11 @@ export default {
         'breakRulesRecord/getPageList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           ...this.searchFrom
-          // CORPINFO_ID: this.loginUserCorpInfoId !== '' ? this.loginUserCorpInfoId : this.$parent.CORPINFO_ID
         }
       ).then((data) => {
         this.listLoading = false
         this.varList = data.varList
         this.total = data.page.totalResult
-        // this.hasButton()
         this.pd = data.pd
       }).catch((e) => {
         this.listLoading = false
@@ -405,7 +399,6 @@ export default {
     },
     // 图片上传相关的函数
     handleRemove(file, fileList) {
-      this.violationUpload = fileList.length >= 4
       this.addForm.FFILE = fileList
     },
     handleChangeIMG(file, fileList) {
@@ -415,9 +408,11 @@ export default {
         this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
         fileList.pop()
       }
-      this.violationUpload = fileList.length >= 4
       this.addForm.FFILE = fileList
     },
+    handleExceed(files, fileList) {
+      this.$message.warning('最多只能上传四张图片');
+    },
     // 点击放大图片
     handlePictureCardPreview(file) {
       this.dialogImageUrl = file.url
@@ -431,7 +426,6 @@ export default {
         return false
       } else {
         this.violation_files.push(file) // 将多个图片放到一个数组中
-        // this.addForm.FFILE = file // 将单个图片放到一个变量中
       }
     },
     // 添加弹窗的确定按钮
@@ -448,7 +442,6 @@ export default {
         'breakRulesRecord/addRecord',
         {
           ...this.addForm
-          // CORPINFO_ID: this.loginUserCorpInfoId
         }
       ).then((data) => {
         if (data.result === 'fail') {