diff --git a/src/api/basicdata/basicdataGoodsShelf.js b/src/api/basicdata/basicdataGoodsShelf.js
index 765e3b1c..4208c9d1 100644
--- a/src/api/basicdata/basicdataGoodsShelf.js
+++ b/src/api/basicdata/basicdataGoodsShelf.js
@@ -31,6 +31,24 @@ export const remove = (ids) => {
     }
   })
 }
+export const disable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsShelf/disable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+export const enable = (ids) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsShelf/enable',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 
 export const add = (row) => {
   return request({
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 7945e4bc..3db46012 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -105,8 +105,8 @@
               <el-button type="primary" text icon="el-icon-view" @click="handleExport(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>
-              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>
-              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>-->
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>-->
             </template>
           </el-table-column>
         </el-table>
@@ -186,18 +186,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-           <el-col :span="12">
-             <el-form-item label="仓库:" prop="warehouseId" v-if="isShow" label-width="110px">
-               <el-select v-model="form.warehouseId" filterable  placeholder="请选择仓库" style="width: 70%" >
-                 <el-option
-                         v-for="item in allWarehouse"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-                 </el-option>
-               </el-select>
-             </el-form-item>
-           </el-col>
+<!--           <el-col :span="12">-->
+<!--             <el-form-item label="仓库:" prop="warehouseId" v-if="isShow" label-width="110px">-->
+<!--               <el-select v-model="form.warehouseId" filterable  placeholder="请选择仓库" style="width: 70%" >-->
+<!--                 <el-option-->
+<!--                         v-for="item in allWarehouse"-->
+<!--                         :key="item.id"-->
+<!--                         :label="item.name"-->
+<!--                         :value="item.id">-->
+<!--                 </el-option>-->
+<!--               </el-select>-->
+<!--             </el-form-item>-->
+<!--           </el-col>-->
           </el-row>
         </el-form>
         <!-- 表单按钮 -->
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index d3327f4c..17e23bc1 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -107,8 +107,8 @@
               <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="addAllocation(row)">编 辑 货 位</el-button>
               <el-button type="primary" text icon="el-icon-edit" @click="locationList(row)">货 位 列 表</el-button>
-              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>
-              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='启用'"  @click="rowDis(row)">禁用</el-button>-->
+<!--              <el-button type="primary" text icon="el-icon-delete" v-if="row.enableStatus=='禁用'" @click="rowEna(row)">启用</el-button>-->
               <!--              <el-button type="primary" text icon="el-icon-edit" @click="enableStatus(row)">-->
               <!--                <span v-if="row.enableStatus === '启用'">禁用</span>-->
               <!--                <span v-else>启用</span>-->
@@ -304,11 +304,11 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,getPrintTemplate,addAllocation } from "@/api/basicdata/basicdataGoodsShelf";
+import { getList, getDetail, add, update, remove,getQRCodeImg,getShowTemplate,getPrintTemplate,addAllocation,disable,enable } from "@/api/basicdata/basicdataGoodsShelf";
 import {getList as allgetList,update as allupdate} from "@/api/basicdata/basicdataGoodsAllocation";
 import option from "@/option/basicdata/basicdataGoodsShelf";
 import { mapGetters } from "vuex";
-import { disable, enable, getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
+import {  getGoodsAreaNodeList } from '@/api/basicdata/basicdataGoodsArea';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getTemplateData} from '@/api/basic/basicPrintTemplate'
 import { getLodop } from '@/utils/LodopFuncs.js'
diff --git a/src/views/reservation/order_list.vue b/src/views/reservation/order_list.vue
index 900d7692..3cdac67b 100644
--- a/src/views/reservation/order_list.vue
+++ b/src/views/reservation/order_list.vue
@@ -969,7 +969,7 @@ export default {
       // 返回false,说明全都相等
       if(!notEqualFlag){
         this.$router.push({
-          path: '/distribution/reservation/reservationFrom',
+          path: '/distribution/reservation/order_listFrom',
           query:{
             id: this.ids,
           }