diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue
index 7d8b235..412ceb9 100644
--- a/src/views/electronic_waybill_management/waybill_registration/add.vue
+++ b/src/views/electronic_waybill_management/waybill_registration/add.vue
@@ -59,9 +59,9 @@
>
@@ -294,6 +294,7 @@
import {
addSafetyWaybillreView,
getUserPersonTypeListAll,
+ getSecurityWaybillreList,
} from "@/request/waybill_registration.js";
import { onMounted, reactive, ref, watchEffect } from "vue";
import useFormValidate from "@/assets/js/useFormValidate.js";
@@ -534,7 +535,16 @@ const changeDESTINATION = () => {
const fnVehicle = async () => {
const res = await getOperationVehicleList();
const varList = res.varList || [];
- data.OperationVehicle = varList.map((item) => item.PLATE_NUMBER);
+ data.OperationVehicle = varList;
+ const waybillList = await getSecurityWaybillreList();
+ waybillList.varList = waybillList.varList.filter((item) => {
+ return item.WAYBILLSTATUS !== "2";
+ });
+ waybillList.varList.forEach((item1) => {
+ data.OperationVehicle = data.OperationVehicle.filter((item2) => {
+ return item2.PLATE_NUMBER !== item1.TRANSPORTVEHICLE;
+ });
+ });
};
const fnTruck = async () => {
@@ -671,7 +681,6 @@ onMounted(async () => {
await fnVehicle();
await fnTruck();
});
-
const fnSubmit = async () => {
await useFormValidate(formRef);
const formData = new FormData();
diff --git a/src/views/electronic_waybill_management/waybill_registration/edit.vue b/src/views/electronic_waybill_management/waybill_registration/edit.vue
index cea4749..613ad4e 100644
--- a/src/views/electronic_waybill_management/waybill_registration/edit.vue
+++ b/src/views/electronic_waybill_management/waybill_registration/edit.vue
@@ -59,9 +59,9 @@
>
@@ -550,7 +550,7 @@ fnGetUnitsList();
const fnVehicle = async () => {
const res = await getOperationVehicleList();
const varList = res.varList || [];
- data.OperationVehicle = varList.map((item) => item.PLATE_NUMBER);
+ data.OperationVehicle = varList.map((item) => item);
};
const fnTruck = async () => {
diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue
index 9683ca9..2f2ab5c 100644
--- a/src/views/electronic_waybill_management/waybill_registration/index.vue
+++ b/src/views/electronic_waybill_management/waybill_registration/index.vue
@@ -22,6 +22,7 @@
+
@@ -52,7 +53,8 @@
- 未出发
+ 待承诺
+ 未出发
已出发
收车后