diff --git a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
index e042969da..a91453697 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue
@@ -128,7 +128,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         areaCode: null,
@@ -174,7 +174,7 @@ export default {
       //编辑
       editFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         areaCode: null,
@@ -213,21 +213,23 @@ export default {
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
@@ -255,21 +257,23 @@ export default {
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {