diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index a75d81a6..234574dc 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -1,69 +1,83 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.list" element-loading-text="正在加载中...">
     <el-row v-if="details.search">
       <el-form :inline="true" :model="Topquery" class="el-fr-d"> </el-form>
     </el-row>
     <!-- 头部右侧按钮模块 -->
-    <div class="el_top_btn">
-      <div>
-        <el-button type="primary" @click="newlyadd" icon="el-icon-plus">新 增</el-button>
-        <el-button type="primary" icon="el-icon-delete" @click="DeleteInformationAll"
-          >批量删除</el-button
-        >
-      </div>
-      <div class="avue-crud__right">
-        <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
-        <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-        <el-button icon="Search" @click="searchHide" circle></el-button>
+    <div> 
+      <el-tabs type="border-card" class="top-el-tabs" v-model="tabName" @tab-change="tabchange">
+      <el-tab-pane label="全部" :name="1">全部</el-tab-pane>
+      <el-tab-pane label="临期" :name="2">临期</el-tab-pane>
+      <el-tab-pane label="到期" :name="3">到期</el-tab-pane>
+    </el-tabs>
+    <div>
+      <div class="el_top_btn">
+        <div>
+          <el-button type="primary" @click="newlyadd" icon="el-icon-plus">新 增</el-button>
+          <el-button type="primary" icon="el-icon-delete" @click="DeleteInformationAll"
+            >批量删除</el-button
+          >
+        </div>
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="Search" @click="searchHide" circle></el-button>
+        </div>
       </div>
-    </div>
 
-    <el-row>
-      <!-- 列表模块 -->
-      <tablecmt
-        :columnList="details.columnList"
-        :tableData="data"
-        :loading="loadingObj.list"
-        :checkselect="selectList"
-        @inputTxt="inputsc"
-        @timeCheck="timesc"
-        @btnCheck="btnsc"
-        @selectCheck="selectsc"
-        @selection="selectionChange"
-      >
-        <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作'">
-            <div class="ElBtnClass">
-              <el-text v-if="userInfo == 'admin'" @click="Expandconfiguration(slotProps.scope.row)"
-                >扩展配置</el-text
-              >
-              <el-text @click="view(slotProps.scope)">查看</el-text>
-              <el-text @click="edit(slotProps.scope)">编辑</el-text>
-              <el-text @click="DeleteInformation(slotProps.scope)">删除</el-text>
-            </div>
+      <el-row>
+        <!-- 列表模块 -->
+        <tablecmt
+          class="tableNode"
+          :columnList="details.columnList"
+          :tableData="data"
+          :checkselect="selectList"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <div class="ElBtnClass">
+                <el-text
+                  v-if="userInfo == 'admin'"
+                  @click="Expandconfiguration(slotProps.scope.row)"
+                  >扩展配置</el-text
+                >
+                <el-text @click="view(slotProps.scope)">查看</el-text>
+                <el-text @click="edit(slotProps.scope)">编辑</el-text>
+                <el-text @click="DeleteInformation(slotProps.scope)">删除</el-text>
+              </div>
+            </template>
           </template>
-        </template>
-      </tablecmt>
-    </el-row>
+        </tablecmt>
+      </el-row>
+
+      <!-- 分页模块 -->
+      <el-row class="el-fy">
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <div></div>
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
+          </el-pagination>
+        </div>
+      </el-row>
+    </div>
+
+
+    </div>
 
-    <!-- 分页模块 -->
-    <el-row class="el-fy">
-      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-        <div></div>
-        <el-pagination
-          align="right"
-          background
-          @size-change="sizeChange"
-          @current-change="currentChange"
-          :current-page="page.currentPage"
-          :page-sizes="[30, 50, 80, 120]"
-          :page-size="page.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="page.total"
-        >
-        </el-pagination>
-      </div>
-    </el-row>
     <!-- 新增弹窗  -->
     <el-dialog destroy-on-close v-model="newlyaddload" :title="dialogTitle" width="50%">
       <el-form
@@ -507,7 +521,7 @@ import {
   $_warehouseConfigupdate,
 } from '@/api/basicdata/basicdataWarehouse';
 
-import { processRowProperty, deepClone } from '@/utils/util';
+import { processRowProperty, deepClone, setNodeHeight } from '@/utils/util';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { getToken } from '@/utils/auth';
 import dayjs from 'dayjs';
@@ -533,6 +547,7 @@ const Expandconfigurationform = ref({});
 const selectAll = ref([]);
 const formdisabled = ref(false);
 const search = ref(false); //搜索展开
+const tabName = ref(1);
 const warehouseID = ref('');
 const Manageregionalconfiguration = {
   multiple: true,
@@ -821,23 +836,33 @@ const MyWareh = () => {
   });
 };
 MyWareh(); //获取仓库列表
+const Setheight = () => {
+  const _node = document.querySelector('.tableNode');
+  setNodeHeight(_node, '', true);
+};
+
+const tabchange = () => {
+  onLoad();
+};
 const onLoad = val => {
   let data = {
     current: details.page.currentPage,
     size: details.page.pageSize,
+    pageType: tabName.value,
     ...val,
     ...details.query,
   };
-
   details.loadingObj.list = true; //开启表格加载
   $_basicdataWarehouse(data)
-    .then(res => {
+    .then(async res => {
       console.log(gradeList.value, '仓库等级');
-      if (res.data.code == 200) {
-        if (res.data.data.records.length) {
-          details.data = res.data.data.records; //表格数据
-
-          details.page.total = res.data.data.total; //总条数
+      console.log(res, '仓库列表');
+      const { code, data } = res.data;
+      console.log(data, '仓库列表1');
+      if (code == 200) {
+        if (data.records.length) {
+          details.data = data.records; //表格数据
+          details.page.total = data.total; //总条数
           details.data.forEach(item => {
             if (item.functionType) {
               // 职能类型
@@ -896,8 +921,10 @@ const onLoad = val => {
               ).dictValue;
             }
           });
+          await nextTick();
+          Setheight();
         } else {
-          details.data = res.data.data.records; //表格数据
+          details.data = res.data.data.records || []; //表格数据
         }
       }
     })
@@ -1311,4 +1338,9 @@ const newlyaddSubmit = () => {
     width: 20%;
   }
 }
+:deep(.top-el-tabs) {
+  .el-tabs__content {
+    display: none;
+  }
+}
 </style>
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 0c802165..1d8e54e8 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -64,7 +64,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="10">
+          <el-col :span="10" v-if="Collectionfreightcharges">
             <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
               <el-input v-model="form.replaceFee" :disabled="true" />
             </el-form-item>
@@ -486,13 +486,15 @@ import dayjs from 'dayjs';
 import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
 import { setNodeHeight, removeZeroWidth } from '@/utils/util.js';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import error from '@/error';
+import { useStore } from 'vuex';
+
 export default {
   name: '/distribution/reservation/reservationAddFrom',
   data() {
     return {
       activeName: 'orderTab',
       Inventoryloading: true, //库存品加载
+      Collectionfreightcharges:false,//是否收取运费权限
       packageQuery: {},
       reservationloading: false,
       orderRow: {},
@@ -1887,7 +1889,7 @@ export default {
       },
       // 表单数据
       form: {
-        isInstall: '1', //安装
+        isInstall: '2', //安装
       },
       // 选择行
       selectionList: [],
@@ -1984,6 +1986,13 @@ export default {
     console.log('123 :>> ', 123);
     this.fetchData();
     this.onLoad(this.page);
+    const $useStore = useStore();
+    console.log($useStore,'$useStore.getters');
+    
+    if ($useStore.getters && $useStore.getters.permission) {
+      this.Collectionfreightcharges = $useStore.getters.permission.Collectionfreightcharges; //批量签收权限
+      console.log(this.Collectionfreightcharges, 'Collectionfreightchargesl按钮权限');
+    }
     // this.$watch(
     //   () => this.$route.params,
     //   () => {