From 9a0af9321770eca82ab462706144adc5a179912f Mon Sep 17 00:00:00 2001
From: Shan Ao <178391389@qq.com>
Date: Fri, 25 Jul 2025 17:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=A3=E9=97=A8=E9=97=A8=E7=A6=81=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E7=94=B3=E8=AF=B7=E6=9B=BF=E6=8D=A2=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/index.js                                  |  1 +
 .../door_access_control/vehicle_info/add.vue  | 20 +++++++++++++------
 .../door_access_control/vehicle_info/view.vue | 19 ++++++++++++------
 pages/mine/information/update.vue             |  2 +-
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/api/index.js b/api/index.js
index 8d8b3ce..1fe58f6 100644
--- a/api/index.js
+++ b/api/index.js
@@ -96,3 +96,4 @@ export const setVehiclemessageUpdate = (params) => post("/vehiclemessage/updateV
 export const getAuditUserList = (params) => post("/sys/user/audit/user", params);
 export const setVehiclemessageDelete = (params) => post("/vehiclemessage/deleteVehicleMessage", params);
 export const uploadSmd = (params) => upload("/busImgfiles/upload/smd", params); // 上传图片至smd（不上传到数据库，返回文件地址）
+export const getVehicleTypeList = () => post("/app/dictionaries/getLevels", {loading: false, DICTIONARIES_ID: '20e73033ae1f81f342fa09c451f02fce'}) //获取车辆类型
diff --git a/pages/door_access_control/vehicle_info/add.vue b/pages/door_access_control/vehicle_info/add.vue
index 5e9b764..28c9d51 100644
--- a/pages/door_access_control/vehicle_info/add.vue
+++ b/pages/door_access_control/vehicle_info/add.vue
@@ -25,9 +25,6 @@
 
         <app-time v-model="form.VISIT_START_TIME" prop="VISIT_START_TIME" label="有效期开始"/>
         <app-time v-model="form.VISIT_END_TIME" prop="VISIT_END_TIME" label="有效期结束"/>
-<!--        <app-department label="审核公司" :id.sync="form.AUDITOR_DEPARTMENT_ID" :name.sync="form.AUDITOR_DEPARTMENT_NAME"-->
-<!--                        type='0'-->
-<!--                        prop="AUDITOR_DEPARTMENT_ID"/>-->
         <u-form-item label="审核公司" prop="corpInfo" borderBottom required
                      @click="fnSingleChoiceClick('corpInfoList')">
           <u-input v-model="form.corpInfoName" border="none" readonly input-align="right"/>
@@ -73,8 +70,10 @@
 import AppTime from "@/components/time/index.vue";
 import AppDepartment from "@/components/department/index.vue";
 import AppPersonnel from "@/components/personnel/index.vue";
-import {addVehicleMessage,goCheckLicenceNo,getVehiclemessageView, setVehiclemessageSave,getCorpInfoList,
-  setVehiclemessageUpdate,getAuditUserList,uploadSmd} from "@/api";
+import {
+  addVehicleMessage, goCheckLicenceNo, getVehiclemessageView, setVehiclemessageSave, getCorpInfoList,
+  setVehiclemessageUpdate, getAuditUserList, uploadSmd, getVehicleTypeList
+} from "@/api";
 export default {
   components: {
     AppTime,
@@ -96,7 +95,7 @@ export default {
         {id: "1", name: "东港区"},
         {id: "2", name: "西港区"},
       ],
-      VEHICLE_TYPE_LIST: [{id: '1', name: "轿车"}],
+      VEHICLE_TYPE_LIST: [],
       form: {
         LICENCE_TYPE: '',
         LICENCE_TYPE_NAME: '',
@@ -149,6 +148,7 @@ export default {
       this.getData();
     }
     this.getCorpInfoList()
+    this.getVehicleTypes();
   },
   computed: {
     userInfo() {
@@ -337,6 +337,14 @@ export default {
         }
       })
     },
+    async getVehicleTypes() {
+      const { list } = await getVehicleTypeList();
+      const TYPE_LIST = [];
+      for (let i = 0; i < list.length; i++){
+        TYPE_LIST.push({id: list[i].BIANMA, name: list[i].NAME})
+      }
+      this.VEHICLE_TYPE_LIST = TYPE_LIST;
+    },
   },
 }
 </script>
diff --git a/pages/door_access_control/vehicle_info/view.vue b/pages/door_access_control/vehicle_info/view.vue
index 3eb00a8..e8a06ed 100644
--- a/pages/door_access_control/vehicle_info/view.vue
+++ b/pages/door_access_control/vehicle_info/view.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { getVehiclemessageView } from "@/api";
+import { getVehiclemessageView, getVehicleTypeList } from "@/api";
 
 export default {
   data() {
@@ -67,11 +67,7 @@ export default {
         3: "绿牌",
         4: "黑牌",
       },
-      VEHICLE_TYPE_MAP: {
-        0: "货车",
-        1: "轿车",
-        2: "大巴客车",
-      },
+      VEHICLE_TYPE_MAP: {},
       VEHICLE_PORT_MAP: {
         0: "全部",
         1: "东港区",
@@ -81,6 +77,7 @@ export default {
   },
   onShow() {
     this.getData()
+    this.getVehicleTypes();
   },
   methods: {
     async getData() {
@@ -93,6 +90,16 @@ export default {
         this.info.vehicleImgs[i].FILEPATH = this.$filePath + resData.pd.vehicleImgs[i].filepath;
       }
     },
+    async getVehicleTypes() {
+      const { list } = await getVehicleTypeList();
+      const TYPE_LIST = [];
+      for (let i = 0; i < list.length; i++){
+        TYPE_LIST.push({id: list[i].BIANMA, name: list[i].NAME})
+      }
+      const TYPE_MAP = new Map(TYPE_LIST.map(item => [item.id, item.name]));
+      // 如果你需要将 Map 转换为普通对象
+      this.VEHICLE_TYPE_MAP = Object.fromEntries(TYPE_MAP);
+    }
   }
 }
 </script>
diff --git a/pages/mine/information/update.vue b/pages/mine/information/update.vue
index 97f37a2..5c593ae 100644
--- a/pages/mine/information/update.vue
+++ b/pages/mine/information/update.vue
@@ -1079,7 +1079,7 @@ export default {
         setTimeout(() => {
           var pages = getCurrentPages(); // 获取当前页面栈
           var prePage = pages[pages.length - 2]; // 上级页面
-          if (prePage.route == 'pages/related_party_units/view') {
+          if (prePage.route === 'pages/related_party_units/view') {
             prePage.$vm.reloadx();
           }
           uni.navigateBack()