From 662ec0e0fcc41ac08249e009472525a838f8f2f4 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Mon, 17 Feb 2025 10:12:31 +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-=20bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auditChronicallyCar/components/list.vue   | 12 +--
 .../vehiclemessage/components/list.vue        | 48 ++++++-----
 .../blacklistmanage/components/list.vue       | 81 +++++--------------
 3 files changed, 54 insertions(+), 87 deletions(-)

diff --git a/src/views/longtermvehicleinputportmessage/auditChronicallyCar/components/list.vue b/src/views/longtermvehicleinputportmessage/auditChronicallyCar/components/list.vue
index 02c2426..3fe9f8a 100644
--- a/src/views/longtermvehicleinputportmessage/auditChronicallyCar/components/list.vue
+++ b/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 = {
-        LICENCE_NO: '' // 车牌号（输入框）
-      }
-      this.$refs.selectTree_Search1.clearHandle() // 清空
-      this.$refs.selectTree_Search2.clearHandle()
+      this.searchFrom.LICENCE_NO = ''
+      this.searchFrom.VEHICLE_DEPARTMENT_NAME = ''
+      this.searchFrom.RELEVANT_UNIT_NAME = ''
+      this.searchFrom.USER_NAME = ''
+      this.$refs.selectTree_Search1.clearHandle()
     },
     getUserList(DEPARTMENT_ID) { // 根据部门获取部门内的人员
       requestFN(
diff --git a/src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue b/src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue
index e0ee290..3a075a3 100644
--- a/src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue
+++ b/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">
-          <SelectTree
-            ref="selectTree_edit"
-            :clearable="true"
+        <el-form-item v-show="roleName !== '普通用户角色'" label="车辆所属部门">
+          <Treeselect
             :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.$refs.selectTree_edit.handleNodeClick(node)
-            })
-          }
+          this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
+          this.getQYUserList(data.pd.VEHICLE_DEPARTMENT_ID)
         } 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,
-          tm: new Date().getTime()
+          DEPARTMENT_ID: e.id
         }
       ).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
       })
     },
     // 添加弹窗中的车辆责任人
diff --git a/src/views/vehiclebreakrulesmanage/blacklistmanage/components/list.vue b/src/views/vehiclebreakrulesmanage/blacklistmanage/components/list.vue
index 9815887..5ca2c32 100644
--- a/src/views/vehiclebreakrulesmanage/blacklistmanage/components/list.vue
+++ b/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
-            ref="selectTree_add2"
-            :clearable="false"
-            :options="licenceTypeList"
-            :props="oneselfDefaultProps"
-            v-model="addForm.LICENCE_TYPE"
-            placeholder="请选择车牌类型"
-            style="width: 300px"/>
+          <el-select v-model="addForm.LICENCE_TYPE" label-width="110px">
+            <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="车辆类型" label-width="110px" prop="VEHICLE_TYPE">
-          <SelectTree
-            ref="selectTree_add3"
-            :clearable="false"
-            :options="vehicleTypeList"
-            :props="oneselfDefaultProps"
-            v-model="addForm.VEHICLE_TYPE"
-            placeholder="请选择车辆类型"
-            style="width: 300px"/>
+          <el-select v-model="addForm.VEHICLE_TYPE" label-width="110px">
+            <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+          </el-select>
         </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('请输入车牌号')
-        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('验证通过')
-          this.ISCHECK = true
-        } else {
-          this.$message.success('车牌号不规范')
-          this.ISCHECK = false
-        }
+        return
+      }
+      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) {
+        requestFN(
+          '/vehiclemessage/licenceNo',
+          {
+            'licenceNo': this.addForm.LICENCE_NO
+          }
+        ).then((data) => {
+          this.addForm.LICENCE_TYPE = String(data.res.LICENCE_TYPE)
+          this.addForm.VEHICLE_TYPE = String(data.res.VEHICLE_TYPE)
+        })
       }
     }
   }