diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js
index 51c2d206..d429fe2b 100644
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@@ -31,6 +31,15 @@ export const remove = (ids) => {
     }
   })
 }
+export const shelf = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsAllocation/downAllocation',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 
 export const add = (row) => {
   return request({
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 7a2adbba..e78e37ad 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -40,6 +40,7 @@
       </template>
       <template #menu="{size,row,index}">
         <el-button type="primary" text icon="el-icon-view"  v-if="row.enableStatus ==1" @click="losses(row,2)">禁 用</el-button>
+        <el-button type="primary" text icon="el-icon-view"  @click="Offshelf(row)">一 键 下 架</el-button>
         <el-button type="primary" text icon="el-icon-view"  v-if="row.enableStatus ==2" @click="losses(row,1)">启 用</el-button>
       </template>
     </avue-crud>
@@ -70,7 +71,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove,getTemplate,getQRCode} from "@/api/basicdata/basicdataGoodsAllocation";
+  import {getList, getDetail, add, update, remove,getTemplate,getQRCode,shelf} from "@/api/basicdata/basicdataGoodsAllocation";
   import option from "@/option/basicdata/basicdataGoodsAllocation";
   import {mapGetters} from "vuex";
   import {exportBlob} from "@/api/common";
@@ -163,8 +164,25 @@
       losses(row,mub){
         this.$confirm('确认操作？')
           .then(_ => {
-        row.enableStatus =mub
-        update(row).then(() => {
+            row.enableStatus =mub
+            update(row).then(() => {
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+            }, error => {
+              loading();
+              console.log(error);
+            });
+          })
+          .catch(_ => {
+          });
+      },
+      Offshelf(row){
+        this.$confirm('确认下架？')
+          .then(_ => {
+            shelf(row.id).then(() => {
           this.onLoad(this.page);
           this.$message({
             type: "success",
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index 8a16a7c9..eb90d403 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -26,11 +26,11 @@
 <!--                   v-if="permission.BasicdataTray_delete"-->
 <!--                   @click="handleDelete">删 除-->
 <!--        </el-button>-->
-        <el-button type="warning"
-                   plain
-                   icon="el-icon-download"
-                   @click="handleExport">导 出
-        </el-button>
+<!--        <el-button type="warning"-->
+<!--                   plain-->
+<!--                   icon="el-icon-download"-->
+<!--                   @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>
@@ -201,6 +201,7 @@
       vacant(row){
         this.$confirm('确认空置？')
           .then(_ => {
+            console.log("row>>>>>>>>>>>>>>>>空置",row);
             vacant(row).then(() => {
               this.onLoad(this.page);
               this.$message({
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 0532f1b7..5e44efd4 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -670,6 +670,7 @@ export default {
   created() {
     // //查询字典
     // this.queryDictionary();
+    this.onLoad();
   },
   computed: {
     ...mapGetters(['permission']),
diff --git a/src/views/warehouse/warehouseLog/warehouseUpdownGoodsLog.vue b/src/views/warehouse/warehouseLog/warehouseUpdownGoodsLog.vue
new file mode 100644
index 00000000..8d7fca19
--- /dev/null
+++ b/src/views/warehouse/warehouseLog/warehouseUpdownGoodsLog.vue
@@ -0,0 +1,318 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <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>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" 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"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </template>
+          <!-- 操作栏模块 -->
+          <el-table-column prop="menu" label="操作" :width="220" align="center">
+            <template #="{row}">
+              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+      <el-row>
+        <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-row>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+          <el-form-item label="仓库id" prop="warehouseId">
+            <el-input v-model="form.warehouseId" placeholder="请输入仓库id"/>
+          </el-form-item>
+          <el-form-item label="仓库名称" prop="warehouseName">
+            <el-input v-model="form.warehouseName" placeholder="请输入仓库名称"/>
+          </el-form-item>
+          <el-form-item label="订单自编码" prop="orderCode">
+            <el-input v-model="form.orderCode" placeholder="请输入订单自编码"/>
+          </el-form-item>
+          <el-form-item label="包件编码" prop="orderPackageCode">
+            <el-input v-model="form.orderPackageCode" placeholder="请输入包件编码"/>
+          </el-form-item>
+          <el-form-item label="上架类型;1=上架,2=下架" prop="bindingType">
+            <el-input v-model="form.bindingType" placeholder="请输入上架类型;1=上架,2=下架"/>
+          </el-form-item>
+          <el-form-item label="是否整托;0不是 1是" prop="isAlltrays">
+            <el-input v-model="form.isAlltrays" placeholder="请输入是否整托;0不是 1是"/>
+          </el-form-item>
+          <el-form-item label="货物类型;有数据 无数据" prop="goodsType">
+            <el-input v-model="form.goodsType" placeholder="请输入货物类型;有数据 无数据"/>
+          </el-form-item>
+          <el-form-item label="关联类型" prop="associationType">
+            <el-input v-model="form.associationType" placeholder="请输入关联类型"/>
+          </el-form-item>
+          <el-form-item label="关联值" prop="associationValue">
+            <el-input v-model="form.associationValue" placeholder="请输入关联值"/>
+          </el-form-item>
+          <el-form-item label="关联id" prop="associationId">
+            <el-input v-model="form.associationId" placeholder="请输入关联id"/>
+          </el-form-item>
+          <el-form-item label="上下架数量" prop="num">
+            <el-input v-model="form.num" placeholder="请输入上下架数量"/>
+          </el-form-item>
+          <el-form-item label="上架方式id" prop="updownTypeId">
+            <el-input v-model="form.updownTypeId" placeholder="请输入上架方式id"/>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注"/>
+          </el-form-item>
+          <el-form-item label="商场id" prop="marketId">
+            <el-input v-model="form.marketId" placeholder="请输入商场id"/>
+          </el-form-item>
+          <el-form-item label="商场名称" prop="marketName">
+            <el-input v-model="form.marketName" placeholder="请输入商场名称"/>
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getpage, getDetail, add, update, remove } from "@/api/warehouse/warehouseUpdownGoodsLog";
+import option from "@/option/warehouse/warehouseUpdownGoodsLog";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted () {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    ids () {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    init () {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    searchHide () {
+      this.search = !this.search;
+    },
+    searchChange () {
+      this.onLoad(this.page);
+    },
+    searchReset () {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit () {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
+      }
+    },
+    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) {
+      this.title = '查看'
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    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) {
+      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);
+    },
+    onLoad (page, params = {}) {
+      this.loading = true;
+      getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>