From 762bf26694a727b52c51ffb018e59f520a281bf5 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 5 Jul 2024 17:39:15 +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 |  2 +-
 .../artery/VehicleArrivalManagement.vue       |  7 +--
 .../distribution/artery/VehicleStowage.vue    | 15 ++----
 .../artery/addTripartiteTransfer.vue          | 49 ++++++++++++++++---
 .../artery/truckLoadingDetails.vue            | 34 ++++++++-----
 .../distribution/inventory/CreateOrder.vue    |  2 +-
 .../addArteryDistrilbutionBillLadingList.vue  |  2 +
 7 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 96e7ae57..4c66d644 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -1585,7 +1585,7 @@ const remoteMethodDriver = async val => {
   details.driverListByName = data;
 };
 
-// 初始化空调
+// 初始化司机
 remoteMethodDriver('');
 
 /** 查询车辆信息 */
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue
index 6bd2c3c2..f04ebf00 100644
--- a/src/views/distribution/artery/VehicleArrivalManagement.vue
+++ b/src/views/distribution/artery/VehicleArrivalManagement.vue
@@ -295,12 +295,7 @@
               </span>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item
-                    v-if="
-                      Mydata.id === slotProps.scope.row.nowWarehouseId &&
-                      Number(slotProps.scope.row.loadStatus) === 20
-                    "
-                  >
+                  <el-dropdown-item v-if="Mydata.id === slotProps.scope.row.nowWarehouseId">
                     <el-text @click="handleNodeCost(slotProps.scope)"> 节点费用 </el-text>
                   </el-dropdown-item>
 
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 5bc98db8..d3eac91d 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -9,7 +9,6 @@
             <el-input v-model="query.serviceNumber" placeholder="请输入车次号" clearable></el-input>
           </el-form-item>
           <el-form-item label="提货时间:" class="el-times">
-            <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
             <el-date-picker
               v-model="stockupDate"
               type="daterange"
@@ -22,8 +21,8 @@
               clearable
             />
           </el-form-item>
+
           <el-form-item label="实际发车:" class="el-times">
-            <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
             <el-date-picker
               v-model="stockupDate"
               type="daterange"
@@ -36,8 +35,8 @@
               clearable
             />
           </el-form-item>
+
           <el-form-item label="创建时间:" class="el-times">
-            <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
             <el-date-picker
               v-model="stockupDate"
               type="daterange"
@@ -270,12 +269,7 @@
                 <template #dropdown>
                   <el-dropdown-menu>
                     <!-- 节点费用 -->
-                    <el-dropdown-item
-                      v-if="
-                        permissionObj.VehicleStowage_nodeCost &&
-                        Number(slotProps.scope.row.loadStatus) === 0
-                      "
-                    >
+                    <el-dropdown-item v-if="permissionObj.VehicleStowage_nodeCost">
                       <el-text @click="handleNodeCost(slotProps.scope)"> 节点费用 </el-text>
                     </el-dropdown-item>
 
@@ -283,8 +277,7 @@
                     <el-dropdown-item
                       v-if="
                         permissionObj.VehicleStowage_handleDirectGoMarketVesited &&
-                        Number(slotProps.scope.row.loadStatus) === 0 &&
-                        Mydata.id === slotProps.scope.row.nowWarehouseId
+                        Number(slotProps.scope.row.loadStatus) !== 100
                       "
                     >
                       <el-text @click="handleDirectGoMarketVesited(slotProps.scope)">
diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index 1db1c374..60a18731 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -138,14 +138,14 @@
 
           <div style="display: flex">
             <el-form-item label="送货车辆" prop="driverName" class="flex1 mr10">
-              <el-select
+              <!-- <el-select
                 v-model="form.driverName"
                 filterable
                 :teleported="false"
                 remote
                 @change="handleNameChange"
                 reserve-keyword
-                placeholder="输入司机名称"
+                placeholder="输入车牌"
                 :remote-method="remoteMethodDriver"
                 :loading="details.loadingObj.driverName"
               >
@@ -155,7 +155,29 @@
                   :label="val.driverName"
                   :value="val.driverId"
                 />
-              </el-select>
+              </el-select> -->
+              <SelectBox
+                ref="goodsNameRef"
+                className="goodsName"
+                :input="() => debounce(handleFindCar(form.carNumber), 1000)"
+                v-model="form.carNumber"
+                placeholder="请选择车辆"
+              >
+                <div v-loading="details.loadingObj.loading">
+                  <template v-if="details.driverListByName > 0">
+                    <div
+                      v-for="val in details.driverListByName"
+                      :key="val.driverName"
+                      @click="() => handleChooseCar(val)"
+                    >
+                      {{ val.goodsName }}
+                    </div>
+                  </template>
+                  <template v-else>
+                    <div class="goodsNameRow">暂无数据</div>
+                  </template>
+                </div>
+              </SelectBox>
             </el-form-item>
 
             <el-button type="primary" @click="handleAddCarrier" icon="Plus" />
@@ -468,14 +490,13 @@ import { downloadXls, computeNumber, setNodeHeight, debounce, deepClone } from '
 import { columnList, newColumnList } from '@/option/distribution/addVehicleStowage';
 import {
   postloadFindLoadInitData,
-  postFindWarehouseListByName,
   postFindAllOrderList,
-  postFindCarListByName,
   postFindDriverListByName,
   postFindCarrierByName,
   postFindUseOrderList,
+  postSelectEditDetailByLoadId,
+  postFindCarListByName
 } from '@/api/distribution/AddVehicleStowage';
-import { postSelectEditDetailByLoadId } from '@/api/distribution/AddVehicleStowage';
 import {
   postSaveNewTripartiteTransfer,
   postUpdateTripartiteTransfer,
@@ -894,6 +915,17 @@ const remoteMethodDriver = async val => {
 
 remoteMethodDriver('');
 
+/** 查询车辆 */
+const handleFindCar = async value => {
+   const res = await postFindCarListByName({ carNumber: value });
+  const { code, data } = res.data;
+  if (code !== 200) return;
+  details.carListByName = data;
+};
+
+/** 选择车辆 */
+const handleChooseCar = val => {};
+
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
@@ -1214,6 +1246,11 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
 :deep(.el-select) {
   width: 100%;
+  height: 100%;
+}
+
+:deep(.selectBox) {
+  height: 100%;
 }
 
 :deep(.el-input-number) {
diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue
index e03d2262..bf0c7522 100644
--- a/src/views/distribution/artery/truckLoadingDetails.vue
+++ b/src/views/distribution/artery/truckLoadingDetails.vue
@@ -768,8 +768,6 @@ const currentChange = pageNum => {
   onLoad();
 };
 
-
-
 /** 弹出层开启前清除数据 */
 const beforeClose = done => {
   done();
@@ -1266,19 +1264,31 @@ const handleBatchBarcode = async () => {
       orderPackageCodes: _arr.map(val => val.scanCode).join(','),
     };
 
-    const [res, zeroRes] = await Promise.all([
-      getShowAdvancePackgeCode(qr),
-      postShowOrderCode({ ids: _zeroArr.map(val => val.id).join(',') }),
-    ]);
+    details.html = '';
+    const _promiseArr = [];
 
-    // const res = await getShowAdvancePackgeCode(qr);
+    _arr.length > 0 &&
+      _promiseArr.push(
+        getShowAdvancePackgeCode(qr).then(res => {
+          const { code, data } = res.data;
+          if (code !== 200) return;
+
+          details.html += getHtmls(data.dataList, data.templateHtml);
+        })
+      );
+    _zeroArr.length > 0 &&
+      _promiseArr.push(
+        postShowOrderCode(qr).then(res => {
+          const { code, data } = res.data;
+          if (code !== 200) return;
+
+          details.html += getHtmls(data.dataList, data.templateHtml);
+        })
+      );
+
+    await Promise.all(_promiseArr);
 
-    if (res.data.code !== 200 || zeroRes.data.code !== 200) return;
     details.popUpShow.QRCodeVisible = true;
-    console.log(res.data);
-    details.html = '';
-    details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
-    details.html += getHtmls(zeroRes.data.data.dataList, zeroRes.data.data.templateHtml);
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 8fa15685..f54ee182 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -3007,7 +3007,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
         const response = await postUpdateWaybillVerify(submitData);
         if (response.data.code !== 200) return;
 
-        if (!response.data.data || response.data.data.length === 0)
+        if (!response.data.data && response.data.data.length === 0)
           return ElMessage.warning('没有更改的数据');
 
         details.changeData = response.data.data;
diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
index c4497036..a3ec21c1 100644
--- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
@@ -1099,6 +1099,7 @@ const addSubmit = async nodeArr => {
       _submitData.billladingWaybillList.push({
         waybillId: item.waybillId,
         waybillNo: item.waybillNo,
+        noBillladingNum: item.noBillladingNum,
         planNum: item.planNum,
       });
     }
@@ -1155,6 +1156,7 @@ const editSubmit = async nodeArr => {
       _submitData.billladingWaybillList.push({
         waybillId: item.waybillId,
         waybillNo: item.waybillNo,
+        noBillladingNum: item.noBillladingNum,
         planNum: item.planNum,
       });
     }