From 7874734e3188775e14af8461902303024d20d20d Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Mon, 13 May 2024 18:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E8=BF=90=E8=BD=A6=E8=BE=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=8C=E6=AD=A5=E8=A1=8C=E8=BD=A6=E4=B8=89=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../waybill_registration/add.vue              | 19 ++++++++++++++-----
 .../waybill_registration/edit.vue             |  8 ++++----
 .../waybill_registration/index.vue            |  4 +++-
 3 files changed, 21 insertions(+), 10 deletions(-)

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 @@
             >
               <el-option
                 v-for="item in data.OperationVehicle"
-                :key="item"
-                :label="item"
-                :value="item"
+                :key="item.OPERATING_ID"
+                :label="item.PLATE_NUMBER"
+                :value="item.OPERATING_ID"
               />
             </el-select>
           </el-form-item>
@@ -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 @@
             >
               <el-option
                 v-for="item in data.OperationVehicle"
-                :key="item"
-                :label="item"
-                :value="item"
+                :key="item.OPERATING_ID"
+                :label="item.PLATE_NUMBER"
+                :value="item.OPERATING_ID"
               />
             </el-select>
           </el-form-item>
@@ -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 @@
                 <el-option label="收车后" :value="2" />
                 <el-option label="已出发" :value="1" />
                 <el-option label="未出发" :value="0" />
+                <el-option label="待承诺" :value="3" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -52,7 +53,8 @@
         <el-table-column prop="WAYBILLNUMBER" label="运单编号" />
         <el-table-column prop="WAYBILLSTATUS" label="运单状态" width="80">
           <template #default="{ row }">
-            <el-tag v-if="row.WAYBILLSTATUS === '0' || row.WAYBILLSTATUS === '3'">未出发</el-tag>
+            <el-tag v-if="row.WAYBILLSTATUS === '3'">待承诺</el-tag>
+            <el-tag v-else-if="row.WAYBILLSTATUS === '0'">未出发</el-tag>
             <el-tag v-else-if="row.WAYBILLSTATUS === '1'">已出发</el-tag>
             <el-tag v-else-if="row.WAYBILLSTATUS === '2'">收车后</el-tag>
           </template>