From 9e94a4b9c0d8f4d71d7af4fb7616b6ce9fb3137f Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 4 Jan 2024 10:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E5=8A=A0=E8=BD=BD=EF=BC=8C?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E5=88=86=E5=8C=BA=E5=8A=A0=E8=BD=BD=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsShelf/basicdataGoodsShelfView.vue    | 36 ++++++++++++++++---
 .../inventory/distrilbutionBillLading.vue     |  3 ++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index fe07e7cf..8f95d6bb 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -1,4 +1,7 @@
 <template>
+  <div class="max" v-loading="exprloading"
+    element-loading-text="正在处理数据中,请稍后...">
+ 
   <div class="head_top">
     <div class="el-sel">
       <span class="el-sel-title">仓库地址</span>
@@ -190,6 +193,7 @@
       </div>
     </el-scrollbar>
   </div>
+
   <el-dialog
     v-model="isshowcon"
     :title="
@@ -572,6 +576,7 @@
       <el-button @click="dcx(3)">零担</el-button>
     </div>
   </el-dialog>
+</div>
 </template>
 <script setup>
 import {
@@ -591,6 +596,7 @@ import { downloadXls } from '@/utils/util';
 import { dateNow } from '@/utils/date';
 const { proxy } = getCurrentInstance();
 const CustomerName = ref(null); //客户名称
+const exprloading=ref(false);//全部load
 const Orderselfnumber = ref(null); //订单自编码
 const Receiptbatchnumber = ref(null); //入库批次号
 const materialcode = ref(null); //物料编码
@@ -645,7 +651,7 @@ let details = reactive({
 onMounted(() => {
   details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
   initconfig();
-  initnumber();
+  // initnumber();
 });
 // async function initnumber() {
 //   let res = await Alloclocationsnub();
@@ -691,6 +697,7 @@ function handleExportArea() {
 }
 // 选择导出内容信息
 function dcx(val) {
+  
   console.log(val);
   let id = details.arrlist[details.checkselect]?.id || 0;
   let name = details.arrlist[details.checkselect]?.name || '';
@@ -709,19 +716,33 @@ function dcx(val) {
     areaId: id,
     type: val,
   };
-  proxy
-    .$confirm('是否导出数据?', '提示', {
+  proxy.$confirm('是否导出数据?', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',
     })
     .then(() => {
+      exprloading.value=true;//开启加载
+      console.log('点击了确定');
+      eldc.value = false;//关闭选择弹窗
       NProgress.start();
       exportBlob(downloadUrl, values).then(res => {
         downloadXls(res.data, name + `${dateNow()}.xlsx`);
+        exprloading.value=false;//关闭加载
+        ElMessage({
+        message: '导出成功',
+        type: 'success',
+        })
         NProgress.done();
-      });
-    });
+      }).catch(res=>{
+        exprloading.value=false;//开启加载
+        ElMessage({
+        message: '导出失败',
+        type: 'warning',
+      })
+
+     });;
+    })
 }
 function currentChange(currentPage) {
   details.currentPage = currentPage;
@@ -848,11 +869,13 @@ async function upgood() {
 }
 
 const checkcso = val => {
+  exprloading.value=true;//开启加载
   console.log(details.arrlist[val].id, '选择的ID-=====');
   console.log(val, '货位接受参数');
   $_locationsnub({ warehouseId: details.arrlist[val].id }).then(res => {
     details.countnumber =res.data.data
     console.log('切换请求成功', res);
+    exprloading.value=false;//关闭加载
   });
   if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
     details.checkregionselect = 0;
@@ -866,6 +889,8 @@ const checkcso = val => {
   }
 };
 const checkregion = () => {
+  exprloading.value=true;//开启加载
+
   details.checksele = 0;
   checkshelves();
   console.log(details.checksele, 'details.checkseledetails.checksele');
@@ -912,6 +937,7 @@ async function checkshelves() {
   console.log(arrs, 'arrsarrsarrs');
   details.contenarr = arrs;
   details.contenbxsty['--length'] = maxlength;
+  exprloading.value=false;//关闭加载
 }
 // checkshelves();
 // const checkshelves = async () => {
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index b7b827ac..9574f08f 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -2263,11 +2263,14 @@ export default {
         ...this.order.query,
       }).then(res => {
         console.log('res :>> ', res);
+        console.log(res.data.data.records,'获取到的包件');
+    
         const data = res.data.data;
         this.order.total = data.total;
         this.order.orderDetails = data.records;
         this.order.orderChooseLoading = false;
         this.order.selectList = [];
+        this.order.selectList =res.data.data.records;//包件自动勾选
         this.selectionClear();
       });
       return null;