From da8c41de1dbf8360ed8f9c803fb62be5c96f0387 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 16 May 2024 10:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E6=8F=90=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=90=8E=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/distrilbutionBillLading.vue     | 595 ++++++++----------
 .../inventory/distrilbutionBillLadingList.vue | 135 ++--
 .../inventory/distrilbutionBillLadingView.vue |   8 +
 3 files changed, 353 insertions(+), 385 deletions(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 791bf234..8f715c18 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -93,34 +93,29 @@
 
         <el-form-item label-width="0" prop="certificateType">
           <el-tabs @tab-click="handleChlickTab" style="width: 100%">
-            
             <el-tab-pane label="定制品">
-              <div style="
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 6px;
-"> 
-              <el-button
-                type="primary"
-                text
-                icon="el-icon-view"
-                @click="handleAddOrder"
-                v-if="orderAdd"
-                >新 增</el-button
-              >
+              <div style="display: flex; justify-content: space-between; margin-bottom: 6px">
+                <el-button
+                  type="primary"
+                  text
+                  icon="el-icon-view"
+                  @click="handleAddOrder"
+                  v-if="orderAdd"
+                  >新 增</el-button
+                >
 
-              <div class="el_multifunctional">
-                      <el-input
-                        v-model="multifunctional"
-                        placeholder="请输入要搜索的值,多条件用英文逗号拼接"
-                        clearable
-                        @clear="soclear"
-                      />
-                      <el-button type="primary" @click="SearchFu"
-                        ><el-icon><Plus /></el-icon>搜索</el-button
-                      >
-                    </div>
-                  </div>
+                <div class="el_multifunctional">
+                  <el-input
+                    v-model="multifunctional"
+                    placeholder="请输入要搜索的值,多条件用英文逗号拼接"
+                    clearable
+                    @clear="soclear"
+                  />
+                  <el-button type="primary" @click="SearchFu"
+                    ><el-icon><Plus /></el-icon>搜索</el-button
+                  >
+                </div>
+              </div>
               <tablecmt
                 class="tablesc"
                 :columnList="columnListedit"
@@ -132,7 +127,6 @@
                 @selectCheck="selectsc"
                 @selection="selectionChange"
                 :searchInput="multifunctional"
-                
               >
                 <template #default="slotProps">
                   <el-button
@@ -653,7 +647,7 @@ import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getToken } from '@/utils/auth';
 import { getListStockList } from '@/api/distribution/distributionStockList';
-import { getListOne ,$_getListOne} from '@/api/distribution/distributionStockArticle';
+import { getListOne, $_getListOne } from '@/api/distribution/distributionStockArticle';
 import dayjs from 'dayjs';
 import { detail } from '@/api/flow/flow';
 import { nextTick, ref } from 'vue';
@@ -666,12 +660,12 @@ export default {
   data() {
     return {
       tabletit: '', //记录当前点击的标题栏
-      multifunctional:'', //编辑订单搜索
+      multifunctional: '', //编辑订单搜索
       dialogImg: false,
       Imgurl: undefined,
       Selfpickuploading: false, //页面加载
-      mydata:{},//仓库信息
-      packageRow:{},//当前选择的包件
+      mydata: {}, //仓库信息
+      packageRow: {}, //当前选择的包件
       OrdercolumnList: [
         {
           prop: 'serviceNumber',
@@ -1916,7 +1910,7 @@ export default {
   mounted() {
     console.log('123 :>> ', 123);
     this.setTableHeight();
-    this.mydata= JSON.parse(localStorage.getItem('my_data'))
+    this.mydata = JSON.parse(localStorage.getItem('my_data'));
     this.init();
 
     if (this.$route.query.type == '2') {
@@ -2057,7 +2051,7 @@ export default {
       }
       this.pageOrder.currentPage = 1;
       this.onLoadOrder(this.pageOrder, this.pageOrder);
-    },  
+    },
     inputsc(index, row) {
       this.query[row.prop] = index;
       this.pageOrder.currentPage = 1;
@@ -2073,7 +2067,7 @@ export default {
       const _type = this.$route.query.type;
       // 编辑状态
       if (Number(_type) === 2) {
-        this.onLoadEditChoose(this.order.query,this.packageRow);
+        this.onLoadEditChoose(this.order.query, this.packageRow);
       } else this.onLoadOrderChoose();
     },
     orderSelectSc(index, row) {
@@ -2084,56 +2078,59 @@ export default {
     orderSelectChange(list) {
       this.order.selectList = list;
     },
-   scrollToElementWithinTableRow(partialIdString) {
-  // 清空之前的样式
-  const tableRows = document.querySelectorAll('tr');
-  tableRows.forEach(function(row) {
-    const cells = row.querySelectorAll('[id]');
-    cells.forEach(function(cell) {
-      cell.style.backgroundColor = ''; // 移除背景颜色
-      cell.style.color = ''; // 移除文字颜色
-    });
-  });
-
-  // 统一逗号分隔符：将中文逗号替换为英文逗号，并去除可能的前后空格
-  const partialIds = partialIdString.replace(/，/g, ',').split(',').map(id => id.trim());
-
-  // 逐行检查是否含有所有partialIds
-  for (let row of tableRows) {
-    let allIdsFound = partialIds.every(partialId => {
-      return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId));
-    });
-
-    if (allIdsFound) {
-      // 行包含所有partialIds, 则高亮显示并滚动到该行
-      const cells = row.querySelectorAll('[id]');
-      cells.forEach(function(cell) {
-        cell.style.backgroundColor = '#ff0000';
-        cell.style.color = '#fff';
+    scrollToElementWithinTableRow(partialIdString) {
+      // 清空之前的样式
+      const tableRows = document.querySelectorAll('tr');
+      tableRows.forEach(function (row) {
+        const cells = row.querySelectorAll('[id]');
+        cells.forEach(function (cell) {
+          cell.style.backgroundColor = ''; // 移除背景颜色
+          cell.style.color = ''; // 移除文字颜色
+        });
       });
 
-      // 滚动到视图中央
-      row.scrollIntoView({ behavior: 'smooth', block: 'center' });
-      break;
-    }
-  }
-},
+      // 统一逗号分隔符：将中文逗号替换为英文逗号，并去除可能的前后空格
+      const partialIds = partialIdString
+        .replace(/，/g, ',')
+        .split(',')
+        .map(id => id.trim());
+
+      // 逐行检查是否含有所有partialIds
+      for (let row of tableRows) {
+        let allIdsFound = partialIds.every(partialId => {
+          return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId));
+        });
+
+        if (allIdsFound) {
+          // 行包含所有partialIds, 则高亮显示并滚动到该行
+          const cells = row.querySelectorAll('[id]');
+          cells.forEach(function (cell) {
+            cell.style.backgroundColor = '#ff0000';
+            cell.style.color = '#fff';
+          });
+
+          // 滚动到视图中央
+          row.scrollIntoView({ behavior: 'smooth', block: 'center' });
+          break;
+        }
+      }
+    },
     // 编辑多功能搜索
- SearchFu(){
-  console.log(this.multifunctional, '搜索的参数值');
-  if (this.multifunctional) {
-    this.scrollToElementWithinTableRow(this.multifunctional);
-  } else {
-    document.querySelectorAll('[id]').forEach(function (el) {
-      el.style.backgroundColor = ''; // 移除背景颜色
-      el.style.color = ''; // 移除文字颜色
-    });
-  }
-  return;
-  // console.log(dataInfo.value, '搜索结果');
-},
-  soclear (){
-    this.SearchFu();
+    SearchFu() {
+      console.log(this.multifunctional, '搜索的参数值');
+      if (this.multifunctional) {
+        this.scrollToElementWithinTableRow(this.multifunctional);
+      } else {
+        document.querySelectorAll('[id]').forEach(function (el) {
+          el.style.backgroundColor = ''; // 移除背景颜色
+          el.style.color = ''; // 移除文字颜色
+        });
+      }
+      return;
+      // console.log(dataInfo.value, '搜索结果');
+    },
+    soclear() {
+      this.SearchFu();
     },
     orderTimesc(index, row) {
       if (!!index) {
@@ -2146,7 +2143,7 @@ export default {
       const _type = this.$route.query.type;
       // 编辑状态
       if (Number(_type) === 2) {
-        this.onLoadEditChoose(this.order.query,this.packageRow);
+        this.onLoadEditChoose(this.order.query, this.packageRow);
       } else this.onLoadOrderChoose();
     },
 
@@ -2155,21 +2152,21 @@ export default {
       this.orderAdd = true;
       getDetail(this.$route.query.id).then(res => {
         let s = res.data.data;
-        console.log(res,'res');
+        console.log(res, 'res');
         this.form = s;
         let f = [];
-        if(s.chargeList){
+        if (s.chargeList) {
           s.chargeList.forEach(c => {
-          let a = this.clientType.find(i => c.cost == i.dictKey);
+            let a = this.clientType.find(i => c.cost == i.dictKey);
 
-          if (!!c.cost && c.cost != '-1') {
-            f.push(c.cost);
-          }
-          if (!!a) {
-            a.remark = c.money.substring(0, c.money.lastIndexOf('.'));
-            this.costList[c.cost] = a.remark;
-          }
-        });
+            if (!!c.cost && c.cost != '-1') {
+              f.push(c.cost);
+            }
+            if (!!a) {
+              a.remark = c.money.substring(0, c.money.lastIndexOf('.'));
+              this.costList[c.cost] = a.remark;
+            }
+          });
         }
 
         this.form.freightMark = f;
@@ -2237,15 +2234,14 @@ export default {
     },
     //订单选择确定
     callFordeliveryOrder() {
+      console.log(this.selectionList, 'this.selectionList');
+      let scID = this.selectionList[0].mallId; //获取第一个商场DI用于匹配后面的是否选择的一样
+      let mallIdState = this.selectionList.find(res => res.mallId != scID);
+      if (mallIdState) {
+        this.$message.warning('请选择同一商场');
+        return;
+      }
 
-      console.log(this.selectionList,'this.selectionList');
-     let scID= this.selectionList[0].mallId;//获取第一个商场DI用于匹配后面的是否选择的一样
-    let mallIdState=this.selectionList.find(res=>res.mallId !=scID)
-    if(mallIdState){
-      this.$message.warning('请选择同一商场');
-      return
-    }
-      
       console.log('111 :>> ', 111);
       let st = false;
       let sts = false;
@@ -2290,10 +2286,10 @@ export default {
       let isa = false;
       this.selectionList.some(i => {
         let a = this.dataList.filter(ele => ele.id == i.id).length >= 1;
-        if(!this.$route.query.id){
-          i.reservationNum=i.handQuantity
-        } 
-       
+        if (!this.$route.query.id) {
+          i.reservationNum = i.handQuantity;
+        }
+
         if (!a) {
           this.dataList.push(i);
         }
@@ -2309,16 +2305,16 @@ export default {
         this.$message.warning('至少选择一条数据！');
         return;
       }
-      console.log(this.selectionList,'22');
-  
-      if(  this.dataList &&   this.dataList.length){
-        if( this.dataList[0].mallId !=this.selectionList[0].marketId){
-        this.$message.warning('请选择和定制品一样的商场！');
-        return;
+      console.log(this.selectionList, '22');
+
+      if (this.dataList && this.dataList.length) {
+        if (this.dataList[0].mallId != this.selectionList[0].marketId) {
+          this.$message.warning('请选择和定制品一样的商场！');
+          return;
         }
       }
-      let scID=  this.selectionList[0].marketId
-      if(this.selectionList.find(res=>res.marketId !=scID)){
+      let scID = this.selectionList[0].marketId;
+      if (this.selectionList.find(res => res.marketId != scID)) {
         this.$message.warning('请选同一商场！');
         return;
       }
@@ -2351,12 +2347,12 @@ export default {
 
     // 选择包件
     async handleChooseOrder(row) {
-      console.log(this.order.columnOrderList,'order.columnOrderList');
-      this.order.columnOrderList.forEach(res=>res.values='')
-      this.order.query={}
-      this.order.currentPage=1
+      console.log(this.order.columnOrderList, 'order.columnOrderList');
+      this.order.columnOrderList.forEach(res => (res.values = ''));
+      this.order.query = {};
+      this.order.currentPage = 1;
       console.log('row :>> ', row);
-      this.packageRow=row
+      this.packageRow = row;
       // 页面类型
       const _type = this.$route.query.type;
       this.orderChooseId = row.id;
@@ -2365,7 +2361,6 @@ export default {
         await this.onLoadEditChoose({}, row);
       } else await this.onLoadOrderChoose();
       this.dialogChooseOrderVisible = true;
-
     },
     // 每页数量改变
     sizeChangeOrderChoose(size) {
@@ -2374,7 +2369,7 @@ export default {
       const _type = this.$route.query.type;
       // 编辑状态
       if (Number(_type) === 2) {
-        this.onLoadEditChoose(this.order.query,this.packageRow);
+        this.onLoadEditChoose(this.order.query, this.packageRow);
       } else this.onLoadOrderChoose();
     },
     // 页码改变
@@ -2384,7 +2379,7 @@ export default {
       const _type = this.$route.query.type;
       // 编辑状态
       if (Number(_type) === 2) {
-        this.onLoadEditChoose(this.order.query,this.packageRow);
+        this.onLoadEditChoose(this.order.query, this.packageRow);
       } else this.onLoadOrderChoose();
     },
     // 请求包件数据 -- 新增
@@ -2422,37 +2417,39 @@ export default {
       await getEditList(this.order.currentPage, this.order.pageSize, {
         ...params,
         ...this.order.query,
-      }).then(res => {
-        if(res.data.code !=200){
-          return
-        }
-        console.log('res :>> ', res);
-        const data = res.data.data;
-        this.order.total = data.total || 0;
-        this.order.orderDetails = data.records || [];
-
-        // 被选中的包件的id list
-        console.log(row,'row=====');
-        if(row){
-          row.originalIdList = [];
-          console.log(this.order,'this.order.orderDetails');
-        // 回显
-        this.order.selectList = this.order.orderDetails.filter(val => {
-          console.log('val :>> ', val);
-          if (val.choice){
-            row.originalIdList.push(val.id);
-          } 
-          return val.choice;
-        });
-                // 深拷贝数据
-        console.log('this.order.selectList :>> ', this.order.selectList);
-        row.originalList = JSON.parse(JSON.stringify(this.order.selectList));
-        this.order.orderChooseLoading = false;
-        }
-       }).catch((error)=>{
-          console.log(error,'error');
+      })
+        .then(res => {
+          if (res.data.code != 200) {
+            return;
+          }
+          console.log('res :>> ', res);
+          const data = res.data.data;
+          this.order.total = data.total || 0;
+          this.order.orderDetails = data.records || [];
+
+          // 被选中的包件的id list
+          console.log(row, 'row=====');
+          if (row) {
+            row.originalIdList = [];
+            console.log(this.order, 'this.order.orderDetails');
+            // 回显
+            this.order.selectList = this.order.orderDetails.filter(val => {
+              console.log('val :>> ', val);
+              if (val.choice) {
+                row.originalIdList.push(val.id);
+              }
+              return val.choice;
+            });
+            // 深拷贝数据
+            console.log('this.order.selectList :>> ', this.order.selectList);
+            row.originalList = JSON.parse(JSON.stringify(this.order.selectList));
+            this.order.orderChooseLoading = false;
+          }
+        })
+        .catch(error => {
+          console.log(error, 'error');
           this.order.orderChooseLoading = false;
-       });
+        });
       return null;
     },
     /**
@@ -2463,9 +2460,9 @@ export default {
       if (this.order.selectList.length === 0) {
         return this.$message({ type: 'warning', message: '最少选择一项数据' });
       }
-      
-      if(this.order.selectList){
-        this.packageRow.reservationNum=this.order.selectList.length
+
+      if (this.order.selectList) {
+        this.packageRow.reservationNum = this.order.selectList.length;
       }
       // billPackageEntityList
       console.log('this.order.dataList :>> ', this.dataList);
@@ -2480,14 +2477,13 @@ export default {
         });
       this.dialogChooseOrderVisible = false;
     },
-ProhibitSelection(val, index) {
-if (val.orderPackageStatus == 70) {
-      return false;
-    } else {
-      return true;
-    }
- 
-},
+    ProhibitSelection(val, index) {
+      if (val.orderPackageStatus == 70) {
+        return false;
+      } else {
+        return true;
+      }
+    },
     // 数量校验
     handleNumberRange(e, row) {
       console.log(e, 'ee=====');
@@ -2643,12 +2639,11 @@ if (val.orderPackageStatus == 70) {
         }
       }
     },
-    lastpage(){
-      this.$router.push('/distribution/inventory/distrilbutionBillLadingList')
+    lastpage() {
+      this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
     },
     // 最后提交
     async handleSubmit() {
-
       // console.log(this.dataList,'this.dataList');
 
       // if (this.$route.query.type !== '2') {
@@ -2677,58 +2672,49 @@ if (val.orderPackageStatus == 70) {
       //   // if ()
       // }
 
-
-
       this.$refs.form.validate(async valid => {
-     if (valid) {
-
-        //   if(!this.dataList.length){
-        //   return ElMessage({
-        //       message: '请选择定制品',
-        //       type: 'warning',
-        //     });
-        // }
-        console.log(this.data,'11');
- 
-        if( !this.data.every(res=>res.inventoryQuantity)){
-            return ElMessage({
-             message: '请移除库存品预约数量为0的订单',
-              type: 'warning',
-            });
-        }
-    
-        let zeroOrderList=null
-        if(this.dataList.length){
-        let resState=this.dataList.find(res=>!res.reservationNum)
-        console.log(resState,'123');
-        if(resState){
-        return ElMessage({
-          message: `单自编号为${resState.orderCode}的计划数量为0请移除或者重新录入预约数量`,
-          type: 'warning',
-         plain: true,
-        })
-        }
+        if (valid) {
+          //   if(!this.dataList.length){
+          //   return ElMessage({
+          //       message: '请选择定制品',
+          //       type: 'warning',
+          //     });
+          // }
+          console.log(this.data, '11');
 
-        zeroOrderList = this.dataList.filter(val => val.isZero === '1');
-        if (this.data.length) {
-          const allQuantitiesAreFalsy = this.data.every(item => item.inventoryQuantity);
-          console.log(allQuantitiesAreFalsy, 'allQuantitiesAreFalsy');
-          if (!allQuantitiesAreFalsy) {
+          if (!this.data.every(res => res.inventoryQuantity)) {
             return ElMessage({
-              message: '请移除添加数量为0的订单',
+              message: '请移除库存品预约数量为0的订单',
               type: 'warning',
             });
-         
           }
-        }
-      }
-
-
 
+          let zeroOrderList = null;
+          if (this.dataList.length) {
+            let resState = this.dataList.find(res => !res.reservationNum);
+            console.log(resState, '123');
+            if (resState) {
+              return ElMessage({
+                message: `单自编号为${resState.orderCode}的计划数量为0请移除或者重新录入预约数量`,
+                type: 'warning',
+                plain: true,
+              });
+            }
 
+            zeroOrderList = this.dataList.filter(val => val.isZero === '1');
+            if (this.data.length) {
+              const allQuantitiesAreFalsy = this.data.every(item => item.inventoryQuantity);
+              console.log(allQuantitiesAreFalsy, 'allQuantitiesAreFalsy');
+              if (!allQuantitiesAreFalsy) {
+                return ElMessage({
+                  message: '请移除添加数量为0的订单',
+                  type: 'warning',
+                });
+              }
+            }
+          }
 
           if (!this.form.id) {
-  
             // if (this.fileListSell.length === 0) {
             //   this.$message.warning('请上传提货证件！！！');
             //   return;
@@ -2795,24 +2781,27 @@ if (val.orderPackageStatus == 70) {
                 this.form.stockArticleId != null
                   ? this.form.stockArticleId + a.join(',')
                   : a.join(',');
-            } 
+            }
             // ParcelLisList
             const submitFormData = this.form;
-            console.log(this.form,'this.form');
-            console.log(submitFormData,'this.sub');
+            console.log(this.form, 'this.form');
+            console.log(submitFormData, 'this.sub');
             // 当有零担数据时
             if (zeroOrderList && zeroOrderList.length !== 0) {
-              console.log(zeroOrderList,'zeroOrderList222');
+              console.log(zeroOrderList, 'zeroOrderList222');
               // console.log(1);
               submitFormData.parcelLisList = [];
               submitFormData.zeroType = '2';
               zeroOrderList.forEach(valE => {
-                console.log(valE,'valE==>');
-                if(valE.ParcelLisList){
-                  if(valE.ParcelLisList.length){
-                     submitFormData.parcelLisList = [...submitFormData.parcelLisList, ...valE.ParcelLisList];
+                console.log(valE, 'valE==>');
+                if (valE.ParcelLisList) {
+                  if (valE.ParcelLisList.length) {
+                    submitFormData.parcelLisList = [
+                      ...submitFormData.parcelLisList,
+                      ...valE.ParcelLisList,
+                    ];
+                  }
                 }
-                } 
               });
               // submitFormData.parcelLisList.forEach(val => (val.quantity = val.tiQuantity));
             } else {
@@ -2828,9 +2817,9 @@ if (val.orderPackageStatus == 70) {
             });
             submitFormData.billPackageEntityList = _billPackageEntityList;
             // SM24010411
-            console.log(submitFormData,'submitFormData');
+            console.log(submitFormData, 'submitFormData');
             this.Selfpickuploading = true; //开启加载效果
-        
+
             add(submitFormData)
               .then(res => {
                 this.Selfpickuploading = false; //开启加载效果
@@ -2844,6 +2833,10 @@ if (val.orderPackageStatus == 70) {
                 this.Selfpickuploading = false; //关闭加载效果
                 console.log(this.Selfpickuploading, '当前状态');
                 this.$store.commit('DEL_TAG_CURRENT');
+                this.$store.commit('EDIT_REFRESHITEM', {
+                  title: 'distrilbutionBillLadingList',
+                  status: true,
+                });
                 this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
               })
               .catch(res => {
@@ -2873,7 +2866,7 @@ if (val.orderPackageStatus == 70) {
 
               if (_flag) return this.$message.warning('请填写正确的费用信息！！！');
             }
-             
+
             this.form.stockDTOList = this.data;
             let o = [];
             const fileListMapping = {
@@ -2912,7 +2905,7 @@ if (val.orderPackageStatus == 70) {
             up.deliveryDocument = this.form.deliveryDocument;
             up.certificateType = this.form.certificateType;
             up.totalCost = this.form.totalCost;
-            up.remark=this.form.remark;
+            up.remark = this.form.remark;
             up.mark = mark;
             up.stockArticleList = this.dataList;
             // 当有零担数据时
@@ -2971,6 +2964,10 @@ if (val.orderPackageStatus == 70) {
                 });
                 this.Selfpickuploading = false; //关闭加载效果
                 this.$store.commit('DEL_TAG_CURRENT');
+                this.$store.commit('EDIT_REFRESHITEM', {
+                  title: 'distrilbutionBillLadingList',
+                  status: true,
+                });
                 this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
               })
               .catch(res => {
@@ -3035,16 +3032,15 @@ if (val.orderPackageStatus == 70) {
       params.genre = 1;
       params.typeService = 3;
       params.isAll = 0;
-      if(this.data && this.data.length){
-       params.mallId =this.data[0].marketId
-       console.log(params,'params');
+      if (this.data && this.data.length) {
+        params.mallId = this.data[0].marketId;
+        console.log(params, 'params');
       }
-      $_getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder)).then(
-        res => {
-          console.log(res,'res===>');
-          if(res.data.code !=200 || !res.data.data){
-            
-            return
+      $_getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder))
+        .then(res => {
+          console.log(res, 'res===>');
+          if (res.data.code != 200 || !res.data.data) {
+            return;
           }
           const data = res.data.data;
           this.pageOrder.total = data.total || 0;
@@ -3079,27 +3075,26 @@ if (val.orderPackageStatus == 70) {
           });
           this.loading = false;
           this.selectionClear();
-        }
-      ).catch(res=>{
-
-      }).finally(()=>{
-        this.loading = false;
-      });
+        })
+        .catch(res => {})
+        .finally(() => {
+          this.loading = false;
+        });
     },
     //库存品
     handleAddView(row) {
       // if (this.dataList.length === 0) {
       //   return this.$message.warning('请选择最少一条定制品');
       // }
-      if(!JSON.parse(localStorage.getItem('my_data'))){
+      if (!JSON.parse(localStorage.getItem('my_data'))) {
         ElMessage({
-        message: '请选择仓库!',
-        type: 'warning',
-      })
-        return
+          message: '请选择仓库!',
+          type: 'warning',
+        });
+        return;
       }
-      console.log(this.dataList,'dataList');
-    
+      console.log(this.dataList, 'dataList');
+
       this.selectionList = [];
       this.dialogFormVisible = true;
       this.onLoadList();
@@ -3178,23 +3173,22 @@ if (val.orderPackageStatus == 70) {
     // 定制品新增 -- 页码改变
     currentChangeOrder(currentPage) {
       this.pageOrder.currentPage = currentPage;
-      this.onLoadOrder(this.pageOrder,this.query);
+      this.onLoadOrder(this.pageOrder, this.query);
     },
     sizeChangeOrder(pageSize) {
       this.pageOrder.pageSize = pageSize;
-      this.onLoadOrder(this.pageOrder,this.query);
+      this.onLoadOrder(this.pageOrder, this.query);
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      this.onLoad(this.page,this.query);
+      this.onLoad(this.page, this.query);
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      this.onLoad(this.page,this.query);
+      this.onLoad(this.page, this.query);
     },
 
     onLoad(page, params = {}) {
-
       this.loading = true;
       params.ids = this.$route.query.id;
       this.orderAdd = false;
@@ -3205,9 +3199,6 @@ if (val.orderPackageStatus == 70) {
         this.loading = false;
         this.selectionClear();
       });
-
-
-
     },
     /**
      * 创建自提
@@ -3220,69 +3211,26 @@ if (val.orderPackageStatus == 70) {
     //库存品
     onLoadList(dataso) {
       let data = {
-          current: this.pageStock.currentPage,
-          size: this.pageStock.pageSize,
-          warehouseId:this.mydata.id,
-          ...dataso,
-        };
-        if(this.dataList && this.dataList.length){
-         data.marketId= this.dataList[0].mallId
-        }
-        console.log(data, '处理好的值');
-        getListStockList(data).then(res => {
-          const dataOwn = res.data.data;
-          this.pageStock.total = dataOwn.total;
-          this.dataOwn = dataOwn.records;
-          this.dataOwn.forEach(i => {
-            i.available = i.quantityStock - i.quantityOccupied;
-          });
-        });
-          this.loading = false;
-          this.selectionClear();
-      return
-      console.log('111 :>> ', 111);
-      this.loading = true;
-      let a = {};
-      if (this.$route.query.type == '1') {
-        a = this.dataList[0];
-      } else if (this.$route.query.type === '2') {
-        a = this.dataList[0];
-      } else if (this.$route.query.type == '3') {
-        a = this.dataList[0];
+        current: this.pageStock.currentPage,
+        size: this.pageStock.pageSize,
+        warehouseId: this.mydata.id,
+        ...dataso,
+      };
+      if (this.dataList && this.dataList.length) {
+        data.marketId = this.dataList[0].mallId;
       }
-      console.log('a :>> ', a);
-      console.log(' this.dataOrder :>> ', this.dataOrder);
-      // let a = this.dataList[0];
-      if (!!a.mallId) {
-        // params.marketId = a.mallId;
-        // params.warehouseId = a.warehouseId;
-        let data = {
-          current: this.pageStock.currentPage,
-          size: this.pageStock.pageSize,
-          //marketId: a.mallId,
-          // warehouseId: a.warehouseId,
-          ...dataso,
-        };
-        console.log(data, '处理好的值');
-        // return
-        getListStockList(data).then(res => {
-          const dataOwn = res.data.data;
-          this.pageStock.total = dataOwn.total;
-          this.dataOwn = dataOwn.records;
-          this.dataOwn.forEach(i => {
-            i.available = i.quantityStock - i.quantityOccupied;
-          });
-          this.loading = false;
-          this.selectionClear();
-        });
-      } else {
-        this.$message({
-          type: 'warning',
-          message: '无法获取商场信息',
+      console.log(data, '处理好的值');
+      getListStockList(data).then(res => {
+        const dataOwn = res.data.data;
+        this.pageStock.total = dataOwn.total;
+        this.dataOwn = dataOwn.records;
+        this.dataOwn.forEach(i => {
+          i.available = i.quantityStock - i.quantityOccupied;
         });
-        this.loading = false;
-        this.pageStock.total = 0;
-      }
+      });
+      this.loading = false;
+      this.selectionClear();
+      return;
     },
     //包件信息
     onLoadOwn(page, params = {}) {
@@ -3329,7 +3277,7 @@ if (val.orderPackageStatus == 70) {
           //   firsts: val.firsts,
           // };
           const zeroOrder = val;
-          // 记录传入行的id   
+          // 记录传入行的id
           zeroOrder.stockArticleId = val.stockArticleId;
           // 物料最大限数
           zeroOrder.maxNum = val.libraryQuantity - val.deliveryQuantity;
@@ -3338,7 +3286,7 @@ if (val.orderPackageStatus == 70) {
           //   zeroOrder.tiQuantity =zeroOrder.tiQuantity;
           //   console.log('a=>>>>');
           // }
-         
+
           // else if (val.deliveryQuantity && Number(this.$route.query.type) === 2) {
           //   zeroOrder.tiQuantity = val.tiQuantity;
           //   console.log('b=>>>>');
@@ -3351,22 +3299,21 @@ if (val.orderPackageStatus == 70) {
     },
     // 修改零担零担信息
     handleRowZeroOrder() {
-      console.log(this.zeroOrderFormList,'12121212');
-      let sum =0
-      this.zeroOrderFormList.forEach(res=>{
-        sum+= res.tiQuantity
-      })
-      console.log(sum,'总和');
-      this.dataList.find(res=>res.id==this.zeroOrderFormList[0].stockArticleId).reservationNum=sum
+      console.log(this.zeroOrderFormList, '12121212');
+      let sum = 0;
+      this.zeroOrderFormList.forEach(res => {
+        sum += res.tiQuantity;
+      });
+      console.log(sum, '总和');
+      this.dataList.find(res => res.id == this.zeroOrderFormList[0].stockArticleId).reservationNum =
+        sum;
 
-     
       // 将修改的零担信息存入dataList中
-      this.dataList.find(val => val.id === this.zeroOrderFormList[0].stockArticleId).ParcelLisList = this.zeroOrderFormList;
-      
+      this.dataList.find(val => val.id === this.zeroOrderFormList[0].stockArticleId).ParcelLisList =
+        this.zeroOrderFormList;
 
       // 关闭零担蒙层弹框
       this.dialogFormZeroOrderVisible = false;
-
     },
     /**
      * 显示维护在库零担数量
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 8770c7cf..edaacb49 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -87,68 +87,68 @@
           </div>
         </div>
       </el-row>
-      <el-row>
-        <!-- 列表模块 -->
-        <tablecmt
-          :columnList="columnList"
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
-          <template #default="slotProps">
-            <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
-            <el-text
-              size="small"
-              text
-              v-if="permission.distrilbutionBillLadingList_view"
-              @click="handleLike(slotProps.scope)"
-              >查看</el-text
-            >
-            <el-text
-              size="small"
-              type="danger"
-              icon="el-icon-edit"
-              text
-              @click="handleLike(slotProps.scope, 'sigin')"
-              v-if="
-                permission.distrilbutionBillLadingList_qs &&
-                Number(slotProps.scope.row.conditions) < 30 &&
-                slotProps.scope.row.printState
-              "
-              >确认提货</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleEdits(slotProps.scope, '1')"
-              v-if="
-                permission.distrilbutionBillLadingList_edit &&
-                Number(slotProps.scope.row.conditions) < 30
-              "
-              >编辑提货信息</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleEdits(slotProps.scope, '2')"
-              v-if="
-                permission.distrilbutionBillLadingList_edit &&
-                Number(slotProps.scope.row.conditions) === 20
-              "
-              >上传签收图片</el-text
-            >
-            <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
 
-            <el-text size="small" text @click="handlePreview(slotProps.scope.row)">打印</el-text>
-          </template>
-        </tablecmt>
-      </el-row>
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="columnList"
+        :tableData="data"
+        :loading="loading"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @btnCheck="btnsc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
+          <el-text
+            size="small"
+            text
+            v-if="permission.distrilbutionBillLadingList_view"
+            @click="handleLike(slotProps.scope)"
+            >查看</el-text
+          >
+          <el-text
+            size="small"
+            type="danger"
+            icon="el-icon-edit"
+            text
+            @click="handleLike(slotProps.scope, 'sigin')"
+            v-if="
+              permission.distrilbutionBillLadingList_qs &&
+              Number(slotProps.scope.row.conditions) < 30 &&
+              slotProps.scope.row.printState
+            "
+            >确认提货</el-text
+          >
+          <el-text
+            type="primary"
+            text
+            icon="el-icon-edit"
+            @click="handleEdits(slotProps.scope, '1')"
+            v-if="
+              permission.distrilbutionBillLadingList_edit &&
+              Number(slotProps.scope.row.conditions) < 30
+            "
+            >编辑提货信息</el-text
+          >
+          <el-text
+            type="primary"
+            text
+            icon="el-icon-edit"
+            @click="handleEdits(slotProps.scope, '2')"
+            v-if="
+              permission.distrilbutionBillLadingList_edit &&
+              Number(slotProps.scope.row.conditions) === 20
+            "
+            >上传签收图片</el-text
+          >
+          <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
+
+          <el-text size="small" text @click="handlePreview(slotProps.scope.row)">打印</el-text>
+        </template>
+      </tablecmt>
+
       <el-row class="el-fy">
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
@@ -252,6 +252,7 @@ import { downloadXls, handleClearTableQuery } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import MyPrint from '@/components/MyPrint/MyPrint.vue';
 export default {
+  name: '/distribution/inventory/distrilbutionBillLadingList',
   data() {
     return {
       columnList: [
@@ -1204,6 +1205,18 @@ export default {
       });
     },
   },
+  activated() {
+    console.log('页面激活');
+    if (this.$store.state.isRefresh.refreshObj.distrilbutionBillLadingList) {
+      // 重新请求数据
+      this.onLoad(this.page);
+
+      this.$store.commit('EDIT_REFRESHITEM', {
+        title: 'distrilbutionBillLadingList',
+        status: false,
+      });
+    }
+  },
 };
 </script>
 <style>
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 444d473b..01739f83 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -1758,6 +1758,10 @@ export default {
                   if (code !== 200) return;
                   this.$message.success('签收成功');
                   this.$store.commit('DEL_TAG_CURRENT');
+                  this.$store.commit('EDIT_REFRESHITEM', {
+                    title: 'distrilbutionBillLadingList',
+                    status: true,
+                  });
                   this.$router.back('-1');
                 })
                 .catch(() => {})
@@ -1774,6 +1778,10 @@ export default {
             if (code !== 200) return;
             this.$message.success('签收成功');
             this.$store.commit('DEL_TAG_CURRENT');
+            this.$store.commit('EDIT_REFRESHITEM', {
+              title: 'distrilbutionBillLadingList',
+              status: true,
+            });
             this.$router.back('-1');
           } catch (error) {
             console.log('error :>> ', error);