Browse Source

【nev-pc】暂存

ag_report_nev
安虹睿 1 year ago
parent
commit
932a209a34
  1. 275
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 15
      fe/PC/src/utils/tableColumns/index.js
  3. 15
      fe/PC/src/utils/tabsDesTions/index.js
  4. 1
      fe/PC/src/views/inventoryManage/transferLib/transferLibJob.vue
  5. 1
      fe/PC/src/views/inventoryManage/transferLib/transferLibNote.vue
  6. 1
      fe/PC/src/views/inventoryManage/transferLib/transferLibRequest.vue
  7. 3
      fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
  8. 3
      fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue

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

@ -3682,38 +3682,20 @@ export const completDumpNoteZP = [
// 人工发料申请(注塑) // 人工发料申请(注塑)
export const IssueRequestZS = [ export const IssueRequestZS = [
{ label: "物品代码", prop: "itemCode" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: "物品描述2", prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE" }, { label: "物品单位", prop: "uom" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "叫料数量", prop: "qty" }, { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "单位", prop: "uom" }, { label: "已发数量", prop: "issuedQty" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "已收数量", prop: "receivedQty" },
{ label: "创建者ID", prop: 'creatorId' }, { label: "请求未发", prop: "toBeIssuedQty" },
{ label: "目标库位", prop: "toLocationCode" }, { label: "已发未收", prop: "toBeReceivedQty" },
{ label: "目标ERP库位", prop: "toLocationErpCode" }, { label: "请求未收", prop: "notFinishQty" },
{ label: "生成任务数量", prop: 'issuedQty' }, { label: "请求箱数量", prop: "boxQty" },
{ 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: "备注", 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 IssueJobZS = [ export const IssueJobZS = [
@ -3721,134 +3703,133 @@ export const IssueJobZS = [
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: "物品描述2", prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE" }, { label: "物品单位", prop: "uom" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "推荐批次", prop: "recommendLot" }, { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "实际批次", prop: "handledLot" }, { label: "请求数量", prop: 'requestQty' },
{ 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: 'requestLocationCode' },
{ label: "到库位", prop: 'toLocationCode' }, { 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: '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: '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: 'prodLine' },
{ label: "工作中心", prop: 'workStation' }, { label: "位置码", prop: 'positionCode' },
{ label: "过期时间", prop: 'expiredTime' }, { label: "推荐类型", prop: 'recommendType' },
{ 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 IssueNoteZS = [ export const IssueNoteZS = [
{ label: "物品代码", prop: "itemCode",fixed: "left" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: "物品描述2", prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE" }, { label: "物品单位", prop: "uom" },
{ label: "发料数量", prop: "qty" }, { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "单位", prop: "uom" }, { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "请求数量", prop: 'requestQty' },
{ label: "创建者ID", prop: 'creatorId' }, { label: "请求库位", prop: 'requestLocationCode' },
{ label: "来源库位", prop: "fromLocationCode" }, { label: "请求库区", prop: 'requestLocationArea' },
{ label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "请求库位组", prop: 'requestLocationGroup' },
{ label: "目标库位", prop: "toLocationCode" }, { label: "请求ERP库位", prop: 'requestLocationErpCode' },
{ label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "推荐来源数量", prop: 'recommendFromQty' },
{ label: "在途库位", prop: 'onTheWayLocationCode' }, { label: "推荐目标数量", prop: 'recommendToQty' },
// ----------------------------------------------------------------------- { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
{ label: "到货日期", prop: "arriveDate", type: "dateTime" }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
{ label: "上次修改者ID", prop: 'lastModifierId' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' },
{ label: "任务编号", prop: 'number',width: orderWidth }, { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
{ label: "备注", prop: 'remark' }, { label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
{ label: "目标仓库", prop: 'toWarehouseCode' }, { label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
{ label: "标包数量", prop: 'stdPackQty' }, { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
{ label: "来源箱码", prop: 'fromPackingCode' }, { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
{ label: "目标箱码", prop: 'toPackingCode' }, { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
{ label: "来源批次", prop: 'fromLot' }, { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
{ label: "目标批次", prop: 'toLot' }, { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
{ label: "供应商批次", prop: 'supplierBatch' }, { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
{ label: "过期日期", prop: 'expireDate', type: "dateTime" }, { label: "实际目标箱标签", prop: 'handledToPackingCode' },
{ label: "来源库位组", prop: 'fromLocationGroup' }, { label: "实际来源库位", prop: 'handledFromLocationCode' },
{ label: "目标库位组", prop: 'toLocationGroup' }, { label: "实际目标库位", prop: 'handledToLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' }, { label: "实际来源库区", prop: 'handledFromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' }, { label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "推荐箱码", prop: "recommendPackingCode" }, { label: "实际来源库位组", prop: 'handledFromLocationGroup' },
{ label: "发料时间", prop: 'issueTime', type: "dateTime" }, { 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: 'prodLine' },
{ label: "工作中心", prop: 'workStation' }, { label: "位置码", prop: 'positionCode' },
{ label: "事务ID", prop: "tenantId" }, { label: "推荐类型", prop: 'recommendType' },
{ 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" },
// ************** 确定隐藏 ************************
] ]
// 人工发料申请(喷涂) // 人工发料申请(喷涂)

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

@ -4260,14 +4260,15 @@ export const IssueRequestZS = [
width: orderWidth width: orderWidth
}, },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, { label: "叫料库位代码", prop: "toLocationCode" },
{ label: "目标库位代", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" }, { label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "操作员", prop: "worker" }, { label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, // { label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
] ]
// 人工注塑任务 // 人工注塑任务
export const IssueJobZS = [ export const IssueJobZS = [
@ -4278,6 +4279,7 @@ export const IssueJobZS = [
type: "name", type: "name",
width: orderWidth width: orderWidth
}, },
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "生产线", prop: 'prodLine' }, { label: "生产线", prop: 'prodLine' },
@ -4285,7 +4287,6 @@ export const IssueJobZS = [
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
] ]
// 人工注塑记录 // 人工注塑记录
@ -4305,8 +4306,6 @@ export const IssueNoteZS = [
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' }, { label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
] ]
// 人工发料申请(喷涂) // 人工发料申请(喷涂)

15
fe/PC/src/utils/tabsDesTions/index.js

@ -3103,14 +3103,15 @@ export const IssueRequestZS = [
type: "name", type: "name",
}, },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true }, { label: "叫料库位代码", prop: "toLocationCode" },
{ label: "目标库位代", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" }, { label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "操作员", prop: "worker" }, { label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, // { label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
] ]
// 人工注塑任务 // 人工注塑任务
export const IssueJobZS = [ export const IssueJobZS = [
@ -3120,6 +3121,7 @@ export const IssueJobZS = [
fixed: "left", fixed: "left",
type: "name", type: "name",
}, },
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "生产线", prop: 'prodLine' }, { label: "生产线", prop: 'prodLine' },
@ -3127,7 +3129,6 @@ export const IssueJobZS = [
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
] ]
// 人工注塑记录 // 人工注塑记录
@ -3146,8 +3147,6 @@ export const IssueNoteZS = [
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' }, { label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
] ]
// 人工发料申请(喷涂) // 人工发料申请(喷涂)

1
fe/PC/src/views/inventoryManage/transferLib/transferLibJob.vue

@ -82,6 +82,7 @@ export default {
// //
currenButtonData: [ currenButtonData: [
// this.defaultImportBtn(),// // this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//
this.defaultFilterBtn(),// this.defaultFilterBtn(),//

1
fe/PC/src/views/inventoryManage/transferLib/transferLibNote.vue

@ -82,6 +82,7 @@ export default {
// //
currenButtonData: [ currenButtonData: [
// this.defaultImportBtn(),// // this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//
this.defaultFilterBtn(),// this.defaultFilterBtn(),//

1
fe/PC/src/views/inventoryManage/transferLib/transferLibRequest.vue

@ -82,6 +82,7 @@ export default {
// //
currenButtonData: [ currenButtonData: [
// this.defaultImportBtn(),// // this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//
this.defaultFilterBtn(),// this.defaultFilterBtn(),//

3
fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue

@ -88,7 +88,8 @@ export default {
URL: 'wms/store/injection-job', URL: 'wms/store/injection-job',
// //
currenButtonData: [ currenButtonData: [
this.defaultImportBtn(),// // this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//
this.defaultFilterBtn(),// this.defaultFilterBtn(),//

3
fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue

@ -88,7 +88,8 @@ export default {
URL: 'wms/store/injection-request', URL: 'wms/store/injection-request',
// //
currenButtonData: [ currenButtonData: [
this.defaultImportBtn(),// // this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),// this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),// this.defaultFreshBtn(),//
this.defaultFilterBtn(),// this.defaultFilterBtn(),//

Loading…
Cancel
Save