Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

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

@@ -2,13 +2,22 @@
 const orderWidth = 180
 // 基础数据管理
 /**/
-// 字典信息
+// 字典信息 20230404
 export const Dict = [
   { label: "字典项代码", prop: "code" },
   { label: "字典项名称", prop: "name" },
   { label: "字典项值", prop: "value" },
   { label: "字典项描述", prop: "description" },
   { label: "是否生效", prop: "enabled", type: "filter", filters: "whetherOrNot" },
+  // -----------------------------------------------------------------------
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "主表ID", prop: 'masterId' },
+  { label: "事务代码", prop: "tenantId" },
+  { label: "ID", prop: "id" },
 ]
 
 // 原料管理
@@ -34,7 +43,7 @@ export const SupplierAsn =  [
   { label: "订单行", prop: 'poLine', width: orderWidth },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
   // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "供应商包装数量", prop: 'supplierPackQty' },
@@ -73,7 +82,7 @@ export const PurchaseOrder =  [
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
   { label: "发货单号", prop: 'number' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "订单行", prop: 'poLine' },
   { label: "供应商包装计量单位", prop: 'supplierPackUom' },
@@ -84,14 +93,14 @@ export const PurchaseOrder =  [
   { label: "订单备注", prop: 'orderRemark' },
   { label: "事务代码", prop: "tenantId" },
   { label: "lineStatus", prop: 'lineStatus' },
-  { label: "id", prop: 'id' },
+  { label: "ID", prop: 'id' },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "创建者ID", prop: 'creatorId' },
   { label: "主表ID", prop: 'masterID' },
   // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
-// 到货请求 已调整
+// 到货请求 20230404
 export const PurchaseReceiptRequest =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
@@ -106,14 +115,14 @@ export const PurchaseReceiptRequest =  [
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "创建者Id", prop: "creatorId" },
+  { label: "创建者ID", prop: "creatorId" },
   // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
   { label: "订单号", prop:'poNumber', width: orderWidth },
   // -----------------------------------------------------------------------
   { label: "单据号", prop:'number', width: orderWidth },
   { label: "备注", prop:'remark'},
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: "lastModifierId" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   // { label: "公司", prop: 'company' },
   { label: "供应商批次", prop: 'supplierBatch' },
   // { label: "仓库", prop: 'warehouseCode' },
@@ -124,8 +133,8 @@ export const PurchaseReceiptRequest =  [
   { label: "供应商包装数量", prop:'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
   { label: "事务代码", prop: "tenantId" },
-  { label: "id", prop: 'id' },
-  { label: "masterID", prop: '主表ID' },
+  { label: "ID", prop: 'id' },
+  { label: "主表ID", prop: 'masterID' },
   // { label: "项目编号", prop: "projectCode" },
   // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   // -----------------------------------------------------------------------