[问题修复](pet_门口门禁):

- bug修复

src/views/longtermvehicleinputportmessage/auditChronicallyCar/components/list.vue

@@ -11,7 +11,7 @@
           <el-form-item label="车辆类型" prop="VEHICLE_TYPE">
             <SelectTree
               ref="selectTree_Search1"
-              :clearable="false"
+              :clearable="true"
               :options="vehicleTypeList"
               :props="vehicleDefaultProps"
               v-model="searchFrom.VEHICLE_TYPE"
@@ -390,11 +390,11 @@ export default {
       })
     },
     resetSearch() {
-      this.searchFrom = {
+      this.searchFrom.LICENCE_NO = ''
-        LICENCE_NO: '' // 车牌号（输入框）
+      this.searchFrom.VEHICLE_DEPARTMENT_NAME = ''
-      }
+      this.searchFrom.RELEVANT_UNIT_NAME = ''
-      this.$refs.selectTree_Search1.clearHandle() // 清空
+      this.searchFrom.USER_NAME = ''
-      this.$refs.selectTree_Search2.clearHandle()
+      this.$refs.selectTree_Search1.clearHandle()
     },
     getUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
       requestFN(

src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue

@@ -203,16 +203,15 @@
           </el-select>
         </el-form-item>
         <!-- 车辆所属部门下拉框 -->
-        <el-form-item v-show="roleName !== '普通用户角色'" label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
+        <el-form-item v-show="roleName !== '普通用户角色'" label="车辆所属部门">
-          <SelectTree
+          <Treeselect
-            ref="selectTree_edit"
-            :clearable="true"
             :options="departmentTreeData"
-            :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 v-show="roleName === '普通用户角色'" label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
           <el-input v-model="loginDepartmentName" disabled/>
@@ -358,6 +357,13 @@ export default {
         label: 'NAME',
         children: 'nodes'
       },
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
       departmentTreeData: [],
       // inspectionTypeList: [], //字典列表
       // 列表展示的数据
@@ -581,15 +587,8 @@ 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.getQYUserList(data.pd.VEHICLE_DEPARTMENT_ID)
-              this.$refs.selectTree_edit.handleNodeClick(node)
-            })
-          }
         } else {
           this.$message({
             message: '数据回显失败',
@@ -757,17 +756,26 @@ export default {
       this.getUserList(DEPARTMENT_ID)
       this.handleDepartmentUpdateChange(DEPARTMENT_ID)
     },
-    getUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
+    getUserList(e) { // 根据部门获取部门内的人员
       requestFN(
         '/user/listAll',
         {
-          DEPARTMENT_ID: DEPARTMENT_ID,
+          DEPARTMENT_ID: e.id
-          tm: new Date().getTime()
         }
       ).then((data) => {
         this.userList = data.userList
-      }).catch((e) => {
+      })
-        // this.listLoading = false
+    },
+    getQYUserList(DEPARTMENT_ID) {
+      console.log('----------------------')
+      requestFN(
+        '/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID
+        }
+      ).then((data) => {
+        console.info(data)
+        this.userList = data.userList
       })
     },
     // 添加弹窗中的车辆责任人

src/views/vehiclebreakrulesmanage/blacklistmanage/components/list.vue

@@ -79,25 +79,15 @@
         </el-form-item>
         <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
         <el-form-item label="车牌类型" label-width="110px" prop="LICENCE_TYPE">
-          <SelectTree
+          <el-select v-model="addForm.LICENCE_TYPE" label-width="110px">
-            ref="selectTree_add2"
+            <el-option v-for="item in licenceTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
-            :clearable="false"
+          </el-select>
-            :options="licenceTypeList"
-            :props="oneselfDefaultProps"
-            v-model="addForm.LICENCE_TYPE"
-            placeholder="请选择车牌类型"
-            style="width: 300px"/>
         </el-form-item>
         <!-- 货车、轿车、大巴客车 下拉框-->
         <el-form-item label="车辆类型" label-width="110px" prop="VEHICLE_TYPE">
-          <SelectTree
+          <el-select v-model="addForm.VEHICLE_TYPE" label-width="110px">
-            ref="selectTree_add3"
+            <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
-            :clearable="false"
+          </el-select>
-            :options="vehicleTypeList"
-            :props="oneselfDefaultProps"
-            v-model="addForm.VEHICLE_TYPE"
-            placeholder="请选择车辆类型"
-            style="width: 300px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -224,19 +214,6 @@ export default {
     getRowKey(row) {
       return row.BLACK_LIST_ID
     },
-    // 获取数据字典数据
-    // getDict: function() {
-    //   requestFN(
-    //     '/dictionaries/listSelectTree',
-    //     {
-    //       DICTIONARIES_ID: '60e6481d96e44a5390ff5c347c4d1ffe' // 检查类型
-    //     }
-    //   ).then((data) => {
-    //     this.inspectionTypeList = JSON.parse(data.zTreeNodes)
-    //   }).catch((e) => {
-    //
-    //   })
-    // },
     // 获得部门树
     getDepartmentTreeData() {
       requestFN(
@@ -247,20 +224,6 @@ export default {
       }).catch((e) => {
       })
     },
-    getLoginUserInfo() { // 获取登录人信息
-      return new Promise((resolve) => {
-        requestFN(
-          '/user/goEditMyInfo',
-          {}
-        ).then((data) => {
-          this.loginUserId = data.pd.USER_ID
-          this.loginUserName = data.pd.NAME
-          resolve('ok')
-        }).catch((e) => {
-
-        })
-      })
-    },
     // 搜索按钮的点击事件
     getQuery() {
       // vehicleMessageTable 需要置空表格的ref值
@@ -358,12 +321,6 @@ export default {
         if (this.licenceTypeList[i].ID == id) return this.licenceTypeList[i].NAME
       }
     },
-    // 违规类型
-    translateViolationType(id) {
-      for (var i = 0; i < this.violationTypeList.length; i++) {
-        if (this.violationTypeList[i].ID == id) return this.violationTypeList[i].NAME
-      }
-    },
     reSetDetail() {
       this.detailForm.LICENCE_NO = ''
       this.detailForm.LICENCE_TYPE = ''
@@ -427,18 +384,20 @@ export default {
     // 检查车牌号是否规范
     goCheckLicenceNo() {
       if (this.addForm.LICENCE_NO === '') {
-        this.$message.success('请输入车牌号')
+        return
-        this.ISCHECK = false
+      }
-      } else {
       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) {
-          this.$message.success('验证通过')
+        requestFN(
-          this.ISCHECK = true
+          '/vehiclemessage/licenceNo',
-        } else {
+          {
-          this.$message.success('车牌号不规范')
+            'licenceNo': this.addForm.LICENCE_NO
-          this.ISCHECK = false
           }
+        ).then((data) => {
+          this.addForm.LICENCE_TYPE = String(data.res.LICENCE_TYPE)
+          this.addForm.VEHICLE_TYPE = String(data.res.VEHICLE_TYPE)
+        })
       }
     }
   }