diff --git a/fe/PC/src/components/currenButton/innerButton.vue b/fe/PC/src/components/currenButton/innerButton.vue
index 33670f7ec..f7525c2f5 100644
--- a/fe/PC/src/components/currenButton/innerButton.vue
+++ b/fe/PC/src/components/currenButton/innerButton.vue
@@ -43,7 +43,6 @@ export default {
             _new.forEach((item) => {
                 if(item.istrue)_num ++
             })
-            console.log(_new)
             this.Butttondata.forEach(item=>{
                 // 监听本地缓存【字段配置】缓存，更改按钮type
                 if(item.name == 'field'){
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 9a3fceebe..676f7a633 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -412,7 +412,7 @@ export const WorkGroup = [
   //   fixed: "right"
   // },
 ]
-// 库位信息
+// 库位信息 20230328
 export const Location = [
   {
     label: "库位代码",
@@ -428,6 +428,31 @@ export const Location = [
   { label: "类型", prop: "type", type: "filter", filters: "locationType" },
   { label: "ERP库位", prop: "erpLocationCode" },
   { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' },
+  // -----------------------------------------------------------------------
+  { label: "货架号", prop: "shelfCode" },
+  { label: "行号", prop: "rowCode" },
+  { label: "列号", prop: "columnCode" },
+  { label: "拣料优先级", prop: "pickPriority" },
+  { label: "拣料顺序", prop: "pickOrder" },
+  { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "备注", prop: "remark" },
+  { label: "描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -462,7 +487,7 @@ export const ItemStoreRelation = [
   //   fixed: "right"
   // },
 ]
-// 库位可用容量信息
+// 库位可用容量信息 20230328 暂无接口
 export const InventoryLocationCapacity = [
   {
     label: "库位代码",
@@ -472,8 +497,10 @@ export const InventoryLocationCapacity = [
   },
   { label: "可用容量(%)", prop: "availableCapacity" },
   { label: "是否无穷大", prop: "isInfinity", type: "filter", filters: "whetherOrNot" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime", showProp: true },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
+  // -----------------------------------------------------------------------
+  
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -482,7 +509,7 @@ export const InventoryLocationCapacity = [
   //   fixed: "right"
   // },
 ]
-// 物品安全库存信息
+// 物品安全库存信息 20230328
 export const ItemSafetyStock = [
   {
     label: "物料代码",
@@ -499,6 +526,10 @@ export const ItemSafetyStock = [
   { label: "补料点", prop: "feedLine" },
   { label: "补料数量", prop: "feedQty" },
   { label: "补料单位", prop: "feedUM" },
+  // -----------------------------------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -507,7 +538,7 @@ export const ItemSafetyStock = [
   //   fixed: "right"
   // },
 ]
-// 事务类型信息
+// 事务类型信息 20230328
 export const TransactionType = [
   {
     label: "事务代码",
@@ -525,6 +556,20 @@ export const TransactionType = [
   { label: "来源库存状态", prop: 'outInventoryStatuses', type: "filterList", filters: "inventoryStage" }, 
   { label: "目标库存状态", prop: 'inInventoryStatuses', type: "filterList", filters: "inventoryStage" },
   { label: "是否可用", prop: 'enabled', type: "filter", filters: "whetherOrNot" },
+  // -----------------------------------------------------------------------
+  { label: "入库库区列表", prop: 'inLocationAreas', type: "filterList", filters: "inventoryStage" },
+  { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" },
+  { label: "自动提交审批", prop: 'autoSubmitRequest', type: "filter", filters: "whetherOrNot" },
+  { label: "自动审批通过", prop: 'autoAgreeRequest', type: "filter", filters: "whetherOrNot" },
+  { label: "自动执行", prop: 'autoHandleRequest', type: "filter", filters: "whetherOrNot" },
+  { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
+  { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
+  { label: "备注", prop: "remark" },
+  { label: "描述", prop: "description" },
+  
+  
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -533,7 +578,7 @@ export const TransactionType = [
   //   fixed: "right"
   // },
 ]
-// 车间信息
+// 车间信息 20230328
 export const Workshop = [
   {
     label: "车间代码",
@@ -544,6 +589,9 @@ export const Workshop = [
   { label: "车间名称", prop: "name" },
   { label: "描述", prop: "description" },
   { label: "备注", prop: "remark" },
+  // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -552,15 +600,21 @@ export const Workshop = [
   //   fixed: "right"
   // },
 ]
-// 生产线信息
+// 生产线信息 20230328
 export const ProductionLine = [
   { label: "生产线代码", prop: "code", fixed: "left", type: "name" },
   { label: "生产线名称", prop: 'name' },
   { label: "类型", prop: "type" },
   { label: "车间代码", prop: "workshopCode" },
-  { label: "原料库位", prop: "rawLocation" },
-  { label: "成品库位", prop: "productLocation" },
+  { label: "原料库位", prop: "rawLocationCode" },
+  { label: "成品库位", prop: "productLocationCode" },
+  { label: "原料库位组", prop: "rawLocationGroupCode" },
   { label: "描述", prop: "description" },
+  // -----------------------------------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -569,11 +623,14 @@ export const ProductionLine = [
   //   fixed: "right"
   // },
 ]
-// 生产线零件关系
+// 生产线零件关系 20230328
 export const ProdLineItem = [
   { label: "物料代码", prop: "itemCode", type: "name" },
   { label: "生产线编号", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
+  // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -600,7 +657,7 @@ export const WorkCenter = [
   //   fixed: "right"
   // },
 ]
-// 班组信息
+// 班组信息 20230328
 export const Team = [
   {
     label: "编号",
@@ -610,6 +667,11 @@ export const Team = [
   },
   { label: "名称", prop: "name" },
   { label: "描述", prop: "description" },
+  // -----------------------------------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "成员", prop: "members" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -618,7 +680,7 @@ export const Team = [
   //   fixed: "right"
   // },
 ]
-// 班次信息
+// 班次信息 20230328
 export const Shift = [
   {
     label: "班次代码",
@@ -628,9 +690,14 @@ export const Shift = [
   },
   { label: "班次名称", prop: "name" },
   { label: "结束到下一天", prop: "endAtNextDay", type: "filter", filters: "whetherOrNot" },
-  { label: "开始时间", prop: "beginTime", type: "dateTime", showProp: true },
-  { label: "结束时间", prop: "endTime", type: "dateTime", showProp: true },
+  { label: "开始时间", prop: "beginTime", type: "dateTime" },
+  { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "描述", prop: "description" },
+  // -----------------------------------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "结束到下一天", prop: "endAtNextDay", type: "filter", filters: "whetherOrNot" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -639,7 +706,7 @@ export const Shift = [
   //   fixed: "right"
   // },
 ]
-// 作业指导书信息
+// 作业指导书信息 20230328
 export const ItemGuideBook = [
   {
     label: "物料代码",
@@ -647,8 +714,15 @@ export const ItemGuideBook = [
     fixed: "left",
     type: "name"
   },
-  { label: "物料名称", prop: "itemName", sortable: false, showProp: true },
-  { label: "物料描述", prop: "itemDesc1", sortable: false, showProp: true },
+  { label: "物料名称", prop: "itemName" },
+  { label: "物料描述", prop: "itemDesc1" },
+  // -----------------------------------------------------------------------
+  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "步骤", prop: "step" },
+  { label: "图片存储名称", prop: "pictureBlobName" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -687,7 +761,7 @@ export const Dict = [
   //   fixed: "right"
   // },
 ]
-// 分类信息
+// 分类信息 20230328
 export const Category = [
   {
     label: "分类编号",
@@ -697,6 +771,10 @@ export const Category = [
   },
   { label: "分类名称", prop: "name" },
   { label: "描述", prop: "description" },
+  // -----------------------------------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -724,16 +802,21 @@ export const Uom = [
   //   fixed: "right"
   // },
 ]
-// 日历信息
+// 日历信息 20230328
 export const Calendar = [
   {
     label: "模块",
-    fixed: "left",
+    prop: "module",
     type: "name",
-    prop: "module"
+    fixed: "left"
   },
-  { label: "状态", prop: "status", type: "filter", filters: "calendarStatus", showProp: true },
+  { label: "状态", prop: "status", type: "filter", filters: "calendarStatus" },
   { label: "备注", prop: "remark" },
+  // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "开始时间", prop: "beginTime",type: "dateTime" },
+  { label: "结束时间", prop: "endTime", type: "dateTime" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -742,7 +825,7 @@ export const Calendar = [
   //   fixed: "right"
   // },
 ]
-// 配置信息
+// 配置信息 20230328 暂无接口
 export const Configuration = [
   {
     label: "键",
@@ -2902,4 +2985,9 @@ export const Department =  [
   { label: "部门名称", prop: "name" },
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
-]
\ No newline at end of file
+]
+
+
+// 字段说明
+// showProp: true //隐藏该字段的高级筛选+列表排序
+// sortable: false //隐藏该字段的列表排序
\ No newline at end of file
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 4b7f4f56b..333c7a480 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -386,7 +386,7 @@ export const WorkGroup =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 库位信息 20221212
+// 库位信息 20230328
 export const Location =  [
   { label: "库位代码", prop: "code" },
   { label: "库位名称", prop: "name" },
@@ -401,21 +401,36 @@ export const Location =  [
   { label: "拣料顺序", prop: "pickOrder" },
   { label: "货架号", prop: "shelfCode" },
   { label: "ERP库位", prop: "erpLocationCode" },
-  { label: "是否混物品", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixItem" },
-  { label: "是否混批次", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixLot" },
-  { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" },
-  { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" },
-  { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" },
-  { label: "是否盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
-  { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" },
-  { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" },
-  { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" },
-  { label: "是否散件存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableBreakStore" },
-  { label: "是否发出", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableShip" },
-  { label: "是否接收", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReceive" },
-  { label: "是否退货给供应商", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnToSupplier" },
-  { label: "是否接收客户退货", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnFromCustomer" },
-  { label: "是否拆箱", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableSplitBox" },
+  { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  // { label: "是否混物品", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixItem" },
+  // { label: "是否混批次", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixLot" },
+  // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" },
+  // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" },
+  // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" },
+  // { label: "是否盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
+  // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" },
+  // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" },
+  // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" },
+  // { label: "是否散件存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableBreakStore" },
+  // { label: "是否发出", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableShip" },
+  // { label: "是否接收", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReceive" },
+  // { label: "是否退货给供应商", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnToSupplier" },
+  // { label: "是否接收客户退货", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableReturnFromCustomer" },
+  // { label: "是否拆箱", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableSplitBox" },
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
@@ -426,7 +441,7 @@ export const Location =  [
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 库位零件关系 20221212
@@ -455,7 +470,7 @@ export const ItemStoreRelation =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 库位可用容量信息 20221212
+// 库位可用容量信息 20230328 暂无接口
 export const InventoryLocationCapacity =  [
   { label: "可用容量(%)", prop: "availableCapacity" },
   { label: "是否无穷大", prop: "isInfinity", type: "filter", filters: "whetherOrNot" },
@@ -473,7 +488,7 @@ export const InventoryLocationCapacity =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物品安全库存信息 20221212apifox
+// 物品安全库存信息 20230328
 export const ItemSafetyStock = [
   { label: "物料代码", prop: "itemCode" },
   { label: "仓库", prop: "warehouseCode" },
@@ -493,10 +508,10 @@ export const ItemSafetyStock = [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 事务类型信息 20221212
+// 事务类型信息 20230328
 export const TransactionType = [
   { label: "事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" },
   { label: "事务子类型", prop: "transSubType", type: "filter", filters: "transSubType" },
@@ -523,10 +538,10 @@ export const TransactionType = [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 车间信息 20221215
+// 车间信息 20230328
 export const Workshop =  [
   { label: "车间代码", prop: "code" },
   { label: "车间名称", prop: 'name' },
@@ -539,17 +554,17 @@ export const Workshop =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 生产线信息 20221215
+// 生产线信息 20230328
 export const ProductionLine =  [
   { label: "生产线代码", prop: "code" },
   { label: "生产线名称", prop: 'name' },
   { label: "类型", prop: "type" },
   { label: "车间", prop: "workshopCode" },
-  { label: "成品库位", prop: "productLocation" },
-  { label: "原料库位", prop: "rawLocation" },
+  { label: "成品库位", prop: "productLocationCode" },
+  { label: "原料库位", prop: "rawLocationCode" },
   { label: "原料库位组", prop: "rawLocationGroupCode" },
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
@@ -560,10 +575,10 @@ export const ProductionLine =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 生产线零件关系 20221215
+// 生产线零件关系 20230328
 export const ProdLineItem =  [
   { label: "物料代码", prop: "itemCode" },
   { label: "生产线编号", prop: "prodLineCode" },
@@ -575,7 +590,7 @@ export const ProdLineItem =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 工作站信息 20221215
@@ -598,7 +613,7 @@ export const WorkCenter =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 班组信息 20221215
+// 班组信息 20230328
 export const Team =  [
   { label: "班组代码", prop: "code" },
   { label: "班组名称", prop: 'name' },
@@ -612,13 +627,13 @@ export const Team =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 班次信息 20221215
+// 班次信息 20230328
 export const Shift =  [
-  { label: "班次代码", prop: "code", type: "input" },
-  { type: "input", label: "班次名称", prop: "name" },
+  { label: "班次代码", prop: "code" },
+  { label: "班次名称", prop: "name" },
   { label: "结束到下一天", prop: "endAtNextDay", type: "filter", filters: "whetherOrNot" },
   { label: "描述", prop: "description" },
   { label: "开始时间", prop: "beginTime", type: "dateTime" },
@@ -631,10 +646,10 @@ export const Shift =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 作业指导书信息 20221215
+// 作业指导书信息 20230328
 export const ItemGuideBook = [
   { label: "物料代码", prop: "itemCode" },
   { label: "物料名称", prop: "itemName" },
@@ -650,7 +665,7 @@ export const ItemGuideBook = [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 账期信息 20221215
@@ -690,7 +705,7 @@ export const Dict = [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 分类信息 20221215
+// 分类信息 20230328
 export const Category =  [
   { label: "分类编号", prop: "code" },
   { label: "分类名称", prop: 'name' },
@@ -703,7 +718,7 @@ export const Category =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 计量单位信息 20221215
@@ -723,7 +738,7 @@ export const Uom =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 日历信息 20221215
+// 日历信息 20230328
 export const Calendar =  [
   { label: "模块", prop: "module" },
   { label: "状态", prop: "status", type: "filter", filters: "calendarStatus" },
@@ -737,10 +752,10 @@ export const Calendar =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 配置信息 20221215
+// 配置信息 20230328 暂无接口
 export const Configuration =  [
   { label: "键", prop: "key" },
   { label: "值", prop: "value" },