From a07cb9efd9e08620bbb240546b4f5d416dd27365 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 17 Oct 2024 16:48:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/aftersalesWorkOrderAdd.vue     |  4 +-
 .../warehouse/basicdataWarehouse.vue          | 52 ++++++++++++++++---
 .../inventory/distrilbutionBillLadingList.vue |  7 +--
 3 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index afb6a7f7..e64aabe0 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -1723,12 +1723,14 @@ const TabactiveClick = (a, b) => {
   box-sizing: border-box;
 }
 :deep(.tablemun) {
-  height: 0;
   padding: 0;
   .el-tabs__nav-scroll {
     // border-left: 1px solid #dcdfe6;
     // border-right: 1px solid #dcdfe6;
   }
+  .el-tabs__content{
+    display: none;
+  }
 }
 .placeholder {
   width: 100%;
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 395b2720..dc6883a5 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -1,8 +1,34 @@
 <template>
   <basic-container v-loading="loadingObj.list" element-loading-text="正在加载中...">
-    <el-row v-if="details.search">
-      <el-form :inline="true" :model="Topquery" class="el-fr-d"> </el-form>
-    </el-row>
+    <div v-h5uShow="details.search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="Topquery" class="header_search">
+          <el-form-item label="仓库:">
+            <el-select
+              v-model="details.query.warehouseId"
+              class="w100"
+              clearable
+              placeholder="请选择仓库"
+              filterable
+            >
+              <el-option
+                v-for="value in warehouseList"
+                :key="value.value"
+                :label="value.label"
+                :value="value.value"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 查询按钮 -->
+          <el-form-item class="el-btn">
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+
+
     <!-- 头部右侧按钮模块 -->
     <div>
       <el-tabs type="border-card" class="top-el-tabs" v-model="tabName" @tab-change="tabchange">
@@ -722,7 +748,13 @@ const searchChangeS = () => {
   Topquery.value = {};
   onLoad();
 };
-
+const searchChange=()=>{
+  onLoad();
+}
+// 清空
+const searchReset=()=>{
+  onLoad();
+}
 const areaoptions = ref([]); //地区
 // 地区获取
 const initialization = () => {
@@ -739,7 +771,7 @@ initialization();
 
 const details = reactive({
   /** 是否开启搜索 */
-  search: false,
+  search: true,
   /** 列表 */
   columnList: deepClone(columnList),
   query: {},
@@ -779,6 +811,7 @@ const details = reactive({
     /** 包明细 */
     packageOrderListlVisited: false,
   },
+  warehouseOption:[],
 });
 
 const {
@@ -793,6 +826,7 @@ const {
   zeroAdditionalRecordingInfo,
   popUpShow,
   recorddata,
+  warehouseOption,
 } = toRefs(details);
 
 // details.columnList = columnList; //菜单配置
@@ -846,10 +880,13 @@ const MyWareh = () => {
           label: item.name,
         });
       });
+
       columnList.find(res => res.label == '仓库名称').checkarr = warehouseList.value;
     }
   });
 };
+
+
 MyWareh(); //获取仓库列表
 const Setheight = () => {
   const _node = document.querySelector('.tableNode');
@@ -949,7 +986,10 @@ const onLoad = val => {
     });
 };
 onLoad();
-const searchHide = () => {};
+const searchHide = () => {
+  return
+  details.search=!details.search
+};
 
 // 每页多少条
 const sizeChange = val => {
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index a2bcd94e..a9842a7e 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -76,7 +76,7 @@
               @click="handleBillAdd"
               >创建自提</el-button
             >
-            <el-button type="primary" icon="el-icon-plus" @click="pickupCancellation"
+            <el-button type="primary"  @click="pickupCancellation"
               >批量取消</el-button
             >
             <!-- <el-button
@@ -887,7 +887,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(() => {
+        .then(async() => {
           // 批量取消
           let data = {
             billLodingIds: '',
@@ -895,9 +895,10 @@ export default {
           data.billLodingIds = this.selectionList.map(res => res.id).join(',');
           console.log(data, '处理好的值');
           this.loading = true; //开启加载
-          $_distrilbutionBillLading(data)
+          await  $_distrilbutionBillLading(data)
             .then(res => {
               console.log(res, '批量取消车成功');
+              this.onLoad(this.page);
             })
             .catch(res => {})
             .finally(() => {