From a8d84d7f7ccad04e8db09b9c01e07aff9b22383f Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 29 Aug 2024 09:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=89=E6=96=B9=E5=8F=91?=
 =?UTF-8?q?=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artery/TripartiteTransfer.vue             | 36 ++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index a3e14de1..eaeda1e3 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -275,7 +275,7 @@
           action="/api/blade-resource/oss/endpoint/put-file"
           list-type="picture-card"
           :on-preview="handlePictureCardPreview"
-          :headers="details.header"
+          :headers="details.headers"
           :on-remove="handleRemove"
           :before-upload="handleBeforeUpload"
           :on-success="handleSiginImgSuccess"
@@ -426,15 +426,29 @@
   <DeleteWarningDialog
     v-model="details.popUpShow.tipVisted"
     :width="'600'"
-    title="取消计划警告！"
-    confirmButtonText="确认取消"
+    title="异常发车警告！"
+    confirmButtonText="确认异常"
     @close="details.popUpShow.tipVisted = false"
     @confirm="startCar"
   >
     <template #content>
+      <div>
+        <el-text class="mx-1" size="large">
+          <el-icon><StarFilled /></el-icon>
+          装车数：{{ details.abnormalInfo.loadingNum || 0 }}
+        </el-text>
+      </div>
+
+      <div>
+        <el-text class="mx-1" size="large">
+          <el-icon><StarFilled /></el-icon>
+          卸车数：{{ details.abnormalInfo.unloadNum || 0 }}
+        </el-text>
+      </div>
+
       <el-text class="mx-1" size="large">
         <el-icon><StarFilled /></el-icon>
-        数据存在<strong>已备货</strong>状态,请<strong>仔细核验数据</strong>,避免误操作！<br />
+        存在<strong>未卸车数据</strong>，避免误操作！<br />
         如果核验无误请继续执行...
       </el-text>
     </template>
@@ -646,11 +660,15 @@ const details = reactive<any>({
   loadId: '',
   /** 在上传图片的中转批次号 */
   carsNo: '',
-  header: computed(() => {
-    return { 'Blade-Auth': 'Bearer ' + getToken() };
-  }),
   // 图片上传必须携带TOKEN
   headers: { 'Blade-Auth': 'Bearer ' + getToken() },
+  /** 异常信息 */
+  abnormalInfo: {
+    /** 装车数 */
+    loadingNum: 0,
+    /** 卸车数 */
+    unloadNum: 0,
+  },
 });
 
 /** 表格实例 */
@@ -1098,8 +1116,10 @@ const handleConfirmStartCar = async () => {
     if (!data.loadingNum) return ElMessage.warning('未存在装车数据，无法发车');
     if (!data.unloadNum) return ElMessage.warning('未存在卸车数据，无法发车');
 
+    details.abnormalInfo = data || {};
+
     // 装车和卸车数据一致, 正常发车
-    if (data.loadingNum === data.unloadNum) {
+    if (data.loadingNum <= data.unloadNum) {
       ElMessageBox.confirm('确认发车吗?', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',