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

Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

dev_web_online
安虹睿 2 years ago
parent
78e792ebea 678d00bc87
commit
852b63c4a6
6 changed files with 249 additions and 189 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 164
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 199
      fe/PC/src/utils/tableColumns/index.js
  3. 69
      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

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

@ -1446,53 +1446,87 @@ export const ProductReceiptScrapNote = [
// { label: "标包计量单位", prop: 'stdPackUom' }, // { label: "标包计量单位", prop: 'stdPackUom' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 半成品上架记录 已调整 // 半成品上架记录 20230415
export const partiallyPreparedProductsNote = [ export const partiallyPreparedProductsNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "数量", prop: "qty" }, { label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" }, { label: "单位", prop: "uom" },
{ label: "批次", prop: "toLot" },
{ label: "箱码", prop: "toPackingCode" },
{ label: "来源库位", prop: "fromLocationCode" }, { label: "来源库位", prop: "fromLocationCode" },
{ label: "目标库位", prop: "toLocationCode" }, { label: "目标库位", prop: "toLocationCode" },
{ label: "ERP库位", prop: "toLocationErpCode" }, { label: "供应商批次", prop: 'supplierBatch' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "操作员", prop: 'worker' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "记录单号", prop: 'number',width:orderWidth }, { label: "单据号", prop: 'number' },
{ label: "发货单号", prop: "asnNumber",width:orderWidth }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "订单号", prop: 'poNumber',width:orderWidth }, { label: "创建者ID", prop: 'creatorId' },
{ label: "任务编号", prop: 'jobNumber',width:orderWidth },
{ label: "生效时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' }, { label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "标包计量单位", prop: 'stdPackUom' }, { label: "采购订单号", prop: "poNumber",width: orderWidth },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' }, { label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' }, { label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' }, { label: "目标批次", prop: 'toLot' },
{ label: "供应商批次", prop: 'supplierBatch' }, { label: "完成时间", prop: 'arriveDate', type: "dateTime" },
{ label: "来源库位组", prop: 'fromLocationGroup' }, { label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "目标库位组", prop: 'toLocationGroup' }, { label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' }, { label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' }, { label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源ERP库位", prop: 'fromLocationErpCode' }, { label: "来源ERP库位", prop: 'fromLocationErpCode' },
{ label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "目标ERP库位", prop: 'toLocationErpCode' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "来源仓库", prop: 'fromWarehouseCode' }, { label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' }, { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "订单行", prop: 'poLine' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "任务编号", prop: 'jobNumber' },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ 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: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "推荐库区", prop: "recommendToLocationArea" },
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
{ label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
{ label: "实际ERP库位", prop: "handledToLocationErpCode" },
{ label: "推荐仓库", prop: "recommendToWarehouseCode" },
{ label: "实际仓库", prop: "handledToWarehouseCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
{ label: "ID", prop: 'id' },
{ label: "主表ID", prop: "masterID" },
{ label: "fromStatus", prop: 'fromStatus' }, { label: "fromStatus", prop: 'fromStatus' },
{ label: "toStatus", prop: 'toStatus' }, { label: "toStatus", prop: 'toStatus' },
{ label: "订单行", prop: 'poLine' }, // { label: "完工收货单号", prop: 'productReceiptNumber',width: orderWidth },
{ label: "供应商包装计量单位", prop: 'supplierPackUom' }, // { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
{ label: "供应商包装数量", prop: 'supplierPackQty' }, // { label: "标包单位", prop: 'stdPackUom' },
// { label: "供应商包装单位", prop: 'supplierPackUom' },
// { label: "供应商包装数量", prop: 'supplierPackQty' },
// { label: "到货数", prop: 'shippedQty' },
// { label: "操作员", prop: 'worker' },
// { label: "到货单号", prop: 'arriveNoticeNumber',width: orderWidth },
// { label: "发货单号", prop: "asnNumber",width: orderWidth },
// { label: "检验单号", prop: "inspectNumber",width: orderWidth },
// { label: "要求到货日期", prop: 'planArriveDate', type:'dateTime' },
// { label: "筹措员代码", prop: 'planUserCode' },
// { label: "收货单号", prop: "receiptNumber",width: orderWidth },
// { label: "供应商代码", prop: "supplierCode" },
// { label: "供应商描述", prop: "supplierSimpleName" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 成品发货申请 20230414 // 成品发货申请 20230414
@ -2903,17 +2937,17 @@ export const InventoryInitialNote = [
{ label: "ID", prop: "id" }, { label: "ID", prop: "id" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点计划 已调整 // 盘点计划 20240415
export const CountPlan = [ export const CountPlan = [
{ label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "库存数量", prop: "inventoryQty" }, { label: "库存数量", prop: "inventoryQty" },
{ label: "初盘数量", prop: "firstCountQty" }, { label: "初盘数量", prop: "firstCountQty" },
{ label: "最终盘点数量", prop: "finalCountQty" }, { label: "最终盘点数量", prop: "finalCountQty" },
{ label: "盘点差异数量", prop: "diffQty" }, { label: "盘点差异数量", prop: "diffQty" },
{ label: "库存单位", prop: "inventoryUom" },
{ label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
{ label: "库位组", prop: "locationGroup" }, { label: "库位组", prop: "locationGroup" },
@ -2925,7 +2959,6 @@ export const CountPlan = [
{ label: "初盘操作员", prop: "firstCountOperator" }, { label: "初盘操作员", prop: "firstCountOperator" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" }, { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
{ label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
{ label: "重盘数量", prop: "repeatCountQty" }, { label: "重盘数量", prop: "repeatCountQty" },
@ -2942,27 +2975,31 @@ export const CountPlan = [
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "单据号", prop: 'number', width:orderWidth }, { label: "单据号", prop: 'number', width:orderWidth },
{ label: "包装数量", prop: "stdPackQty" }, { label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' }, { label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "仓库", prop: 'warehouseCode' }, { label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" }, { label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" }, { label: "ID", prop: "id" },
{ label: "status", prop: "status" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点任务 已调整 // 盘点任务 20230415
export const CountJob = [ export const CountJob = [
{ label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "库存数量", prop: "inventoryQty" }, { label: "库存数量", prop: "inventoryQty" },
{ label: "盘点数量", prop: "countQty" }, { label: "盘点数量", prop: "countQty" },
{ label: "库存单位", prop: "inventoryUom" }, { label: "库存库位", prop: "inventoryLocationCode" },
{ label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" }, { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -2972,13 +3009,12 @@ export const CountJob = [
{ label: "ERP库位", prop: "locationErpCode" }, { label: "ERP库位", prop: "locationErpCode" },
{ label: "盘点时间", prop: 'countTime', type: "dateTime" }, { label: "盘点时间", prop: 'countTime', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "盘点操作员", prop: "countOperator" },
{ label: "盘点描述", prop: "countDescription" }, { label: "盘点描述", prop: "countDescription" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "单据号", prop: 'number', width:orderWidth }, { label: "单据号", prop: 'number', width:orderWidth },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "包装数量", prop: "stdPackQty" }, { label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "供应商批次", prop: "supplierBatch" }, { label: "供应商批次", prop: "supplierBatch" },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' }, { label: "创建者ID", prop: 'creatorId' },
@ -2987,25 +3023,27 @@ export const CountJob = [
{ label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "盘点标签", prop: "countLabel" }, { label: "盘点标签", prop: "countLabel" },
{ label: "监盘操作员", prop: 'auditCountOperator' },
{ label: "监盘描述", prop: 'auditCountDescription' },
{ label: "仓库", prop: 'warehouseCode' }, { label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" }, { label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" }, { label: "ID", prop: "id" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "监盘操作员", prop: 'auditCountOperator' },
// { label: "监盘描述", prop: 'auditCountDescription' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点记录 已调整 // 盘点记录 20230415
export const CountNote = [ export const CountNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "库存数量", prop: "inventoryQty" }, { label: "库存数量", prop: "inventoryQty" },
{ label: "初盘数量", prop: "firstCountQty" }, { label: "初盘数量", prop: "firstCountQty" },
{ label: "最终盘点数量", prop: "finalCountQty" }, { label: "最终盘点数量", prop: "finalCountQty" },
{ label: "盘点差异数量", prop: "diffQty" }, { label: "盘点差异数量", prop: "diffQty" },
{ label: "库存单位", prop: "inventoryUom" }, { label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" }, { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -3017,11 +3055,8 @@ export const CountNote = [
{ label: "初盘描述", prop: "firstCountDescription" }, { label: "初盘描述", prop: "firstCountDescription" },
{ label: "初盘操作员", prop: "firstCountOperator" }, { label: "初盘操作员", prop: "firstCountOperator" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "盘点描述", prop: "countDescription" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "包装数量", prop: "stdPackQty" }, { label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" }, { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
{ label: "阶段", prop: "stage",type: "filter", filters: "stageType" }, { label: "阶段", prop: "stage",type: "filter", filters: "stageType" },
{ label: "重盘数量", prop: "repeatCountQty" }, { label: "重盘数量", prop: "repeatCountQty" },
@ -3045,21 +3080,24 @@ export const CountNote = [
{ label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "仓库", prop: 'warehouseCode' }, { label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" }, { label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" }, { label: "ID", prop: "id" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "盘点描述", prop: "countDescription" },
// { label: "包装单位", prop: "stdPackUom" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点调整申请 已调整 // 盘点调整申请 20230415
export const CountPlanAdjust = [ export const CountPlanAdjust = [
{ label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "盘点数量", prop: "countQty" }, { label: "盘点数量", prop: "countQty" },
{ label: "调整数量", prop: "qty" }, { label: "调整数量", prop: "qty" },
{ label: "库存数量", prop: "inventoryQty" }, { label: "库存数量", prop: "inventoryQty" },
{ label: "库存单位", prop: "inventoryUom" }, { label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" }, { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -3071,13 +3109,10 @@ export const CountPlanAdjust = [
{ label: "原因代码", prop: "reasonCode", }, { label: "原因代码", prop: "reasonCode", },
{ label: "原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, { label: "原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "供应商批次", prop: "supplierBatch" }, { label: "供应商批次", prop: "supplierBatch" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "单据号", prop: 'number' }, { label: "单据号", prop: 'number' },
{ label: "包装数量", prop: "stdPackQty" }, { label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' }, { label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@ -3085,22 +3120,24 @@ export const CountPlanAdjust = [
{ label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type: "dateTime" },
// { label: "托标签", prop: "containerCode" },
{ label: "仓库", prop: 'warehouseCode' }, { label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" }, { label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" }, { label: "ID", prop: "id" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "库存单位", prop: "inventoryUom" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点调整记录 已调整 // 盘点调整记录 20230415
export const CountAdjustNote = [ export const CountAdjustNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" }, { label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "库存数量", prop: "inventoryQty" }, { label: "库存数量", prop: "inventoryQty" },
{ label: "盘点差异数量", prop: "diffQty" }, { label: "盘点差异数量", prop: "diffQty" },
{ label: "盘点数量", prop: "countQty" }, { label: "盘点数量", prop: "countQty" },
{ label: "调整数量", prop: "adjustQty" }, { label: "调整数量", prop: "adjustQty" },
{ label: "库存单位", prop: "inventoryUom" }, { label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" }, { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -3112,27 +3149,26 @@ export const CountPlanAdjust = [
{ label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "操作员", showProp:"worker",type:"outerMainFilter" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "供应商批次", prop: "supplierBatch" }, { label: "供应商批次", prop: "supplierBatch" },
{ label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "单据号", prop: 'number', width:orderWidth }, { label: "单据号", prop: 'number', width:orderWidth },
{ label: "包装数量", prop: "stdPackQty" }, { label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' }, { label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' }, { label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "盘点标签", prop: "countLabel" }, { label: "盘点标签", prop: "countLabel" },
{ label: "仓库", prop: 'warehouseCode' }, { label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" }, { label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" }, { label: "ID", prop: "id" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "生产日期", prop: "produceDate",type:"dateTime" },
// { label: "操作员", showProp:"worker",type:"outerMainFilter" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "供应商批次", prop: "supplierBatch" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]

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

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

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

@ -1566,30 +1566,31 @@ export const ProductReceiptScrapNote = [
// { label: "仓库代码", prop: 'warehouseCode' }, // { label: "仓库代码", prop: 'warehouseCode' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 半成品上架记录 已调整 1 // 半成品上架记录 20230415
export const partiallyPreparedProductsNote = [ export const partiallyPreparedProductsNote = [
{ label: "上架记录单号", prop: 'number' }, { label: "上架记录单号", prop: 'number' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "检验单号", prop: 'inspectNumber' },
{ label: "收货单号", prop: 'receiptNumber' },
{ label: "发货单号", prop: 'asnNumber' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "完工收货单号", prop: 'productReceiptNumber' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" }, { label: "创建者ID", prop: "creatorId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" }, { label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "检验单号", prop: 'inspectNumber' },
{ label: "收货单号", prop: 'receiptNumber' },
{ label: "到货单号", prop: 'arriveNoticeNumber' },
{ label: "发货单号", prop: 'asnNumber' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "完工收货单号", prop: 'productReceiptNumber' },
{ label: "类型", prop: 'type' },
{ label: "ID", prop: 'id' }, { label: "ID", prop: 'id' },
{ label: "type", prop: 'type' },
// { label: "公司", prop: 'company' },
// { label: "到货单号", prop: 'arriveNoticeNumber' },
// { label: "仓库代码", prop: 'warehouseCode' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 成品发货申请 20230414 // 成品发货申请 20230414
@ -2708,7 +2709,7 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "ID", prop: 'id' }, { label: "ID", prop: 'id' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点计划 已调整 1 // 盘点计划 20230415
export const CountPlan = [ export const CountPlan = [
{ label: "盘点计划单号", prop: "number" }, { label: "盘点计划单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
@ -2722,6 +2723,7 @@ export const CountPlan = [
{ label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"}, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "盘点根据", prop: "countMethod",type: "filter", filters: "countMethod" },
{ label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "类型", prop: "type",type: "filter", filters: "checkType" },
{ label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
{ label: "生效时间", prop: 'activeDate', type: "dateTime" }, { label: "生效时间", prop: 'activeDate', type: "dateTime" },
@ -2735,12 +2737,13 @@ export const CountPlan = [
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "物品代码JSON", prop: 'jsonItemCodes' }, { label: "物品代码JSON", prop: 'jsonItemCodes' },
{ label: "库位JSON", prop: 'jsonLocationCodes' }, { label: "库位JSON", prop: 'jsonLocationCodes' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' }, { label: "ID", prop: 'id' },
{ label: "公司", prop: 'company' }, { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点任务 已调整 1 // 盘点任务 20230415
export const CountJob = [ export const CountJob = [
{ label: "盘点任务号", prop: "number" }, { label: "盘点任务号", prop: "number" },
{ label: "盘点计划号", prop: "countPlanNumber" }, { label: "盘点计划号", prop: "countPlanNumber" },
@ -2754,6 +2757,8 @@ export const CountJob = [
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "物品代码", prop: "itemCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "上游任务编号", prop: "upStreamJobNumber" }, { label: "上游任务编号", prop: "upStreamJobNumber" },
{ label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" }, { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
@ -2772,10 +2777,10 @@ export const CountJob = [
{ label: "工作组代码", prop: "workGroupCode" }, { label: "工作组代码", prop: "workGroupCode" },
{ label: "仓库代码", prop: "warehouseCode" }, { label: "仓库代码", prop: "warehouseCode" },
{ label: "ID", prop: 'id' }, { label: "ID", prop: 'id' },
{ label: "公司", prop: 'company' }, // { label: "公司", prop: 'company' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点记录 已调整 1 // 盘点记录 20230415
export const CountNote = [ export const CountNote = [
{ label: "盘点记录单号", prop: "number" }, { label: "盘点记录单号", prop: "number" },
{ label: "盘点计划单号", prop: "countPlanNumber" }, { label: "盘点计划单号", prop: "countPlanNumber" },
@ -2794,12 +2799,12 @@ export const CountNote = [
{ label: "创建者ID", prop: "creatorId" }, { label: "创建者ID", prop: "creatorId" },
{ label: "上次修改者", prop: "lastModifierId" }, { label: "上次修改者", prop: "lastModifierId" },
{ label: "描述", prop: "description" }, { label: "描述", prop: "description" },
{ label: "公司", prop: 'company' }, // { label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' }, // { label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' }, // { label: "ID", prop: 'id' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点调整申请 已调整 1 // 盘点调整申请 20230415
export const CountPlanAdjust = [ export const CountPlanAdjust = [
{ label: "盘点调整申请单号", prop: "number" }, { label: "盘点调整申请单号", prop: "number" },
{ label: "状态", type: "tagFilter", filters: "requestStatus", prop: "requestStatus" }, { label: "状态", type: "tagFilter", filters: "requestStatus", prop: "requestStatus" },
@ -2807,19 +2812,24 @@ export const CountPlanAdjust = [
{ label: "操作员", prop: 'worker' }, { label: "操作员", prop: 'worker' },
{ label: "生效时间", prop: 'activeDate', type: "dateTime" }, { label: "生效时间", prop: 'activeDate', type: "dateTime" },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
{ label: "盘点记录单号", prop: 'countNoteNumber' },
{ label: "盘点计划单号", prop: 'countPlanNumber' },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', 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: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" }, { label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: "creatorId" }, { label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者", prop: "lastModifierId" }, { label: "上次修改者", prop: "lastModifierId" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "公司", prop: 'company' },
{ label: "ID", prop: 'id' }, { label: "ID", prop: 'id' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]
// 盘点调整记录 已调整 1 // 盘点调整记录 20230415
export const CountAdjustNote = [ export const CountAdjustNote = [
{ label: "盘点调整单号", prop: "number" }, { label: "盘点调整单号", prop: "number" },
{ label: "盘点记录单号", prop: 'countNoteNumber' }, { label: "盘点记录单号", prop: 'countNoteNumber' },
@ -2834,9 +2844,10 @@ export const CountAdjustNote = [
{ label: "创建者ID", prop: "creatorId" }, { label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者", prop: "lastModifierId" }, { label: "上次修改者", prop: "lastModifierId" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' }, { label: "ID", prop: 'id' },
{ label: "isAdjusted", prop: 'isAdjusted' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
] ]

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

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

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

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

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

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

Write Preview
Loading…
Cancel
Save