diff --git a/fe/PC/src/styles/padMain.scss b/fe/PC/src/styles/padMain.scss index 21da3da03..bd0849d69 100644 --- a/fe/PC/src/styles/padMain.scss +++ b/fe/PC/src/styles/padMain.scss @@ -6,114 +6,67 @@ height:calc(100% - 20px); min-width:800px; overflow:auto; - // ::v-deep .el-dialog { - // .el-dialog__body { - // padding-bottom: 20px; - // } - // .form1, - // .form2 { - // display: flex; - // flex-direction: column; - // width: 100%; - // height: 100%; - // } - - // .form1 .el-form { - // flex: 1; - // padding-left: 70px; - // padding-right: 70px; - // display: flex; - // flex-direction: column; - // overflow: hidden; - - - // .el-row { - // flex: 2; - // padding-left: 30px; - // padding-right: 30px; - // flex-wrap: wrap; - // overflow: hidden; - // overflow-y: auto; - // } - - // .formTable-box { - // flex: 2; - // overflow: hidden; - - // .el-form-item__content { - // width: 100%; - // height: 100%; - // display: flex; - // flex-direction: column; - // overflow: hidden; - // margin: 0 !important; - // } - - // .heder { - // padding: 5px 0; - // text-align: end; - - // span { - // color: rgb(64, 158, 255); - // cursor: pointer; - - // &:hover { - // color: blue; - // } - // } - // } - - // .el-table { - // flex: 1; - - // // white-space: nowrap; - // // display: flex; - // .childTable { - // display: flex; - // justify-content: space-around; - - // span { - // cursor: pointer; - - // &:nth-child(1) { - // color: red; - // } - - // &:nth-child(2) { - // color: green; - // } - // } - // } - // } - // } - // } - // } - - // .form2 .el-form { - // flex: 1; - // padding-left: 100px; - // padding-right: 100px; - // display: flex; - // justify-content: flex-start; - // align-content: flex-start; - // flex-wrap: wrap; - // overflow: hidden; - // overflow-y: auto; - // } - - // .screen-push { - // color: rgb(64, 158, 255); - - // span { - // cursor: pointer; - - // &:hover { - // color: blue; - // } - // } - // } - - // .formButton { - // padding: 20px 20px 20px 0; - // } +} +.padListPage{ + background:#fff; + margin:15px; + height:calc(100% - 30px); + min-width:800px; + overflow:auto; + display: flex; + flex-direction: column; + + .padListHeader{ + padding: 10px 10px 0 10px; + box-shadow: 1px 1px 5px #ddd; + flex-shrink: 0; + + ::v-deep .el-form-item{ + margin-bottom: 10px; + } + } + + .padListCard{ + height: 100%; + overflow: auto; + background: #f8f8f8; + margin-top: 4px; + + .padListRow{ + box-shadow: 1px 1px 5px #ddd; + padding: 10px; + background: #fff; + margin-bottom: 10px; + } + + .detailDataBox{ + padding: 10px 10px 5px 10px; + border: #ddd dashed 1px; + } + } + + .padListPager{ + height: 30px; + line-height: 30px; + flex-shrink: 0; + text-align: center; + color: #999; + overflow: hidden; + + ::v-deep .el-loading-spinner { + display: flex; + justify-content: center; + + .circular{ + height: 22px; + width: 22px; + margin: 7px 10px 0 0; + } + } + } + + .listRowButtonBox{ + text-align: right; + padding-top: 10px; + } } diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index d3384fbda..509178adf 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -3687,954 +3687,650 @@ export const completDumpNoteZP = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] -// 人工注塑申请 +// 注塑申请 export const IssueRequestZS = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "已发数量", prop: "issuedQty" }, - { label: "已收数量", prop: "receivedQty" }, - { label: "请求未发", prop: "toBeIssuedQty" }, + { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, + { label: "单位", prop: "uom" }, + { label: "数量", prop: "qty" }, + { label: "申请数量", prop: 'issuedQty' }, + { label: "已收数量", prop: 'receivedQty' }, { label: "已发未收", prop: "toBeReceivedQty" }, { label: "请求未收", prop: "notFinishQty" }, + { label: "请求未发", prop: "toBeIssuedQty" }, { label: "请求箱数量", prop: "boxQty" }, + { label: "标包数量", prop: 'stdPackQty' }, + { label: "目标库位", prop: 'toLocationCode' }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "位置码", prop: 'positionCode' }, + { label: "推荐类型", prop: 'recommendType' }, + { label: "到仓库", prop: 'toWarehouseCode' }, + { label: "生产线", prop: 'prodLine' }, { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工注塑任务 +// 注塑任务 export const IssueJobZS = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, + { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, + { label: "单位", prop: "uom" }, + { label: "请求库位代码", prop: 'requestLocationCode' }, + { label: "请求库位区域", prop: 'requestLocationArea' }, { label: "请求库位组", prop: 'requestLocationGroup' }, { label: "请求ERP库位", prop: 'requestLocationErpCode' }, + { label: "请求仓库代码", prop: 'requestWarehouseCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "请求数量", prop: 'requestQty' }, { label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, + { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, + { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, + { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, + { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, + { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "推荐来源批次", prop: 'recommendFromLot' }, + { label: "推荐目标批次", prop: 'recommendToLot' }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, + { label: "推荐来源分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐目标分组", prop: 'recommendToLocationGroup' }, { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, - { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, - { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源库位", prop: 'handledFromLocationCode' }, - { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: "实际来源库区", prop: 'handledFromLocationArea' }, - { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, - { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, - { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, - { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' }, + { label: "推荐目标仓库", prop: "recommendToWarehouseCode" }, { label: "库移来源数量", prop: 'transferLibFromQty' }, { label: "库移目标数量", prop: 'transferLibToQty' }, { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, + { label: "库移来源批次", prop: 'transferLibFromLot' }, + { label: "库移目标批次", prop: 'transferLibToLot' }, + { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, + { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' }, + { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" }, + { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" }, + { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" }, + { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" }, + { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, + { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, { label: "库移目标库区", prop: 'transferLibToLocationArea' }, { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, + { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, + { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, + { label: "实际来源数量", prop: 'handledFromQty' }, + { label: "实际目标数量", prop: 'handledToQty' }, + { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, + { label: "实际目标箱标签", prop: 'handledToPackingCode' }, + { label: "实际来源批次", prop: 'handledFromLot' }, + { label: "实际目标批次", prop: 'handledToLot' }, + { label: "实际来源库位", prop: 'handledFromLocationCode' }, + { label: "实际目标库位", prop: 'handledToLocationCode' }, + { label: "实际来源库区", prop: 'handledFromLocationArea' }, + { label: "实际目标库区", prop: 'handledToLocationArea' }, + { label: "实际来源分组", prop: 'handledFromLocationGroup' }, + { label: "实际目标分组", prop: 'handledToLocationGroup' }, + { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, + { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, + { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, + { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, + { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, + { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, + { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, + { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "实际来源仓库", prop: 'handledFromWarehouseCode' }, + { label: "实际目标仓库", prop: "handledToWarehouseCode" }, + { label: "标包数量", prop: 'stdPackQty' }, { label: "位置码", prop: 'positionCode' }, { label: "推荐类型", prop: 'recommendType' }, + { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工注塑记录 +// 注塑记录 export const IssueNoteZS = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, + { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, + { label: "单位", prop: "uom" }, + { label: "请求库位代码", prop: 'requestLocationCode' }, + { label: "请求库位区域", prop: 'requestLocationArea' }, { label: "请求库位组", prop: 'requestLocationGroup' }, { label: "请求ERP库位", prop: 'requestLocationErpCode' }, + { label: "请求仓库代码", prop: 'requestWarehouseCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "请求数量", prop: 'requestQty' }, { label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, + { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, + { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, + { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, + { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, + { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "推荐来源批次", prop: 'recommendFromLot' }, + { label: "推荐目标批次", prop: 'recommendToLot' }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, + { label: "推荐来源分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐目标分组", prop: 'recommendToLocationGroup' }, { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' }, + { label: "推荐目标仓库", prop: "recommendToWarehouseCode" }, + { label: "库移来源数量", prop: 'transferLibFromQty' }, + { label: "库移目标数量", prop: 'transferLibToQty' }, + { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, + { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, + { label: "库移来源批次", prop: 'transferLibFromLot' }, + { label: "库移目标批次", prop: 'transferLibToLot' }, + { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, + { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' }, + { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" }, + { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" }, + { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" }, + { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" }, + { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, + { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, + { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, + { label: "库移目标库位", prop: 'transferLibToLocationCode' }, + { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, + { label: "库移目标库区", prop: 'transferLibToLocationArea' }, + { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, + { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, + { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, + { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, + { label: "实际来源数量", prop: 'handledFromQty' }, + { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, + { label: "实际来源批次", prop: 'handledFromLot' }, + { label: "实际目标批次", prop: 'handledToLot' }, { label: "实际来源库位", prop: 'handledFromLocationCode' }, { label: "实际目标库位", prop: 'handledToLocationCode' }, { label: "实际来源库区", prop: 'handledFromLocationArea' }, { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, + { label: "实际来源分组", prop: 'handledFromLocationGroup' }, + { label: "实际目标分组", prop: 'handledToLocationGroup' }, { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, + { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, + { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, + { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, + { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, - { label: "库移来源数量", prop: 'transferLibFromQty' }, - { label: "库移目标数量", prop: 'transferLibToQty' }, - { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, - { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, - { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, - { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, - { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, - { label: "库移目标库区", prop: 'transferLibToLocationArea' }, - { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, - { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, + { label: "实际来源仓库", prop: 'handledFromWarehouseCode' }, + { label: "实际目标仓库", prop: "handledToWarehouseCode" }, + { label: "标包数量", prop: 'stdPackQty' }, { label: "位置码", prop: 'positionCode' }, { label: "推荐类型", prop: 'recommendType' }, + { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料申请（喷涂） +// 喷涂申请 export const IssueRequestPT = [ - { label: "物品代码", prop: "itemCode" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, - { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "目标库位", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: "toLocationErpCode" }, - { label: "生成任务数量", prop: 'issuedQty' }, + { label: "数量", prop: "qty" }, + { label: "申请数量", prop: 'issuedQty' }, { label: "已收数量", prop: 'receivedQty' }, - { label: "单据号", prop: 'number' }, - // ----------------------------------------------------------------------- + { label: "已发未收", prop: "toBeReceivedQty" }, + { label: "请求未收", prop: "notFinishQty" }, + { label: "请求未发", prop: "toBeIssuedQty" }, + { label: "请求箱数量", prop: "boxQty" }, { label: "标包数量", prop: 'stdPackQty' }, + { label: "目标库位", prop: 'toLocationCode' }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "位置码", prop: 'positionCode' }, + { label: "推荐类型", prop: 'recommendType' }, + { label: "到仓库", prop: 'toWarehouseCode' }, { label: "生产线", prop: 'prodLine' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "工作中心", prop: 'workStation' }, - { label: "过期时间", prop: 'expiredTime' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, - { label: "请求未发", prop: 'toBeIssuedQty' }, - { label: "已发未收", prop: 'toBeReceivedQty' }, - { label: "请求未收", prop: 'notFinishQty' }, - // ************** 确定隐藏 ************************ - // { label: "主表ID", prop: "masterID" }, - // { label: "ID", prop: 'id' }, - // ************** 确定隐藏 ************************ + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料任务（喷涂） +// 喷涂任务 export const IssueJobPT = [ + { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际数量", prop: 'handledQty' }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "在途库位", prop: 'onTheWayLocationCode' }, - // ----------------------------------------------------------------------- - { label: "标包数量", prop: "stdPackQty" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "任务编号", prop: 'number',width: orderWidth }, - { label: "备注", prop: 'remark' }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, - { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, - { label: "计量单位", prop: 'uom' }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - { label: "到库区", prop: 'toLocationArea' }, - { label: "到库位组", prop: 'toLocationGroup' }, - { label: "到ERP库位", prop: 'toLocationErpCode' }, - { label: "到仓库", prop: 'toWarehouseCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "到库位", prop: 'toLocationCode' }, - { label: "生产线", prop: 'prodLine' }, - { label: "工作中心", prop: 'workStation' }, - { label: "过期时间", prop: 'expiredTime' }, - { label: "工序", prop: 'operation' }, - { label: "取整后数量", prop: 'roundedQty' }, - { label: "计划开始时间", prop: 'planBeginTime' }, - { label: "每次配送数量", prop: 'deliveryQty' }, - { label: "事务ID", prop: "tenantId" }, - // ************** 确定隐藏 ************************ - // { label: "distributionType", prop: 'distributionType' }, - // { label: "plannedSplitRule", prop: 'plannedSplitRule' }, - // { label: "truncType", prop: 'truncType' }, - // { label: "ID", prop: 'id' }, - // { label: "主表ID", prop: "masterID" }, - // ************** 确定隐藏 ************************ -] -// 人工发料记录（喷涂） -export const IssueNotePT = [ - { label: "物品代码", prop: "itemCode",fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "发料数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "来源库位", prop: "fromLocationCode" }, - { label: "来源ERP库位", prop: 'fromLocationErpCode' }, - { label: "目标库位", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: 'toLocationErpCode' }, - { label: "在途库位", prop: 'onTheWayLocationCode' }, - // ----------------------------------------------------------------------- - { label: "到货日期", prop: "arriveDate", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "任务编号", prop: 'number',width: orderWidth }, - { label: "备注", prop: 'remark' }, - { label: "来源仓库", prop: 'fromWarehouseCode' }, - { label: "目标仓库", prop: 'toWarehouseCode' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期日期", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "发料时间", prop: 'issueTime', type: "dateTime" }, - { label: "生产线", prop: 'prodLine' }, - { label: "工作中心", prop: 'workStation' }, - { label: "事务ID", prop: "tenantId" }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际批次", prop: "handledLot" }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, - { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, - { label: "实际数量", prop: 'handledQty' }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - // ************** 确定隐藏 ************************ - // { label: "fromStatus", prop: 'fromStatus' }, - // { label: "toStatus", prop: 'toStatus' }, - // { label: "ID", prop: 'id' }, - // { label: "主表ID", prop: "masterID" }, - // ************** 确定隐藏 ************************ -] - -// 人工发料申请（装配） -export const IssueRequestZP = [ - { label: "物品代码", prop: "itemCode" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, - { label: "叫料数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "目标库位", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: "toLocationErpCode" }, - { label: "生成任务数量", prop: 'issuedQty' }, - { label: "已收数量", prop: 'receivedQty' }, - { label: "单据号", prop: 'number' }, - // ----------------------------------------------------------------------- - { label: "标包数量", prop: 'stdPackQty' }, - { label: "生产线", prop: 'prodLine' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "工作中心", prop: 'workStation' }, - { label: "过期时间", prop: 'expiredTime' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, - { label: "请求未发", prop: 'toBeIssuedQty' }, - { label: "已发未收", prop: 'toBeReceivedQty' }, - { label: "请求未收", prop: 'notFinishQty' }, - // ************** 确定隐藏 ************************ - // { label: "主表ID", prop: "masterID" }, - // { label: "ID", prop: 'id' }, - // ************** 确定隐藏 ************************ -] -// 人工发料任务（装配） -export const IssueJobZP = [ - { label: "物品代码", prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际数量", prop: 'handledQty' }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "在途库位", prop: 'onTheWayLocationCode' }, - // ----------------------------------------------------------------------- - { label: "标包数量", prop: "stdPackQty" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "任务编号", prop: 'number',width: orderWidth }, - { label: "备注", prop: 'remark' }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, - { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, - { label: "计量单位", prop: 'uom' }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - { label: "到库区", prop: 'toLocationArea' }, - { label: "到库位组", prop: 'toLocationGroup' }, - { label: "到ERP库位", prop: 'toLocationErpCode' }, - { label: "到仓库", prop: 'toWarehouseCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "到库位", prop: 'toLocationCode' }, - { label: "生产线", prop: 'prodLine' }, - { label: "工作中心", prop: 'workStation' }, - { label: "过期时间", prop: 'expiredTime' }, - { label: "工序", prop: 'operation' }, - { label: "取整后数量", prop: 'roundedQty' }, - { label: "计划开始时间", prop: 'planBeginTime' }, - { label: "每次配送数量", prop: 'deliveryQty' }, - { label: "事务ID", prop: "tenantId" }, - // ************** 确定隐藏 ************************ - // { label: "distributionType", prop: 'distributionType' }, - // { label: "plannedSplitRule", prop: 'plannedSplitRule' }, - // { label: "truncType", prop: 'truncType' }, - // { label: "ID", prop: 'id' }, - // { label: "主表ID", prop: "masterID" }, - // ************** 确定隐藏 ************************ -] -// 人工发料记录（装配） -export const IssueNoteZP = [ - { label: "物品代码", prop: "itemCode",fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "配置", prop: "item_configurationFromFE" }, - { label: "发料数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "来源库位", prop: "fromLocationCode" }, - { label: "来源ERP库位", prop: 'fromLocationErpCode' }, - { label: "目标库位", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: 'toLocationErpCode' }, - { label: "在途库位", prop: 'onTheWayLocationCode' }, - // ----------------------------------------------------------------------- - { label: "到货日期", prop: "arriveDate", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: 'lastModifierId' }, - { label: "任务编号", prop: 'number',width: orderWidth }, - { label: "备注", prop: 'remark' }, - { label: "来源仓库", prop: 'fromWarehouseCode' }, - { label: "目标仓库", prop: 'toWarehouseCode' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期日期", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "发料时间", prop: 'issueTime', type: "dateTime" }, - { label: "生产线", prop: 'prodLine' }, - { label: "工作中心", prop: 'workStation' }, - { label: "事务ID", prop: "tenantId" }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际批次", prop: "handledLot" }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际仓库", prop: 'handledFromWarehouseCode' }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, - { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, - { label: "实际数量", prop: 'handledQty' }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - // ************** 确定隐藏 ************************ - // { label: "fromStatus", prop: 'fromStatus' }, - // { label: "toStatus", prop: 'toStatus' }, - // { label: "ID", prop: 'id' }, - // { label: "主表ID", prop: "masterID" }, - // ************** 确定隐藏 ************************ -] - -// 自动叫料（注塑）申请 -export const automaticRequestZS = [ - { label: "物品代码", prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "已发数量", prop: "issuedQty" }, - { label: "已收数量", prop: "receivedQty" }, - { label: "请求未发", prop: "toBeIssuedQty" }, - { label: "已发未收", prop: "toBeReceivedQty" }, - { label: "请求未收", prop: "notFinishQty" }, - { label: "请求箱数量", prop: "boxQty" }, - { label: "备注", prop: "remark" }, -] -// 自动叫料（注塑）任务 -export const automaticJobZS = [ - { label: "物品代码", prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, + { label: "单位", prop: "uom" }, + { label: "请求库位代码", prop: 'requestLocationCode' }, + { label: "请求库位区域", prop: 'requestLocationArea' }, { label: "请求库位组", prop: 'requestLocationGroup' }, { label: "请求ERP库位", prop: 'requestLocationErpCode' }, + { label: "请求仓库代码", prop: 'requestWarehouseCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "请求数量", prop: 'requestQty' }, { label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, + { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, + { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, + { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, + { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, + { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "推荐来源批次", prop: 'recommendFromLot' }, + { label: "推荐目标批次", prop: 'recommendToLot' }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, + { label: "推荐来源分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐目标分组", prop: 'recommendToLocationGroup' }, { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, - { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, - { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源库位", prop: 'handledFromLocationCode' }, - { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: "实际来源库区", prop: 'handledFromLocationArea' }, - { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, - { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, - { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, - { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' }, + { label: "推荐目标仓库", prop: "recommendToWarehouseCode" }, { label: "库移来源数量", prop: 'transferLibFromQty' }, { label: "库移目标数量", prop: 'transferLibToQty' }, { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, + { label: "库移来源批次", prop: 'transferLibFromLot' }, + { label: "库移目标批次", prop: 'transferLibToLot' }, + { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, + { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' }, + { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" }, + { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" }, + { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" }, + { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" }, + { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, + { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, { label: "库移目标库区", prop: 'transferLibToLocationArea' }, { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, - { label: "位置码", prop: 'positionCode' }, - { label: "推荐类型", prop: 'recommendType' }, -] -// 自动叫料（注塑）记录 -export const automaticNoteZS = [ - { label: "物品代码", prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, - { label: "请求库位组", prop: 'requestLocationGroup' }, - { label: "请求ERP库位", prop: 'requestLocationErpCode' }, - { label: "推荐来源数量", prop: 'recommendFromQty' }, - { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, - { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, - { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, - { label: "推荐目标库位", prop: 'recommendToLocationCode' }, - { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, - { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, - { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, - { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, + { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, + { label: "实际来源数量", prop: 'handledFromQty' }, + { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, + { label: "实际来源批次", prop: 'handledFromLot' }, + { label: "实际目标批次", prop: 'handledToLot' }, { label: "实际来源库位", prop: 'handledFromLocationCode' }, { label: "实际目标库位", prop: 'handledToLocationCode' }, { label: "实际来源库区", prop: 'handledFromLocationArea' }, { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, + { label: "实际来源分组", prop: 'handledFromLocationGroup' }, + { label: "实际目标分组", prop: 'handledToLocationGroup' }, { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" }, - { label: "库移来源数量", prop: 'transferLibFromQty' }, - { label: "库移目标数量", prop: 'transferLibToQty' }, - { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, - { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, - { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, - { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, - { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, - { label: "库移目标库区", prop: 'transferLibToLocationArea' }, - { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, - { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, + { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, + { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, + { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, + { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, + { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "实际来源仓库", prop: 'handledFromWarehouseCode' }, + { label: "实际目标仓库", prop: "handledToWarehouseCode" }, + { label: "标包数量", prop: 'stdPackQty' }, { label: "位置码", prop: 'positionCode' }, { label: "推荐类型", prop: 'recommendType' }, -] - -// 自动叫料（喷涂）申请 -export const automaticRequestPT = [ - { label: "物品代码", prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "已发数量", prop: "issuedQty" }, - { label: "已收数量", prop: "receivedQty" }, - { label: "请求未发", prop: "toBeIssuedQty" }, - { label: "已发未收", prop: "toBeReceivedQty" }, - { label: "请求未收", prop: "notFinishQty" }, - { label: "请求箱数量", prop: "boxQty" }, + { label: "生产线", prop: 'prodLine' }, { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（喷涂）任务 -export const automaticJobPT = [ +// 喷涂记录 +export const IssueNotePT = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, + { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, + { label: "单位", prop: "uom" }, + { label: "请求库位代码", prop: 'requestLocationCode' }, + { label: "请求库位区域", prop: 'requestLocationArea' }, { label: "请求库位组", prop: 'requestLocationGroup' }, { label: "请求ERP库位", prop: 'requestLocationErpCode' }, + { label: "请求仓库代码", prop: 'requestWarehouseCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "请求数量", prop: 'requestQty' }, { label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, + { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, + { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, + { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, + { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, + { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "推荐来源批次", prop: 'recommendFromLot' }, + { label: "推荐目标批次", prop: 'recommendToLot' }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, + { label: "推荐来源分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐目标分组", prop: 'recommendToLocationGroup' }, { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, - { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, - { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源库位", prop: 'handledFromLocationCode' }, - { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: "实际来源库区", prop: 'handledFromLocationArea' }, - { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, - { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, - { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, - { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' }, + { label: "推荐目标仓库", prop: "recommendToWarehouseCode" }, { label: "库移来源数量", prop: 'transferLibFromQty' }, { label: "库移目标数量", prop: 'transferLibToQty' }, { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, + { label: "库移来源批次", prop: 'transferLibFromLot' }, + { label: "库移目标批次", prop: 'transferLibToLot' }, + { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, + { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' }, + { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" }, + { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" }, + { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" }, + { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" }, + { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, + { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, { label: "库移目标库区", prop: 'transferLibToLocationArea' }, - { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, - { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, - { label: "位置码", prop: 'positionCode' }, - { label: "推荐类型", prop: 'recommendType' }, -] -// 自动叫料（喷涂）记录 -export const automaticNotePT = [ - { label: "物品代码", prop: "itemCode", fixed: "left" }, - { label: "物品名称", prop: "itemName" }, - { label: "物品描述1", prop: "itemDesc1" }, - { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, - { label: "请求库位组", prop: 'requestLocationGroup' }, - { label: "请求ERP库位", prop: 'requestLocationErpCode' }, - { label: "推荐来源数量", prop: 'recommendFromQty' }, - { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, - { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, - { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, - { label: "推荐目标库位", prop: 'recommendToLocationCode' }, - { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, - { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, - { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, - { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, + { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, + { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, + { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, + { label: "实际来源数量", prop: 'handledFromQty' }, + { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, + { label: "实际来源批次", prop: 'handledFromLot' }, + { label: "实际目标批次", prop: 'handledToLot' }, { label: "实际来源库位", prop: 'handledFromLocationCode' }, { label: "实际目标库位", prop: 'handledToLocationCode' }, { label: "实际来源库区", prop: 'handledFromLocationArea' }, { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, + { label: "实际来源分组", prop: 'handledFromLocationGroup' }, + { label: "实际目标分组", prop: 'handledToLocationGroup' }, { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" }, - { label: "库移来源数量", prop: 'transferLibFromQty' }, - { label: "库移目标数量", prop: 'transferLibToQty' }, - { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, - { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, - { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, - { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, - { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, - { label: "库移目标库区", prop: 'transferLibToLocationArea' }, - { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, - { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, + { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, + { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, + { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, + { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, + { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "实际来源仓库", prop: 'handledFromWarehouseCode' }, + { label: "实际目标仓库", prop: "handledToWarehouseCode" }, + { label: "标包数量", prop: 'stdPackQty' }, { label: "位置码", prop: 'positionCode' }, { label: "推荐类型", prop: 'recommendType' }, + { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（装配）申请 -export const automaticRequestZP = [ +// 装配申请 +export const IssueRequestZP = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "已发数量", prop: "issuedQty" }, - { label: "已收数量", prop: "receivedQty" }, - { label: "请求未发", prop: "toBeIssuedQty" }, + { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, + { label: "单位", prop: "uom" }, + { label: "数量", prop: "qty" }, + { label: "申请数量", prop: 'issuedQty' }, + { label: "已收数量", prop: 'receivedQty' }, { label: "已发未收", prop: "toBeReceivedQty" }, { label: "请求未收", prop: "notFinishQty" }, + { label: "请求未发", prop: "toBeIssuedQty" }, { label: "请求箱数量", prop: "boxQty" }, + { label: "标包数量", prop: 'stdPackQty' }, + { label: "目标库位", prop: 'toLocationCode' }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "位置码", prop: 'positionCode' }, + { label: "推荐类型", prop: 'recommendType' }, + { label: "到仓库", prop: 'toWarehouseCode' }, + { label: "生产线", prop: 'prodLine' }, { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（装配）任务 -export const automaticJobZP = [ +// 装配任务 +export const IssueJobZP = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, + { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, + { label: "单位", prop: "uom" }, + { label: "请求库位代码", prop: 'requestLocationCode' }, + { label: "请求库位区域", prop: 'requestLocationArea' }, { label: "请求库位组", prop: 'requestLocationGroup' }, { label: "请求ERP库位", prop: 'requestLocationErpCode' }, + { label: "请求仓库代码", prop: 'requestWarehouseCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "请求数量", prop: 'requestQty' }, { label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, + { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, + { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, + { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, + { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, + { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "推荐来源批次", prop: 'recommendFromLot' }, + { label: "推荐目标批次", prop: 'recommendToLot' }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, + { label: "推荐来源分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐目标分组", prop: 'recommendToLocationGroup' }, { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, - { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, - { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源库位", prop: 'handledFromLocationCode' }, - { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: "实际来源库区", prop: 'handledFromLocationArea' }, - { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, - { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, - { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, - { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' }, + { label: "推荐目标仓库", prop: "recommendToWarehouseCode" }, { label: "库移来源数量", prop: 'transferLibFromQty' }, { label: "库移目标数量", prop: 'transferLibToQty' }, { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, + { label: "库移来源批次", prop: 'transferLibFromLot' }, + { label: "库移目标批次", prop: 'transferLibToLot' }, + { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, + { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' }, + { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" }, + { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" }, + { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" }, + { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" }, + { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, + { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, { label: "库移目标库区", prop: 'transferLibToLocationArea' }, { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, + { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, + { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, + { label: "实际来源数量", prop: 'handledFromQty' }, + { label: "实际目标数量", prop: 'handledToQty' }, + { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, + { label: "实际目标箱标签", prop: 'handledToPackingCode' }, + { label: "实际来源批次", prop: 'handledFromLot' }, + { label: "实际目标批次", prop: 'handledToLot' }, + { label: "实际来源库位", prop: 'handledFromLocationCode' }, + { label: "实际目标库位", prop: 'handledToLocationCode' }, + { label: "实际来源库区", prop: 'handledFromLocationArea' }, + { label: "实际目标库区", prop: 'handledToLocationArea' }, + { label: "实际来源分组", prop: 'handledFromLocationGroup' }, + { label: "实际目标分组", prop: 'handledToLocationGroup' }, + { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, + { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, + { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, + { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, + { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, + { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, + { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, + { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "实际来源仓库", prop: 'handledFromWarehouseCode' }, + { label: "实际目标仓库", prop: "handledToWarehouseCode" }, + { label: "标包数量", prop: 'stdPackQty' }, { label: "位置码", prop: 'positionCode' }, { label: "推荐类型", prop: 'recommendType' }, + { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（装配）记录 -export const automaticNoteZP = [ +// 装配记录 +export const IssueNoteZP = [ { label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "请求数量", prop: 'requestQty' }, - { label: "请求库位", prop: 'requestLocationCode' }, - { label: "请求库区", prop: 'requestLocationArea' }, + { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, + { label: "单位", prop: "uom" }, + { label: "请求库位代码", prop: 'requestLocationCode' }, + { label: "请求库位区域", prop: 'requestLocationArea' }, { label: "请求库位组", prop: 'requestLocationGroup' }, { label: "请求ERP库位", prop: 'requestLocationErpCode' }, + { label: "请求仓库代码", prop: 'requestWarehouseCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "请求数量", prop: 'requestQty' }, { label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + { label: "推荐来源箱标签", prop: "recommendFromPackingCode" }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, + { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, + { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, + { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, + { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, + { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + { label: "推荐来源批次", prop: 'recommendFromLot' }, + { label: "推荐目标批次", prop: 'recommendToLot' }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, + { label: "推荐来源分组", prop: 'recommendFromLocationGroup' }, + { label: "推荐目标分组", prop: 'recommendToLocationGroup' }, { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' }, { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, - { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, - { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源库位", prop: 'handledFromLocationCode' }, - { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: "实际来源库区", prop: 'handledFromLocationArea' }, - { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, - { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, - { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, - { label: "实际目标数量", prop: 'handledToQty' }, - { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, - { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' }, + { label: "推荐目标仓库", prop: "recommendToWarehouseCode" }, { label: "库移来源数量", prop: 'transferLibFromQty' }, { label: "库移目标数量", prop: 'transferLibToQty' }, { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' }, { label: "库移目标箱标签", prop: 'transferLibToPackingCode' }, + { label: "库移来源批次", prop: 'transferLibFromLot' }, + { label: "库移目标批次", prop: 'transferLibToLot' }, + { label: "库移来源供应商批次", prop: 'transferLibFromSupplierBatch' }, + { label: "库移目标批应商批次", prop: 'transferLibToSupplierBatch' }, + { label: "库移来源到货时间", prop: 'transferLibFromArriveDate', type: "dateTime" }, + { label: "库移目标到货时间", prop: 'transferLibToArriveDate', type: "dateTime" }, + { label: "库移来源生产时间", prop: 'transferLibFromProduceDate', type: "dateTime" }, + { label: "库移目标生产时间", prop: 'transferLibToProduceDate', type: "dateTime" }, + { label: "库移来源过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, + { label: "库移目标过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, { label: "库移来源库位", prop: 'transferLibFromLocationCode' }, { label: "库移目标库位", prop: 'transferLibToLocationCode' }, - { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, - { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, { label: "库移来源库区", prop: 'transferLibFromLocationArea' }, { label: "库移目标库区", prop: 'transferLibToLocationArea' }, { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' }, { label: "库移目标库位组", prop: 'transferLibToLocationGroup' }, - { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' }, - { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' }, - { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" }, - { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, - { label: "生产线", prop: 'prodLine' }, + { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' }, + { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' }, + { label: "实际来源数量", prop: 'handledFromQty' }, + { label: "实际目标数量", prop: 'handledToQty' }, + { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, + { label: "实际目标箱标签", prop: 'handledToPackingCode' }, + { label: "实际来源批次", prop: 'handledFromLot' }, + { label: "实际目标批次", prop: 'handledToLot' }, + { label: "实际来源库位", prop: 'handledFromLocationCode' }, + { label: "实际目标库位", prop: 'handledToLocationCode' }, + { label: "实际来源库区", prop: 'handledFromLocationArea' }, + { label: "实际目标库区", prop: 'handledToLocationArea' }, + { label: "实际来源分组", prop: 'handledFromLocationGroup' }, + { label: "实际目标分组", prop: 'handledToLocationGroup' }, + { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' }, + { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, + { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, + { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, + { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, + { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, + { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, + { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + { label: "实际来源仓库", prop: 'handledFromWarehouseCode' }, + { label: "实际目标仓库", prop: "handledToWarehouseCode" }, + { label: "标包数量", prop: 'stdPackQty' }, { label: "位置码", prop: 'positionCode' }, { label: "推荐类型", prop: 'recommendType' }, + { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] // 业务库移申请 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index c1688dc43..a49bbb7fb 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -4297,443 +4297,163 @@ export const completDumpNoteZP = [ ] // 注塑计划 -export const IssuePlanZS = [ - { - label: "注塑计划号", - prop: "number", - fixed: "left", - width: orderWidth - }, - { label: "计划说明", prop: 'remark',width:"auto" }, - { label: "版本号", prop: 'version' }, - { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "planStatus_ZS",width:"auto" }, - { label: "计划日期", prop: 'planTime', type: "dateTime",width:"auto"}, -] -// 人工注塑申请 +// export const IssuePlanZS = [ +// { +// label: "注塑计划号", +// prop: "number", +// fixed: "left", +// width: orderWidth +// }, +// { label: "计划说明", prop: 'remark',width:"auto" }, +// { label: "版本号", prop: 'version' }, +// { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "planStatus_ZS",width:"auto" }, +// { label: "计划日期", prop: 'planTime', type: "dateTime",width:"auto"}, +// ] +// 注塑申请 export const IssueRequestZS = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, + { label: "请求单号", prop: "number", fixed: "left", type: "name" }, + { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, + { label: "目标库位代码", prop: "toLocationCode" }, { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工注塑任务 +// 注塑任务 export const IssueJobZS = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "要货单号", prop: 'kittingRequestNumber'}, + { label: "承接者用户名", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime',type: "dateTime" }, + { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工注塑记录 +// 注塑记录 export const IssueNoteZS = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: 'requestNumber' }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: "任务代码", prop: 'jobNumber' }, + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料申请（喷涂） +// 喷涂申请 export const IssueRequestPT = [ - { - label: "叫料申请编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "请求单号", prop: "number", fixed: "left", type: "name" }, + { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, + { label: "目标库位代码", prop: "toLocationCode" }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "叫料类型", prop: 'type' }, - { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth }, - { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ************** 确认隐藏 ************************ - // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "事务ID", prop: "tenantId" }, - // ************** 确认隐藏 ************************ + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料任务（喷涂） +// 喷涂任务 export const IssueJobPT = [ - { - label: "发料任务编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, - { label: "申请单号", prop: "materialRequestNumber",width: orderWidth }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "完成时间", prop: "completeTime", type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "仓库代码", prop: 'warehouseCode' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, + { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "要货单号", prop: 'kittingRequestNumber'}, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, - { label: "叫料请求类型", prop: 'requestType' }, { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ************** 确认隐藏 ************************ - // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "上次修改者ID", prop: "lastModifierId" }, - // { label: "事务ID", prop: "tenantId" }, - // { label: "承接者ID", prop: 'acceptUserId' }, - // { label: "完成者", prop: 'completeUserId' }, - // ************** 确认隐藏 ************************ + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料记录（喷涂） +// 喷涂记录 export const IssueNotePT = [ - { - label: "发料记录单号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate',type: "dateTime" }, - { label: "车间", prop: 'workshop' }, - { label: "叫料请求类型", prop: 'requestType' }, + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: 'requestNumber' }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - // ************** 确认隐藏 ************************ - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "上次修改者ID", prop: "lastModifierId" }, - // { label: "事务ID", prop: "tenantId" }, - // ************** 确认隐藏 ************************ + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: "任务代码", prop: 'jobNumber' }, + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] - -// 人工发料申请（装配） +// 装配申请 export const IssueRequestZP = [ - { - label: "叫料申请编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "请求单号", prop: "number", fixed: "left", type: "name" }, + { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, + { label: "目标库位代码", prop: "toLocationCode" }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "叫料类型", prop: 'type' }, - { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth }, - { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ************** 确认隐藏 ************************ - // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "事务ID", prop: "tenantId" }, - // ************** 确认隐藏 ************************ + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料任务（装配） -export const IssueJobZP = [ - { - label: "发料任务编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, - { label: "申请单号", prop: "materialRequestNumber",width: orderWidth }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "完成时间", prop: "completeTime", type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "仓库代码", prop: 'warehouseCode' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, +// 装配任务 +export const IssueJobZP = [ + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, + { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "要货单号", prop: 'kittingRequestNumber'}, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, - { label: "叫料请求类型", prop: 'requestType' }, { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ************** 确认隐藏 ************************ - // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "上次修改者ID", prop: "lastModifierId" }, - // { label: "事务ID", prop: "tenantId" }, - // { label: "承接者ID", prop: 'acceptUserId' }, - // { label: "完成者", prop: 'completeUserId' }, - // ************** 确认隐藏 ************************ -] -// 人工发料记录（装配） -export const IssueNoteZP = [ - { - label: "发料记录单号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate',type: "dateTime" }, - { label: "车间", prop: 'workshop' }, - { label: "叫料请求类型", prop: 'requestType' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - // ************** 确认隐藏 ************************ - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "上次修改者ID", prop: "lastModifierId" }, - // { label: "事务ID", prop: "tenantId" }, - // ************** 确认隐藏 ************************ -] - -// 自动叫料（注塑）申申请 -export const automaticRequestZS = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: "toLocationErpCode" }, - { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, -] -// 自动叫料（注塑）申任务 -export const automaticJobZS = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, - { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - -] -// 自动叫料（注塑）申记录 -export const automaticNoteZS = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, -] - -// 自动叫料（喷涂）申请 -export const automaticRequestPT = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, -] -// 自动叫料（喷涂）申任务 -export const automaticJobPT = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, - { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（喷涂）申记录 -export const automaticNotePT = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, +// 装配记录 +export const IssueNoteZP = [ + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: 'requestNumber' }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, -] - -// 自动叫料（装配）申请 -export const automaticRequestZP = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: "任务代码", prop: 'jobNumber' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, -] -// 自动叫料（装配）申任务 -export const automaticJobZP = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, - { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - -] -// 自动叫料（装配）申记录 -export const automaticNoteZP = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - width: orderWidth - }, - { label: "申请单号", prop: 'requestNumber',width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] // 业务库移申请 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 1dfdb8685..8e8c1ca98 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -3120,403 +3120,151 @@ export const completDumpNoteZP = [ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] -// 人工注塑申请 +// 注塑申请 export const IssueRequestZS = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - }, + { label: "请求单号", prop: "number", fixed: "left", type: "name" }, { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, + { label: "目标库位代码", prop: "toLocationCode" }, { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工注塑任务 +// 注塑任务 export const IssueJobZS = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, + { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "要货单号", prop: 'kittingRequestNumber'}, + { label: "承接者用户名", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime',type: "dateTime" }, + { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工注塑记录 +// 注塑记录 export const IssueNoteZS = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - }, + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: "任务代码", prop: 'jobNumber' }, + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料申请（喷涂） +// 喷涂申请 export const IssueRequestPT = [ - { - label: "叫料申请编号", - prop: "number", - fixed: "left", - type: "name", - }, + { label: "请求单号", prop: "number", fixed: "left", type: "name" }, { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, + { label: "目标库位代码", prop: "toLocationCode" }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "叫料类型", prop: 'type' }, - { label: "备料计划单号", prop: 'preparationPlanNumber' }, - { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ************** 确认隐藏 ************************ - // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - // { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - // { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "事务ID", prop: "tenantId" }, - // ************** 确认隐藏 ************************ + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料任务（喷涂） +// 喷涂任务 export const IssueJobPT = [ - { - label: "发料任务编号", - prop: "number", - fixed: "left", - type: "name", - }, + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, - { label: "申请单号", prop: "materialRequestNumber" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "完成时间", prop: "completeTime", type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "仓库代码", prop: 'warehouseCode' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "任务类型", prop: 'jobType' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "工作组", prop: 'workGroupCode' }, + { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "要货单号", prop: 'kittingRequestNumber'}, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, - { label: "叫料请求类型", prop: 'requestType' }, { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // ************** 确认隐藏 ************************ - // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "上次修改者ID", prop: "lastModifierId" }, - // { label: "事务ID", prop: "tenantId" }, - // { label: "承接者ID", prop: 'acceptUserId' }, - // { label: "完成者", prop: 'completeUserId' }, - // ************** 确认隐藏 ************************ + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 人工发料记录（喷涂） +// 喷涂记录 export const IssueNotePT = [ - { - label: "发料记录单号", - prop: "number", - fixed: "left", - type: "name", - }, + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate',type: "dateTime" }, - { label: "车间", prop: 'workshop' }, - { label: "叫料请求类型", prop: 'requestType' }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - // ************** 确认隐藏 ************************ - // { label: "创建者ID", prop: 'creatorId' }, - // { label: "上次修改者ID", prop: "lastModifierId" }, - // { label: "事务ID", prop: "tenantId" }, - // ************** 确认隐藏 ************************ -] - - -// 人工发料申请（装配） -export const IssueRequestZP = [ - { label: "申请编号", prop: "number" }, - { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: "任务代码", prop: 'jobNumber' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "备注", prop: 'remark' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "事务ID", prop: "tenantId" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "备料计划单号", prop: 'preparationPlanNumber' }, - { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - // ************** 确认隐藏 ************************ - // { label: "ID", prop: 'id' }, - // { label: "叫料类型", prop: 'type' }, - // ************** 确认隐藏 ************************ -] -// 人工发料任务（装配） -export const IssueJobZP = [ - { label: "发料任务编号", prop: "number" }, - { label: "申请单号", prop: "materialRequestNumber" }, - { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接用户", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成用户", prop: 'completeUserName' }, - { label: "完成时间", prop: "completeTime", type: "dateTime" }, - { label: "叫料请求类型", prop: 'requestType' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "备注", prop: 'remark' }, - { label: "上游任务编号", prop: 'upStreamJobNumber',}, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, - { label: "事务ID", prop: "tenantId" }, - { label: "工作组", prop: 'workGroupCode' }, - { label: "创建者ID", prop: "creatorId" }, - { label: "承接者ID", prop: 'acceptUserId' }, - { label: "完成者ID", prop: 'completeUserId' }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "生产线", prop: 'prodLine' }, - { label: "车间", prop: 'workshop' }, - { label: "仓库代码", prop: 'warehouseCode' }, - // ************** 确认隐藏 ************************ - // { label: "ID", prop: 'id' }, - // ************** 确认隐藏 ************************ -] -// 人工发料记录（装配） -export const IssueNoteZP = [ - { label: "发料记录单号", prop: "number" }, - { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: 'worker' }, - { label: "叫料请求类型", prop: 'requestType' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "车间", prop: 'workshop' }, - { label: "确认时间", prop: 'confirmTime', type: "dateTime" }, - // ************** 确认隐藏 ************************ - // { label: "ID", prop: 'id' }, - // ************** 确认隐藏 ************************ + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（注塑）申请 -export const automaticRequestZS = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - }, +// 装配申请 +export const IssueRequestZP = [ + { label: "请求单号", prop: "number", fixed: "left", type: "name" }, { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, + { label: "目标库位代码", prop: "toLocationCode" }, { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（注塑）任务 -export const automaticJobZS = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, +// 装配任务 +export const IssueJobZP = [ + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, - { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - -] -// 自动叫料（注塑）记录 -export const automaticNoteZS = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, -] - -// 自动叫料（喷涂）申请 -export const automaticRequestPT = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: "toLocationErpCode" }, - { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, -] -// 自动叫料（喷涂）任务 -export const automaticJobPT = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "要货单号", prop: 'kittingRequestNumber'}, + { label: "承接者用户名", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime',type: "dateTime" }, + { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - -] -// 自动叫料（喷涂）记录 -export const automaticNotePT = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, -] - - -// 自动叫料（装配）申请 -export const automaticRequestZP = [ - { - label: "申请编号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" }, - { label: "叫料库位代码", prop: "toLocationCode" }, - { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - // { label: "创建时间", prop: "creationTime", type: "dateTime" }, - // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, - // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, -] -// 自动叫料（装配）任务 -export const automaticJobZP = [ - { - label: "任务编号", - prop: "number", - fixed: "left", - type: "name", - }, - { label: "要货单号", prop: 'injectionIssueRequestNumber' }, - { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" }, - { label: "生产线", prop: 'prodLine' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] -// 自动叫料（装配）记录 -export const automaticNoteZP = [ - { - label: "记录单号", - prop: "number", - fixed: "left", - type: "name", - }, +// 装配记录 +export const IssueNoteZP = [ + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, { label: "申请单号", prop: 'requestNumber' }, - { label: "任务单号", prop: 'jobNumber' }, - { label: "操作员", prop: 'worker' }, - { label: "备注", prop: 'remark' }, + { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, + { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: "任务代码", prop: 'jobNumber' }, + { label: "备注", prop: "remark" }, + { label: "操作员", prop: "worker" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] // 业务库移申请 @@ -3767,4 +3515,4 @@ export const isPadForTransferLibJob = [ { label: "完成时间", prop: "completeTime", type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, -] \ No newline at end of file +] diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue b/fe/PC/src/views/materialIssuePT/IssueJobPT.vue similarity index 98% rename from fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue rename to fe/PC/src/views/materialIssuePT/IssueJobPT.vue index 8f70b0fe7..c14d7a9dd 100644 --- a/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue +++ b/fe/PC/src/views/materialIssuePT/IssueJobPT.vue @@ -88,7 +88,7 @@ export default { }, data() { return { - URL: "wms/store/issue-job", + URL: "wms/store/coating-issue-job", //常用按钮数据 currenButtonData: [ // this.defaultImportBtn(),//导入 diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue b/fe/PC/src/views/materialIssuePT/IssueNotePT.vue similarity index 98% rename from fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue rename to fe/PC/src/views/materialIssuePT/IssueNotePT.vue index ff8cd3553..aa715ce4c 100644 --- a/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue +++ b/fe/PC/src/views/materialIssuePT/IssueNotePT.vue @@ -72,7 +72,7 @@ export default { ], data() { return { - URL: "wms/store/issue-note", + URL: "wms/store/coating-issue-note", //常用按钮数据 currenButtonData: [ // this.defaultImportBtn(),//导入 diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue b/fe/PC/src/views/materialIssuePT/IssueRequestPT.vue similarity index 97% rename from fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue rename to fe/PC/src/views/materialIssuePT/IssueRequestPT.vue index 4e0f1386a..b7b289782 100644 --- a/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue +++ b/fe/PC/src/views/materialIssuePT/IssueRequestPT.vue @@ -86,7 +86,7 @@ export default { }, data() { return { - URL: "wms/store/material-request", + URL: "wms/store/coating-issue-request", //常用按钮数据 currenButtonData: [ // this.defaultImportBtn(),//导入 @@ -102,7 +102,7 @@ export default { name: "handleGetIds", hide: () => { return this.hideButton([1,5,9]) }, size: 'mini', - handleGetJobsUrl:'wms/store/material-job', + handleGetJobsUrl:'wms/store/coating-issue-job', // handleRequestUrl:'wms/store/kitting-issue-request', }, { diff --git a/fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue b/fe/PC/src/views/materialIssueZP/IssueJobZP.vue similarity index 98% rename from fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue rename to fe/PC/src/views/materialIssueZP/IssueJobZP.vue index 722647373..d360db829 100644 --- a/fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue +++ b/fe/PC/src/views/materialIssueZP/IssueJobZP.vue @@ -88,7 +88,7 @@ export default { }, data() { return { - URL: "wms/store/issue-job", + URL: "wms/store/assemble-issue-job", //常用按钮数据 currenButtonData: [ // this.defaultImportBtn(),//导入 diff --git a/fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue b/fe/PC/src/views/materialIssueZP/IssueNoteZP.vue similarity index 98% rename from fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue rename to fe/PC/src/views/materialIssueZP/IssueNoteZP.vue index a24082619..faa8f73a0 100644 --- a/fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue +++ b/fe/PC/src/views/materialIssueZP/IssueNoteZP.vue @@ -72,7 +72,7 @@ export default { ], data() { return { - URL: "wms/store/issue-note", + URL: "wms/store/assemble-issue-note", //常用按钮数据 currenButtonData: [ // this.defaultImportBtn(),//导入 diff --git a/fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue b/fe/PC/src/views/materialIssueZP/IssueRequestZP.vue similarity index 97% rename from fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue rename to fe/PC/src/views/materialIssueZP/IssueRequestZP.vue index c7e913c1e..0edce326c 100644 --- a/fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue +++ b/fe/PC/src/views/materialIssueZP/IssueRequestZP.vue @@ -86,7 +86,7 @@ export default { }, data() { return { - URL: "wms/store/material-request", + URL: "wms/store/assemble-issue-request", //常用按钮数据 currenButtonData: [ // this.defaultImportBtn(),//导入 @@ -102,7 +102,7 @@ export default { name: "handleGetIds", hide: () => { return this.hideButton([1,5,9]) }, size: 'mini', - handleGetJobsUrl:'wms/store/material-job', + handleGetJobsUrl:'wms/store/assemble-issue-job', // handleRequestUrl:'wms/store/kitting-issue-request', }, { diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue b/fe/PC/src/views/materialIssueZS/IssueJobZS.vue similarity index 100% rename from fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue rename to fe/PC/src/views/materialIssueZS/IssueJobZS.vue diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue b/fe/PC/src/views/materialIssueZS/IssueNoteZS.vue similarity index 100% rename from fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue rename to fe/PC/src/views/materialIssueZS/IssueNoteZS.vue diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssuePlanZS.vue b/fe/PC/src/views/materialIssueZS/IssuePlanZS.vue similarity index 99% rename from fe/PC/src/views/materialIssueManage/ZS/IssuePlanZS.vue rename to fe/PC/src/views/materialIssueZS/IssuePlanZS.vue index 0026eff01..31dd6b2af 100644 --- a/fe/PC/src/views/materialIssueManage/ZS/IssuePlanZS.vue +++ b/fe/PC/src/views/materialIssueZS/IssuePlanZS.vue @@ -286,7 +286,7 @@ export default { };