基础数据字段整理

fe/PC/src/utils/tableColumns/index.js

@@ -2,7 +2,7 @@
 const orderWidth = 180
 // 基础信息数据管理
 /**/
-// 物品基础信息
+// 物品基础信息 20230328
 export const ItemBasic = [
   {
     label: "物料代码",
@@ -24,7 +24,23 @@ export const ItemBasic = [
   { label: "产品类", prop: 'productLine' },
   { label: "E-LEVEL等级", prop: 'elevel' },
   { label: "物料分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" },
-  { label: "颜色", prop: "itemCategoryDictionary", type: "object", showProp: "Color" },
+  { label: "颜色", prop: "color" },
+  // ---------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "种类", prop: "category" },
+  { label: "分组", prop: "group" },
+  { label: "配置", prop: "configuration" },
+  { label: "基本计量单位", prop: "basicUom" },
+  { label: "标包数", prop: "stdPackQty" },
+  { label: "项目", prop: "project" },
+  { label: "版本", prop: "version" },
+  { label: "工程变革", prop: "eco" },
+  { label: "有效期值", prop: "validity" },
+  { label: "有效期", prop: "validityUnit", type: "filter", filters: "validityUnit" },
+  { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
+  { label: "备注", prop: "remark" },
+
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -33,7 +49,7 @@ export const ItemBasic = [
   //   fixed: "right"
   // },
 ]
-// 物品质量信息
+// 物品质量信息 20230328
 export const ItemQuality = [
   {
     label: "物料代码",
@@ -44,7 +60,11 @@ export const ItemQuality = [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "状态", prop: 'status', type: "filter", filters: "openToClose" },
   { label: "检验类型", prop: 'inspectType', type: "filter", filters: "inspectType" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime", showProp: true },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  // -----------------------------------
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  { label: "描述", prop: "description" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -53,7 +73,7 @@ export const ItemQuality = [
   //   fixed: "right"
   // },
 ]
-// 物品分类信息
+// 物品分类信息 20230328
 export const ItemCategory = [
   {
     label: "物料代码",
@@ -63,8 +83,11 @@ export const ItemCategory = [
   },
   { label: "分类编号", prop: 'categoryCode' },
   { label: "分类值", prop: 'value' },
-  { label: "创建时间", prop: "creationTime", type: "dateTime", showProp: true },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
+  // --------------------------------
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -122,7 +145,7 @@ export const AQL = [
   //   fixed: "right"
   // },
 ]
-// 物料清单信息
+// 物料清单信息 20230328
 export const Bom = [
   {
     label: "父物料号",
@@ -141,6 +164,10 @@ export const Bom = [
   { label: "开始时间", prop: "beginTime", type: "dateTime", showProp: true },
   { label: "结束时间", prop: "endTime", type: "dateTime", showProp: true },
   { label: "备注", prop: 'remark' },
+  // --------------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "层级", prop: "layer" },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -210,7 +237,7 @@ export const Customer = [
   //   fixed: "right"
   // },
 ]
-// 客户物品信息
+// 客户物品信息 20230328
 export const CustomerItem = [
   {
     label: "客户代码",
@@ -225,6 +252,11 @@ export const CustomerItem = [
   { label: "开始时间", prop: "beginTime", type: "dateTime", showProp: true },
   { label: "结束时间", prop: "endTime", type: "dateTime", showProp: true },
   { label: "备注", prop: 'remark' },
+  // -----------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "版本", prop: 'version' },
+
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -350,7 +382,7 @@ export const SupplierItem = [
   //   fixed: "right"
   // },
 ]
-// 供应商时间窗口
+// 供应商时间窗口 20230328
 export const SupplierTime = [
   {
     label: "供应商代码",
@@ -361,6 +393,11 @@ export const SupplierTime = [
   { label: "供应商名称", prop: "supplierName" },
   { label: "当前时间", prop: "week", type: "filter", filters: "week" },
   { label: "时间窗口", prop: "timeSlot" },
+  // ------------------------------------
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+  { label: "备注", prop: "remark" },
+  
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -715,7 +752,7 @@ export const ProdLineItem = [
   //   fixed: "right"
   // },
 ]
-// 工作站信息
+// 工作站信息 20230328
 export const WorkCenter = [
   {
     label: "编号",
@@ -724,7 +761,16 @@ export const WorkCenter = [
     prop: "code"
   },
   { label: "生产线", prop: "productionLineCode" },
-  { label: "类型", prop: "type", showProp: true },
+  { label: "类型", prop: "type", type: "filter", filters: "workCenterType" },
+  // ---------------------------------------
+  { label: "名称", prop: "name" },
+  { label: "描述", prop: "description" },
+  { label: "原料库位", prop: "rawLocationCode" },
+  { label: "成品库位", prop: "productLocationCode" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: "remark" },
+
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -807,19 +853,28 @@ export const ItemGuideBook = [
   //   fixed: "right"
   // },
 ]
-// 账期信息
+// 账期信息 20230328
 export const accountPeriodNote = [
   {
-    label: "库存年",
+    label: "代码",
-    prop: "name",
+    prop: "code",
     fixed: "left",
     type: "name"
   },
-  { label: "启日", prop: "beginTime",type:'dateTime', showProp: true },
+  { label: "启日", prop: "beginTime", type:'dateTime' },
-  { label: "迄日期", prop: "endTime", type:'dateTime', showProp: true },
+  { label: "迄日期", prop: "endTime", type:'dateTime' },
-  { label: "最后异动时间", prop: "convertToTime", type:'dateTime', showProp: true },
+  { label: "最后异动时间", prop: "convertToTime", type:'dateTime' },
+  // ------------------------------
+  { label: "名称", prop: "name" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+  { label: "年", prop: "year" },
+  { label: "月", prop: "month" },
+  { label: "转换生效时间", prop: "convertToTime", type:'dateTime' },
+  { label: "描述", prop: "description" },
+  
 ]
-// 字典信息
+// 字典信息 20230328
 export const Dict = [
   {
     label: "字典编号",
@@ -829,6 +884,11 @@ export const Dict = [
   },
   { label: "字典名称", prop: "name" },
   { label: "描述", prop: "description" },
+  // -----------------------------------------
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "备注", prop: "remark" },
+
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -859,7 +919,7 @@ export const Category = [
   //   fixed: "right"
   // },
 ]
-// 计量单位信息
+// 计量单位信息 20230328
 export const Uom = [
   {
     label: "计量单位编号",
@@ -870,6 +930,11 @@ export const Uom = [
   { label: "计量单位名称", prop: "name" },
   { label: "类型", prop: "type", type: "filter", filters: "uomType" },
   { label: "描述", prop: "description" },
+  // ------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -920,26 +985,26 @@ export const Configuration = [
   //   fixed: "right"
   // },
 ]
-// 文档信息
+// 文档信息 20230328
 export const documentBasic = [
   {
-    label: "名称",
+    label: "编码",
     fixed: "left",
     type: "name",
-    prop: "name",
+    prop: "code",
     width:"200px"
   },
-  { label: "编码", prop: "code" },
+  { label: "名称", prop: "name" },
   { label: "描述", prop: "description" },
   { label: "事务类型", type: "filter", prop: "transactionType", filters: "TransTypeBaseForStr" },
   { label: "单号前缀", prop: "numberPrefix" },
   { label: "单号格式", prop: "numberFormat" },
   { label: "单号流水长度", prop: "numberSerialLength" },
   { label: "单号分隔符", prop: "numberSeparator" },
-  { label: "创建时间", prop: "creationTime", type:'dateTime', showProp: true },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId", showProp: true },
+  { label: "创建者Id", prop: "creatorId" },
-  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime', showProp: true },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
-  { label: "上次修改者", prop: "lastModifierId", showProp: true },
+  { label: "上次修改者", prop: "lastModifierId" },
   { label: "备注", prop: "remark" },
   // {
   //   label: "操作",

fe/PC/src/utils/tabsDesTions/index.js

@@ -35,10 +35,12 @@ export const ItemBasic =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
+   // ---------------------------------------
+   { label: "标包数", prop: "stdPackQty" },
   // -----------------------------------------------------------------------
 ]
-// 物品质量信息 20221212
+// 物品质量信息 20230328
 export const ItemQuality =  [
   { label: "物料代码", prop: "itemCode" },
   { label: "供应商代码", prop: 'supplierCode' },
@@ -53,10 +55,10 @@ export const ItemQuality =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物品分类信息 20221212
+// 物品分类信息 20230328
 export const ItemCategory =  [
   { label: "物料代码", prop: 'itemCode' },
   { label: "分类编号", prop: "categoryCode" },
@@ -69,7 +71,7 @@ export const ItemCategory =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 物品包装信息 20221212
@@ -115,7 +117,7 @@ export const AQL =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物料清单信息 20221212
+// 物料清单信息 20230328
 export const Bom =  [
   { label: "父物料号", prop: "product" },
   { label: "子物料号", prop: 'component' },
@@ -137,7 +139,7 @@ export const Bom =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 客户信息 20230328
@@ -166,7 +168,7 @@ export const Customer =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 客户物品信息 20221212
+// 客户物品信息 20230328
 export const CustomerItem =  [
   { label: "客户代码", prop: 'customerCode' },
   { label: "物料代码", prop: "itemCode" },
@@ -184,7 +186,8 @@ export const CustomerItem =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
+  { label: "版本", prop: 'version' },
   // -----------------------------------------------------------------------
 ]
 // 客户地址信息 20230328
@@ -278,7 +281,7 @@ export const SupplierItem =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 供应商时间窗口 20221212
+// 供应商时间窗口 20230328
 export const SupplierTime =  [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "供应商名称", prop: 'supplierName' },
@@ -292,7 +295,7 @@ export const SupplierTime =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 收货口信息 20230328
@@ -609,7 +612,7 @@ export const ProdLineItem =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 工作站信息 20221215
+// 工作站信息 20230328
 export const WorkCenter =  [
   { label: "生产线编号", prop: "productionLineCode" },
   { label: "原料库位", prop: "rawLocation" },
@@ -626,7 +629,7 @@ export const WorkCenter =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 班组信息 20230328
@@ -684,17 +687,17 @@ export const ItemGuideBook = [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 账期信息 20221215
+// 账期信息 20230328
 export const accountPeriodNote = [
-  { label: "库存年", prop: "name" },
+  { label: "名称", prop: "name" },
   { label: "启日", prop: "beginTime",type:'dateTime' },
   { label: "迄日期", prop: "endTime", type:'dateTime' },
   { label: "最后异动时间", prop: "convertToTime", type:'dateTime' },
   // -----------------------------------------------------------------------
-  { label: "日历年", prop: "year" },
+  { label: "年", prop: "year" },
-  { label: "日历月", prop: "month" },
+  { label: "月", prop: "month" },
-  { label: "接口日历代码", prop: "code" },
+  { label: "代码", prop: "code" },
-  { label: "日历描述", prop: "description" },
+  { label: "描述", prop: "description" },
   { label: "备注", prop: "remark" },
   { label: "事务代码", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
@@ -702,10 +705,10 @@ export const accountPeriodNote = [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 字典信息 20221215
+// 字典信息 20230328
 export const Dict = [
   { label: "字典编号", prop: "code" },
   { label: "字典名称", prop: "name" },
@@ -718,7 +721,7 @@ export const Dict = [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 分类信息 20230328
@@ -737,7 +740,7 @@ export const Category =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 计量单位信息 20221215
+// 计量单位信息 20230328
 export const Uom =  [
   { label: "计量单位编号", prop: "code" },
   { label: "计量单位名称", prop: 'name' },
@@ -751,7 +754,7 @@ export const Uom =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 日历信息 20230328
@@ -787,7 +790,7 @@ export const Configuration =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 文档信息 20221215
+// 文档信息 20230328
 export const documentBasic = [
   { label: "编号", prop: "code" },
   { label: "名称", prop: "name" },
@@ -805,7 +808,7 @@ export const documentBasic = [
   { label: "id", prop: "id" },
   { label: "描述", prop: "description" },
   // -----------------------------------------------------------------------
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]