From e3c6e255ffbda3ff7d823b9014855ac1419b607e Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Wed, 9 Aug 2023 21:40:34 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=89=A9=E6=96=99=E5=AF=BC=E5=87=BA=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5,=E6=89=98=E7=9B=98=E6=8A=A5=E6=8D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/warehouseRetentionRecord.js |   50 +
 src/option/basic/basicMaterial.js             |    3 +-
 src/option/basicdata/basicdataTray.js         |    8 +-
 .../warehouse/warehouseRetentionRecord.js     |  231 ++++
 src/router/views/index.js                     |   19 +
 src/views/basic/material/basicMaterial.vue    |   75 +-
 .../goodsArea/basicdataGoodsArea.vue          |    6 +-
 .../warehouse/tray/basicdataTray.vue          |  122 +-
 .../warehouse/tray/basicdataTrayedt.vue       | 1026 +++++++++++++++++
 .../deliverylist/distributionDeliveryList.vue |    1 -
 .../distributionDeliveryListedt.vue           |   37 +-
 .../warehouse/warehouseRetentionRecord.vue    |  225 ++++
 12 files changed, 1770 insertions(+), 33 deletions(-)
 create mode 100644 src/api/warehouse/warehouseRetentionRecord.js
 create mode 100644 src/option/warehouse/warehouseRetentionRecord.js
 create mode 100644 src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
 create mode 100644 src/views/warehouse/warehouseRetentionRecord.vue

diff --git a/src/api/warehouse/warehouseRetentionRecord.js b/src/api/warehouse/warehouseRetentionRecord.js
new file mode 100644
index 00000000..df0e0a7b
--- /dev/null
+++ b/src/api/warehouse/warehouseRetentionRecord.js
@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseRetentionRecord/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseRetentionRecord/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseRetentionRecord/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseRetentionRecord/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseRetentionRecord/submit',
+    method: 'post',
+    data: row
+  })
+}
+
diff --git a/src/option/basic/basicMaterial.js b/src/option/basic/basicMaterial.js
index 9af76ac1..291b11e8 100644
--- a/src/option/basic/basicMaterial.js
+++ b/src/option/basic/basicMaterial.js
@@ -7,7 +7,8 @@ export default {
   border: true,
   index: true,
   viewBtn: true,
-  selection: true,
+  delBtn:true,
+  selection: false,
   indexLabel: "序号",
   indexWidth: '80',
   dialogClickModal: false,
diff --git a/src/option/basicdata/basicdataTray.js b/src/option/basicdata/basicdataTray.js
index f3328d1a..6c64486b 100644
--- a/src/option/basicdata/basicdataTray.js
+++ b/src/option/basicdata/basicdataTray.js
@@ -7,7 +7,7 @@ export default {
   searchMenuSpan: 6,
   border: true,
   viewBtn: true,
-  selection: true,
+  selection: false,
   index: true,
   indexLabel:'序号',
   indexWidth:'150',
@@ -136,6 +136,7 @@ export default {
         label: 'name',
         value: 'id',
       },
+      rules: [{ required: true, message: '请选择仓库!',trigger: 'blur'}],
       placeholder:'请输入仓库关键词',
       labelWidth:'100',
       addDisplay: true,
@@ -171,7 +172,7 @@ export default {
       align:'center',
       labelWidth:'100',
       width:200,
-      addDisplay: false,
+
 
     },
     {
@@ -192,7 +193,8 @@ export default {
       addDisplay: true,
       editDisplay: false,
       viewDisplay: false,
-      hide: true
+      hide: true,
+      rules: [{ required: true, message: '请选择状态!',trigger: 'blur'}],
     },
     {
       label: "旧托盘码",
diff --git a/src/option/warehouse/warehouseRetentionRecord.js b/src/option/warehouse/warehouseRetentionRecord.js
new file mode 100644
index 00000000..33dd3443
--- /dev/null
+++ b/src/option/warehouse/warehouseRetentionRecord.js
@@ -0,0 +1,231 @@
+export default {
+  height:'auto',
+  calcHeight: 30,
+  tip: false,
+  searchShow: true,
+  searchMenuSpan: 6,
+  border: true,
+  index: true,
+  viewBtn: true,
+  selection: true,
+  dialogClickModal: false,
+  column: [
+    {
+      label: "主键",
+      prop: "id",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "租户号",
+      prop: "tenantId",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建人",
+      prop: "createUser",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建时间",
+      prop: "createTime",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "更新人",
+      prop: "updateUser",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "更新时间",
+      prop: "updateTime",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "状态",
+      prop: "status",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "是否已删除",
+      prop: "isDeleted",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "创建部门",
+      prop: "createDept",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "预留1",
+      prop: "reserve1",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "预留2",
+      prop: "reserve2",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "预留3",
+      prop: "reserve3",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "预留4",
+      prop: "reserve4",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "预留5",
+      prop: "reserve5",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "订单自编码",
+      prop: "orderCode",
+      type: "input",
+    },
+    {
+      label: "包件码",
+      prop: "packageCode",
+      type: "input",
+    },
+    {
+      label: "运单号",
+      prop: "waybillNo",
+      type: "input",
+    },
+    {
+      label: "滞留车次号",
+      prop: "retentionCarId",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "滞留车次号",
+      prop: "retentionCarNo",
+      type: "input",
+    },
+    {
+      label: "滞留仓库id",
+      prop: "retentionWarehouseId",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "滞留仓库名称",
+      prop: "retentionWarehouseName",
+      type: "input",
+    },
+    {
+      label: "滞留类型;1=装车滞留，2=配送滞留，3=取消滞留,4=出库滞留",
+      prop: "retentionType",
+      type: "input",
+    },
+    {
+      label: "装车时间",
+      prop: "assembleCarDate",
+      type: "input",
+    },
+    {
+      label: "装车人id",
+      prop: "assembleCarPersonId",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "装车人名称",
+      prop: "assembleCarPersonName",
+      type: "input",
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      type: "input",
+    },
+    {
+      label: "取消滞留人id",
+      prop: "cancelRetentionUserId",
+      type: "input",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: true,
+    },
+    {
+      label: "取消滞留人名称",
+      prop: "cancelRetentionUserName",
+      type: "input",
+    },
+    {
+      label: "取消滞留备注",
+      prop: "cancelRemark",
+      type: "input",
+    },
+  ]
+}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 4747a7dd..d86b4f92 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -781,6 +781,25 @@ export default [
       },
     ],
   },
+  {
+    path: '/basicdata/warehouse/tray/basicdataTrayedt',
+    component: Layout,
+    redirect: '/warehouse/tray/basicdataTrayedt',
+    children: [
+      {
+        path: '/basicdata/warehouse/tray/basicdataTrayedt',
+        name: '在托货物',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id
+        }),
+        component: () => import('@/views/basicdata/warehouse/tray/basicdataTrayedt.vue'),
+      },
+    ],
+  },
   // {
   //   path: '/distribution/inventory/distributionPrints',
   //   component: Layout,
diff --git a/src/views/basic/material/basicMaterial.vue b/src/views/basic/material/basicMaterial.vue
index b0a825c5..ae29317d 100644
--- a/src/views/basic/material/basicMaterial.vue
+++ b/src/views/basic/material/basicMaterial.vue
@@ -23,9 +23,9 @@
         <el-button type="danger"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.basicMaterial_delete"
-                   @click="handleDelete">删 除
+                   @click="handleImport">导 入
         </el-button>
+<!--        v-if="permission.basicMaterial_delete"-->
         <el-button type="warning"
                    plain
                    icon="el-icon-download"
@@ -39,6 +39,15 @@
                    @click="rowDelTripartite(row,index)">三方物料</el-button>
       </template>
     </avue-crud>
+    <el-dialog title="物料导入" append-to-body v-model="excelBox" width="555px">
+      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+        <template #excelTemplate>
+          <el-button type="primary" @click="handleTemplate">
+            点击下载<i class="el-icon-download el-icon--right"></i>
+          </el-button>
+        </template>
+      </avue-form>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -60,6 +69,8 @@
         query: {},
         search: {},
         loading: true,
+        excelBox: false,
+        excelForm: {},
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -67,7 +78,32 @@
         },
         selectionList: [],
         option: option,
-        data: []
+        data: [],
+        excelOption: {
+          submitBtn: false,
+          emptyBtn: false,
+          column: [
+            {
+              label: '文件上传',
+              prop: 'excelFile',
+              type: 'upload',
+              drag: true,
+              loadText: '文件上传，请稍等',
+              span: 24,
+              propsHttp: {
+                res: 'data',
+              },
+              tip: '请上传 .xls,.xlsx 标准格式文件',
+              action: '/api/logpm-basic/material/import-basicMaterial',
+            },
+            // {
+            //   label: '模板下载',
+            //   prop: 'excelTemplate',
+            //   formslot: true,
+            //   span: 24,
+            // },
+          ],
+        },
       };
     },
     computed: {
@@ -88,6 +124,15 @@
         return ids.join(",");
       }
     },
+
+    watch:{
+      'excelForm.isCovered'() {
+        if (this.excelForm.isCovered !== '') {
+          const column = this.findObject(this.excelOption.column, 'excelFile');
+          column.action = `/api/logpm-warehouse/warehouseWarehousingEntry/import-WarehousingEntry?isCovered=${this.excelForm.isCovered}`;
+        }
+      },
+    },
     methods: {
 
       rowDelTripartite(row,num){
@@ -174,8 +219,14 @@
             this.$refs.crud.toggleSelection();
           });
       },
+      uploadAfter(res, done, loading, column) {
+        window.console.log(column);
+        this.excelBox = false;
+        this.refreshChange();
+        done();
+      },
       handleExport() {
-        let downloadUrl = `/blade-basicMaterial/basicMaterial/export-basicMaterial?${this.website.tokenHeader}=${getToken()}`;
+        let downloadUrl = `/api/logpm-basic/material/export-basicMaterial?${this.website.tokenHeader}=${getToken()}`;
         const {
         } = this.query;
         let values = {
@@ -192,6 +243,19 @@
           })
         });
       },
+      //导出
+      handleImport(){
+        this.excelBox = true;
+      },
+      //下载模板
+      handleTemplate() {
+        console.log("下载模板！！！");
+        exportBlob(
+          `/api/logpm-warehouse/warehouseWarehousingEntry/export-warehouseWarehousingEntry?${this.website.tokenHeader}=${getToken()}`
+        ).then(res => {
+          downloadXls(res.data, '物料数据模板.xlsx');
+        });
+      },
       beforeOpen(done, type) {
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
@@ -237,7 +301,8 @@
         let values = {
           productCode:productCode,
           name:name,
-          brandId:brandId
+          brandId:brandId,
+          hide:1
         };
 
         getList(page.currentPage, page.pageSize, values).then(res => {
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index bb5a53a9..87a901ab 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -296,9 +296,9 @@ export default {
 
     },
     getListInfo(){
-      // getDictionaryBiz( 'area_type').then(res => {
-      //   this.areaTypeData = res.data.data;
-      // });
+      getDictionaryBiz( 'area_type').then(res => {
+        this.areaTypeData = res.data.data;
+      });
 
       getDictionaryBiz( 'enable_status').then(res => {
         this.enableStatus = res.data.data;
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index 783c8728..ffcf135c 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -32,7 +32,29 @@
                    @click="handleExport">导 出
         </el-button>
       </template>
+      <template #menu="{size,row,index}">
+        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="losses(row)">报  损</el-button>
+        <el-button type="primary" text icon="el-icon-view" v-if="row.trayStatus !=='3'" @click="Details(row)">在 托 详 情</el-button>
+        <el-button type="primary" text icon="el-icon-view" @click="losses(row)">历 史 记 录</el-button>
+      </template>
     </avue-crud>
+    <el-dialog :title="'确认破损'"
+               v-model="damagedBox"
+               width="45%"
+               append-to-body>
+      <avue-form :option="damagedoption"
+                 v-model="damagedform"
+                 :data="damageddata"
+                 ref="signform"
+      >
+      </avue-form>
+      <div style="bottom: 7%;margin-left: 500px;width: 50%">
+        <div style="width: 100%">
+          <el-button  type="primary" @click="submitForm" style="margin-right: 20%" >确定</el-button>
+          <el-button  type="primary" @click="cancellation" >取消</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -46,12 +68,15 @@
   import {dateNow} from "@/utils/date";
   import NProgress from 'nprogress';
   import 'nprogress/nprogress.css';
+  import dayjs from 'dayjs';
 
   export default {
     data() {
       return {
         form: {},
         query: {},
+        //破损是否显示
+        damagedBox:false,
         search: {},
         loading: true,
         page: {
@@ -59,6 +84,57 @@
           currentPage: 1,
           total: 0
         },
+        // 破损表单数据
+        damagedform: {},
+        // 破损列表
+        damageddata: [],
+        // 表单配置
+        damagedoption: {
+          height:'auto',
+          width:'40px',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          dialogClickModal: false,
+          emptyBtn: false, //隐藏清空按钮
+          submitBtn: false, //隐藏提交按钮
+          column: [
+            {
+              label: "破损图片",
+              prop: "damagedPhotos",
+              labelWidth:'150',
+              type: 'upload',
+              listType: 'picture-card',
+              width:"150px",
+              span:15,
+              multiple:true,
+              align:'left',
+              action: '/blade-resource/oss/endpoint/put-file',
+              limit: 5,
+              propsHttp: {
+                res: 'data',
+                url: 'link',
+              },
+              disabled:false,
+            },
+
+            {
+              label: "备注",
+              prop: "damagedNote",
+              labelWidth:'150',
+              span:15,
+              type: "input",
+              width:"150px",
+              align:'center',
+            },
+
+          ]
+        },
+        damagedId:null,
         selectionList: [],
         option: option,
         data: []
@@ -83,8 +159,41 @@
       }
     },
     methods: {
+      //取消
+      cancellation(){
+        this.damagedBox = false;
+      },
+      submitForm(){
+        let row = {}
+        row.id = this.damagedform.id
+
+        console.log("更新参数>>>>>>>>",row);
+            update(row).then(() => {
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+            }, error => {
+              loading();
+              console.log(error);
+            });
+      },
+      losses(row){
+        this.damagedform = row
+        this.damagedBox = true
+      },
+      Details(row){
+        this.$router.push({
+          path: '/basicdata/warehouse/tray/basicdataTrayedt',
+          query: {
+            data: encodeURIComponent(JSON.stringify(row)),
+            name: row.palletCode +'-查看在托情况'
+          }
+        });
+      },
       rowSave(row, done, loading) {
-        console.log(this.form);
+        console.log("this.form>>>>>>>>>>>>",this.form);
+        // this.form.trayStatus("1");
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -150,7 +259,7 @@
           });
       },
       handleExport() {
-        let downloadUrl = `/blade-BasicdataTray/BasicdataTray/export-BasicdataTray?${this.website.tokenHeader}=${getToken()}`;
+        let downloadUrl = `/api/logpm-basicdata/material/export-BasicdataTray?${this.website.tokenHeader}=${getToken()}`;
         const {
         } = this.query;
         let values = {
@@ -205,15 +314,20 @@
         this.loading = true;
 
         const {
+          warehouseId,
+          trayStatus,
+          type
         } = this.query;
 
         let values = {
+          warehouseId:warehouseId,
+          trayStatus:trayStatus,
+          type:type
         };
 
         getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
-          console.log(">>>>>>",data);
-          // this.page.total = data.total;
+           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
           this.selectionClear();
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
new file mode 100644
index 00000000..1e1b4cb3
--- /dev/null
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -0,0 +1,1026 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-divider>托 盘 信 息</el-divider>
+<!--      <avue-form :option="propertyoption"  ref="myForm" v-model="dataForm"  @row-update="rowUpdate" >-->
+<!--        <template #input="{row}">-->
+<!--          <el-tag>序号:{{row.$index}}-数据:{{row.input}}</el-tag>-->
+<!--        </template>-->
+<!--      </avue-form>-->
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="8" :sm="24" >
+          <span>托盘码：{{traydata.palletCode}} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>类 型：{{traydata.$type}} </span>
+        </el-col>
+      </el-row>
+
+      <el-divider>在托货物</el-divider>
+      <el-tabs type="border-card" v-model="activeTab"  @tab-click="handleTabClick" >
+        <el-tab-pane label="包 件 列 表" name="tab1">
+          <!-- 列表模块 -->
+          <el-table ref="table" v-loading="loading"
+                    @selection-change="selectionChange"
+                    :data="packdata"
+                    :height="height"
+                    style="width: 100%"
+                    :border="option.border"
+          >
+            <el-table-column type="expand" v-if="wrapoption.expand" align="center"></el-table-column>
+            <template v-for="(item,index) in wrapoption.column">
+              <!-- table字段 -->
+              <el-table-column v-if="item.hide!==true"
+                               :prop="item.prop"
+                               :label="item.label"
+                               align="center"
+                               :width="item.width"
+                               :key="index">
+              </el-table-column>
+            </template>
+          </el-table>
+
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="psizeChange"
+                           @current-change="pcurrentChange"
+                           :current-page="packpage.currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50, 100]"
+                           :page-size="packpage.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="packpage.total">
+            </el-pagination>
+          </div>
+
+        </el-tab-pane>
+        <el-tab-pane label="库 存 品 列 表" name="tab2">
+            <!-- 列表模块 -->
+          <el-table ref="table" v-loading="loading"
+                    @selection-change="selectionChange"
+                    :data="inventorydata"
+                    :height="height"
+                    style="width: 100%"
+                    :border="option.border"
+          >
+            <el-table-column type="expand" v-if="inventoryoption.expand" align="center"></el-table-column>
+            <template v-for="(item,index) in inventoryoption.column">
+              <!-- table字段 -->
+              <el-table-column v-if="item.hide!==true"
+                               :prop="item.prop"
+                               :label="item.label"
+                               align="center"
+                               :width="item.width"
+                               :key="index">
+              </el-table-column>
+            </template>
+          </el-table>
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="isizeChange"
+                           @current-change="icurrentChange"
+                           :current-page="inventorypage.currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50, 100]"
+                           :page-size="inventorypage.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="inventorypage.total">
+            </el-pagination>
+          </div>
+
+        </el-tab-pane>
+        <el-tab-pane label="零 担 列 表" name="tab3">
+          <!-- 列表模块 -->
+          <el-table ref="table" v-loading="loading"
+                    @selection-change="selectionChange"
+                    :data="data"
+                    :height="height"
+                    style="width: 100%"
+                    :border="option.border"
+          >
+            <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+            <template v-for="(item,index) in option.column">
+              <!-- table字段 -->
+              <el-table-column v-if="item.hide!==true"
+                               :prop="item.prop"
+                               :label="item.label"
+                               align="center"
+                               :width="item.width"
+                               :key="index">
+              </el-table-column>
+            </template>
+          </el-table>
+          <div class="avue-crud__pagination" style="width:100%">
+            <!-- 分页模块 -->
+            <el-pagination align="right"
+                           background
+                           @size-change="sizeChange"
+                           @current-change="currentChange"
+                           :current-page="page.currentPage"
+                           :page-sizes="[10, 20, 30, 40, 50, 100]"
+                           :page-size="page.pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="page.total">
+            </el-pagination>
+          </div>
+
+
+        </el-tab-pane>
+
+      </el-tabs>
+
+
+
+      <el-row>
+      </el-row>
+
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getDetail, add, update, remove } from '@/api/basicdata/basicdataTray';
+import {  update as updatesign,getOneclickq } from "@/api/distribution/distributionSignfor";
+import option from '@/option/basic/basicPdarecords';
+import { mapGetters } from 'vuex';
+import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
+
+export default {
+  data() {
+    return {
+      height: 300,
+      // 弹框标题
+      title: '',
+      signtitle: '',
+      // 是否展示弹框
+      box: false,
+      //签收是否显示
+      signBox: false,
+      //签收类型
+      signBoxO: false,
+      dataForm: {},
+      // 是否显示查询
+      search: true,
+      //是否显示新增
+      isadd: false,
+      traydata:{
+        reservationList:[],
+      },
+      // 加载中
+      loading: true,
+      //查看按钮
+      edt:false,
+      activeTab:'tab1',
+      previousTab: null,
+      //隐藏
+      pake:false,
+      cus:true,
+      ord:false,
+      inventory:false,
+      //查看pda
+      padview:false,
+      // 是否为查看模式。。
+      view: false,
+      // 签收。。
+      signView:false,
+      // 查询信息
+      query: {},
+      inputTypeData:[],
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 签收表单数据
+      signform: {},
+      // 选择行
+      selectionList: [],
+      isLiabilityData: [],
+      //状态列表
+      stateData: [],
+      // 表单配置
+      option: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "配送车次号",
+            prop: "trainNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "收货人",
+            prop: "consignee",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "收货电话",
+            prop: "deliveryPhone",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "收货地址",
+            prop: "deliveryAddress",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "订单自编号",
+            prop: "orderIds",
+            search: true,
+            width:"100px"
+          },
+
+          {
+            label: "配送件数",
+            prop: "packageNub",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "配送库存品数",
+            prop: "reservationStockListNum",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "扫描件数",
+            prop: "loadedNub",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "是否加急",
+            prop: "businessDepartment",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "签收件数",
+            prop: "receivedQuantity",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "签收状态",
+            prop: "signingStatus",
+            search: true,
+            width:"100px"
+          },
+        ]
+      },
+
+      // 表单配置
+      signoption: {
+        height:'auto',
+        width:'40px',
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        viewBtn: true,
+        dialogClickModal: false,
+        emptyBtn: false, //隐藏清空按钮
+        submitBtn: false, //隐藏提交按钮
+        column: [
+          {
+            label: "收货人姓名",
+            labelWidth:'150',
+            span:11,
+            prop: "consignee",
+            type: "input",
+            width:"150px",
+            align:'center',
+            disabled:true,
+            // rules: [{
+            //   required: true,
+            //   message: "输入承运商编号",
+            //   trigger: "blur"
+            // }],
+          },
+          {
+            label: "收货人电话",
+            prop: "deliveryPhone",
+            labelWidth:'150',
+            span:11,
+            type: "input",
+            width:"150px",
+            align:'center',
+            disabled:true,
+          },
+          {
+            label: "收货地址",
+            prop: "deliveryAddress",
+            labelWidth:'150',
+            span:11,
+            type: "input",
+            width:"150px",
+            align:'center',
+            disabled:true,
+          },
+          {
+            label: "签收类型",
+            prop: "signingType",
+            labelWidth:'150',
+            span:11,
+            type: "radio",
+            width:"150px",
+            align:'center',
+            disabled:false,
+            dicData: [
+              {
+                label: '签收',
+                value: '1',
+              },
+              {
+                label: '代签收',
+                value: '2',
+              }
+            ],
+          },
+          {
+            label: "签收图片",
+            prop: "deliverySignPictures",
+            labelWidth:'150',
+            type: 'upload',
+            listType: 'picture-card',
+            width:"150px",
+            span:15,
+            multiple:true,
+            align:'left',
+            action: '/blade-resource/oss/endpoint/put-file',
+            limit: 5,
+            propsHttp: {
+              res: 'data',
+              url: 'link',
+            },
+            disabled:false,
+          },
+          // {
+          //   label: "复核图片",
+          //   prop: "clerkSignPictures",
+          //   type: 'upload',
+          //   listType: 'picture-card',
+          //   dataType: 'string',
+          //   labelWidth:'150',
+          //   span:15,
+          //   multiple:true,
+          //   width:"200px",
+          //   align:'left',
+          //   action: '/blade-resource/oss/endpoint/put-file',
+          //   limit: 15,
+          //   propsHttp: {
+          //     res: 'data',
+          //     url: 'link',
+          //   },
+          //   rules: [{
+          //     required: true,
+          //     message: "请上传图片",
+          //     trigger: "blur"
+          //   }],
+          // },
+
+          {
+            label: "备注",
+            prop: "clerkSignRemarks",
+            labelWidth:'150',
+            span:15,
+            type: "input",
+            width:"150px",
+            align:'center',
+          },
+
+        ]
+      },
+
+
+      // 表单配置
+      wrapoption: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "包条码",
+            prop: "orderPackageCode",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "仓库",
+            prop: "warehouse",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "一级品类",
+            prop: "firsts",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "二级品类",
+            prop: "second",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "三级品类",
+            prop: "thirdProduct",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料编号",
+            prop: "materialCode",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料名称",
+            prop: "materialName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "托盘码",
+            prop: "pallet",
+            width:"100px"
+          },
+          {
+            label: "库位号",
+            prop: "goodsAllocation",
+
+            width:"100px"
+          },
+
+        ]
+      },
+      // 库存品表单配置
+      inventoryoption: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "sku",
+            prop: "sku",
+            search: true,
+            width:"100px"
+          },
+          // {
+          //   label: "订单自编号",
+          //   prop: "orderCode",
+          //   search: true,
+          //   width:"100px"
+          // },
+          {
+            label: "物料名称",
+            prop: "descriptionGoods",
+            search: true,
+            width:"100px"
+          },
+          // {
+          //   label: "单位",
+          //   prop: "cargoUnit",
+          //   search: true,
+          //   width:"100px"
+          // },
+          {
+            label: "备货数",
+            prop: "deliveryNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "已备数量",
+            prop: "readyStock",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料编号",
+            prop: "cargoNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "单位",
+            prop: "cargoUnit",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "托盘码",
+            prop: "pallet",
+            width:"100px"
+          },
+          {
+            label: "库位信息",
+            prop: "goodsAllocation",
+            width:"100px"
+          },
+
+
+        ]
+      },
+      // 订单表单配置
+      ordoption: {
+        expand: false,
+        index: true,
+        border: true,
+        selection: true,
+        column: [
+          {
+            label: "订单自编号",
+            prop: "orderCode",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "货物名称",
+            prop: "descriptionGoods",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "物料名称",
+            prop: "materialName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "备货件数",
+            prop: "deliveryNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "已备数量",
+            prop: "readyStock",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "备货状态",
+            prop: "stockArticleState",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "托盘码",
+            prop: "pallet",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "货位信息",
+            prop: "goodsAllocation",
+            search: true,
+            width:"100px"
+          },
+        ]
+      },
+      //包肩分页信息
+      wpage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      //包肩分页信息
+      packpage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      ordpage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      inventorypage:{
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单列表
+      data: [],
+      // 签收列表
+      signdata: [],
+      //客户id
+      wid:null,
+      //客户详情
+      wrapdata:[],
+      //包条列表
+      packdata:[],
+      //订单列表
+      orddata:[],
+      //库存品列表
+      inventorydata:[],
+    };
+  },
+  watch: {
+    // eslint-disable-next-line no-unused-vars
+    '$route'(to, from) {
+      // this.isadd =false;
+      // this.query.masterId = null;
+      // this.masterId = null;
+      // if (!!this.$route.query.data) {
+      //   //   //做一些路由变化的响应
+      //   //   //   this.isadd =true;
+      //   //   this.query.masterId = this.$route.query.data;
+      //   //   this.masterId = this.$route.query.data;
+      //   //重新获取数据
+      //   this.onLoad(this.page);
+      // } else {
+      // }
+    }
+  },
+  mounted() {
+    this.init();
+    this.onLoad();
+  },
+  created() {
+    // //查询字典
+    // this.queryDictionary();
+  },
+  computed: {
+    ...mapGetters(['permission']),
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(',');
+    }
+  },
+  methods: {
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    //修改
+    rowUpdate(row, index, done, loading) {
+      console.log("row>>>>>>>>",row);
+    },
+    queryDictionary() {
+      getDictionaryBiz('yes_no').then(res => {
+        this.isLiabilityData = res.data.data;
+      });
+      getDictionaryBiz('basic_in_type').then(res => {
+        this.inputTypeData = res.data.data;
+      });
+
+    },
+    //返回
+    handleViewpda() {
+
+    },
+    //取消
+    cancellation(){
+      this.signBox = false;
+    },
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    handleTabClick(tab, event){
+      console.log("tab>>>>>>>>", tab.paneName);
+      let tabName = tab.paneName
+      switch (tabName){
+        case 'tab1':
+          console.log("ssss")
+          break;
+        case 'tab2':
+          console.log("ssss")
+          break;
+        case 'tab3':
+          console.log("ssss")
+          break;
+        case 'tab4':
+          console.log("ssss")
+          break;
+      }
+    },
+    searchHide() {
+      this.search = !this.search;
+    },
+    searchChange() {
+      this.onLoad(this.page);
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.form.stringValue =jsonString;
+          if (!this.form.id) {
+            this.form.masterId = this.propertyformdata.id;
+            add(this.form).then(() => {
+              this.box = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+              let str = {
+                val: false
+              }
+              this.$emit("returnproperty", str);
+            });
+          } else {
+            update(this.form).then(() => {
+              this.box = false;
+              this.onLoad(this.page);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+              let str = {
+                val: false
+              }
+              this.$emit("returnproperty", str);
+            });
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    submitForm(){
+      this.$refs.signform.validate(valid => {
+        if (valid) {
+          if (this.signtitle='复核签收'){
+          let row = {}
+          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.signBox = false;
+            this.onLoad()
+          }, error => {
+            console.log(error);
+            this.signBox = false;
+          });
+          }else {
+            let data ={}
+            data.reservationId =row.id
+            data.deliveryId =this.traydata.id
+            data.deliverySignPictures = this.signform.deliverySignPictures
+            data.clerkSignRemarks = this.signform.clerkSignRemarks
+            console.log("一键签收data>>>>>>>>>>",data);
+            getOneclickq(data).then(res => {
+              this.$message.success(res.data.msg)
+              this.signBox = false;
+              this.onLoad()
+            });
+          }
+        }
+      });
+    },
+    //客户列表
+    handleCustom(){
+      this.cus =true
+      this.pake =false
+      this.ord =false
+      this.inventory =false
+    },
+    //订单列表
+    handleOrder(page){
+      let params={}
+      params.deliveryId =  this.traydata.id
+      getorddetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log("查看>>>>>订单>>",res.data.data);
+        const data =res.data.data
+        this.orddata = data.records
+        this.ordpage.total = data.total
+      });
+    },
+    //包件列表
+    handlePackage(page){
+      let params={}
+      params.deliveryId =  this.traydata.id
+      getpackdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log("查看>>>>>包间>>",res.data.data);
+        const data =res.data.data
+        this.packdata = data.records
+        this.packpage.total = data.total
+      });
+
+    },
+    //库存列表
+    handleInventory(page){
+      let params={}
+      params.deliveryId =  this.traydata.id
+      getinventorydetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log("查看>>>>>库存>>",res.data.data);
+        const data =res.data.data
+        this.inventorydata = data.records
+        this.inventorypage.total = data.total
+      });
+    },
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
+    },
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView(row) {
+      console.log("查看>>>>>>>>>>",row);
+      this.title = '查看';
+      this.view = true;
+      this.box = true;
+      this.wid= row.id
+    this.getWrapdetails(this.wpage)
+    },
+    handleSign(row) {
+      console.log("签收>>>>>>>>>>",row);
+      this.signtitle = '复核签收';
+      // this.view = true;
+      this.signform = row
+       this.signBox = true;
+    //  this.wid= row.id
+   // this.getWrapdetails(this.wpage)
+    },
+    //一键签收
+    handleSignone(row) {
+      console.log("一键签收>>>>>>>>>>",row);
+        this.signtitle = '一键签收';
+          this.signform = row
+          this.signBox = true
+    },
+    handleOne(row) {
+      console.log("签收>>>>>>>>>>",row);
+      this.$confirm('确认一键装车？')
+        .then(_ => {
+              let data ={}
+            data.reservationId =row.id
+            data.deliveryId =this.traydata.id
+          getOneclick(data).then(res => {
+           this.$message.success(res.data.msg)
+            this.onLoad()
+          });
+        })
+        .catch(_ => {
+        });
+    },
+    getWrapdetails(page){
+      let params={}
+      params.reservationId = this.wid
+      getWrapdetail(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log("查看>>>>>>>",res.data.data);
+        const data =res.data.data
+        this.wrapdata = data.records
+        this.wpage.total = data.total
+      });
+    },
+
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+        });
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+        });
+    },
+    beforeClose(done) {
+      done();
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange(list) {
+      console.log("sllsls");
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.table.clearSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    wcurrentChange(currentPage) {
+      this.wpage.currentPage = currentPage;
+      this.getWrapdetails(this.wpage)
+    },
+    wsizeChange(pageSize) {
+      this.wpage.pageSize = pageSize;
+      this.getWrapdetails(this.wpage)
+    },
+    pcurrentChange(currentPage) {
+      this.packpage.currentPage = currentPage;
+      this.handlePackage(this.packpage)
+    },
+    psizeChange(pageSize) {
+      this.packpage.pageSize = pageSize;
+      this.handlePackage(this.packpage)
+    },
+    ocurrentChange(currentPage) {
+      this.ordpage.currentPage = currentPage;
+      this.handleordpage(this.ordpage)
+    },
+    osizeChange(pageSize) {
+      this.inventorypage.pageSize = pageSize;
+      this.handleordpage(this.inventorypage)
+    },
+    icurrentChange(currentPage) {
+      this.inventorypage.currentPage = currentPage;
+      this.handleordpage(this.inventorypage)
+    },
+    isizeChange(pageSize) {
+      this.inventorypage.pageSize = pageSize;
+      this.handleordpage(this.inventorypage)
+    },
+    onLoad() {
+      //查询详情
+      const data = decodeURIComponent(this.$route.query.data);
+      this.traydata = JSON.parse(data);
+      console.log("data>>>>>>>>", this.traydata);
+      this.loading = true;
+      let id =  this.traydata.id;
+      getDetail(id).then(res => {
+        console.log("res.data>>>>>>>>>>>>",res.data.data);
+        const data = res.data.data
+        //this.traydata = data
+        this.data = data.reservationList
+      });
+      // this.handleOrder(this.packpage);
+      // this.handlePackage(this.packpage);
+      // this.handleInventory(this.packpage);
+      this.loading = false;
+    }
+  }
+};
+</script>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index e00420bc..72985c4b 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -52,7 +52,6 @@
           <template #default="slotProps">
             <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
             <el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
-<!--            <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
             <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>
           </template>
         </tablecmt>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index d894a75e..ab4fec71 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -266,7 +266,7 @@
 <!--        </template>-->
       </el-dialog>
 
-      <el-dialog :title="'签收'"
+      <el-dialog :title="signtitle"
                  v-model="signBox"
                  width="45%"
                  append-to-body>
@@ -313,6 +313,7 @@ export default {
       height: 300,
       // 弹框标题
       title: '',
+      signtitle: '',
       // 是否展示弹框
       box: false,
       //签收是否显示
@@ -930,9 +931,10 @@ export default {
     submitForm(){
       this.$refs.signform.validate(valid => {
         if (valid) {
+          if (this.signtitle='复核签收'){
           let row = {}
           row.id = this.signform.deliveryId
-          row.clerkSignPictures = this.signform.clerkSignPictures
+          row.deliverySignPictures = this.signform.deliverySignPictures
           row.clerkSignRemarks = this.signform.clerkSignRemarks
           row.signingTime =dayjs().format("YYYY-MM-DD HH:mm:ss")
           row.signingStatus = '2'
@@ -949,6 +951,19 @@ export default {
             console.log(error);
             this.signBox = false;
           });
+          }else {
+            let data ={}
+            data.reservationId =row.id
+            data.deliveryId =this.deliverydata.id
+            data.deliverySignPictures = this.signform.deliverySignPictures
+            data.clerkSignRemarks = this.signform.clerkSignRemarks
+            console.log("一键签收data>>>>>>>>>>",data);
+            getOneclickq(data).then(res => {
+              this.$message.success(res.data.msg)
+              this.signBox = false;
+              this.onLoad()
+            });
+          }
         }
       });
     },
@@ -1015,7 +1030,7 @@ export default {
     },
     handleSign(row) {
       console.log("签收>>>>>>>>>>",row);
-      // this.title = '查看';
+      this.signtitle = '复核签收';
       // this.view = true;
       this.signform = row
        this.signBox = true;
@@ -1025,19 +1040,9 @@ export default {
     //一键签收
     handleSignone(row) {
       console.log("一键签收>>>>>>>>>>",row);
-      this.$confirm('确认一键签收？')
-        .then(_ => {
-          let data ={}
-          data.reservationId =row.id
-          data.deliveryId =this.deliverydata.id
-          console.log("一键签收data>>>>>>>>>>",data);
-          getOneclickq(data).then(res => {
-            this.$message.success(res.data.msg)
-            this.onLoad()
-          });
-        })
-        .catch(_ => {
-        });
+        this.signtitle = '一键签收';
+          this.signform = row
+          this.signBox = true
     },
     handleOne(row) {
       console.log("签收>>>>>>>>>>",row);
diff --git a/src/views/warehouse/warehouseRetentionRecord.vue b/src/views/warehouse/warehouseRetentionRecord.vue
new file mode 100644
index 00000000..2a65f3cb
--- /dev/null
+++ b/src/views/warehouse/warehouseRetentionRecord.vue
@@ -0,0 +1,225 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               v-model:search="search"
+               v-model:page="page"
+               v-model="form"
+               :table-loading="loading"
+               :data="data"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template #menu-left>
+        <el-button type="danger"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.warehouseRetentionRecord_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+        <el-button type="warning"
+                   plain
+                   icon="el-icon-download"
+                   @click="handleExport">导 出
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/warehouse/warehouseRetentionRecord";
+  import option from "@/option/warehouse/warehouseRetentionRecord";
+  import {mapGetters} from "vuex";
+  import {exportBlob} from "@/api/common";
+  import {getToken} from '@/utils/auth';
+  import {downloadXls} from "@/utils/util";
+  import {dateNow} from "@/utils/date";
+  import NProgress from 'nprogress';
+  import 'nprogress/nprogress.css';
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        search: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: option,
+        data: []
+      };
+    },
+    computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.validData(this.permission.warehouseRetentionRecord_add, false),
+          viewBtn: this.validData(this.permission.warehouseRetentionRecord_view, false),
+          delBtn: this.validData(this.permission.warehouseRetentionRecord_delete, false),
+          editBtn: this.validData(this.permission.warehouseRetentionRecord_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      handleExport() {
+        let downloadUrl = `/retentionRecord/warehouseRetentionRecord/export-warehouseRetentionRecord?${this.website.tokenHeader}=${getToken()}`;
+        const {
+        } = this.query;
+        let values = {
+        };
+        this.$confirm("是否导出数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          NProgress.start();
+          exportBlob(downloadUrl, values).then(res => {
+            downloadXls(res.data, `滞留记录${dateNow()}.xlsx`);
+            NProgress.done();
+          })
+        });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+
+        const {
+        } = this.query;
+
+        let values = {
+        };
+
+        getList(page.currentPage, page.pageSize, values).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>