diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json index 3476c0c0c..60d4e6307 100644 --- a/fe/PC/public/version.json +++ b/fe/PC/public/version.json @@ -1,3 +1,3 @@ { - "version": "1.0.61" + "version": "1.0.62" } \ No newline at end of file diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index d96b08bed..503366f17 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -2955,7 +2955,6 @@ export const CountPlan = [ { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // ----------------------------------------------------------------------- { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" }, - { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, { label: "重盘数量", prop: "repeatCountQty" }, { label: "重盘时间", prop: "repeatCountTime",type: "dateTime" }, { label: "重盘描述", prop: "repeatCountDescription" }, @@ -2977,8 +2976,9 @@ export const CountPlan = [ { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "仓库", prop: 'warehouseCode' }, - // { label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" }, // ************** 确定隐藏 ************************ + // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, + // { label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" }, // { label: "主表ID", prop: "masterID" }, // { label: "ID", prop: "id" }, // { label: "status", prop: "status" }, @@ -3050,7 +3050,6 @@ export const CountNote = [ // ----------------------------------------------------------------------- { label: "包装数量", prop: "stdPackQty" }, { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" }, - // { label: "阶段", prop: "stage",type: "filter", filters: "stageType" }, { label: "重盘数量", prop: "repeatCountQty" }, { label: "重盘时间", prop: "repeatCountTime",type: "dateTime" }, { label: "重盘描述", prop: "repeatCountDescription" }, @@ -3074,6 +3073,7 @@ export const CountNote = [ { label: "过期时间", prop: "expireDate",type: "dateTime" }, { label: "仓库", prop: 'warehouseCode' }, // ************** 确定隐藏 ************************ + // { label: "阶段", prop: "stage",type: "filter", filters: "stageType" }, // { label: "初盘数量", prop: "firstCountQty" }, // { label: "主表ID", prop: "masterID" }, // { label: "ID", prop: "id" }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 1a0d36229..6d4e09065 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3311,12 +3311,12 @@ export const CountPlan = [ { label: "操作员", prop: 'worker',}, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, - { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, { label: "生效时间", prop: 'activeDate', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "物品代码JSON", prop: 'jsonItemCodes' }, { label: "库位JSON", prop: 'jsonLocationCodes' }, // ************** 确认隐藏 ************************ + // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, // { label: "创建者ID", prop: "creatorId" }, // { label: "上次修改者ID", prop: "lastModifierId" }, // { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, @@ -3397,7 +3397,6 @@ export const CountJob = [ { label: "物品代码", prop: 'itemCode' }, { label: "库位代码", prop: "locationCode" }, { label: "上游任务编号", prop: "upStreamJobNumber", width:orderWidth}, - { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, @@ -3409,6 +3408,7 @@ export const CountJob = [ { label: "工作组代码", prop: "workGroupCode" }, { label: "仓库代码", prop: "warehouseCode" }, // ************** 确认隐藏 ************************ + // { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" }, // { label: "创建者ID", prop: "creatorId" }, // { label: "承接者ID", prop: "acceptUserId" }, // { label: "完成者ID", prop: "completeUserId" }, @@ -3433,12 +3433,12 @@ export const CountNote = [ { label: "操作员", prop: 'worker',}, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "类型", prop: "type", type: "filter", filters: "checkType" }, - // { label: "阶段", prop: "stage", type: "filter", filters: "stageType" }, { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "生效时间", prop: "activeDate", type: "dateTime" }, { label: "描述", prop: "description" }, // ************** 确认隐藏 ************************ + // { label: "阶段", prop: "stage", type: "filter", filters: "stageType" }, // { label: "事务ID", prop: "tenantId" }, // { label: "创建者ID", prop: "creatorId" }, // { label: "上次修改者ID", prop: "lastModifierId" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index a25c36724..c0c0c77ba 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2531,7 +2531,6 @@ export const CountPlan = [ { 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" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改者ID", prop: "lastModifierId" }, @@ -2544,6 +2543,7 @@ export const CountPlan = [ { label: "物品代码JSON", prop: 'jsonItemCodes' }, { label: "库位JSON", prop: 'jsonLocationCodes' }, // ************** 确认隐藏 ************************ + // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, // { label: "ID", prop: 'id' }, // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' }, // ************** 确认隐藏 ************************ @@ -2564,7 +2564,6 @@ export const CountJob = [ { label: "物品代码", prop: "itemCode" }, { label: "库位代码", prop: "locationCode" }, { label: "上游任务编号", prop: "upStreamJobNumber" }, - { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, @@ -2581,6 +2580,7 @@ export const CountJob = [ { label: "工作组代码", prop: "workGroupCode" }, { label: "仓库代码", prop: "warehouseCode" }, // ************** 确认隐藏 ************************ + // { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" }, // { label: "ID", prop: 'id' }, // ************** 确认隐藏 ************************ ] @@ -2596,13 +2596,13 @@ export const CountNote = [ { label: "生效时间", prop: "activeDate", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "类型", prop: "type",type: "filter", filters: "checkType" }, - // { label: "阶段", prop: "stage", type: "filter", filters: "stageType" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改者", prop: "lastModifierId" }, { label: "描述", prop: "description" }, // ************** 确认隐藏 ************************ + // { label: "阶段", prop: "stage", type: "filter", filters: "stageType" }, // { label: "ID", prop: 'id' }, // ************** 确认隐藏 ************************ ]