From a6a78d1c1bba6586a24d9196a3a686937ddac1c8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 27 Dec 2023 17:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListedt.vue           |   7 +-
 .../turndelivery/deliveryDiscuss.vue          | 124 +++++++++++++++++-
 2 files changed, 125 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 4caad91e..f6e320b3 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -182,11 +182,12 @@
                 text
                 icon="el-icon-view"
                 @click="handleSignone(slotProps.scope.row)"
-                v-if="
+             
+                >一键签收
+                <!-- v-if="
                   slotProps.scope.row.signingStatus == '待审核' &&
                   slotProps.scope.row.driverSigning == '未签收'
-                "
-                >一键签收
+                " -->
               </el-text>
             </template>
           </tablecmt>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 90183d73..0465d54e 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -421,6 +421,9 @@
                   <el-dialog v-model="AddLalog" :title="wrapLoading ? '包件信息' : '在库订单信息'">
                     <!-- 表格列开始 -->
                     <!-- data 订单信息  wrapData包件信息 -->
+                    <div v-if="!wrapLoading"> 
+
+                  
                     <div class="SoInput" v-if="searchSo" ref="SoHeight">
                       <el-form label-width="100px" :model="parameter">
                         <el-form-item label="商场名称:">
@@ -484,6 +487,27 @@
                         搜索菜单预留按钮 
                       </div> -->
                     </div>
+                  </div>
+                  <!-- 包件搜索 -->
+                    <div v-else class="el_package"> 
+                      <el-form  :model="PackageFrom">
+                        <el-form-item label="运单号:">
+                          <el-input
+                            v-model="PackageFrom.inputwaybillNumber"
+                            clearable
+                            placeholder="请输入运单号"
+                          />
+                        </el-form-item>
+                        <el-form-item label="包条码:">
+                          <el-input
+                            v-model="PackageFrom.orderPackageCode"
+                            placeholder="请输入包条码"
+                          />
+                        </el-form-item>
+                      </el-form>
+                    </div>
+
+
                     <!-- 顶部开始 -->
                     <div class="el-Cart-button">
                       <!-- 表格顶部左侧按钮 -->
@@ -831,6 +855,7 @@ const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
 const background = ref(true); // 是否开启背景颜色
 const disabled = ref(false); // 是否禁止使用页码功能
 const data = ref([]); // 表格数据
+const PackageFrom=ref({});//包件搜索
 const wrapData = ref([]); //包件表格信息
 const wrapLoading = ref(false); //包件表格弹窗
 const dataInfo = ref([]); //表格展示信息
@@ -849,6 +874,7 @@ const flexList = ref<(string | number)[]>([]); //冻结
 const loading = ref(false); //刷新功能
 const BG = ref(false); //表格功能列表
 const BtnRadio = ref('1'); //按钮样式风格切换
+const Packageow = ref(); //查看包间报错当前数据
 const ElBtnClass = ref('el-Btn-link'); //按钮样式风格类名
 const searchSo = ref(false); //搜索弹窗
 const SoHeight = ref(); //搜索栏高度动态
@@ -1614,8 +1640,6 @@ const wrap = ref([
     head: true,
   },
 
-
-
   {
     prop: 'quantity',
     label: '数量',
@@ -2107,17 +2131,89 @@ const findIndexById = id => {
   return -1; //返回-1表示没用查询到
 };
 
+// 查看包间函数
+const PackageFn=()=>{
+  //接收点击查看当前行数据;
+  //   编辑信息弹窗状态
+  if (RouteId.value) {
+    console.log(wrapLoading.value, '当前为编辑状态');
+    $_getPackageListByDeliveryIdAndOrderId({
+     ...PackageFrom.value,//搜索参数
+      current: 1,
+      size: 100,
+      deliveryId: RouteId.value,
+      id: Packageow.value.id,
+    }).then(res => {
+      console.log(res, '订单包件信息');
+      if (res.data.code == 200) {
+        wrapData.value = res.data.data.data.packageList;
+        let IdTmp = []; //订单ID暂存
+        dataInfo.value[dataId.value].packageListInfo = wrapTemp.value[dataId.value];
+        //查看当前订单下面包件是缓存值,如果有就读取缓存值,否则就是第一次加载,使用API返回值
+        if (dataInfo.value[dataId.value].packageListInfo) {
+          dataInfo.value[dataId.value].packageListInfo.forEach(item => {
+            IdTmp.push(item.id);
+          });
+        }
+        toggleSelection({
+          val: false,
+          data: IdTmp.length ? IdTmp : res.data.data.data.packageListIds.split(','),
+          index: kind.value ? 0 : 1,
+        }); //编辑的时候选中已有的数据
+      }
+      // AddLalog.value = false; //关闭弹窗
+      console.log(wrapData.value, '包件表格信息');
+      console.log(res);
+    });
+  } else {
+    // 运单号
+    // 包条码
+    $_getPackageListByStockArticleId({
+      ...PackageFrom.value,//搜索参数
+      id: Packageow.value.id,
+      current: 1,
+      size: 100,
+    }).then(res => {
+      wrapData.value = res.data.data.records;
+      console.log(res, '订单包件');
+      if (kind.value) {
+        toggleSelection({ index: 0 }); //自主配送下面包件全选
+      } else {
+        toggleSelection({ index: 1 }); //外协下面包件全选
+      }
+      console.log(tableRefs, 'tableRefs');
+      console.log(res.data.data.records, '查看下面的包件');
+    });
+    // 新增 查看订单流程
+    console.log('当前为新增状态');
+    console.log(Packageow.value, Packageow.value.id, '查看包件事件');
+    //临时存储下标用于查询包件对应的下标
+    console.log(dataId.value, 'dataId.value下标');
+    console.log(wrapDataInfo.value[dataId.value], '当前订单下面的包件信息');
+    console.log(wrapDataInfo, '订单');
+  }
+  editLoading.value = false; //关闭加载效果
+}
+
+
+
+
 // 查看包件事件
 const ViewEvent = val => {
+  Packageow.value = val;
   wrapLoading.value = true; //查看包件弹窗
   AddLalog.value = true; //开启弹窗
   editLoading.value = true; //开启加载效果
   dataId.value = findIndexById(val.id);
   //接收点击查看当前行数据;
   //   编辑信息弹窗状态
+  PackageFn()
+  return
   if (RouteId.value) {
     console.log(wrapLoading.value, '当前为编辑状态');
     $_getPackageListByDeliveryIdAndOrderId({
+      waybillNumber: '', //运单号
+      orderPackageCode: '', //包条码
       current: 1,
       size: 100,
       deliveryId: RouteId.value,
@@ -2145,7 +2241,11 @@ const ViewEvent = val => {
       console.log(res);
     });
   } else {
+    // 运单号
+    // 包条码
     $_getPackageListByStockArticleId({
+      waybillNumber: '', //运单号
+      orderPackageCode: '', //包条码
       id: val.id,
       current: 1,
       size: 100,
@@ -2317,20 +2417,33 @@ const search = () => {
 };
 // 顶部搜索功能
 const SoInput = () => {
+if(!wrapLoading){
   if (kind.value) {
     OrderSelection(0, parameter.value);
   } else {
     OrderSelection(1, parameter.value);
   }
+}else{
+  PackageFn()
+}
+
+
+
 };
 // 顶部清空搜索
 const SoEmpty = () => {
-  parameter.value = {};
+  if(!wrapLoading){
+    parameter.value = {};
   if (kind.value) {
     OrderSelection(0);
   } else {
     OrderSelection(1);
   }
+  }else{
+    PackageFrom.value={}
+    PackageFn()
+  }
+
 };
 
 // 去重函数 接收一个数字通过ID匹配去掉重复项
@@ -3172,4 +3285,9 @@ const SubmitCommercial = () => {
   background-color: #ff0000;
   color: #fff;
 }
+.el_package{
+  :deep(.el-form){
+    justify-content: flex-start !important;
+  }
+}
 </style>