diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 0edc64fac..172621273 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -93,6 +93,7 @@ export const ItemCategory = [ ] // 物品包装信息 20230328 export const ItemPack = [ + { label: '物品代码', prop: "itemCode" }, { label: "包装代码", prop: "packCode", @@ -101,7 +102,6 @@ export const ItemPack = [ }, { label: "包装名称", prop: "packName" }, { label: '包装类型', prop: "packType" }, - { label: '物品代码', prop: "itemCode" }, { label: '包装计量单位', prop: "basicUom" }, { label: '包装数量', prop: "qty" }, { label: "备注", prop: "remark" }, @@ -192,12 +192,12 @@ export const BomInner = [ { label: "结束时间", prop: "endTime", type:'dateTime' }, { label: "备注", prop: 'remark' }, { label: "层级", prop: "layer" }, - { label: "事务ID", prop: "tenantId" }, { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者ID", prop: "lastModifierId" }, // ************** 确认隐藏 ************************ + // { label: "事务ID", prop: "tenantId" }, + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, // { label: "ID", prop: 'id' }, // ************** 确认隐藏 ************************ // { @@ -661,15 +661,17 @@ export const TransactionType = [ // { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" }, { label: "入库库区列表", prop: 'inLocationAreas' }, { label: "出库库区列表", prop: 'outLocationAreas' }, - { label: "自动提交审批", prop: 'autoSubmitRequest', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgreeRequest', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandleRequest', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: "creationTime", type:'dateTime' }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "备注", prop: "remark" }, { label: "描述", prop: "description" }, + // ************** 确认隐藏 ************************ + // { label: "自动提交审批", prop: 'autoSubmitRequest', type: "filter", filters: "whetherOrNot" }, + // { label: "自动审批通过", prop: 'autoAgreeRequest', type: "filter", filters: "whetherOrNot" }, + // { label: "自动执行", prop: 'autoHandleRequest', type: "filter", filters: "whetherOrNot" }, + // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, + // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, + // ************** 确认隐藏 ************************ // { // label: "操作", // type:"buttonOperation", @@ -971,10 +973,12 @@ export const documentBasic = [ { label: "单号流水长度", prop: "numberSerialLength" }, { label: "单号分隔符", prop: "numberSeparator" }, { label: "创建时间", prop: "creationTime", type:'dateTime' }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者", prop: "lastModifierId" }, { label: "备注", prop: "remark" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // ************** 确认隐藏 ************************ // { // label: "操作", // type:"buttonOperation", @@ -1004,8 +1008,6 @@ export const SupplierAsn = [ { label: "订单备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "车牌号", prop: 'truckNumber' }, @@ -1017,10 +1019,12 @@ export const SupplierAsn = [ { label: "到期日期", prop: 'dueDate', type: "dateTime" }, { label: "时间窗口", prop: 'timeWindow' }, { label: "筹措员代码", prop: 'planUserCode' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ // { label: "status", prop: 'status' }, // { label: "createType", prop: 'createType' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ ] // 采购订单信息 20230404 @@ -1049,11 +1053,11 @@ export const PurchaseOrder = [ { label: "版本", prop: 'version' }, { label: "税率", prop: 'taxRate' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ // { label: "orderStatus", prop: 'orderStatus' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ ] // 到货请求 20230404 @@ -1065,6 +1069,7 @@ export const PurchaseReceiptRequest = [ type: "name", width: orderWidth }, + { label: "请求状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "发货单号", prop: 'asnNumber',width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, @@ -1074,18 +1079,19 @@ export const PurchaseReceiptRequest = [ { label: "订单备注", prop: 'remark' }, { label: "创建时间", prop: 'creationTime', type:'dateTime' }, { label: "操作员", prop: 'worker' }, - { label: "请求状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'truckNumber' }, { label: "收货口", prop: 'dockCode' }, { label: "时间窗口", prop: 'timeWindow' }, + // ************** 确认隐藏 ************************ + // { 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" }, + // ************** 确认隐藏 ************************ ] // 采购收货任务 20230404 export const PurchaseReceiptJob = [ @@ -1109,7 +1115,6 @@ export const PurchaseReceiptJob = [ { label: "创建时间", prop: 'creationTime', type:'dateTime' }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, @@ -1117,17 +1122,18 @@ export const PurchaseReceiptJob = [ { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "任务描述", prop: 'jobDescription' }, { label: "时间窗口", prop: 'timeWindow' }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // { label: "完成者ID", prop: 'completeUserId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, // { label: "type", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -1360,8 +1366,8 @@ export const InspectRequest = [ fixed: "left", type: "name", }, - { label: "单据号", prop: 'number', width: orderWidth }, { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" }, + { label: "单据号", prop: 'number', width: orderWidth }, { label: "操作员", prop: "worker" }, { label: "采购订单号", prop: "poNumber",width: orderWidth }, { label: "发货单号", prop: "asnNumber",width: orderWidth }, @@ -1369,9 +1375,7 @@ export const InspectRequest = [ { label: "到货单号", prop: 'purchaseReceiptRequestNumber' }, { label: "供应商代码", prop: "supplierCode" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, @@ -1379,17 +1383,19 @@ export const InspectRequest = [ { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "完成者ID", prop: 'completeUserId' }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, // { label: "nextAction", prop: 'nextAction' }, // ************** 确认隐藏 ************************ ] @@ -1410,22 +1416,21 @@ export const InspectNote = [ { label: "供应商代码", prop: "supplierCode" }, { label: "筹措员代码", prop: "worker" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "备注", prop: 'remark' }, { label: "要货计划单号", prop: 'rpNumber',width: orderWidth }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "ID", prop: 'id' }, // ************** 确认隐藏 ************************ ] // 不合格库存(不合格转合格) 已调整 export const unqualifiedToQualified = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, @@ -1440,7 +1445,6 @@ export const unqualifiedToQualified = [ { label: "ERP库位", prop: "locationErpCode" }, { label: "标包数量", prop: "stdPackQty" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货日期", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, @@ -1455,8 +1459,10 @@ export const unqualifiedToQualified = [ { label: "是否可用", prop: 'isActive' }, { label: "最后事务号", prop: 'lastTransNumber' }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, // { label: "ID", prop: 'id' }, // { label: "manageType", prop: 'manageType' }, // { label: "status", prop: 'status' }, @@ -1494,16 +1500,16 @@ export const PutawayNote = [ { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "检验单号", prop: 'inspectNumber' }, { label: "收货单号", prop: 'receiptNumber' }, { label: "发货单号", prop: 'asnNumber' }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "完工收货单号", prop: 'productReceiptNumber' }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, // { label: "type", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -1518,23 +1524,24 @@ export const IssueRequest = [ }, { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "操作员", prop: "worker" }, { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'type' }, { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { 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: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 人工发料任务 20230411 export const IssueJob = [ @@ -1545,15 +1552,12 @@ export const IssueJob = [ type: "name", width: orderWidth }, - { label: "申请单号", prop: "materialRequestNumber",width: orderWidth }, { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, + { label: "申请单号", prop: "materialRequestNumber",width: orderWidth }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "完成时间", prop: "completeTime", type: "dateTime" }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, @@ -1561,17 +1565,22 @@ export const IssueJob = [ { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "任务描述", prop: 'jobDescription' }, { label: "叫料请求类型", prop: 'requestType' }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // ************** 确认隐藏 ************************ + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "完成者", prop: 'completeUserId' }, + // ************** 确认隐藏 ************************ ] // 人工发料记录 20230411 export const IssueNote = [ @@ -1585,10 +1594,8 @@ export const IssueNote = [ { label: "申请单号", prop: 'requestNumber',width: orderWidth }, { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "车间", prop: 'workshop' }, @@ -1596,7 +1603,11 @@ export const IssueNote = [ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 自动叫料申请 20230411 export const automaticCallApply = [ @@ -1609,23 +1620,25 @@ export const automaticCallApply = [ }, { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "操作员", prop: "worker" }, { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'type' }, { label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { 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: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 自动发料任务 20230411 export const automaticCallJob = [ @@ -1636,15 +1649,12 @@ export const automaticCallJob = [ type: "name", width: orderWidth }, - { label: "申请单号", prop: "materialRequestNumber",width: orderWidth }, { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, + { label: "申请单号", prop: "materialRequestNumber",width: orderWidth }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "完成时间", prop: "completeTime", type: "dateTime" }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, @@ -1652,17 +1662,22 @@ export const automaticCallJob = [ { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "任务描述", prop: 'jobDescription' }, { label: "叫料请求类型", prop: 'requestType' }, { label: "生产线", prop: 'prodLine' }, { label: "车间", prop: 'workshop' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + // ************** 确认隐藏 ************************ + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "完成者ID", prop: 'completeUserId' }, + // ************** 确认隐藏 ************************ ] // 自动发料记录 20230411 export const automaticCallNote = [ @@ -1676,10 +1691,8 @@ export const automaticCallNote = [ { label: "申请单号", prop: 'requestNumber',width: orderWidth }, { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "车间", prop: 'workshop' }, @@ -1687,7 +1700,11 @@ export const automaticCallNote = [ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "事务ID", prop: "tenantId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "创建者ID", prop: 'creatorId' }, + // ************** 确认隐藏 ************************ ] // 上架前退货记录 20230412 export const beforeGroundingReturnNote = [ @@ -1704,16 +1721,16 @@ export const beforeGroundingReturnNote = [ { label: "退货时间", prop: "returnTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, + { label: "任务单号", prop: 'jobNumber' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "任务ID", prop: 'jobNumber' }, { label: "订单号", prop: 'poNumber' }, { label: "退货请求单号", prop: 'purchaseReturnRequestNumber' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "returnType", prop: 'returnType' }, // { label: "status", prop: 'status' }, // ************** 确认隐藏 ************************ @@ -1728,7 +1745,6 @@ export const PurchaseReturnRequest = [ }, { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "发货单号", prop: "asnNumber", width: orderWidth }, { label: "订单号", prop: "poNumber",width: orderWidth }, { label: "供应商代码", prop: "supplierCode" }, @@ -1736,17 +1752,18 @@ export const PurchaseReturnRequest = [ { label: "操作员", prop: "worker" }, { label: "备注", prop: 'remark' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'rpNumber' }, - { label: "returnType", prop: 'returnType' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { 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: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "returnType", prop: 'returnType' }, + // { label: "事务ID", prop: "tenantId" }, // { label: "returnType", prop: 'returnType' }, // ************** 确认隐藏 ************************ ] @@ -1768,10 +1785,8 @@ export const PurchaseReturnJob = [ { label: "退货原因说明", prop: 'returnReason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "供应商代码", prop: "supplierCode" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, @@ -1779,16 +1794,20 @@ export const PurchaseReturnJob = [ { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, { label: "收货单号", prop: 'rpNumber' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "完成者", prop: 'completeUserId' }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 上架后退货记录 20230412 export const PurchaseReturnNote = [ @@ -1805,16 +1824,16 @@ export const PurchaseReturnNote = [ { label: "退货时间", prop: "returnTime", type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "收货单号", prop: 'rpNumber',width: orderWidth }, { label: "退货请求单号", prop: 'purchaseReturnRequestNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "returnType", prop: 'returnType' }, // { label: "status", prop: 'status' }, // ************** 确认隐藏 ************************ @@ -1831,14 +1850,16 @@ export const ScrapNote = [ { label: "报废日期", prop: "activeDate",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber' }, { label: "报废类型", prop: 'type' }, { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "任务ID", prop: 'jobNumber' }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 原料直发客户记录 20230412 export const materialDirectSendNote = [ @@ -1855,16 +1876,18 @@ export const materialDirectSendNote = [ { label: "操作员", prop: "worker" }, { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, { label: "发货计划单号", prop: 'deliverPlanNumber',width: orderWidth }, { label: "发货申请单号", prop: 'deliverRequestNumber',width: orderWidth }, { label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "任务ID", prop: 'jobNumber',width: orderWidth }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 直接发料记录 20230413 export const directIssueNote = [ @@ -1878,10 +1901,8 @@ export const directIssueNote = [ { label: "申请单号", prop: 'requestNumber',width: orderWidth }, { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "车间", prop: 'workshop' }, @@ -1889,7 +1910,11 @@ export const directIssueNote = [ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 成品管理 @@ -1906,15 +1931,8 @@ export const ProductReceiptRequest = [ { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'productionPlanNumber' }, { label: "车间", prop: 'workshop' }, { label: "生产线", prop: 'prodLine' }, @@ -1922,9 +1940,16 @@ export const ProductReceiptRequest = [ { label: "班组", prop: 'team' }, { label: "计划日期", prop: 'planDate' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "type", prop: 'type' }, + // { 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" }, // ************** 确认隐藏 ************************ ] // 完工收货缴库记录 20230413 @@ -1940,16 +1965,16 @@ export const ProductReceiptNote = [ { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "完工时间", prop: 'completeTime',type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "上级关联菜单号", prop: 'sourceNumber',width: orderWidth }, { label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, { label: "车间", prop: 'workShop' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "任务ID", prop: 'jobNumber',width: orderWidth }, + // { label: "事务ID", prop: "tenantId" }, // { label: "type", prop: 'type' }, // { label: "receiptType", prop: 'receiptType' }, // ************** 确认隐藏 ************************ @@ -1966,18 +1991,20 @@ export const ProductReceiptScrapRequest = [ { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus", }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'type' }, + { label: "报废类型", prop: 'type' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // 完工收货报废记录 20230412 @@ -1992,14 +2019,16 @@ export const ProductReceiptScrapNote = [ { label: "报废日期", prop: "activeDate",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber' }, { label: "报废类型", prop: 'type' }, { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "任务ID", prop: 'jobNumber' }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 半成品上架记录 20230415 export const partiallyPreparedProductsNote = [ @@ -2018,16 +2047,16 @@ export const partiallyPreparedProductsNote = [ { label: "到货单号", prop: "purchaseReceiptRequestNumber", width: orderWidth }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "检验单号", prop: 'inspectNumber' }, { label: "收货单号", prop: 'receiptNumber' }, { label: "发货单号", prop: 'asnNumber' }, { label: "要货计划单号", prop: 'rpNumber' }, { label: "完工收货单号", prop: 'productReceiptNumber' }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, // { label: "type", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -2046,18 +2075,20 @@ export const DeliverRequest = [ { label: "操作员", prop: 'worker' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { 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: 'lastModificationTime', type: "dateTime" }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, { label: "客户地址", prop: 'customerAddressCode' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // 成品发货任务 20230414 export const DeliverJob = [ @@ -2070,13 +2101,11 @@ export const DeliverJob = [ }, { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "发货申请单号", prop: "deliverRequestNumber",width:orderWidth }, { label: "发货时间", prop: "deliverTime",type: "dateTime" }, { label: "客户代码", prop: "customerCode" }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "上游任务编号", prop: 'upStreamJobNumber' }, @@ -2084,17 +2113,21 @@ export const DeliverJob = [ { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, { label: "客户地址", prop: 'customerAddressCode' }, { label: "发货计划单号", prop: 'deliverPlanNumber' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "完成者ID", prop: 'completeUserId' }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 成品发货记录 20230414 export const DeliverNote = [ @@ -2110,9 +2143,7 @@ export const DeliverNote = [ { label: "客户代码", prop: "customerCode" }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "发货任务单号", prop: "jobNumber", width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -2120,7 +2151,11 @@ export const DeliverNote = [ { label: "发货计划单号", prop: 'deliverPlanNumber' }, { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" }, { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // ************** 确认隐藏 ************************ ] // FIS发货申请 20230414 export const FISDeliverRequest = [ @@ -2133,22 +2168,24 @@ export const FISDeliverRequest = [ }, { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "发货时间", prop: "deliverTime", type: "dateTime" }, { label: "客户代码", prop: "customerCode" }, { label: "操作员", prop: 'worker' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'deliverPlanNumber' }, { label: "客户地址", prop: 'customerAddressCode' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // FIS发货记录 20230415 export const FISDeliverNote = [ @@ -2164,9 +2201,7 @@ export const FISDeliverNote = [ { label: "客户代码", prop: "customerCode" }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "发货任务单号", prop: "jobNumber", width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -2174,7 +2209,11 @@ export const FISDeliverNote = [ { label: "发货计划单号", prop: 'deliverPlanNumber' }, { label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" }, { label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 客户退拆申请 20230415 export const customerDismantle = [ @@ -2188,21 +2227,21 @@ export const customerDismantle = [ { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "班次", prop: 'shift' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'workshop' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ // { label: "ID", prop: 'id' }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, // ************** 确认隐藏 ************************ ] // 客户退拆记录 20230415 @@ -2220,12 +2259,14 @@ export const customerDismantleNote = [ { label: "生效时间", prop: "activeDate",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "申请编号", prop: 'requestNumber', width:orderWidth }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 客户退拆记录-明细【即回冲记录】 20230415 export const customerDismantleBackFlushNote = [ @@ -2251,17 +2292,19 @@ export const productionReturnRequest = [ { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // 生产退库任务 20230415 export const productionReturnJob = [ @@ -2276,9 +2319,7 @@ export const productionReturnJob = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth }, { label: "操作员", prop: 'worker' }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "上游任务编号", prop: 'upStreamJobNumber',width:orderWidth }, @@ -2286,15 +2327,19 @@ export const productionReturnJob = [ { label: "优先级", prop: 'priority' }, { label: "优先级增量", prop: 'priorityIncrement' }, { label: "工作组", prop: 'workGroupCode' }, - { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, - { label: "承接者ID", prop: 'acceptUserId' }, { label: "承接者用户名", prop: 'acceptUserName' }, { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "完成者", prop: 'completeUserId' }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "任务描述", prop: 'jobDescription' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "承接者ID", prop: 'acceptUserId' }, + // { label: "完成者ID", prop: 'completeUserId' }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" }, + // ************** 确认隐藏 ************************ ] // 生产退库记录 20230413 export const productionReturnNote = [ @@ -2307,15 +2352,17 @@ export const productionReturnNote = [ }, { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "退料时间", prop: 'returnTime', type: "dateTime" }, - { label: "任务ID", prop: 'jobNumber', width:orderWidth }, - { label: "事务ID", prop: "tenantId" }, + { label: "任务单号", prop: 'jobNumber', width:orderWidth }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 线边仓缴库申请 20230415 export const lineSideWarehousePaymentRequest = [ @@ -2329,15 +2376,8 @@ export const lineSideWarehousePaymentRequest = [ { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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: 'productionPlanNumber' }, { label: "车间", prop: 'workshop' }, { label: "生产线", prop: 'prodLine' }, @@ -2345,8 +2385,15 @@ export const lineSideWarehousePaymentRequest = [ { label: "班组", prop: 'team' }, { label: "计划日期", prop: 'planDate' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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: "type", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -2363,16 +2410,16 @@ export const lineSideWarehousePaymentNote = [ { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "完工时间", prop: 'completeTime',type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "上级关联菜单号", prop: 'sourceNumber',width: orderWidth }, { label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, { label: "车间", prop: 'workShop' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "任务ID", prop: 'jobNumber',width: orderWidth }, + // { label: "事务ID", prop: "tenantId" }, // { label: "type", prop: 'type' }, // { label: "receiptType", prop: 'receiptType' }, // ************** 确认隐藏 ************************ @@ -2389,19 +2436,19 @@ export const lineSideWarehouseScrappingRequest = [ { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus", }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ // { label: "报废类型", prop: 'type' }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { 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" }, // ************** 确认隐藏 ************************ ] // 线边仓报废记录 20230412 @@ -2416,14 +2463,14 @@ export const lineSideWarehouseScrappingNote = [ { label: "报废日期", prop: "activeDate",type: "dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber' }, { label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "任务ID", prop: 'jobNumber' }, // { label: "报废类型", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -2643,9 +2690,7 @@ export const expectOut = [ }, { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, @@ -2664,8 +2709,12 @@ export const expectOut = [ { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "序号", prop: "serialNumber" }, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 预计入库存(+自定义tab页) 20230411 export const expectIn = [ @@ -2694,13 +2743,15 @@ export const expectIn = [ { label: "生产日期", prop: "produceDate",type: "dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "仓库代码", prop: 'warehouseCode' }, { label: "序号", prop: 'serialNumber' }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 非生产领料申请 20230417 export const pickingRequest = [ @@ -2717,17 +2768,19 @@ export const pickingRequest = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // 非生产领料审批 20230417 export const pickingApproval = [ @@ -2744,17 +2797,19 @@ export const pickingApproval = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // 非生产领料记录 20230417 export const pickingNote = [ @@ -2771,12 +2826,14 @@ export const pickingNote = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 非生产退料申请 20230417 export const materialReturnRequest = [ @@ -2793,17 +2850,19 @@ export const materialReturnRequest = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // 非生产退料审批 20230417 export const materialReturnApproval = [ @@ -2820,17 +2879,19 @@ export const materialReturnApproval = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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' }, - { label: "事务ID", prop: "tenantId" }, + { label: "备注", prop: 'remark' }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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" }, + // ************** 确认隐藏 ************************ ] // 非生产退料记录 20230417 export const materialReturnNote = [ @@ -2847,12 +2908,14 @@ export const materialReturnNote = [ { label: "部门代码", prop: "deptCode" }, { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 回收料收货记录 20230415 export const recycledMaterialsReceipt = [ @@ -2866,11 +2929,13 @@ export const recycledMaterialsReceipt = [ { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "生效日期", prop: "activeDate" ,type: "dateTime" }, { label: "操作员", prop: "worker" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 回收料调整申请 20230415 export const recycledMaterialsAdjustmentApply = [ @@ -2884,17 +2949,19 @@ export const recycledMaterialsAdjustmentApply = [ { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, { label: "创建时间", prop: "creationTime" ,type: "dateTime" }, { label: "操作员", prop: "worker" }, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { 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: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { 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: "事务ID", prop: "tenantId" }, + // ************** 确认隐藏 ************************ ] // 回收料调整记录 20230415 export const materialsAdjustment = [ @@ -2908,15 +2975,15 @@ export const materialsAdjustment = [ { label: "申请单号", prop: "requestNumber",width: orderWidth }, { label: "创建日期", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker",}, - { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "任务单号", prop: "jobNumber" }, { label: "备注", prop: 'remark' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ // { label: "type", prop: 'type' }, + // { label: "创建者ID", prop: 'creatorId' }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ ] // 线边仓调拨申请 20230417 @@ -2934,14 +3001,14 @@ export const lineSideWarehouseAllocationRequest = [ { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { 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: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ************** 确认隐藏 ************************ // { label: "调拨类型", prop: 'type' }, + // { 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"}, // ************** 确认隐藏 ************************ ] // 线边仓调拨确认 20230417 @@ -2953,20 +3020,20 @@ export const lineSideWarehouseAllocationConfirm = [ type: "name", width: orderWidth }, - { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, + { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "任务ID", prop: 'jobNumber',width: orderWidth }, + // { label: "事务ID", prop: "tenantId" }, // { label: "调拨类型", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -2979,20 +3046,20 @@ export const lineSideWarehouseAllocationNote = [ type: "name", width: orderWidth }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, - // ************** 确认隐藏 ************************ + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "调拨类型", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -3009,14 +3076,14 @@ export const interStorageAllocationNote = [ { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "任务ID", prop: 'jobNumber',width: orderWidth }, + // { label: "事务ID", prop: "tenantId" }, // { label: "调拨类型", prop: 'type' }, // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, // { label: "确认时间", prop: "confirmTime",type:"dateTime" }, @@ -3037,14 +3104,14 @@ export const customerStorageAllocationRequest = [ { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { 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: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ************** 确认隐藏 ************************ // { label: "调拨类型", prop: 'type' }, + // { 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"}, // ************** 确认隐藏 ************************ ] // 客户储位调拨确认 20230410 @@ -3056,20 +3123,20 @@ export const customerStorageAllocationConfirm = [ type: "name", width: orderWidth }, - { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, + { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ************** 确认隐藏 ************************ + // { label: "事务ID", prop: "tenantId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "创建者ID", prop: "creatorId" }, // { label: "调拨类型", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -3082,20 +3149,20 @@ export const customerStorageAllocationNote = [ type: "name", width: orderWidth }, - { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, + { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "调拨类型", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -3113,13 +3180,13 @@ export const intraStorageTransferNote = [ { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "调拨申请单号", prop: "requestNumber",width: orderWidth }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "type", prop: 'type' }, // { label: "确认时间", prop: "confirmTime",type:"dateTime" }, // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, @@ -3137,18 +3204,18 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, { label: "操作员", prop: 'worker' }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { 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' }, - { label: "事务ID", prop: "tenantId" }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { 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: "type", prop: 'type' }, // ************** 确认隐藏 ************************ ] @@ -3164,14 +3231,14 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "操作员", prop: 'worker' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, { label: "调整单号", prop: "requestNumber",width: orderWidth }, { label: "备注", prop: 'remark' }, - { label: "任务ID", prop: 'jobNumber',width: orderWidth }, - { label: "事务ID", prop: "tenantId" }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, // { label: "类型", prop: 'type' }, // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, // { label: "确认时间", prop: "confirmTime",type:"dateTime" }, @@ -3199,18 +3266,18 @@ export const CountPlan = [ { label: "类型", prop: "type",type: "filter", filters: "checkType" }, { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, { label: "生效时间", prop: 'activeDate', type: "dateTime" }, - { label: "创建者ID", prop: "creatorId" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者ID", prop: "lastModifierId" }, - { 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: "事务ID", prop: "tenantId" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "物品代码JSON", prop: 'jsonItemCodes' }, { label: "库位JSON", prop: 'jsonLocationCodes' }, // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { 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: "事务ID", prop: "tenantId" }, // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' }, // ************** 确认隐藏 ************************ ] @@ -3223,8 +3290,8 @@ export const CountJob = [ type: "name", width:orderWidth }, - { label: "盘点计划号", prop: "countPlanNumber",width:orderWidth }, { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, + { label: "盘点计划号", prop: "countPlanNumber",width:orderWidth }, { label: "盘点根据", prop: "countMethod",type: "filter", filters: "countMethod" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "承接时间", prop: "acceptTime", type: "dateTime" }, @@ -3238,20 +3305,22 @@ export const CountJob = [ { 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"}, - { label: "创建者ID", prop: "creatorId" }, - { label: "承接者ID", prop: "acceptUserId" }, - { label: "完成者ID", prop: "completeUserId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "上次修改者Id", prop: "lastModifierId" }, { label: "优先级", prop: 'priority',}, { label: "优先级增量", prop: 'priorityIncrement',}, - { label: "事务ID", prop: "tenantId" }, { label: "备注", prop: 'remark' }, { label: "描述", prop: "description" }, { label: "任务描述", prop: 'jobDescription' }, { label: "工作组代码", prop: "workGroupCode" }, { label: "仓库代码", prop: "warehouseCode" }, + // ************** 确认隐藏 ************************ + // { label: "创建者ID", prop: "creatorId" }, + // { label: "承接者ID", prop: "acceptUserId" }, + // { label: "完成者ID", prop: "completeUserId" }, + // { label: "上次修改者Id", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot"}, + // ************** 确认隐藏 ************************ ] // 盘点记录 20230415 export const CountNote = [ @@ -3262,8 +3331,8 @@ export const CountNote = [ type: "name", width: orderWidth }, - { label: "盘点计划单号", prop: "countPlanNumber", width: orderWidth }, { label: "是否已生成盘点调整申请", prop: "adjusted", type: "tagFilter", filters: "whetherOrNot" }, + { label: "盘点计划单号", prop: "countPlanNumber", width: orderWidth }, { label: "开始时间", prop: "beginTime", type: "dateTime" }, { label: "结束时间", prop: "endTime", type: "dateTime" }, { label: "操作员", prop: 'worker',}, @@ -3271,12 +3340,14 @@ export const CountNote = [ { 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: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者", prop: "lastModifierId" }, { label: "生效时间", prop: "activeDate", type: "dateTime" }, { label: "描述", prop: "description" }, + // ************** 确认隐藏 ************************ + // { label: "事务ID", prop: "tenantId" }, + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, + // ************** 确认隐藏 ************************ ] // 盘点调整申请 20230415 export const CountPlanAdjust = [ @@ -3292,19 +3363,19 @@ export const CountPlanAdjust = [ { 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' }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: "creatorId"}, + { label: "备注", prop: 'remark' }, { label: "生效时间", prop: 'activeDate', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "上次修改者", prop: "lastModifierId" }, // ************** 确认隐藏 ************************ + // { label: "上次修改者ID", prop: "lastModifierId" }, + // { label: "事务ID", prop: "tenantId" }, + // { label: "创建者ID", prop: "creatorId"}, // { label: "ID", prop: 'id' }, + // { 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" }, // ************** 确认隐藏 ************************ ] // 盘点调整记录 20230415 @@ -3322,12 +3393,12 @@ export const CountAdjustNote = [ { label: "操作员", prop: 'worker' }, { label: "类型", prop: "type" }, { label: "备注", prop: "remark" }, - { label: "事务ID", prop: "tenantId" }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true }, - { label: "上次修改者", prop: "lastModifierId" }, { label: "生效时间", prop: "activeDate", type: "dateTime" }, // ************** 确认隐藏 ************************ + // { label: "事务ID", prop: "tenantId" }, + // { label: "创建者ID", prop: "creatorId" }, + // { label: "上次修改者ID", prop: "lastModifierId" }, // { label: "isAdjusted", prop: 'isAdjusted' }, // ************** 确认隐藏 ************************ ] @@ -3346,14 +3417,16 @@ export const MessageType = [ { label: "消息类别名称", prop: "messageTypeName" }, { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime",type: "dateTime",showProp: true }, - { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true }, - { label: "上次修改者", prop: "lastModifierId" }, { label: "消息使用的邮件模板名称", prop: "emailTemplate" }, { label: "消息使用的短信模板名称", prop: "smsTemplate" }, - { label: "事务ID", prop: "tenantId" }, { label: "是否发送邮件", prop: "isSendEmail", type: "filter", filters: "whetherOrNot" }, { label: "是否发送短信", prop: "isSendSms", type: "filter", filters: "whetherOrNot" }, + // ************** 确认隐藏 ************************ + // { label: "事务ID", prop: "tenantId" }, + // { label: "上次修改者", prop: "lastModifierId" }, + // { label: "创建者ID", prop: "creatorId" }, + // ************** 确认隐藏 ************************ ] // 系统权限管理