From 80be506abf8a16ab62e4fe455a8cfee047986101 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 18 Sep 2024 17:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/warehouseRetentionRecord.js |  17 +-
 src/option/basicdata/BackStockTask.js         | 207 ++++++++
 src/option/finance/WaybillAudit.js            |  63 ++-
 .../deliverylist/distributionDeliveryList.vue |  54 +--
 .../distributionDeliveryListdis.vue           |  30 +-
 .../distributionDeliveryListedt.vue           | 191 +++-----
 .../distributionDeliveryListmar.vue           |   3 +-
 .../distribution/inventory/BackStockTask.vue  | 445 ++++++++++++++++++
 .../warehouseRetentionRecord.vue              |   9 +-
 src/views/waybill/TemporaryStorageList.vue    |  12 +-
 10 files changed, 819 insertions(+), 212 deletions(-)
 create mode 100644 src/option/basicdata/BackStockTask.js
 create mode 100644 src/views/distribution/inventory/BackStockTask.vue

diff --git a/src/api/warehouse/warehouseRetentionRecord.js b/src/api/warehouse/warehouseRetentionRecord.js
index 8576ffa9..aa7bad40 100644
--- a/src/api/warehouse/warehouseRetentionRecord.js
+++ b/src/api/warehouse/warehouseRetentionRecord.js
@@ -38,13 +38,13 @@ export const getDetail = id => {
  * @param id
  * @returns {*}
  */
-export const getRetentionPackageByType = (retentionId,type) => {
+export const getRetentionPackageByType = (retentionId, type) => {
   return request({
     url: '/api/logpm-warehouse/warehouseRetentionRecord/getRetentionPackageByType',
     method: 'get',
     params: {
       retentionId,
-      type
+      type,
     },
   });
 };
@@ -94,7 +94,7 @@ export const $_RetentionWarehouseRetentionRecord = params => {
     responseType: 'blob',
   });
 };
- 
+
 export const $_warehouseRetentionRecordPage = params => {
   return request({
     url: '/api/logpm-warehouse/warehouseRetentionScan/page',
@@ -111,4 +111,13 @@ export const $_warehouseRetentionScan = params => {
     params,
     responseType: 'blob',
   });
-};
\ No newline at end of file
+};
+
+/** 回库任务列表 */
+export const getNewPage = params => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseRetentionScan/newPage',
+    method: 'get',
+    params,
+  });
+};
diff --git a/src/option/basicdata/BackStockTask.js b/src/option/basicdata/BackStockTask.js
new file mode 100644
index 00000000..edbbc12f
--- /dev/null
+++ b/src/option/basicdata/BackStockTask.js
@@ -0,0 +1,207 @@
+export default [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    label: '配送回库任务编号',
+    prop: 'taskCode',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '回库任务类型',
+    prop: 'retentionTypeName',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '包条码',
+    prop: 'orderPackageCode',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '订单编号',
+    prop: 'orderCode',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '运单编号',
+    prop: 'waybillNumber',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '配送类型',
+    prop: 'deliveryTypeName',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '货物类型',
+    prop: 'conditionsName',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '预约编号',
+    prop: 'reservationCode',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '配送车次',
+    prop: 'trainNumber',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '装车车牌',
+    prop: 'vehicleNumber',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '件数',
+    prop: 'retentionQuantity',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '物料编码',
+    prop: 'materialNumber',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '物料名称',
+    prop: 'materialName',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '仓库名称',
+    prop: 'warehouseName',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '任务状态',
+    prop: 'confirmStatusName',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '回库操作人员',
+    prop: 'retentionScanUsername',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '回库时间',
+    prop: 'retentionScanTime',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    label: '操作',
+    prop: '',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: 'right',
+    sortable: true,
+  },
+];
diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js
index 59df455c..b32f8408 100644
--- a/src/option/finance/WaybillAudit.js
+++ b/src/option/finance/WaybillAudit.js
@@ -37,7 +37,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'orderCode',
+    prop: 'orderNo',
     label: '订单编号',
     type: 1,
     values: '',
@@ -48,7 +48,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'createTime',
+    prop: 'shipper',
     label: '发货单位',
     type: 1,
     values: '',
@@ -59,7 +59,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'userName',
+    prop: 'consignee',
     label: '收货单位',
     type: 1,
     values: '',
@@ -70,7 +70,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'waybillType',
     label: '运单类型',
     type: 1,
     values: '',
@@ -81,7 +81,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'serviceType',
     label: '服务类型',
     type: 1,
     values: '',
@@ -92,7 +92,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'waybillStatus',
     label: '运单状态',
     type: 1,
     values: '',
@@ -104,7 +104,7 @@ export const columnList = [
   },
   {
     prop: 'templateType',
-    label: '运单标识',
+    label: '是否改单',
     type: 1,
     values: '',
     width: '150',
@@ -114,7 +114,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'createTime',
     label: '开单时间',
     type: 1,
     values: '',
@@ -125,7 +125,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'goodsName',
     label: '货物品类',
     type: 1,
     values: '',
@@ -158,7 +158,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'totalCount',
     label: '总件数',
     type: 1,
     values: '',
@@ -169,7 +169,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'totalWeight',
     label: '总重量',
     type: 1,
     values: '',
@@ -180,7 +180,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'totalVolume',
     label: '总体积',
     type: 1,
     values: '',
@@ -191,7 +191,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'totalFreight',
     label: '总费用',
     type: 1,
     values: '',
@@ -201,6 +201,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'templateType',
+    label: '开单价',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'templateType',
     label: '预估总费用',
@@ -246,7 +257,7 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'templateType',
+    prop: 'pickupFee',
     label: '提货费',
     type: 1,
     values: '',
@@ -421,6 +432,28 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'templateType',
+    label: '超区公里数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'templateType',
+    label: '超区公里费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'templateType',
     label: '安装费',
@@ -500,7 +533,7 @@ export const columnList = [
   },
   {
     prop: 'templateType',
-    label: '发货手机号',
+    label: '发货人手机号',
     type: 1,
     values: '',
     width: '150',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index c69773dc..a0728b02 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -334,7 +334,7 @@ import dayjs from 'dayjs';
 export default {
   data() {
     return {
-      currentdate:true,
+      currentdate: true,
       height: 0,
       // 弹框标题
       title: '',
@@ -734,18 +734,17 @@ export default {
         getDriverList(1, 10, '').then(res => {
           const data = res.data.data;
           let po = [];
-          if(data.records?.length){
+          if (data.records?.length) {
             data.records.forEach(item => {
-            let a = {
-              dictKey: item.id,
-              dictValue: item.name,
-            };
-            po.push(a);
-          });
-          this.driverData = po;
-          rv(res.data.data.records);
+              let a = {
+                dictKey: item.id,
+                dictValue: item.name,
+              };
+              po.push(a);
+            });
+            this.driverData = po;
+            rv(res.data.data.records);
           }
-    
         });
       });
     },
@@ -861,7 +860,8 @@ export default {
       this.$router.push({
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
-          data: encodeURIComponent(JSON.stringify(row)),
+          // data: encodeURIComponent(JSON.stringify(row)),
+          id: row.id,
           name: row.trainNumber + '-查看配送',
         },
       });
@@ -1022,6 +1022,7 @@ export default {
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
           data: encodeURIComponent(JSON.stringify(row)),
+          id: row.id,
           name: row.trainNumber + '-查看配送',
         },
       });
@@ -1085,21 +1086,21 @@ export default {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    Getcurrentdate(){
-// 获取当前日期
-const currentDate = dayjs();
-// 计算一个月前的日期
-const startDate = currentDate.subtract(1, 'month');
-// 格式化日期为 'YYYY-MM-DD'
-const formatDate = (date) => date.format('YYYY-MM-DD');
-this.query.taskTimeArr = []
-this.query.taskTimeArr[0] = formatDate(startDate), // 一个月前的日期
-this.query.taskTimeArr[1] = formatDate(currentDate) // 当前日期
+    Getcurrentdate() {
+      // 获取当前日期
+      const currentDate = dayjs();
+      // 计算一个月前的日期
+      const startDate = currentDate.subtract(1, 'month');
+      // 格式化日期为 'YYYY-MM-DD'
+      const formatDate = date => date.format('YYYY-MM-DD');
+      this.query.taskTimeArr = [];
+      (this.query.taskTimeArr[0] = formatDate(startDate)), // 一个月前的日期
+        (this.query.taskTimeArr[1] = formatDate(currentDate)); // 当前日期
     },
- async onLoad(page, params = {}) {
+    async onLoad(page, params = {}) {
       this.loading = true;
-      if(this.currentdate){
-      await  this.Getcurrentdate()
+      if (this.currentdate) {
+        await this.Getcurrentdate();
       }
       if (getObjType(this.query.taskTimeArr) === 'array') {
         params.taskTimeStart = this.query.taskTimeArr[0];
@@ -1107,7 +1108,6 @@ this.query.taskTimeArr[1] = formatDate(currentDate) // 当前日期
       }
 
       getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-
         const data = res.data.data;
         // eslint-disable-next-line no-empty
         for (let i = 0; i < data.records.length; i++) {
@@ -1134,7 +1134,7 @@ this.query.taskTimeArr[1] = formatDate(currentDate) // 当前日期
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
-        this.currentdate=false
+        this.currentdate = false;
         this.selectionClear();
       });
       getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 10d78949..319f8f8b 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -92,7 +92,7 @@
       <!-- </el-row> -->
       <!-- 商配总车次 -->
 
-      <div style="height:100%">
+      <div style="height: 100%">
         <div class="flex-c-sb">
           <div class="flex1">
             <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -152,13 +152,9 @@
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
-              <el-text @click="printOrder(slotProps.scope.row)">
-                打 印
-              </el-text>
-              <el-text @click="editsolt(slotProps.scope)">
-                详 情
-              </el-text>
-      
+              <el-text @click="printOrder(slotProps.scope.row)"> 打 印 </el-text>
+              <el-text @click="editsolt(slotProps.scope)"> 详 情 </el-text>
+
               <el-text
                 size="small"
                 v-if="
@@ -174,10 +170,8 @@
                 @click="CancelDelivery(slotProps.scope)"
                 >取消配送</el-text
               >
-       
-              <el-text @click="editmap(slotProps.scope)">
-                地 图
-              </el-text>
+
+              <el-text @click="editmap(slotProps.scope)"> 地 图 </el-text>
             </template>
 
             <template v-if="slotProps.scope.column.label === '车次号'">
@@ -335,14 +329,14 @@ import {
   $_cancelDelivery,
 } from '@/api/distribution/distributionDeliveryList';
 import option from '@/option/distribution/distributionDeliveryList';
-import {columnList} from '@/option/distribution/distributionDeliveryListdis.js'
+import { columnList } from '@/option/distribution/distributionDeliveryListdis.js';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { addIncrement } from '@/api/distribution/distributionStockArticle';
 import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
 import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
 import print from '@/utils/print';
-import { downloadXls, getObjType, handleClearTableQuery,setNodeHeight } from '@/utils/util';
+import { downloadXls, getObjType, handleClearTableQuery, setNodeHeight } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import * as XLSX from 'xlsx';
 export default {
@@ -415,7 +409,7 @@ export default {
           },
         },
       ],
-      columnList:columnList,
+      columnList: columnList,
       // 表单配置
       option: option,
       //增值服务弹窗
@@ -697,7 +691,8 @@ export default {
       this.$router.push({
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
-          data: encodeURIComponent(JSON.stringify(row)),
+          // data: encodeURIComponent(JSON.stringify(row)),
+          id: row.id,
           name: row.trainNumber + '-查看配送',
         },
       });
@@ -872,7 +867,8 @@ export default {
       this.$router.push({
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
-          data: encodeURIComponent(JSON.stringify(row)),
+          // data: encodeURIComponent(JSON.stringify(row)),
+          id: row.id,
           name: row.trainNumber + '-查看配送',
         },
       });
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index c162ec9d..8abf332a 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -409,7 +409,7 @@
               @inputTxt="inputscReservationPackage"
               @timeCheck="timescReservationPackage"
               @selectCheck="selectscReservationPackage"
-              ref="wtableBox"
+              ref="wtableBox1"
               @selection="selectionChange"
             >
               <template #default="slotProps">
@@ -485,7 +485,7 @@
               @inputTxt="inputscReservationInventoryPackage"
               @timeCheck="timescReservationInventoryPackage"
               @selectCheck="selectscReservationInventoryPackage"
-              ref="wtableBox"
+              ref="wtableBox2"
               @selection="selectionChange"
             >
               <template #default="slotProps">
@@ -556,7 +556,7 @@
               @timeCheck="timescLessThantruckloadList"
               @selectCheck="selectscLessThantruckloadList"
               @selection="selectionChange"
-              ref="wtableBox"
+              ref="wtableBox3"
             >
               <template #default="slotProps">
                 <template v-if="slotProps.scope.column.label === '操作'">
@@ -770,7 +770,7 @@
       @close="Abnormalshutdown"
       class="el_abnormalBox"
     >
-    <el-button type="primary" @click="abnormalViewQRcode(1)">批量查看二维码</el-button>
+      <el-button type="primary" @click="abnormalViewQRcode(1)">批量查看二维码</el-button>
       <tablecmt
         :columnList="AbnormalReview"
         :tableData="AbnormalReviewData"
@@ -801,7 +801,7 @@
             </div>
 
             <el-text
-              @click="abnormalViewQRcode(2,slotProps.scope.row)"
+              @click="abnormalViewQRcode(2, slotProps.scope.row)"
               style="margin-left: 10px"
               type="primary"
               text
@@ -3281,7 +3281,7 @@ export default {
           const element = data.moldList[i];
           this.html += element;
         }
-        this.isShowPrint = true;//开启二维码弹出框
+        this.isShowPrint = true; //开启二维码弹出框
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
@@ -3333,41 +3333,47 @@ export default {
       };
       this.AbnormalReviewloading = true; //开启加载
       this.dialogViReject = false;
-      $_loadingAbnormalPackageListTurnDown(data).then(res => {
-        if (res.data.code == 200) {
-          console.log(res, '驳回成功返回值');
-          ElMessage({
-          message: res.data.msg,
-          type: 'success',
+      $_loadingAbnormalPackageListTurnDown(data)
+        .then(res => {
+          if (res.data.code == 200) {
+            console.log(res, '驳回成功返回值');
+            ElMessage({
+              message: res.data.msg,
+              type: 'success',
+            });
+            this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
+          }
         })
-          this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
-        }
-      }).catch(error=>{
-        console.log(error,'error');
-      }).finally(()=>{
-        this.AbnormalReviewloading = false; //关闭加载
-      });
+        .catch(error => {
+          console.log(error, 'error');
+        })
+        .finally(() => {
+          this.AbnormalReviewloading = false; //关闭加载
+        });
     },
     //审批异常装车包件
     auditing(row) {
       this.AbnormalReviewloading = true; //开启加载
       console.log('----------->row', row);
-      loadingAbnormalPackageListAuditing(row.id).then(res => {
-        console.log('res-------->', res);
-        if (res.data.code == 200) {
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
-          });
+      loadingAbnormalPackageListAuditing(row.id)
+        .then(res => {
+          console.log('res-------->', res);
+          if (res.data.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '操作成功!',
+            });
+            this.AbnormalReviewloading = false; //关闭加载
+            console.log();
+            this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
+          }
+        })
+        .catch(error => {
+          console.log(error, 'error');
+        })
+        .finally(() => {
           this.AbnormalReviewloading = false; //关闭加载
-          console.log();
-          this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
-        }
-      }).catch(error=>{
-        console.log(error,'error');
-      }).finally(()=>{
-        this.AbnormalReviewloading = false; //关闭加载
-      });
+        });
     },
     // 一键审核
     allauditing() {
@@ -4723,68 +4729,6 @@ export default {
             this.TCloading = false; //取消限制
           });
       }
-
-      // 本身图片处理结束
-
-      // 上传图片处理开始
-      // {
-      //   name: item.name,
-      //   reservationId: reservationId,
-      //   type: photoType,
-      //   urlRoute: item.url,
-      // }
-
-      // console.log(row, '要提交的参数');
-      // getOneclickq(row).then(res => {
-      //   console.log(res);
-      // });
-      // this.$refs.signform.validate(valid => {
-      //   if (valid) {
-      //     if (this.signtitle === '复核签收') {
-      //       let row = {};
-      //       console.log(
-      //         'this.signform.deliverySignPictures>>>>>>>>>',
-      //         this.signform.deliverySignPictures
-      //       );
-      //       row.id = this.signform.deliveryId;
-      //       row.deliverySignPictures = this.signform.deliverySignPictures;
-      //       row.clerkSignRemarks = this.signform.clerkSignRemarks;
-      //       row.signingTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      //       row.signingStatus = '2';
-      //       console.log('更新参数>>>>>>>>', row);
-      //       if (!!row.id) {
-      //         updatesign(row).then(
-      //           () => {
-      //             this.$message({
-      //               type: 'success',
-      //               message: '操作成功!',
-      //             });
-      //             this.onLoad();
-      //           },
-      //           error => {
-      //             console.log(error);
-      //           }
-      //         );
-      //       }
-      //     } else {
-      //       let data = {};
-      //       console.log('---------------->this.deliverydata', this.deliverydata);
-      //       console.log('---------------->this.signform', this.signform);
-      //       data.reservationId = this.signform.id;
-      //       data.deliveryId = this.deliverydata.id;
-      //       data.deliverySignPictures = this.signform.deliverySignPictures.join(',');
-      //       data.clerkSignRemarks = this.signform.clerkSignRemarks;
-      //       console.log('一键签收data>>>>>>>>>>', data);
-      //       getOneclickq(data).then(res => {
-      //         this.$message.success(res.data.msg);
-      //         this.onLoad();
-      //       });
-      //     }
-      //     // 清空签收表单的数据, 并关闭弹出框
-      //     this.signform = {};
-      //     this.signBox = false;
-      //   }
-      // });
     },
     //客户列表
     handleCustom() {
@@ -4888,8 +4832,10 @@ export default {
       this.reservationActiveName = 'reservationPackage';
       this.getWrapdetails(this.wpage);
       await this.$nextTick();
-
-      setNodeHeight(this.$refs.wtableBox.$el, '600px');
+      console.log('this.$refs :>> ', this.$refs);
+      setNodeHeight(this.$refs.wtableBox1.$el, '600px');
+      setNodeHeight(this.$refs.wtableBox2.$el, '600px');
+      setNodeHeight(this.$refs.wtableBox3.$el, '600px');
     },
     /** 是否全屏 */
     /**
@@ -4904,9 +4850,13 @@ export default {
         case 'el-dialog-view':
           this.wrapoption.fullscreen = !this.wrapoption.fullscreen;
           if (_type === 'close') {
-            if (_node) setNodeHeight(_node, '600px');
+            setNodeHeight(this.$refs.wtableBox1.$el, '600px');
+            setNodeHeight(this.$refs.wtableBox2.$el, '600px');
+            setNodeHeight(this.$refs.wtableBox3.$el, '600px');
           } else {
-            if (_node) setNodeHeight(_node);
+            setNodeHeight(this.$refs.wtableBox1.$el);
+            setNodeHeight(this.$refs.wtableBox2.$el);
+            setNodeHeight(this.$refs.wtableBox3.$el);
           }
           break;
 
@@ -5236,18 +5186,10 @@ export default {
       try {
         this.loadingObj.pageLoading = true;
         //查询详情
-        const subdata = decodeURIComponent(this.$route.query.data);
-        this.deliverydata = JSON.parse(subdata);
+
         this.loading = true; //开启加载
-        console.log(this.Routid, this.Routid, '存储的ID=====================WDWADAWD');
-        console.log('data>>>>>>>>', this.deliverydata);
-        if (this.deliverydata.retention) {
-          // 滞留跳转进来的
-          this.deliveryId = this.deliverydata.deliveryId; //存储ID
-        } else {
-          // 商配进来的
-          this.deliveryId = this.deliverydata.id; //存储ID
-        }
+
+        this.deliveryId = this.$route.query.id;
         const res = await getDetail(this.deliveryId);
 
         const { code, data } = res.data;
@@ -5255,7 +5197,6 @@ export default {
         if (code !== 200) return;
 
         this.deliverydata = data;
-        // this.deliverydata.outboundDate = data.stockupInfo.outboundDate;
         if (data.stockupInfo && data.stockupInfo.forkliftName) {
           this.deliverydata.forkliftName = data.stockupInfo.forkliftName;
         }
@@ -5263,22 +5204,6 @@ export default {
         console.log('this.deliverydata>>>>>>>>>>>>', this.deliverydata);
         this.deliverydata.remarks = data.remarks;
 
-        // this.deliverydata.teamResponsibility = b.join(',');
-        // console.log(
-        //   'data.stockupInfo.teamResponsibility------------------->',
-        //   data.stockupInfo.teamResponsibility
-        // );
-        // let a = data.stockupInfo.teamResponsibility.split(',');
-        // let b = [];
-        // a.forEach(item => {
-        //   switch (item) {
-        //     case '1':
-        //       b.push('装');
-        //       return;
-        //     case '2':
-        //       b.push('卸');
-        //   }
-        // });
         this.data = data.reservationList;
         let a = 0;
         let packNum = 0;
@@ -5296,16 +5221,6 @@ export default {
         this.deliverydata.deliveryNumber = packNum;
         this.deliverydata.inventoryNub = invenNum;
         this.deliverydata.signingNumber = signNum;
-        // console.log('---------------------------->a', a);
-        // console.log('---------------------------->packNum', packNum);
-        // console.log('---------------------------->invenNum', invenNum);
-        // console.log('---------------------------->signNum', signNum);
-        // this.handleOrder(this.packpage);
-        // this.handlePackage(this.packpage);
-        // console.log('--------->deliveryType', this.deliverydata);
-        // if (this.deliverydata.deliveryType !== '商配') {
-        //   this.handleInventory(this.packpage);
-        // }
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index fed7a3d1..c15c8738 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -554,8 +554,9 @@ export default {
       this.$router.push({
         path: '/distribution/deliverylist/distributionDeliveryListedt',
         query: {
-          data: encodeURIComponent(JSON.stringify(row)),
+          // data: encodeURIComponent(JSON.stringify(row)),
           state: 'imgType',
+          id: row.id,
           name: row.trainNumber + '-查看配送',
         },
       });
diff --git a/src/views/distribution/inventory/BackStockTask.vue b/src/views/distribution/inventory/BackStockTask.vue
new file mode 100644
index 00000000..07d2af9f
--- /dev/null
+++ b/src/views/distribution/inventory/BackStockTask.vue
@@ -0,0 +1,445 @@
+<template>
+  <basic-container v-loading="details.loadingObj.pageLoading">
+    <div class="avue-crud">
+      <!-- 搜索模块 -->
+      <div v-h5uShow="!search">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="header_search">
+          <template v-for="item in details.columnList" :key="item.prop">
+            <el-form-item v-if="item.isTitleSearch" :label="item.label">
+              <!-- 普通输入框 -->
+              <template v-if="item.type === 2">
+                <el-input
+                  class="w100"
+                  :placeholder="`请输入${item.label}`"
+                  v-model="details.query[item.prop]"
+                  clearable
+                ></el-input>
+              </template>
+
+              <!-- 下拉框 -->
+              <template v-else-if="item.type === 3">
+                <el-select
+                  v-model="details.query[item.prop.replace('Name', '')]"
+                  :placeholder="`请选择${item.label}`"
+                  class="w100"
+                  clearable
+                  filterable
+                  :multiple="item.multiple || false"
+                  @change="
+                    val => {
+                      !val && delete details.query[item.prop.replace('Name', '')];
+                    }
+                  "
+                >
+                  <el-option
+                    v-for="val in item.checkarr"
+                    :key="val.value"
+                    :label="val.label"
+                    :value="val.value"
+                  />
+                </el-select>
+              </template>
+            </el-form-item>
+          </template>
+
+          <!-- 查询按钮 -->
+          <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 class="avue-crud__header">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <!-- 导出 -->
+          <el-button type="primary" icon="Download" @click="handleExport">导 出</el-button>
+        </div>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="Search" @click="searchHide" circle></el-button>
+        </div>
+      </div>
+
+      <!-- 列表模块 -->
+      <tablecmt
+        :columnList="details.columnList"
+        :tableData="data"
+        :loading="loadingObj.list"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @selectCheck="selectsc"
+        @selection="selectionChange"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text @click="handleView(slotProps.scope)"> 查看配送详情 </el-text>
+          </template>
+        </template>
+      </tablecmt>
+
+      <!-- 分页模块 -->
+      <div class="flex-c-sb mt20">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.current"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
+    </div>
+  </basic-container>
+
+  <!-- 上传 -->
+  <MyUpload
+    ref="myUpload"
+    v-model="details.popUpShow.UploadPackageDelivery"
+    templateSrc=""
+    uploadAddress="/api/logpm-basicdata/vehicle/import-basicdataVehicle"
+    isDefined
+    :success="
+      () => {
+        details.popUpShow.UploadPackageDelivery = false;
+        onLoad();
+      }
+    "
+  >
+    <!-- <el-button type="danger" icon="Download" @click="handleDownloadTemplate"> 下载模板 </el-button> -->
+  </MyUpload>
+
+  <!-- 列表配置显示 -->
+  <edittablehead
+    @closce="showdrawer"
+    :drawerShow="drawerShow"
+    v-model="details.columnList"
+  ></edittablehead>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, toRefs, computed, onMounted, nextTick, getCurrentInstance } from 'vue';
+import functions from '@/utils/functions.js';
+import dayjs from 'dayjs';
+import { mapGetters } from 'vuex';
+/** 获取字典 */
+import { getDictionaryBiz } from '@/api/system/dict';
+import {
+  downloadXls,
+  setNodeHeight,
+  getHtmls,
+  deepClone,
+  handleClearTableQuery,
+  debounce,
+  handleSelectQuery,
+  handleInputQuery,
+  handleTranslationDataSeclect,
+  getObjType,
+} from '@/utils/util';
+import columnList from '@/option/basicdata/BackStockTask.js';
+import { useStore } from 'vuex';
+import { useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { exportBlob } from '@/api/common';
+import { dateNow } from '@/utils/date';
+import { getNewPage } from '@/api/warehouse/warehouseRetentionRecord.js';
+import { remove, getPage, getDictionary } from '@/api/basicdata/basicdataVehicle';
+
+// 获取路由实例
+const $router = useRouter();
+
+const $store = useStore();
+
+const details = reactive<any>({
+  /** 是否开启搜索 */
+  search: true,
+  /** 表格搜索条件 */
+  query: {},
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+  /** 列表 */
+  columnList: deepClone(columnList),
+  /** 列表数据 */
+  data: [{}],
+  /** 页面loading */
+  loadingObj: {
+    /** 列表加载loading */
+    list: false,
+    /** 页面loading */
+    pageLoading: false,
+  },
+  /** 列表复选框选中的数据 */
+  selectionList: [],
+  /** 是否显示设置表格 */
+  drawerShow: false,
+  /** 分页参数 */
+  page: {
+    current: 1,
+    size: 30,
+    total: 0,
+  },
+  /** 弹出层显示 */
+  popUpShow: {
+    /** 图片预览 */
+    abnormalVisited: false,
+    /** 上传 */
+    UploadPackageDelivery: false,
+  },
+  /** 列表Dom节点 */
+  listNode: '',
+  form: {},
+  /** 全屏 */
+  fullscreenObj: {
+    /** 查看 */
+    view: false,
+  },
+});
+
+const { search, query, shortcuts, data, loadingObj, selectionList, drawerShow, page } =
+  toRefs(details);
+
+const instance = getCurrentInstance();
+
+/** vuex */
+const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList']));
+
+onMounted(() => {
+  const timer = setTimeout(() => {
+    details.listNode = document.querySelector('.maboxhi');
+    details.listNode.style.transition = 'all .5s ease-out';
+    clearTimeout(timer);
+  }, 100);
+});
+
+/** 请求页面数据 */
+const onLoad = debounce(async () => {
+  try {
+    details.loadingObj.list = true;
+    let _page = details.page;
+    // 获取暂存单列表
+    const res = await getNewPage({ ..._page, ...details.query });
+    console.log('res :>> ', res);
+    const { code, data } = res.data;
+    if (code !== 200) return;
+    details.data = data.records;
+
+    handleTranslationDataSeclect(details.data, details.columnList);
+
+    details.page.total = data.total;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+}, 10);
+
+const handleData = (key, res) => {
+  const { code, data } = res.data;
+  if (code !== 200) return;
+  for (let i = 0; i < details.columnList.length; i++) {
+    const value = details.columnList[i];
+
+    if (value.label === key)
+      return (value.checkarr =
+        getObjType(data) === 'array'
+          ? data.map(val => {
+              val.label = val.dictValue;
+              val.value = val.dictKey;
+              return val;
+            })
+          : []);
+  }
+};
+
+// 获取字典数据
+const initData = async () => {
+  try {
+    details.loadingObj.pageLoading = true;
+
+    await Promise.all([
+      // 车辆来源
+      getDictionaryBiz('basic_vehicle_source').then(res => handleData('车辆来源', res)),
+
+      onLoad(false),
+    ]);
+
+    await nextTick();
+    handleTranslationDataSeclect(details.data, details.columnList);
+    console.log('details.columnList :>> ', details.columnList);
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+initData();
+
+/** 搜索 */
+const searchChange = () => {
+  onLoad();
+};
+
+/** 清空表单 */
+const searchReset = () => {
+  details.query = {};
+  details.page.current = 1;
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
+
+/** 展开列表控件 */
+const showdrawer = (_flag?: boolean) => {
+  details.drawerShow = _flag;
+};
+
+/** 是否开启搜索区 */
+const searchHide = () => {
+  details.search = !details.search;
+
+  setNodeHeight(details.listNode, '', true);
+};
+
+/** 表格表头输入框搜索 */
+const inputsc = (index, row) => {
+  handleInputQuery(index, row, details.query);
+  onLoad();
+};
+
+/** 表格表头时间选择 */
+const timesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.query[row.prop] = index;
+  if (!index) {
+    delete details.query[row.prop];
+  }
+  onLoad();
+};
+
+/** 表格表头下拉框选择 */
+const selectsc = (index, row) => {
+  handleSelectQuery(index, row, details.query);
+
+  onLoad();
+};
+
+/** 表格表头复选框选择 */
+const selectionChange = (list: any) => {
+  details.selectionList = list;
+};
+
+/** 每页数量改变执行的回调 */
+const sizeChange = (size: number) => {
+  details.page.size = size;
+  onLoad();
+};
+
+/** 页码改变执行的回调 */
+const currentChange = current => {
+  details.page.current = current;
+  onLoad();
+};
+
+/** 查看 */
+const handleView = ({ row }) => {
+  $router.push({
+    path: '/distribution/deliverylist/distributionDeliveryListedt',
+    query: {
+      id: row.deliveryId,
+      name: row.trainNumber + '-查看配送',
+    },
+  });
+};
+
+/** 导出 */
+const handleExport = () => {
+  console.log('instance :>> ', instance);
+
+  let downloadUrl = `/logpm-basicdata/vehicle/export-basicdataVehicle`;
+  let submitData = {
+    ids: '',
+  };
+  submitData.ids = details.selectionList.map(item => item.id).join(',') || '';
+  ElMessageBox.confirm('是否导出数据?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await exportBlob(downloadUrl, submitData);
+      const { status, data } = res;
+      if (status !== 200) return;
+
+      downloadXls(res.data, `车辆信息导出${dateNow()}.xlsx`);
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+</script>
+
+<style scoped lang="scss">
+// 日期选择器
+:deep(.el-date-editor.el-input) {
+  height: 100% !important;
+  width: 100% !important;
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 100% !important;
+}
+
+.mt20 {
+  margin-top: 20px;
+}
+
+.fwb {
+  font-weight: bold;
+}
+</style>
diff --git a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
index 2191b7e6..f0a03632 100644
--- a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
+++ b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
@@ -335,14 +335,15 @@ const onLoad = () => {
     });
 };
 onLoad();
-const view = row => {
+const view = ({ row }) => {
   console.log(row, 'row');
-  row.row.retention = true;
+  row.retention = true;
   $router.push({
     path: '/distribution/deliverylist/distributionDeliveryListedt',
     query: {
-      data: JSON.stringify(row.row),
-      name: row.row.deliveryId + '-查看配送',
+      // data: JSON.stringify(row),
+      id: row.deliveryId,
+      name: row.deliveryId + '-查看配送',
     },
   });
 };
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index f7dd74f8..ed5dc34f 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -1379,8 +1379,8 @@ const handleClose = res => {
 /** 开标签提交 */
 const handleSubmitAddTag = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
-  if (valid) {
-    formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
+    if (valid) {
       ElMessageBox.confirm('确认提交吗?', '提示', {
         confirmButtonText: '确认',
         cancelButtonText: '取消',
@@ -1410,10 +1410,10 @@ const handleSubmitAddTag = (formEl: FormInstance | undefined) => {
           details.loadingObj.addTagLoading = false;
         }
       });
-    });
-  } else {
-    console.log('error submit!', fields);
-  }
+    } else {
+      console.log('error submit!', fields);
+    }
+  });
 };
 
 /** 开标签重置 */