From 7e2fdc7acc6a38ef5c1c976221852c6f8de6be0e Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 17 May 2024 17:57:27 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/enterprise_management.js | 4 ++++ src/request/operation_vehicle.js | 4 ++++ .../driving_log/drivingLog_info.vue | 4 ++-- .../waybill_registration/add.vue | 18 ++++++++++++------ .../freight_trailer/index.vue | 1 + .../operation_vehicle/index.vue | 1 + src/views/mechanical_files/insure/add.vue | 3 +++ 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/request/enterprise_management.js b/src/request/enterprise_management.js index 335638c..9212c65 100644 --- a/src/request/enterprise_management.js +++ b/src/request/enterprise_management.js @@ -62,6 +62,10 @@ export const getFreightTrailerView = (params) => post("/freightTrailer/goEdit", params); // 货运挂车查看 export const setFreightTrailerAdd = (params) => post("/freightTrailer/add", params); // 货运挂车新增 + +export const getTrailerList = (params) => + post("/freightTrailer/trailerList", params); // 货运挂车新增 + export const setFreightTrailerEdit = (params) => post("/freightTrailer/edit", params); // 货运挂车修改 export const setFreightTrailerDelete = (params) => diff --git a/src/request/operation_vehicle.js b/src/request/operation_vehicle.js index c4216ae..3916b33 100644 --- a/src/request/operation_vehicle.js +++ b/src/request/operation_vehicle.js @@ -97,6 +97,10 @@ export const findByIdOperatingVehicleInfo = (params) => export const editOperatingVehicleInfo = (params) => upload("/operatingvehicles/edit", params); // 修改运营车辆 +export const getOperationVehicleAll = (params) => + upload("/operatingvehicles/operationvehicleList", params); // 修改运营车辆 + + export const getOperationVehicleInfo = (params) => post("/operatingvehicles/findById", params); // 根据Id获取运营车辆信息 diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue index 6e2f147..624d876 100644 --- a/src/views/driving_inspections/driving_log/drivingLog_info.vue +++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue @@ -71,8 +71,8 @@ {{ item2.INQUIRYCONTENT }} - 合格 - 不合格 + 是 + 否 不涉及 diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue index 412ceb9..6cbda28 100644 --- a/src/views/electronic_waybill_management/waybill_registration/add.vue +++ b/src/views/electronic_waybill_management/waybill_registration/add.vue @@ -303,9 +303,9 @@ import LayoutDepartment from "@/components/department/index.vue"; import { getPostListAll, getUserListAll } from "@/request/data_dictionary.js"; import { getTrafficCustomerSelectList } from "@/request/customer_management.js"; import { getTrafficLocationSelectList } from "@/request/location_management.js"; -import { getOperationVehicleList } from "@/request/operation_vehicle.js"; +import { getOperationVehicleAll } from "@/request/operation_vehicle.js"; import { useRouter } from "vue-router"; -import { getFreightTrailerList } from "@/request/enterprise_management.js"; +import { getTrailerList } from "@/request/enterprise_management.js"; const formRef = ref(null); const confirmed = (rule, client, callback) => { @@ -533,8 +533,11 @@ const changeDESTINATION = () => { }; const fnVehicle = async () => { - const res = await getOperationVehicleList(); - const varList = res.varList || []; + const res = await getOperationVehicleAll(); + res.list = res.list.filter( + (item) => item.ISASSIGNED === "0" && item.ISSCRAP === "0" + ); + const varList = res.list || []; data.OperationVehicle = varList; const waybillList = await getSecurityWaybillreList(); waybillList.varList = waybillList.varList.filter((item) => { @@ -548,8 +551,11 @@ const fnVehicle = async () => { }; const fnTruck = async () => { - const res = await getFreightTrailerList(); - const varList = res.varList || []; + const res = await getTrailerList(); + res.list = res.list.filter( + (item) => item.ISASSIGNED === "0" && item.ISSCRAP === "0" + ); + const varList = res.list || []; data.OperationTruck = varList.map((item) => item.PLATE_NUMBER); }; diff --git a/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue b/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue index 1131fd1..e961fe7 100644 --- a/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue +++ b/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue @@ -108,6 +108,7 @@ 查看 { if (!INSURE_ID) { if (insureType) { data.info = await getInsureList(); + data.info.varList = data.info.varList.filter( + (item) => item.REVERT === "1" + ); data.info.varList.forEach((item) => { if (item.VEHICLE === data.busInfo.ID) { if (insureType === item.INSURANCE_COVERAGE) {