zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

采购收货记录相关字段

dev_web_online
安虹睿 2 years ago
parent
65d73044eb
commit
1fbb8b0688
2 changed files with 162 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 171
      fe/PC/src/utils/tableColumns/index.js
  2. 13
      fe/PC/src/utils/tabsDesTions/index.js

171
fe/PC/src/utils/tableColumns/index.js
View File

@ -1209,7 +1209,7 @@ export const PurchaseReceiptJob = [
{ label: "时间窗口", prop: 'timeWindow' },
// -----------------------------------------------------------------------
]
// 采购收货记录 已调整
// 采购收货记录 已调整 20230404
export const PurchaseReceiptNote = [
{
label: "收货单号",
@ -1220,26 +1220,27 @@ export const PurchaseReceiptNote = [
},
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "发货单号", prop: "asnNumber", width:orderWidth },
{ label: "到货单号", prop: "arriveNoticeNumber", width:orderWidth },
{ label: "到货单号", prop: "purchaseReceiptRequestNumber", width:orderWidth },
{ label: "采购订单号", prop: "poNumber", width:orderWidth },
{ label: "供应商代码", prop: "supplierCode" },
{ label: "供应商名称", prop: "supplierName" },
{ label: "供应商地址", prop: "supplierAddress" },
{ label: "筹措员代码", prop: "contactUserName" },
// { label: "筹措员代码", prop: "contactUserName" },
{ label: "备注", prop: 'remark' },
{ label: "收货时间", prop: 'receiveTime',type: "dateTime" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "type", prop: 'type' },
{ label: "status", prop: 'status' },
{ label: "任务代码", prop: 'jobNumber' },
// -----------------------------------------------------------------------
]
// 采购收货记录-详情【合格品收货明细】
// 采购收货记录-详情【合格品收货明细】 20230404
export const qualifiedInfo = [
{
label: "检验单号",
@ -1251,16 +1252,61 @@ export const qualifiedInfo = [
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: "物品代码", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "物品单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "recommendErpCode" },
{ label: "ERP库位", prop: "locationErpCode" },
// { label: "ERP库位", prop: "recommendErpCode" },
{ label: "到货时间", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "订单号", prop: "poNumber" },
{ label: "订单行", prop: "poLine" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
{ label: "实际ERP库位", prop: "handledToLocationErpCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
{ label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
{ label: "生产时间", prop: "produceDate",type: "dateTime" },
{ label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
{ label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
{ label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
{ label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "库区", prop: "locationArea" },
{ label: "推荐库区", prop: "recommendToLocationArea" },
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
{ label: "标包数量", prop: "stdPackQty" },
{ label: "推荐批次排序", prop: "recommendLot" },
{ label: "实际批次排序", prop: "handledLot" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "推荐仓库", prop: 'recommendToWarehouseCode' },
{ label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "目检照片Json", prop: 'inspectPhotoJson' },
{ label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
{ label: "质量缺陷", prop: "massDefect" },
{ label: "供应商包装计量单位", prop: "supplierPackUom" },
{ label: "供应商包装数量", prop: "supplierPackQty" },
{ label: "status", prop: 'status' },
]
// 采购收货记录-详情【不合格品收货明细】
// 采购收货记录-详情【不合格品收货明细】 20230404
export const unqualifiedInfo = [
{
label: "检验单号",
@ -1272,25 +1318,118 @@ export const unqualifiedInfo = [
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: "物品代码", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "物品单位", prop: "uom" },
{ label: "箱码", prop: "packingCode" },
{ label: "ERP库位", prop: "recommendErpCode" },
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
{ label: "质量缺陷", prop: "massDefect" },
{ label: "到货时间", prop: "arriveTime",type: "dateTime" },
{ label: "到货时间", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label:"查看照片",type:"button", fixed: "right",tableAlign:"center",tableHeaderAlign:"center" }
{ label:"查看照片",type:"button", fixed: "right",tableAlign:"center",tableHeaderAlign:"center" },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "订单号", prop: "poNumber" },
{ label: "订单行", prop: "poLine" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
{ label: "实际ERP库位", prop: "handledToLocationErpCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
{ label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
{ label: "生产时间", prop: "produceDate",type: "dateTime" },
{ label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
{ label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
{ label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
{ label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "库区", prop: "locationArea" },
{ label: "推荐库区", prop: "recommendToLocationArea" },
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
{ label: "标包数量", prop: "stdPackQty" },
{ label: "批次排序", prop: "lot" },
{ label: "推荐批次排序", prop: "recommendLot" },
{ label: "实际批次排序", prop: "handledLot" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "推荐仓库", prop: 'recommendToWarehouseCode' },
{ label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "目检照片Json", prop: 'inspectPhotoJson' },
{ label: "供应商包装计量单位", prop: "supplierPackUom" },
{ label: "供应商包装数量", prop: "supplierPackQty" },
{ label: "status", prop: 'status' },
]
// 采购收货记录-详情【收货缺料明细】
// 采购收货记录-详情【收货缺料明细】 20230404
export const lackMaterialsInfo = [
{ label: "物品代码", prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "批次", prop: "lot" },
{ label: "ERP库位", prop: "recommendErpCode" },
{ label: "ERP库位", prop: "locationErpCode" },
// -----------------------------------------------------------------------
{ label: "单据号", prop: "number" },
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "订单号", prop: "poNumber" },
{ label: "订单行", prop: "poLine" },
{ label: "箱码", prop: "packingCode" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
{ label: "实际ERP库位", prop: "handledToLocationErpCode" },
{ label: "物品单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "到货时间", prop: "arriveDate",type: "dateTime" },
{ label: "推荐批次到货时间", prop: "recommendArriveDate",type: "dateTime" },
{ label: "实际批次到货时间", prop: "handledArriveDate",type: "dateTime" },
{ label: "生产时间", prop: "produceDate",type: "dateTime" },
{ label: "推荐批次生产时间", prop: "recommendProduceDate",type: "dateTime" },
{ label: "实际批次生产时间", prop: "handledProduceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: "推荐批次过期时间", prop: "recommendExpireDate",type: "dateTime" },
{ label: "实际批次过期时间", prop: "handledExpireDate",type: "dateTime" },
{ label: "库位代码", prop: "locationCode" },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "库区", prop: "locationArea" },
{ label: "推荐库区", prop: "recommendToLocationArea" },
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
{ label: "标包数量", prop: "stdPackQty" },
{ label: "推荐批次排序", prop: "recommendLot" },
{ label: "实际批次排序", prop: "handledLot" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "推荐仓库", prop: 'recommendToWarehouseCode' },
{ label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "目检照片Json", prop: 'inspectPhotoJson' },
{ label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
{ label: "质量缺陷", prop: "massDefect" },
{ label: "供应商包装计量单位", prop: "supplierPackUom" },
{ label: "供应商包装数量", prop: "supplierPackQty" },
{ label: "status", prop: 'status' },
]
// 报检单 已调整
export const InspectNotice = [

13
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -952,12 +952,12 @@ export const PurchaseReceiptJob = [
{ label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 采购收货记录 已调整 20221220
// 采购收货记录 已调整 20230404
export const PurchaseReceiptNote = [
{ label: "收货单号", prop: 'number' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "发货单号", prop: "asnNumber" },
{ label: "到货单号", prop: 'arriveNoticeNumber' },
{ label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
{ label: "采购订单号", prop: "poNumber" },
{ label: "供应商代码", prop: "supplierCode" },
{ label: "供应商名称", prop: "supplierName" },
@ -965,8 +965,9 @@ export const PurchaseReceiptNote = [
{ label: "备注", prop: 'remark' },
{ label: "收货时间", prop: "receiveTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "是否有不合格", prop: "hasNoOk" },
{ label: "是否有缺料", prop: "hasNoReceipt" },
// TODO:两个字段
// { label: "是否有不合格", prop: "hasNoOk" },
// { label: "是否有缺料", prop: "hasNoReceipt" },
// -----------------------------------------------------------------------
{ label: "创建者ID", prop: "creatorId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
@ -977,9 +978,9 @@ export const PurchaseReceiptNote = [
{ label: "type", prop: 'type' },
{ label: "status", prop: 'status' },
{ label: "任务代码", prop: 'jobNumber' },
{ label: "仓库", prop: 'warehouseCode' },
// { label: "仓库", prop: 'warehouseCode' },
{ label: "ID", prop: "id" },
{ label: "公司", prop: 'company' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 报检单 已调整 20221220

Write Preview
Loading…
Cancel
Save