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 @@ - - - @@ -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; + }, }, } 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 @@ 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()