BUG优化

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) =>

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获取运营车辆信息
 

src/views/driving_inspections/driving_log/drivingLog_info.vue

@@ -71,8 +71,8 @@
                 <td>{{ item2.INQUIRYCONTENT }}</td>
 
                 <td>
-                  <el-tag v-if="item2.STATUS === '0'">合格</el-tag>
-                  <el-tag v-else-if="item2.STATUS === '1'">不合格</el-tag>
+                  <el-tag v-if="item2.STATUS === '0'">是</el-tag>
+                  <el-tag v-else-if="item2.STATUS === '1'">否</el-tag>
                   <el-tag v-else>不涉及</el-tag>
                 </td>
               </tr>

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);
 };
 

src/views/enterprise_management/basics_info_management/freight_trailer/index.vue

@@ -108,6 +108,7 @@
               查看
             </el-button>
             <el-button
+              v-if="row.ISSCRAP === '0' && row.ISASSIGNED === '0'"
               type="primary"
               text
               link

src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue

@@ -135,6 +135,7 @@
             </el-button>
 
             <el-button
+              v-if="row.ISSCRAP === '0' && row.ISASSIGNED === '0'"
               type="primary"
               text
               link

src/views/mechanical_files/insure/add.vue

@@ -359,6 +359,9 @@ const insureType = async (rule, insureType, callback) => {
   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) {