From fe14aa86a62630614c4929f9c71d1c9960d14121 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 25 Jul 2024 11:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/artery/AddVehicleStowage.vue | 20 ++++++++++++++-----
 .../reservation/reservationDetails.vue        |  8 +++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 373e5f6f..119bed33 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -647,8 +647,13 @@
     </tablecmt>
 
     <div class="flex-c-c">
-      <el-button @click="details.popUpShow.problemDataVisited = false">取消</el-button>
-      <el-button type="primary" icon="Promotion" @click="handleSubmitProblemData"> 提交 </el-button>
+      <!-- 关闭 -->
+      <el-button icon="CircleClose" @click="details.popUpShow.problemDataVisited = false">
+        关闭
+      </el-button>
+
+      <!-- 挂载 -->
+      <el-button type="primary" icon="Promotion" @click="handleSubmitProblemData"> 挂载 </el-button>
     </div>
   </el-dialog>
 
@@ -1742,7 +1747,7 @@ const handleRemoveWaybill = async (index: number) => {
 const remoteMethodDriver = async val => {
   // if (!val) return;
 
-  const res = await postFindDriverListByName({ driverName: val });
+  const res = await postFindDriverListByName({ driverName: val, driverType: 1 });
   const { code, data } = res.data;
   if (code !== 200) return;
   details.driverListByName = data;
@@ -2027,8 +2032,6 @@ const editSubmit = async () => {
       // 新增的订单
       const _addArr = [];
 
-      console.log('Object.keys(_item).length === 0 :>> ', Object.keys(_item).length === 0);
-
       // 未找到数据，则该节点为新增节点
       if (Object.keys(_item).length === 0) {
         val.updateType = 2;
@@ -2190,6 +2193,13 @@ const nodeCostSubmit = async () => {
 const handleSubmit = (formEl: FormInstance | undefined) => {
   if (details.nodeInfoData.length <= 1) return ElMessage.warning('最少存在一个目的仓');
 
+  if (details.problemDataByReal.length > 0) {
+    details.problemInfo.activeName = 'real';
+    handleShowProblemData();
+
+    return ElMessage.warning('存在装车数据未挂载目的仓，请处理后提交');
+  }
+
   if (btnLoadingObj.submitBtn) return;
   if (!formEl) return;
   formEl.validate((valid, fields) => {
diff --git a/src/views/distribution/reservation/reservationDetails.vue b/src/views/distribution/reservation/reservationDetails.vue
index 5d5675fe..9b0a9688 100644
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
@@ -242,7 +242,13 @@
         </el-form-item>
       </el-dialog>
 
-      <MyPrint :html="html" v-model="dialogVisibleF" :isShowExport="false" width="780px"></MyPrint>
+      <MyPrint
+        :html="html"
+        v-model="dialogVisibleF"
+        :isShowExport="false"
+        type="titlePrint"
+        width="780px"
+      ></MyPrint>
 
       <el-dialog v-model="dialogVisible" title="增值服务" width="30%">
         <!--                :before-close="handleClose"-->