From a225e01cd9de89e74f2ba85e06f429d8ac08dd37 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 22 Jan 2024 10:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/projectorder/detail.vue    | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
index c66ef614..6bfbadec 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue
@@ -7,35 +7,31 @@
       <img src="/src/assets/imgs/status/status16.png" v-if="formData.orderStatus == 16" alt="" />
       <img src="/src/assets/imgs/status/status3.png" v-else-if="formData.orderStatus == 3" alt="" />
       <img src="/src/assets/imgs/status/status8.png" v-else-if="formData.orderStatus == 8" alt="" />
-      <div
-        v-else-if="query.active != 'detailArchive' && formData.orderStatus == 32"
-        class="shipments"
-      >
-        <div v-if="formData.deliveryStatus == 3">
-          <span class="shipmentsfont">已发货</span>
-        </div>
+      <div v-else-if="formData.orderStatus == 32">
+        <div v-if="query.active != 'detailArchive'">
+          <div v-if="formData.deliveryStatus == 3">
+            <span class="shipmentsfont">已发货</span>
+          </div>
 
-        <div v-else>
-          <span
-            v-if="betweenDay(new Date(), new Date(formData.projectEndTime)) == -1"
-            class="shipmentsfont"
-            >距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
-          </span>
-          <span
-            v-else-if="betweenDay(new Date(), new Date(formData.projectEndTime)) < -1"
-            class="shipmentsfont"
-            >距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
-          </span>
-          <span v-else class="shipmentsfont"
-            >距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
-          </span>
+          <div v-else class="shipments">
+            <span
+              v-if="betweenDay(new Date(), new Date(formData.projectEndTime)) == -1"
+              class="shipmentsfont"
+              >距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
+            </span>
+            <span
+              v-else-if="betweenDay(new Date(), new Date(formData.projectEndTime)) < -1"
+              class="shipmentsfont"
+              >距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
+            </span>
+            <span v-else class="shipmentsfont"
+              >距交货还有{{ betweenDay(new Date(), new Date(formData.projectEndTime)) + 1 }}天
+            </span>
+            <img src="/src/assets/imgs/status/status32.png" alt="" />
+          </div>
         </div>
+        <img v-else src="/src/assets/imgs/status/status32.png" alt="" />
       </div>
-      <img
-        v-else-if="formData.orderStatus == 32"
-        src="/src/assets/imgs/status/status32.png"
-        alt=""
-      />
       <img
         src="/src/assets/imgs/status/status64.png"
         v-else-if="formData.orderStatus == 64"