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

盘点计划 盘点记录 盘点调整申请 盘点调整记录 字段调整

dev_web_online
陈薪名 2 years ago
parent
fd29753e0c
commit
b2c235d354
3 changed files with 74 additions and 59 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. 60
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 39
      fe/PC/src/utils/tableColumns/index.js
  3. 34
      fe/PC/src/utils/tabsDesTions/index.js

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

@ -2903,17 +2903,17 @@ export const InventoryInitialNote = [
{ label: "ID", prop: "id" },
// -----------------------------------------------------------------------
]
// 盘点计划 已调整
// 盘点计划 20240415
export const CountPlan = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "初盘数量", prop: "firstCountQty" },
{ label: "最终盘点数量", prop: "finalCountQty" },
{ label: "盘点差异数量", prop: "diffQty" },
{ label: "库存单位", prop: "inventoryUom" },
{ label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" },
{ label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" },
{ label: "库位组", prop: "locationGroup" },
@ -2925,7 +2925,6 @@ export const CountPlan = [
{ label: "初盘操作员", prop: "firstCountOperator" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
{ label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
{ label: "重盘数量", prop: "repeatCountQty" },
@ -2942,17 +2941,19 @@ export const CountPlan = [
{ label: "备注", prop: 'remark' },
{ label: "单据号", prop: 'number', width:orderWidth },
{ label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" },
{ label: "status", prop: "status" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" },
// -----------------------------------------------------------------------
]
// 盘点任务 已调整
@ -2996,16 +2997,17 @@ export const CountJob = [
{ label: "ID", prop: "id" },
// -----------------------------------------------------------------------
]
// 盘点记录 已调整
// 盘点记录 20230415
export const CountNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "初盘数量", prop: "firstCountQty" },
{ label: "最终盘点数量", prop: "finalCountQty" },
{ label: "盘点差异数量", prop: "diffQty" },
{ label: "库存单位", prop: "inventoryUom" },
{ label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" },
@ -3017,11 +3019,8 @@ export const CountNote = [
{ label: "初盘描述", prop: "firstCountDescription" },
{ label: "初盘操作员", prop: "firstCountOperator" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "盘点描述", prop: "countDescription" },
// -----------------------------------------------------------------------
{ label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
{ label: "阶段", prop: "stage",type: "filter", filters: "stageType" },
{ label: "重盘数量", prop: "repeatCountQty" },
@ -3045,21 +3044,24 @@ export const CountNote = [
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "盘点描述", prop: "countDescription" },
// { label: "包装单位", prop: "stdPackUom" },
// -----------------------------------------------------------------------
]
// 盘点调整申请 已调整
// 盘点调整申请 20230415
export const CountPlanAdjust = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "盘点数量", prop: "countQty" },
{ label: "调整数量", prop: "qty" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "库存单位", prop: "inventoryUom" },
{ label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" },
@ -3071,13 +3073,10 @@ export const CountPlanAdjust = [
{ label: "原因代码", prop: "reasonCode", },
{ label: "原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
// -----------------------------------------------------------------------
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "备注", prop: 'remark' },
{ label: "单据号", prop: 'number' },
{ label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@ -3085,22 +3084,24 @@ export const CountPlanAdjust = [
{ label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
// { label: "托标签", prop: "containerCode" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "库存单位", prop: "inventoryUom" },
// -----------------------------------------------------------------------
]
// 盘点调整记录 已调整
// 盘点调整记录 20230415
export const CountAdjustNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "盘点差异数量", prop: "diffQty" },
{ label: "盘点数量", prop: "countQty" },
{ label: "调整数量", prop: "adjustQty" },
{ label: "库存单位", prop: "inventoryUom" },
{ label: "单位", prop: "uom" },
{ label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" },
{ label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" },
@ -3112,27 +3113,26 @@ export const CountPlanAdjust = [
{ label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "操作员", showProp:"worker",type:"outerMainFilter" },
// -----------------------------------------------------------------------
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "单据号", prop: 'number', width:orderWidth },
{ label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "托标签", prop: "containerCode" },
{ label: "盘点标签", prop: "countLabel" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: "id" },
// { label: "库存单位", prop: "inventoryUom" },
// { label: "生产日期", prop: "produceDate",type:"dateTime" },
// { label: "操作员", showProp:"worker",type:"outerMainFilter" },
// { label: "包装单位", prop: "stdPackUom" },
// { label: "供应商批次", prop: "supplierBatch" },
// -----------------------------------------------------------------------
]

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

@ -3403,7 +3403,7 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "备注", prop: 'remark' },
// -----------------------------------------------------------------------
]
// 盘点计划 已调整
// 盘点计划 20230415
export const CountPlan = [
{
label: "盘点计划单号",
@ -3417,7 +3417,7 @@ export const CountPlan = [
{ label: "结束时间", prop: "endTime", type: "dateTime" },
{ label: "计划时间", prop: 'planTime', type: "dateTime"},
{ 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: 'remark', },
{ label: "操作员", prop: 'worker',},
@ -3437,9 +3437,9 @@ export const CountPlan = [
{ label: "事务ID", prop: "tenantId" },
{ label: "物品代码JSON", prop: 'jsonItemCodes' },
{ label: "库位JSON", prop: 'jsonLocationCodes' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "公司", prop: 'company' },
{ label: "ID", prop: 'id' },
{ label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点任务 已调整
@ -3483,7 +3483,7 @@ export const CountJob = [
{ label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]
// 盘点记录 已调整
// 盘点记录 20230415
export const CountNote = [
{
label: "盘点记录单号",
@ -3508,12 +3508,12 @@ export const CountNote = [
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "生效时间", prop: "activeDate", type: "dateTime" },
{ label: "描述", prop: "description" },
{ label: "公司", prop: 'company',},
{ label: "仓库", prop: 'warehouseCode',},
{ label: "ID", prop: 'id',},
// { label: "公司", prop: 'company',},
// { label: "仓库", prop: 'warehouseCode',},
// { label: "ID", prop: 'id',},
// -----------------------------------------------------------------------
]
// 盘点调整申请 已调整
// 盘点调整申请 20230415
export const CountPlanAdjust = [
{
label: "盘点调整申请单号",
@ -3526,6 +3526,11 @@ export const CountPlanAdjust = [
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ 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: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
@ -3534,12 +3539,13 @@ export const CountPlanAdjust = [
{ label: "生效时间", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "公司", prop: 'company' },
{ label: "ID", prop: 'id' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点调整记录 已调整
// 盘点调整记录 20230415
export const CountAdjustNote = [
{
label: "盘点调整单号",
@ -3560,9 +3566,10 @@ export const CountAdjustNote = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "生效时间", prop: "activeDate", type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
{ label: "isAdjusted", prop: 'isAdjusted' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]

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

@ -2708,7 +2708,7 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]
// 盘点计划 已调整 1
// 盘点计划 20230415
export const CountPlan = [
{ label: "盘点计划单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
@ -2722,6 +2722,7 @@ export const CountPlan = [
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
// -----------------------------------------------------------------------
{ label: "盘点根据", prop: "countMethod",type: "filter", filters: "countMethod" },
{ label: "类型", prop: "type",type: "filter", filters: "checkType" },
{ label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
{ label: "生效时间", prop: 'activeDate', type: "dateTime" },
@ -2735,9 +2736,10 @@ export const CountPlan = [
{ label: "事务ID", prop: "tenantId" },
{ label: "物品代码JSON", prop: 'jsonItemCodes' },
{ label: "库位JSON", prop: 'jsonLocationCodes' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
{ label: "公司", prop: 'company' },
{ label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点任务 已调整 1
@ -2775,7 +2777,7 @@ export const CountJob = [
{ label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点记录 已调整 1
// 盘点记录 20230415
export const CountNote = [
{ label: "盘点记录单号", prop: "number" },
{ label: "盘点计划单号", prop: "countPlanNumber" },
@ -2794,12 +2796,12 @@ export const CountNote = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "描述", prop: "description" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]
// 盘点调整申请 已调整 1
// 盘点调整申请 20230415
export const CountPlanAdjust = [
{ label: "盘点调整申请单号", prop: "number" },
{ label: "状态", type: "tagFilter", filters: "requestStatus", prop: "requestStatus" },
@ -2807,19 +2809,24 @@ export const CountPlanAdjust = [
{ label: "操作员", prop: 'worker' },
{ label: "生效时间", prop: 'activeDate', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "盘点记录单号", prop: 'countNoteNumber' },
{ label: "盘点计划单号", prop: 'countPlanNumber' },
{ label: "自动完成任务", prop: 'autoCompleteJob', 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: "事务ID", prop: "tenantId" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "公司", prop: 'company' },
{ label: "ID", prop: 'id' },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 盘点调整记录 已调整 1
// 盘点调整记录 20230415
export const CountAdjustNote = [
{ label: "盘点调整单号", prop: "number" },
{ label: "盘点记录单号", prop: 'countNoteNumber' },
@ -2834,9 +2841,10 @@ export const CountAdjustNote = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
{ label: "isAdjusted", prop: 'isAdjusted' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]

Write Preview
Loading…
Cancel
Save