From 6e97be203c268be371cf3a3598f1eb3b5e97afc6 Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Thu, 2 Nov 2023 10:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9B=B6=E6=8B=85=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=EF=BC=8C=E9=AB=98=E5=BA=A6=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/turndelivery/devtmp.vue      | 50 +++++++------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/views/distribution/turndelivery/devtmp.vue b/src/views/distribution/turndelivery/devtmp.vue
index 298b3eb1..a8dabe81 100644
--- a/src/views/distribution/turndelivery/devtmp.vue
+++ b/src/views/distribution/turndelivery/devtmp.vue
@@ -390,11 +390,11 @@
                   </div>
                 </div>
                 <!-- 弹窗组件 -->
-                <div class="addlalog addlalogS">
+                <div class="addlalog addlalogS" >
                   <el-dialog v-model="AddLalog" :title="wrapLoading ? '包件信息' : '在库订单信息'">
                     <!-- 表格列开始 -->
                     <!-- data 订单信息  wrapData包件信息 -->
-                    <div class="SoInput" v-show="searchSo" ref="SoHeight">
+                    <div class="SoInput" v-if="searchSo" ref="SoHeight">
                       <el-form label-width="100px" :model="parameter">
                         <el-form-item label="商场名称:">
                           <el-input
@@ -487,7 +487,7 @@
                     <el-table
                       :data="wrapLoading ? wrapData : data"
                       border
-                      :height="searchSo ? 512 : 600 + 'px'"
+                      :height="searchSo? '500': '580'"
                       style="width: 100%"
                       ref="tableRefs"
                       @select-all="selectAll"
@@ -693,7 +693,7 @@
     <!-- 弹窗组件 -->
     <div class="addlalog addlalogS">
       <!-- <el-dialog v-model="SjTc" title="司机信息配置"> -->
-      <el-dialog v-model="comprehensive" title="零担品类信息">
+      <el-dialog v-model="comprehensive" :title="SjTc ? '司机配置' : '零担品类信息'">
         <!-- 司机信息弹窗  -->
         <el-table v-if="SjTc" :data="DvInfoData" border style="width: 100%">
           <el-table-column prop="driverName" label="司机信息" />
@@ -704,13 +704,12 @@
             </template>
           </el-table-column>
         </el-table>
-
         <!-- EnteringLibrary在库录入 -->
-        <div Class="iszer">
-          <!-- <span style="font-weight: bold; display: block; padding-bottom: 10px"
+        <div Class="iszer" v-if="EnteringLibrary">
+          <span style="font-weight: bold; display: block; padding-bottom: 10px"
             >在库总数:{{ dataInfo[dataId].handQuantity }}</span
-          > -->
-          <el-table v-if="EnteringLibrary" :data="isZeroTable" border style="width: 100%">
+          >
+          <el-table :data="isZeroTable" border style="width: 100%">
             <el-table-column fixed prop="firsts" label="名称" />
             <el-table-column prop="quantity" label="数量" />
             <el-table-column prop="handQuantity" label="在库数量" />
@@ -835,11 +834,12 @@ const labelPosition = ref<FormProps['labelPosition']>('right');
 const SoInfoData = ref(); //搜索框
 const parameter = ref({}); //搜索框参数
 const wrapTemp = ref([]); //包件选中项暂存
-const EnteringLibrary = ref(true); //在库录入按钮
+const EnteringLibrary = ref(false); //在库录入按钮
 const QuantityEntryS = ref(false); //数量录入按钮
 const isZeroTable = ref([]); //零担表格
 const comprehensive = ref(false); //司机,零担弹窗
 const QuantityEntryStatus = ref(false); //零担数量录入状态
+const TCzj = ref(); //弹窗组件实例
 // 司机选择信息
 // 车辆选项
 // 备货人员
@@ -1776,25 +1776,6 @@ const EditEvent = val => {
   // 接收点击编辑当前行数据
   console.log('触发了编辑事件', val);
 };
-// 表格自动全选
-// const toggleSelection = (val = true, data, dataInfo = wrapData.value,index=0) => {
-//   //对表单进行循环把所有表格进行全部选中,或者通过IF对条件满足进行选中
-//   const setIn = setTimeout(() => {
-//     if (val) {
-//       // tableRefs.value[0]弹窗表格
-//       dataInfo.forEach((row, i) => {
-//         tableRefs.value[index].toggleRowSelection(dataInfo[i], true);
-//       });
-//     } else {
-//       dataInfo.forEach((row, i) => {
-//         if (row.id == data[i]) {
-//           tableRefs.value[index].toggleRowSelection(dataInfo[i], true);
-//         }
-//       });
-//     }
-//     clearTimeout(setIn); //清除定时器
-//   }, 0);
-// };
 
 const toggleSelection = options => {
   const { val = true, data, dataInfo = wrapData.value, index = 0 } = options;
@@ -1895,6 +1876,7 @@ const Entering = val => {
   comprehensive.value = true; //开启弹窗
   EnteringLibrary.value = true; //显示零担
   QuantityEntryStatus.value = false; //关闭零担录入
+  SjTc.value = false; //关闭司机弹窗
   console.log('在库录入', val);
 
   getZeroOrderDetail(val.id).then(res => {
@@ -1908,6 +1890,7 @@ const QuantityEntry = val => {
   comprehensive.value = true; //开启弹窗
   QuantityEntryStatus.value = true; //此时开启零担录入
   EnteringLibrary.value = true; //显示零担
+  SjTc.value = false; //关闭司机弹窗
   getZeroOrderDetail(val.id).then(res => {
     console.log(res, '数量录入返回信息');
     isZeroTable.value = res.data.data;
@@ -1919,9 +1902,9 @@ const ModifyLCL = () => {
     console.log(res, '修改零担');
     console.log(isZeroTable.value, '修改零担的值');
   });
-  comprehensive.value = false; //开启弹窗
-  QuantityEntryStatus.value = false; //此时开启零担录入
-  EnteringLibrary.value = false; //显示零担
+  comprehensive.value = false; //关闭弹窗
+  QuantityEntryStatus.value = false; //此时关闭零担录入
+  EnteringLibrary.value = false; //关闭零担
 };
 // 零担提交
 const SubmitLoad = () => {
@@ -1936,7 +1919,7 @@ const SubmitLoad = () => {
       console.log(isZeroTable.value, '提交零担的值');
     });
   }
- comprehensive.value = false; //关闭弹窗
+  comprehensive.value = false; //关闭弹窗
   EnteringLibrary.value = false; //关闭零担
   QuantityEntryStatus.value = false; //此时开启零担录入
 };
@@ -2177,6 +2160,7 @@ const merge = (val, kindS) => {
   }
   comprehensive.value = true; //开启弹窗
   SjTc.value = true;
+  EnteringLibrary.value = false; //关闭零担弹窗
 };
 
 // 查看司机合并数据