diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index bde8fd245..23919838b 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -73,7 +73,7 @@ export const ItemCategory = [ // fixed: "right" // }, ] -// 物品包装信息 +// 物品包装信息 20230328 export const ItemPack = [ { label: "包装代码", @@ -84,11 +84,17 @@ export const ItemPack = [ { label: "包装名称", prop: "packName" }, { label: '包装类型', prop: "packType" }, { label: '物料代码', prop: "itemCode" }, - { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" }, - { label: '标包编号', prop: "stdPackCode" }, - { label: "包装数量", prop: "packQty", showProp: true }, - { label: "物料单位", prop: "packUom", showProp: true }, - { label: "转换率", prop: "conversionRate" }, + // { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" }, + // { label: '标包编号', prop: "stdPackCode" }, + // { label: "包装数量", prop: "packQty" }, + // { label: "物料单位", prop: "packUom" }, + // { label: "转换率", prop: "conversionRate" }, + // ----------------------------------------------------------------------- + { label: '包装计量单位', prop: "basicUom" }, + { label: '包装数量', prop: "qty" }, + { label: "备注", prop: "remark" }, + { label: "创建时间", prop: "creationTime", type:'dateTime' }, + { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, // { // label: "操作", // type:"buttonOperation", @@ -97,7 +103,7 @@ export const ItemPack = [ // fixed: "right" // }, ] -// 物料质检标准信息 +// 物料质检标准信息 20230328 export const AQL = [ { //label: "物料代码", @@ -114,6 +120,9 @@ export const AQL = [ { label: "抽检百分比", prop: 'samplePercent' }, { label: "抽检数量", prop: 'sampleQty' }, { label: "备注", prop: "remark" }, + // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime", type:'dateTime' }, + { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, // { // label: "操作", // type:"buttonOperation", diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 3e65f5c1c..c97774b76 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -72,16 +72,18 @@ export const ItemCategory = [ { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 物品包装信息 20221212 +// 物品包装信息 20230328 export const ItemPack = [ { label: "包装代码", prop: 'packCode' }, { label: "包装名称", prop: "packName" }, { label: '物料代码', prop: "itemCode" }, - { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" }, - { label: '标包编号', prop: "stdPackCode" }, - { label: "包装数量", prop: "packQty" }, - { label: "物料单位", prop: "packUom" }, - { label: "转换率", prop: "conversionRate" }, + { label: '包装计量单位', prop: "basicUom" }, + { label: '包装数量', prop: "qty" }, + // { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" }, + // { label: '标包编号', prop: "stdPackCode" }, + // { label: "包装数量", prop: "packQty" }, + // { label: "物料单位", prop: "packUom" }, + // { label: "转换率", prop: "conversionRate" }, { label: "备注", prop: 'remark', colSpan: 12 }, // ----------------------------------------------------------------------- { label: "事务代码", prop: "tenantId" }, @@ -91,10 +93,10 @@ export const ItemPack = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 物料质检标准信息 20221212 +// 物料质检标准信息 20230328 export const AQL = [ { label: "物料代码", prop: "itemCode" }, { label: "供应商代码", prop: "supplierCode" }, @@ -112,7 +114,7 @@ export const AQL = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 物料清单信息 20221212