diff --git a/src/api/basicdata/basicdataGoodsAllocation.js b/src/api/basicdata/basicdataGoodsAllocation.js
index 78b09d87..1797d765 100644
--- a/src/api/basicdata/basicdataGoodsAllocation.js
+++ b/src/api/basicdata/basicdataGoodsAllocation.js
@@ -8,7 +8,14 @@ export const getList = params => {
     params,
   });
 };
-
+/** 是否自动上架 */
+export const $_updateDefault = data => {
+  return request({
+    url: '/api/logpm-basicdata/goodsAllocation/updateDefault',
+    method: 'post',
+    data,
+  });
+};
 export const getDetail = id => {
   return request({
     url: '/api/logpm-basicdata/goodsAllocation/detail',
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index 5553d26b..b2852322 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -25,6 +25,18 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  
+  {
+    prop: 'isDefault',
+    label: '是否自动上架',
+    type: 6,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'goodsAreaName',
     label: '货区名称',
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 1b2093c1..d0c5524e 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -108,6 +108,14 @@
 
             <el-text @click="() => handleDownAllocation(false, slotProps.scope)">一键下架</el-text>
           </template>
+          <template v-if="slotProps.scope.column.label == '是否自动上架'">
+            <el-switch
+              @click="handleMakeCargo(slotProps.scope.row)"
+              v-model="slotProps.scope.row.isDefault"
+              :active-value="1"
+              :inactive-value="0"
+            />
+          </template>
         </template>
       </tablecmt>
 
@@ -181,6 +189,7 @@ import {
   disable,
   enable,
   getNode,
+  $_updateDefault,
   downAllocation,
 } from '@/api/basicdata/basicdataGoodsAllocation';
 
@@ -559,6 +568,37 @@ const handleView = ({ row }) => {
     },
   });
 };
+const handleMakeCargo = async row => {
+  row.isDefault = !row.isDefault ? 1 : 0;
+  ElMessageBox.confirm(`是否确认${row.isDefault ? '关闭' : '开启'}{操作?`, '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(async () => {
+      try {
+        details.loadingObj.list = true;
+        let data = {
+          id: row.id,
+          isDefault: !row.isDefault ? 1 : 0,
+        };
+        await $_updateDefault(data).then(res => {
+          if (res.data.code == 200) {
+            ElMessage.success(res.data.msg);
+          }
+        });
+      } catch (e) {
+        console.log(e);
+      } finally {
+        details.loadingObj.list = false;
+        onLoad();
+      }
+    })
+    .catch(() => {
+      console.log(row,'row');
+      
+    });
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 234574dc..9ee16dc4 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -470,6 +470,20 @@
             />
           </el-select>
         </el-form-item>
+
+        <el-form-item label="是否自动上架">
+          <el-select
+            v-model="Expandconfigurationform.isAutoWarehouse"
+            placeholder="请选择是否自动上架"
+          >
+            <el-option
+              v-for="item in Compulsoryoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -1108,12 +1122,14 @@ const Expandconfiguration = async row => {
     let _res = await $_warehouseConfig(data);
 
     if (_res.data.code == 200) {
-      const { id, isStrictLoading, isAutoRelease } = _res.data.data;
+      const { id, isStrictLoading, isAutoRelease,isAutoWarehouse } = _res.data.data;
       dialogExpandconfiguration.value = true;
       let form = Expandconfigurationform.value;
       form.id = id; //id
       form.isStrictLoading = isStrictLoading; //是否强制装车
       form.isAutoRelease = isAutoRelease; //是否自动释放
+      form.isAutoWarehouse = isAutoWarehouse; //是否自动释放
+      
     }
     console.log(_res, '_res');
   } catch (err) {
diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
index 0f0927a6..a2c31dd5 100644
--- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
+++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
@@ -49,7 +49,9 @@
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="ElBtnClass">
-                <el-text type="primary">编辑</el-text>
+                <el-text type="primary">异动调整</el-text>
+                <el-text type="primary">异动记录</el-text>
+                <el-text type="primary">结算</el-text>
               </div>
             </template>
           </template>