diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 39c10bcb1..225d00327 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -828,7 +828,6 @@ export const Shift = [
   { label: "备注", prop: "remark" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "结束到下一天", prop: "endAtNextDay", type: "filter", filters: "whetherOrNot" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
diff --git a/fe/PC/src/views/basicData/WarehouseManage/Area.vue b/fe/PC/src/views/basicData/WarehouseManage/Area.vue
index da4814e2f..5389b9c5a 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/Area.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/Area.vue
@@ -109,7 +109,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         areaType: 1,
@@ -120,7 +120,7 @@ export default {
       //编辑
       editFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         areaType: 1,
@@ -134,6 +134,7 @@ export default {
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -142,6 +143,7 @@ export default {
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue
index 53254b0f2..9152b5dff 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/WorkGroup.vue
@@ -112,7 +112,7 @@ export default {
         code: '',
         name: '',
         description: '',
-        warehouseCode: '',
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: ''
       },
       //编辑
@@ -120,7 +120,7 @@ export default {
         code: null,
         name: '',
         description: '',
-        warehouseCode: '',
+        warehouseCode: localStorage.getItem('warehouseCode'),
         concurrencyStamp: '',
         remark: ''
       },
@@ -128,12 +128,14 @@ export default {
       CreateForm: [
         { type: "input", label: "工作组代码", prop: "code", colSpan: 12 },
         { type: "input", label: "工作组名称", prop: 'name', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "工作组代码", prop: "code", disabled:"true", colSpan: 12 },
         { type: "input", label: "工作组名称", prop: 'name', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],