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

回收料接口修改及盘点任务字段调整

dev_web_online
陈薪名 2 years ago
parent
e206c18498
commit
4e1bdebab8
6 changed files with 89 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 142
      fe/PC/src/utils/tableColumns/index.js
  3. 6
      fe/PC/src/utils/tabsDesTions/index.js
  4. 2
      fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
  5. 2
      fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue
  6. 2
      fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentApply.vue

18
fe/PC/src/utils/detailsTableColumns/index.js
View File

@ -2956,14 +2956,16 @@ export const CountPlan = [
// { label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" },
// -----------------------------------------------------------------------
]
// 盘点任务 已调整
// 盘点任务 20230415
export const CountJob = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "盘点数量", prop: "countQty" },
{ label: "库存单位", prop: "inventoryUom" },
{ label: "库存库位", prop: "inventoryLocationCode" },
{ label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" },
@ -2973,13 +2975,12 @@ export const CountJob = [
{ label: "ERP库位", prop: "locationErpCode" },
{ label: "盘点时间", prop: 'countTime', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "盘点操作员", prop: "countOperator" },
{ label: "盘点描述", prop: "countDescription" },
// -----------------------------------------------------------------------
{ label: "单据号", prop: 'number', width:orderWidth },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "备注", prop: 'remark' },
{ label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' },
@ -2988,13 +2989,14 @@ export const CountJob = [
{ label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "盘点标签", prop: "countLabel" },
{ label: "监盘操作员", prop: 'auditCountOperator' },
{ label: "监盘描述", prop: 'auditCountDescription' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "监盘操作员", prop: 'auditCountOperator' },
// { label: "监盘描述", prop: 'auditCountDescription' },
// -----------------------------------------------------------------------
]
// 盘点记录 20230415

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

@ -1084,7 +1084,7 @@ export const SupplierAsn = [
{ label: "createType", prop: 'createType' },
// { label: "联系人电话", prop: 'contactUserPhone' },
// { label: "联系人邮件", prop: 'contactUserEmail' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// { label: "筹措员代码", prop: "contactUserName" },
// { label: "供应商名称", prop: "supplierName",showProp: true },
@ -1127,7 +1127,7 @@ export const PurchaseOrder = [
// { label: "发货日期", prop: "shipDate",type: "dateTime" },
// { label: "联系人电话", prop: 'contactUserPhone' },
// { label: "联系人邮件", prop: 'contactUserEmail' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 到货请求 已调整 20230404
@ -1155,7 +1155,7 @@ export const PurchaseReceiptRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "公司", prop: 'company' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@ -1193,7 +1193,7 @@ export const PurchaseReceiptJob = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@ -1239,7 +1239,7 @@ export const PurchaseReceiptNote = [
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "type", prop: 'type' },
{ label: "status", prop: 'status' },
@ -1300,7 +1300,7 @@ export const qualifiedInfo = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "推荐仓库", prop: 'recommendToWarehouseCode' },
{ label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
@ -1369,7 +1369,7 @@ export const unqualifiedInfo = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "推荐仓库", prop: 'recommendToWarehouseCode' },
{ label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
@ -1425,7 +1425,7 @@ export const lackMaterialsInfo = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "推荐仓库", prop: 'recommendToWarehouseCode' },
{ label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
@ -1458,7 +1458,7 @@ export const InspectRequest = [
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
@ -1518,7 +1518,7 @@ export const InspectNote = [
{ label: "事务ID", prop: "tenantId" },
// { label: "到货单号", prop: "arriveNoticeNumber",width: orderWidth },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 不合格库存（不合格转合格） 已调整
@ -1578,7 +1578,7 @@ export const unqualifiedToQualifiedNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "公司", prop: 'company' },
{ label: "备注", prop: 'remark' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// -----------------------------------------------------------------------
]
@ -1611,7 +1611,7 @@ export const PutawayNote = [
{ label: "事务ID", prop: "tenantId" },
{ label: "type", prop: "type" },
// { label: "到货单号", prop: 'arriveNoticeNumber' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 人工叫料申请 20230411
@ -1644,7 +1644,7 @@ export const IssueRequest = [
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 人工发料任务 20230411
@ -1667,7 +1667,7 @@ export const IssueJob = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@ -1714,7 +1714,7 @@ export const IssueNote = [
{ label: "确认时间", prop: 'confirmTime' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "完成时间", prop: "completeTime",type: "dateTime" },
// -----------------------------------------------------------------------
]
@ -1748,7 +1748,7 @@ export const automaticCallApply = [
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 自动发料任务 20230411
@ -1771,7 +1771,7 @@ export const automaticCallJob = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@ -1818,7 +1818,7 @@ export const automaticCallNote = [
{ label: "确认时间", prop: 'confirmTime' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "完成时间", prop: "completeTime",type: "dateTime" },
// -----------------------------------------------------------------------
]
@ -1850,7 +1850,7 @@ export const beforeGroundingReturnNote = [
{ label: "status", prop: 'status' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 上架后退货申请 20230412
@ -1883,7 +1883,7 @@ export const PurchaseReturnRequest = [
{ label: "returnType", prop: 'returnType' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 上架后退货任务 20230412
@ -1957,7 +1957,7 @@ export const PurchaseReturnNote = [
{ label: "status", prop: 'status' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 原料报废记录 20230412
@ -1983,7 +1983,7 @@ export const ScrapNote = [
{ label: "事务ID", prop: "tenantId" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 原料直发客户记录 20230412
@ -2016,7 +2016,7 @@ export const materialDirectSendNote = [
// { label: "目标库区", prop: 'toLocationArea' },
// { label: "目标ERP库位", prop: 'toLocationErpCode' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 直接发料记录 20230413
@ -2045,7 +2045,7 @@ export const directIssueNote = [
{ label: "确认时间", prop: 'confirmTime' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "完成时间", prop: "completeTime",type: "dateTime" },
// -----------------------------------------------------------------------
]
@ -2083,7 +2083,7 @@ export const ProductReceiptRequest = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "type", prop: "type" },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
@ -2113,7 +2113,7 @@ export const ProductReceiptNote = [
{ label: "事务ID", prop: "tenantId" },
{ label: "type", prop: "type" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 完工收货报废申请 20230412
@ -2141,7 +2141,7 @@ export const ProductReceiptScrapRequest = [
{ label: "报废类型", prop: 'type' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
@ -2169,7 +2169,7 @@ export const ProductReceiptScrapNote = [
{ label: "事务ID", prop: "tenantId" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 半成品上架记录 已调整
@ -2188,7 +2188,7 @@ export const partiallyPreparedProductsNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "任务ID", prop: 'jobNumber',width: orderWidth },
{ label: "检验单号", prop: 'inspectNumber',width: orderWidth },
@ -2229,7 +2229,7 @@ export const DeliverRequest = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 成品发货任务 20230414
@ -2303,7 +2303,7 @@ export const DeliverNote = [
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "目标库位代码", prop: 'toLocationCode' },
// { label: "目标库区", prop: 'toLocationArea' },
// { label: "目标库位组", prop: 'toLocationGroup' },
@ -2339,7 +2339,7 @@ export const FISDeliverRequest = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// FIS发货记录 20230415
@ -2369,7 +2369,7 @@ export const FISDeliverNote = [
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "目标库位代码", prop: 'toLocationCode' },
// { label: "目标库区", prop: 'toLocationArea' },
// { label: "目标库位组", prop: 'toLocationGroup' },
@ -2404,7 +2404,7 @@ export const customerDismantle = [
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: "id" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 客户退拆记录 20230415
@ -2470,7 +2470,7 @@ export const productionReturnRequest = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "采购订单号", prop: "poNumber",width:orderWidth },
// -----------------------------------------------------------------------
]
@ -2534,7 +2534,7 @@ export const productionReturnNote = [
{ label: "事务ID", prop: "tenantId" },
// { label: "采购订单号", prop: "poNumber", width:orderWidth },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 线边仓缴库申请 20230415
@ -2568,7 +2568,7 @@ export const lineSideWarehousePaymentRequest = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "type", prop: "type" },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
@ -2598,7 +2598,7 @@ export const lineSideWarehousePaymentNote = [
{ label: "事务ID", prop: "tenantId" },
{ label: "type", prop: "type" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 线边仓报废申请 20230412
@ -2626,7 +2626,7 @@ export const lineSideWarehouseScrappingRequest = [
{ label: "报废类型", prop: 'type' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
@ -2653,7 +2653,7 @@ export const lineSideWarehouseScrappingNote = [
{ label: "事务ID", prop: "tenantId" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
@ -2717,7 +2717,7 @@ export const InventoryInitialNote = [
width: orderWidth
},
{ label: "操作员", prop: 'worker' },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "生效日期", prop: "activeDate" },
{ label: "库存初始化请求单号", prop: "requestNumber" },
]
@ -2758,7 +2758,7 @@ export const InventoryBalance = [
{ label: "备注", prop: "remark" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' },
]
@ -2802,7 +2802,7 @@ export const InventoryTransaction = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
]
// 库存快照
export const InventorySnapshot = [
@ -2958,7 +2958,7 @@ export const pickingRequest = [
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产领料审批 已调整
@ -2984,7 +2984,7 @@ export const pickingApproval = [
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产领料记录 已调整
@ -3005,7 +3005,7 @@ export const pickingNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产退料申请 已调整
@ -3031,7 +3031,7 @@ export const materialReturnRequest = [
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产退料审批 已调整
@ -3057,7 +3057,7 @@ export const materialReturnApproval = [
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产退料记录 已调整
@ -3078,7 +3078,7 @@ export const materialReturnNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "公司", prop: 'company',},
{ label: "仓库", prop: 'warehouseCode',},
{ label: "仓库代码", prop: 'warehouseCode',},
// -----------------------------------------------------------------------
]
// 回收料收货记录 已调整
@ -3097,7 +3097,7 @@ export const recycledMaterialsReceipt = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company',},
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
// -----------------------------------------------------------------------
]
// 回收料调整申请 已调整
@ -3122,7 +3122,7 @@ export const recycledMaterialsAdjustmentApply = [
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
// -----------------------------------------------------------------------
]
// 回收料调整记录 已调整
@ -3143,7 +3143,7 @@ export const materialsAdjustment = [
{ label: "任务单号", prop: "jobNumber" },
{ label: "公司", prop: 'company' },
{ label: "备注", prop: 'remark' },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
// -----------------------------------------------------------------------
]
// 线边仓调拨申请 已调整
@ -3160,7 +3160,7 @@ export const lineSideWarehouseAllocationRequest = [
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "公司", prop: 'company',},
{ label: "备注", prop: 'remark' },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot"},
@ -3189,7 +3189,7 @@ export const lineSideWarehouseAllocationConfirm = [
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "公司", prop: 'company' },
{ label: "备注", prop: 'remark' },
{ label: "调拨类型", prop: 'type' },
@ -3215,7 +3215,7 @@ export const lineSideWarehouseAllocationNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: "remark" },
{ label: "公司", prop: "company" },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "任务ID", prop: "jobNumber" },
{ label: "调拨类型", prop: "type" },
{ label: "使用中间库", prop: "useOnTheWayLocation", type: "filter", filters: "whetherOrNot" },
@ -3237,7 +3237,7 @@ export const interStorageAllocationNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: "remark" },
{ label: "公司", prop: "company" },
{ label: "仓库", prop: "warehouseCode" },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "任务ID", prop: "jobNumber" },
// -----------------------------------------------------------------------
@ -3257,7 +3257,7 @@ export const customerStorageAllocationRequest = [
// -----------------------------------------------------------------------
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// { label: "仓库", prop: "warehouseCode" },
// { label: "仓库代码", prop: "warehouseCode" },
// { label: "公司", prop: 'company',},
{ label: "备注", prop: 'remark' },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot"},
@ -3293,7 +3293,7 @@ export const customerStorageAllocationConfirm = [
{ label: "事务ID", prop: "tenantId" },
{ label: "调拨类型", prop: 'type' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "仓库", prop: "warehouseCode" },
// { label: "仓库代码", prop: "warehouseCode" },
// { label: "公司", prop: 'company',},
// -----------------------------------------------------------------------
]
@ -3321,7 +3321,7 @@ export const customerStorageAllocationNote = [
{ label: "事务ID", prop: "tenantId" },
{ label: "调拨类型", prop: 'type' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "仓库", prop: "warehouseCode" },
// { label: "仓库代码", prop: "warehouseCode" },
// { label: "公司", prop: 'company',},
// -----------------------------------------------------------------------
]
@ -3352,7 +3352,7 @@ export const intraStorageTransferNote = [
// { label: "transferType", prop: "transferType" },
// { label: "供应商代码", prop: 'supplierCode' },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "仓库", prop: "warehouseCode" },
// { label: "仓库代码", prop: "warehouseCode" },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
@ -3372,7 +3372,7 @@ export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
{ label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@ -3399,7 +3399,7 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "盘点记录单号", prop: 'countNoteNumber', width: orderWidth },
{ label: "盘点计划单号", prop: "countPlanNumber",width: orderWidth },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "备注", prop: 'remark' },
// -----------------------------------------------------------------------
]
@ -3438,11 +3438,11 @@ export const CountPlan = [
{ label: "物品代码JSON", prop: 'jsonItemCodes' },
{ label: "库位JSON", prop: 'jsonLocationCodes' },
{ label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点任务 已调整
// 盘点任务 20230415
export const CountJob = [
{
label: "任务编号",
@ -3461,6 +3461,8 @@ export const CountJob = [
{ label: "完成用户", prop: "completeUserName" },
{ label: "操作员", prop: 'worker' },
// -----------------------------------------------------------------------
{ label: "物品代码", prop: 'itemCode' },
{ label: "库位代码", prop: "locationCode" },
{ label: "上游任务编号", prop: "upStreamJobNumber", width:orderWidth},
{ label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
@ -3478,9 +3480,9 @@ export const CountJob = [
{ label: "描述", prop: "description" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "工作组代码", prop: "workGroupCode" },
{ label: "仓库", prop: "warehouseCode" },
{ label: "公司", prop: 'company' },
{ label: "ID", prop: 'id' },
{ label: "仓库代码", prop: "warehouseCode" },
// { label: "公司", prop: 'company' },
// { label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]
// 盘点记录 20230415
@ -3509,7 +3511,7 @@ export const CountNote = [
{ label: "生效时间", prop: "activeDate", type: "dateTime" },
{ label: "描述", prop: "description" },
// { label: "公司", prop: 'company',},
// { label: "仓库", prop: 'warehouseCode',},
// { label: "仓库代码", prop: 'warehouseCode',},
// { label: "ID", prop: 'id',},
// -----------------------------------------------------------------------
]
@ -3541,7 +3543,7 @@ export const CountPlanAdjust = [
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "ID", prop: 'id' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
@ -3568,7 +3570,7 @@ export const CountAdjustNote = [
{ label: "生效时间", prop: "activeDate", type: "dateTime" },
{ label: "isAdjusted", prop: 'isAdjusted' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]

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

@ -2742,7 +2742,7 @@ export const CountPlan = [
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点任务 已调整 1
// 盘点任务 20230415
export const CountJob = [
{ label: "盘点任务号", prop: "number" },
{ label: "盘点计划号", prop: "countPlanNumber" },
@ -2756,6 +2756,8 @@ export const CountJob = [
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "物品代码", prop: "itemCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "上游任务编号", prop: "upStreamJobNumber" },
{ label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
@ -2774,7 +2776,7 @@ export const CountJob = [
{ label: "工作组代码", prop: "workGroupCode" },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "ID", prop: 'id' },
{ label: "公司", prop: 'company' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点记录 20230415

2
fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
View File

@ -90,7 +90,7 @@ export default {
},
data () {
return {
URL: 'wms/job/count-job',
URL: 'wms/store/count-job',
//常用按钮数据
currenButtonData: [
this.defaultExportBtn(),//导出

2
fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustment.vue
View File

@ -60,7 +60,7 @@ export default {
],
data() {
return {
URL: "wms/store/item-transfrom-note",
URL: "wms/store/item-transform-note",
//常用按钮数据
currenButtonData: [
this.defaultExportBtn(),//导出

2
fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentApply.vue
View File

@ -73,7 +73,7 @@ export default {
],
data () {
return {
URL: 'wms/store/item-transfrom-request',
URL: 'wms/store/item-transform-request',
//常用按钮数据
currenButtonData: [
this.defaultImportBtn(),//导入

Write Preview
Loading…
Cancel
Save