Browse Source

【nev-pc】供应商批次等字段调整

dev_pc_nev
安虹睿 5 months ago
parent
commit
2d9302fec7
  1. 12
      fe/PC/src/utils/summaryTableColumns/index.js
  2. 24
      fe/PC/src/utils/tableColumns/index.js

12
fe/PC/src/utils/summaryTableColumns/index.js

@ -28,7 +28,7 @@ export const InspectRequest = [
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "计量单位", prop: 'uom' }, { label: "计量单位", prop: 'uom' },
// { label: "标包数量", prop: 'stdPackQty' },//后期打开 // { label: "标包数量", prop: 'stdPackQty' },//后期打开
{ label: "供应商批次", prop: 'supplierBatch' }, // { label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" },
@ -40,8 +40,8 @@ export const InspectRequest = [
{ label: "检验报告", fixed: "right",prop: 'inspectReport',type:'button',buttonName:'查看报告' }, { label: "检验报告", fixed: "right",prop: 'inspectReport',type:'button',buttonName:'查看报告' },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" }, { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
{ label: "不合格原因代码", prop: 'failedReason' }, // { label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" }, // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
] ]
// 检验记录 // 检验记录
@ -57,15 +57,15 @@ export const InspectNote = [
{ label: "合格数量", prop: 'goodQty' }, { label: "合格数量", prop: 'goodQty' },
{ label: "不合格数量", prop: 'failedQty' }, { label: "不合格数量", prop: 'failedQty' },
{ label: "检验人", prop: 'inspectUser' }, { label: "检验人", prop: 'inspectUser' },
{ label: "不合格原因代码", prop: 'failedReason' }, // { label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" }, // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
{ label: "单据号", prop: "number" }, { label: "单据号", prop: "number" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' }, { label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "供应商批次", prop: 'supplierBatch' }, // { label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" },

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

@ -1110,7 +1110,7 @@ export const qualifiedInfo = [
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true}, { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
// { label: "推荐批次排序", prop: "recommendLot" }, // { label: "推荐批次排序", prop: "recommendLot" },
// { label: "实际批次排序", prop: "handledLot" }, // { label: "实际批次排序", prop: "handledLot" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
// { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
// { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, // { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
@ -1176,7 +1176,7 @@ export const unqualifiedInfo = [
{ label: "批次排序", prop: "lot" }, { label: "批次排序", prop: "lot" },
// { label: "推荐批次排序", prop: "recommendLot" }, // { label: "推荐批次排序", prop: "recommendLot" },
// { label: "实际批次排序", prop: "handledLot" }, // { label: "实际批次排序", prop: "handledLot" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
// { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
// { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, // { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
@ -1228,7 +1228,7 @@ export const lackMaterialsInfo = [
{ label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "标包数量", prop: "stdPackQty",isNumber:true },
// { label: "推荐批次排序", prop: "recommendLot" }, // { label: "推荐批次排序", prop: "recommendLot" },
// { label: "实际批次排序", prop: "handledLot" }, // { label: "实际批次排序", prop: "handledLot" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
// { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" }, // { label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
// { label: "实际批次供应商批次", prop: "handledSupplierBatch" }, // { label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
@ -1304,7 +1304,7 @@ export const unqualifiedToQualified = [
// { label: _Names.locationErpCode, prop: "locationErpCode" }, // { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "标包数量", prop: "stdPackQty",isNumber:true },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "供应商批次", prop: 'supplierBatch' }, // { label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货日期", prop: 'arriveDate', type: "dateTime" }, { label: "到货日期", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" },
@ -2148,7 +2148,7 @@ export const labelsList = [
// { label: "供应商物品名称", prop: 'supplierItemName' },//后期打开 // { label: "供应商物品名称", prop: 'supplierItemName' },//后期打开
// { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" }, // { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" },
{ label: "完整条码文本", prop: "fullBarcodeString" }, { label: "完整条码文本", prop: "fullBarcodeString" },
{ label: "供应商批次", prop: 'supplierBatch' }, // { label: "供应商批次", prop: 'supplierBatch' },
{ label: "标包数量", prop: 'stdPackQty',isNumber:true }, { label: "标包数量", prop: 'stdPackQty',isNumber:true },
// { label: "器具号", prop: 'containerCode' }, // { label: "器具号", prop: 'containerCode' },
// { label: "质量级别", prop: "qLevel" }, // { label: "质量级别", prop: "qLevel" },
@ -2215,7 +2215,7 @@ export const InventoryBalance = [
// { label: "序号", prop: "serialNumber" }, // { label: "序号", prop: "serialNumber" },
// { label: "备注", prop: "remark" }, // { label: "备注", prop: "remark" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' }, { label: "最后事务编号", prop: 'lastTransNumber' },
] ]
@ -2256,7 +2256,7 @@ export const InventoryBalanceActive = [
// { label: "序号", prop: "serialNumber" }, // { label: "序号", prop: "serialNumber" },
{ label: "备注", prop: "remark" }, { label: "备注", prop: "remark" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' }, { label: "最后事务编号", prop: 'lastTransNumber' },
] ]
@ -2297,7 +2297,7 @@ export const InventoryTransaction = [
{ label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "标包数量", prop: "stdPackQty",isNumber:true },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
{ label: "备注", prop: "remark" }, { label: "备注", prop: "remark" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },
@ -2347,7 +2347,7 @@ export const InventoryTransferLog = [
{ label: "标包数", prop: "stdPackQty",isNumber:true }, { label: "标包数", prop: "stdPackQty",isNumber:true },
{ label: "从排序批次", prop: "fromLot" }, { label: "从排序批次", prop: "fromLot" },
{ label: "到排序批次", prop: 'toLot' }, { label: "到排序批次", prop: 'toLot' },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
{ label: "从箱码", prop: "fromPackingCode" }, { label: "从箱码", prop: "fromPackingCode" },
{ label: "从库位组", prop: "fromLocationGroup" }, { label: "从库位组", prop: "fromLocationGroup" },
{ label: "到库位组", prop: 'toLocationGroup' }, { label: "到库位组", prop: 'toLocationGroup' },
@ -2385,7 +2385,7 @@ export const expectOut = [
{ label: "计量单位", prop: "uom" }, { label: "计量单位", prop: "uom" },
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
// { label: "库区", prop: "locationArea" }, // { label: "库区", prop: "locationArea" },
// { label: "库位组", prop: "locationGroup" }, // { label: "库位组", prop: "locationGroup" },
{ label: _Names.locationErpCode, prop: "locationErpCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" },
@ -2416,7 +2416,7 @@ export const expectIn = [
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
// { label: "库区", prop: "locationArea" }, // { label: "库区", prop: "locationArea" },
// { label: "库位组", prop: "locationGroup" }, // { label: "库位组", prop: "locationGroup" },
{ label: _Names.locationErpCode, prop: "locationErpCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" },
@ -3024,7 +3024,7 @@ export const countJobDepDetails = [
{ label: _Names.locationErpCode, prop: "locationErpCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "库区", prop: "locationArea" }, { label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" }, { label: "库位组", prop: "locationGroup" },
{ label: "供应商批次", prop: "supplierBatch" }, // { label: "供应商批次", prop: "supplierBatch" },
{ label: "盘点描述", prop: 'countDescription' }, { label: "盘点描述", prop: 'countDescription' },
{ label: "盘点操作员", prop: 'countOperator' }, { label: "盘点操作员", prop: 'countOperator' },
{ label: "盘点时间", prop: "countTime",type: "dateTime" }, { label: "盘点时间", prop: "countTime",type: "dateTime" },

Loading…
Cancel
Save