diff --git a/src/api/wms/inspectRecordDetail/index.ts b/src/api/wms/inspectRecordDetail/index.ts index a2308b717..5bda8668a 100644 --- a/src/api/wms/inspectRecordDetail/index.ts +++ b/src/api/wms/inspectRecordDetail/index.ts @@ -22,7 +22,7 @@ export interface InspectRecordDetailVO { number: string itemCode: string remark: string - creationTime: Date + createTime: Date creator: string itemName: string itemDesc1: string diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts index 51dd36ec9..51629781d 100644 --- a/src/api/wms/unplannedreceiptRequestDetail/index.ts +++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts @@ -15,7 +15,7 @@ export interface UnplannedreceiptRequestDetailVO { number: string itemCode: string remark: string - creationTime: Date + createTime: Date creator: string itemName: string itemDesc1: string diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts index f6b64fb24..82d62b9cf 100644 --- a/src/utils/disposition/formFields.ts +++ b/src/utils/disposition/formFields.ts @@ -369,7 +369,7 @@ export const InventoryLocationCapacity = [ { label: "可用容量(%)", prop: "availableCapacity", }, { type: "filter", label: "是否无穷大", prop: "isInfinity", filters: "whetherOrNot" }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] @@ -530,7 +530,7 @@ { label: "到货日期", prop: 'dueDate', type:'dateTime' }, { label: "时间窗口", prop: 'timeWindow' }, { label: "公司", prop: 'company' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "创建时间", prop: 'createTime', type:'dateTime' }, ] /** * @returns {Array} 客户发货通知 @@ -557,7 +557,7 @@ { label: "订单号", prop: "poNumber" }, { label: "供应商编号", prop: "supplierCode" }, { label: "状态", type: "filter", filters: "arriveNoticeStatus", prop: "status", }, - { type: "dateTime", label: "创建时间", prop: "creationTime" }, + { type: "dateTime", label: "创建时间", prop: "createTime" }, { label: "备注", prop: "remark" }, ] /** @@ -571,7 +571,7 @@ { label: "收货单号", prop: "number", }, { label: "要货计划单号", prop: "rpNumber", }, { type: "dateTime", label: "收货时间", prop: "receiveTime", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] /** @@ -600,7 +600,7 @@ // { label: "要货计划单号", prop: "rpNumber", }, // { label: "收货时间", prop: "receiveTime", }, { type: "dateTime", label: "退货时间", prop: "returnTime", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] /** @@ -618,7 +618,7 @@ // { label: "发货单号", prop: 'asnNumber',}, // { label: "要货计划单号", prop: 'rpNumber',}, // { label: "完工收货单号", prop: 'productReceiptNumber',}, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] /** @@ -629,7 +629,7 @@ { label: "要料申请单号", prop: "number", }, { label: "车间", prop: "workshop", }, { label: "任务状态", type: "filter", filters: "requestStatus", prop: "status", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] /** @@ -641,7 +641,7 @@ { label: "任务ID", prop: 'jobNumber',}, { label: "操作员", prop: 'worker',}, { label: "车间", prop: 'workshop',}, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] /** @@ -707,7 +707,7 @@ { type: "dateTime", label: "计划时间", prop: "planTime", }, { label: "发货计划单号", prop: "number", }, { type: "filter", filters: "DeliverPlanStatus", label: "状态", prop: "status", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { type: "filter", label: "发货方式", prop: "shipVia", filters: "DeliverPlanTransport" }, { type: "filter", label: "运输方式", prop: "modeOfTransport", filters: "DeliverPlanTransport" }, { type: "filter", label: "承运商", prop: "carrier", filters: "DeliverPlanFreightTJ" }, @@ -724,7 +724,7 @@ { label: "发货申请单号", prop: "number", }, { label: "客户", prop: "customer", }, { label: "任务状态", type: "filter", filters: "requestStatus", prop: "status", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] @@ -738,7 +738,7 @@ export const DeliverNote = [ { label: "操作员", prop: 'worker',}, { label: "客户", prop: 'customer',}, { label: "客户地址", prop: 'customerAddressCode',}, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] @@ -851,7 +851,7 @@ export const DeliverNote = [ { label: "从仓库", prop: "fromWarehouseCode"}, { label: "到仓库", prop: "toWarehouseCode"}, { label: "操作员", prop: "worker" }, - { label: "创建时间", prop: "creationTime", type: "dateTime"}, + { label: "创建时间", prop: "createTime", type: "dateTime"}, { label: "备注", prop: 'remark' } ] /** @@ -870,7 +870,7 @@ export const DeliverNote = [ { label: "从仓库", prop: "fromWarehouseCode"}, { label: "到仓库", prop: "toWarehouseCode"}, { label: "操作员", prop: "worker"}, - { label: "创建时间", prop: "creationTime", type: "dateTime"}, + { label: "创建时间", prop: "createTime", type: "dateTime"}, ] /** * @returns {Array} 盘点计划 @@ -915,7 +915,7 @@ export const DeliverNote = [ { label: "盘点差异调整记录单号", prop: "number", }, { label: "盘点记录单号", prop: 'countNoteNumber', }, { label: "盘点计划单号", prop: 'countPlanNumber', }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] @@ -943,7 +943,7 @@ export const DeliverNote = [ { type: "dateTime", label: "上次盘点时间", prop: "lastCountTime", }, { label: "上次盘点单号", prop: "lastCountPlanNumber", }, { label: "上次盘点标签号", prop: "lastCountLabel", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { type: "filter", label: "是否可用", prop: "isActive", filters: "whetherOrNot", }, ] @@ -957,7 +957,7 @@ export const ERPInventoryBalance = [ { label: "批次", prop: "lot", }, { type: "object", label: "库存数量", prop: "qty", showProp: "qty", }, { type: "object", label: "计量单位", prop: "qty", showProp: "uom", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { type: "dateTime", label: "最后修改时间", prop: "lastModificationTime", }, ] @@ -1041,7 +1041,7 @@ export const ERPInventoryBalance = [ export const InventoryTransferNote = [ { label: "库存转移编号", prop: "number" }, - { type: "dateTime", label: "创建时间", prop: "creationTime" }, + { type: "dateTime", label: "创建时间", prop: "createTime" }, { label: "操作员", prop: "worker" }, { label: "备注", prop: 'remark' }, ] @@ -1096,7 +1096,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ { type: "object", label: "库区代码", prop: "location", showProp: "area" }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, { type: "filter", filters: "taskStatus", label: "状态", prop: "status", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] @@ -1119,7 +1119,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ { type: "object", label: "库区代码", prop: "location", showProp: "area" }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, { type: "filter", filters: "taskStatus", label: "状态", prop: "status", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] @@ -1133,7 +1133,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ { label: "班组", prop: "team", }, { label: "班次", prop: "shift", }, { type: "filter", filters: "ProductionPlanStatus", label: "状态", prop: "status", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { type: "dateTime", label: "计划日期", prop: "planDate", }, ] @@ -1200,7 +1200,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ // { label: "编号", prop: "id", }, { label: "下线结算记录单号", prop: "number", }, { label: "业务单号", prop: 'productReceiptNumber', }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] @@ -1226,7 +1226,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ // { type: "dateTime", label: "库位编号", prop: "completeTime" }, // { type: "object", label: "产品批次", prop: "batch", showProp: "supplierBatch", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] @@ -1238,7 +1238,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ { type: "dateTime", label: "回收时间", prop: 'recycleTime', }, { label: "车间", prop: 'workshop', }, { label: "班次", prop: 'shift', }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] @@ -1251,7 +1251,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ { label: "车间", prop: 'workshop', }, { label: "任务ID", prop: 'jobNumber',}, { label: "操作员", prop: 'worker',}, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] @@ -1265,7 +1265,7 @@ export const InventoryTransferLogHegeZBuHeGe = [ { label: "客户", prop: 'customer', }, { label: "任务ID", prop: 'jobNumber',}, { label: "操作员", prop: 'worker',}, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] @@ -1294,7 +1294,7 @@ export const ReworkNote = [ { label: "库位", prop: 'locationCode' }, { label: "仓库", prop: 'warehouseCode' }, { label: "操作员", prop: 'worker' }, - { type: "dateTime", label: "创建时间", prop: "creationTime",}, + { type: "dateTime", label: "创建时间", prop: "createTime",}, { label: "备注", prop: "remark",}, ] @@ -1310,7 +1310,7 @@ export const ReworkNote = [ { label: "要货计划单号", prop: "rpNumber", }, { label: "订单号", prop: "poNumber", }, { label: "供应商编号", prop: "supplierCode", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] @@ -1325,7 +1325,7 @@ export const ReworkNote = [ { label: "要货计划单号", prop: "rpNumber", }, { label: "供应商代码", prop: "supplierCode", }, { label: "操作员", prop: "worker", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, ] /** @@ -1338,7 +1338,7 @@ export const ReworkNote = [ { label: "检验单号", prop: 'inspectNumber', }, { label: "收货单号", prop: 'receiptNumber', }, { label: "供应商编号", prop: 'supplierCode', }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: "remark", }, ] @@ -1359,7 +1359,7 @@ export const ReworkNote = [ { label: "完成者用户名", prop: "completeUserName", }, { type: "dateTime", label: "完成时间", prop: "completeTime", }, { label: "操作员", prop: "worker", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, // { label: "承接者用户名", prop: "acceptUserName", }, // { type: "dateTime", label: "承接者时间", prop: "acceptTime", }, // { label: "完成者用户名", prop: "completeUserName", }, @@ -1374,7 +1374,7 @@ export const ReworkNote = [ // { label: "工作组", prop: "workGroupCode",}, // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", }, // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", }, - // { type: "dateTime", label: "创建时间", prop: "creationTime", }, + // { type: "dateTime", label: "创建时间", prop: "createTime", }, // { label: "备注", prop: 'remark', }, ] @@ -1395,7 +1395,7 @@ export const ReworkNote = [ { label: "订单号", prop: "poNumber", }, { label: "供应商编码", prop: "supplierCode", }, { label: "工作组", prop: 'workGroupCode', }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] @@ -1414,7 +1414,7 @@ export const ReworkNote = [ // { label: "完成者用户名", prop: "completeUserName", }, // { label: "供应商代码", prop: "supplierCode" }, // { label: "供应商名称", prop: "supplierName" }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { type: "dateTime", label: "承接者时间", prop: "acceptTime", }, { type: "dateTime", label: "完成时间", prop: "completeTime", }, @@ -1424,7 +1424,7 @@ export const ReworkNote = [ // { type: "dateTime", label: "完成时间", prop: "completeTime", }, // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", }, // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", }, - // { type: "dateTime", label: "创建时间", prop: "creationTime", }, + // { type: "dateTime", label: "创建时间", prop: "createTime", }, // { label: "到货单号", prop: "arriveNoticeNumber", }, // { label: "收货单号", prop: "receiptNumber", }, // { label: "发货单号", prop: "asnNumber", }, @@ -1446,7 +1446,7 @@ export const ReworkNote = [ { label: "完成者用户名", prop: "completeUserName", }, { type: "dateTime", label: "承接者时间", prop: "acceptTime", }, { type: "dateTime", label: "完成时间", prop: "completeTime", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, // { label: "承接者用户名", prop: "acceptUserName", }, // { type: "dateTime", label: "承接者时间", prop: "acceptTime", }, @@ -1454,7 +1454,7 @@ export const ReworkNote = [ // { type: "dateTime", label: "完成时间", prop: "completeTime", }, // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", }, // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", }, - // { type: "dateTime", label: "创建时间", prop: "creationTime", }, + // { type: "dateTime", label: "创建时间", prop: "createTime", }, // { label: "到货单号", prop: "arriveNoticeNumber", }, // { label: "备注", prop: 'remark', }, ] @@ -1470,7 +1470,7 @@ export const ReworkNote = [ { label: "完成者用户名", prop: "completeUserName", }, { type: "dateTime", label: "承接者时间", prop: "acceptTime", }, { type: "dateTime", label: "完成时间", prop: "completeTime", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, // { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", }, // { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", }, @@ -1496,7 +1496,7 @@ export const ReworkNote = [ { type: "dateTime", label: "完成时间", prop: "completeTime", }, { type: "filter", filters: "taskType", label: "任务类型", prop: "jobType", }, { label: "任务状态", type: "filter", filters: "taskStatus", prop: "jobStatus", }, - { type: "dateTime", label: "创建时间", prop: "creationTime", }, + { type: "dateTime", label: "创建时间", prop: "createTime", }, { label: "生产计划单号", prop: "productionPlanNumber", }, { label: "车间", prop: "workshop", }, { label: "班次", prop: "shift", }, @@ -1619,7 +1619,7 @@ export const ReworkNote = [ { label: "发货单号", prop: "deliverNumber" }, { label: "仓库", prop: 'warehouseCode' }, { label: "操作员", prop: 'worker' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "创建时间", prop: 'createTime', type:'dateTime' }, ] /** @@ -1630,7 +1630,7 @@ export const OuterPillarDeliverNote = [ { label: "发货单号", prop: "deliverNumber" }, { label: "仓库", prop: 'warehouseCode' }, { label: "操作员", prop: 'worker' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "创建时间", prop: 'createTime', type:'dateTime' }, ] /** @@ -1655,7 +1655,7 @@ export const OuterPillarDeliverNote = [ { label: "说明", prop: 'description' }, { label: "换件用户", prop: 'replacePeople' }, { label: "换件时间", prop: 'replaceDate', type:'dateTime' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "创建时间", prop: 'createTime', type:'dateTime' }, { label: "操作员", prop: 'worker' }, ] @@ -1672,7 +1672,7 @@ export const OuterPillarDeliverNote = [ }, { label: "计划外入库单号", prop: "outerUnplannedReceiptNumber" }, { label: "仓库", prop: 'warehouseCode' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "创建时间", prop: 'createTime', type:'dateTime' }, ] /** @@ -1687,7 +1687,7 @@ export const OuterPillarDeliverNote = [ }, { label: "计划外出库单号", prop: "outerUnplannedIssueNumber" }, { label: "仓库", prop: 'warehouseCode' }, - { label: "创建时间", prop: 'creationTime', type:'dateTime' }, + { label: "创建时间", prop: 'createTime', type:'dateTime' }, ] /** @@ -1700,7 +1700,7 @@ export const OuterPillarDeliverNote = [ fixed: "left", type: "name" }, - { label: "创建时间", prop: "creationTime", showProp: true }, + { label: "创建时间", prop: "createTime", showProp: true }, { label: "creatorId", prop: "creatorId", showProp: true }, { label: "跟踪编号", prop: "traceId", showProp: true }, { label: "errorCode", prop: "errorCode", showProp: true }, @@ -1759,7 +1759,7 @@ export const OuterPillarDeliverNote = [ label: "id", prop: "id", }, - { label: "创建时间", prop: "creationTime", type:'dateTime', showProp: true }, + { label: "创建时间", prop: "createTime", type:'dateTime', showProp: true }, { label: "数据编号", prop: "number", showProp: true }, { label: "数据类型", prop: "dataType", showProp: true }, { label: "生效日期", prop: "effectiveDate", type:'dateTime', showProp: true }, @@ -1780,7 +1780,7 @@ export const OuterPillarDeliverNote = [ label: "id", prop: "id", }, - { label: "创建时间", prop: "creationTime", type:'dateTime', showProp: true }, + { label: "创建时间", prop: "createTime", type:'dateTime', showProp: true }, { label: "creatorId", prop: "creatorId", showProp: true }, { label: "数据编号", prop: "number", showProp: true }, { label: "数据类型", prop: "dataType", showProp: true }, @@ -1803,7 +1803,7 @@ export const OuterPillarDeliverNote = [ label: "id", prop: "id", }, - { label: "创建时间", prop: "creationTime", type:'dateTime', showProp: true }, + { label: "创建时间", prop: "createTime", type:'dateTime', showProp: true }, { label: "creatorId", prop: 'creatorId', showProp: true }, { label: "跟踪编号", prop: 'traceId', showProp: true }, { label: "errorCode", prop: 'errorCode', showProp: true }, @@ -1951,4 +1951,4 @@ export const labelInfo = [ { label: "完工时间", prop: 'completeTime', type: "dateTime" }, { label: "流水号", prop: "lsh" }, { label: "客户物料号", prop: "customerItemCode" }, -] \ No newline at end of file +] diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts index c060f8ac5..6ff591b9a 100644 --- a/src/utils/disposition/tableColumns.ts +++ b/src/utils/disposition/tableColumns.ts @@ -6061,7 +6061,7 @@ export const Strategy = useCrudSchemas(reactive([ }, { label: '创建时间', - field: 'creationTime', + field: 'createTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -21012,7 +21012,7 @@ export const InspectRecordDetail = useCrudSchemas(reactive([ }, { label: '创建时间', - field: 'creationTime', + field: 'createTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -54879,7 +54879,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ }, { label: '创建时间', - field: 'creationTime', + field: 'createTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -73183,4 +73183,4 @@ export const CountadjustRecordDetailRules =reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/utils/disposition/tableDetailsColumns.ts b/src/utils/disposition/tableDetailsColumns.ts index f42b294db..ce19853d7 100644 --- a/src/utils/disposition/tableDetailsColumns.ts +++ b/src/utils/disposition/tableDetailsColumns.ts @@ -536,7 +536,7 @@ { label: "托标签", prop: "containerCode", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, // { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, - // { type: "dateTime", label: "生产日期", prop: "creationTime" }, + // { type: "dateTime", label: "生产日期", prop: "createTime" }, { label: "备注", prop: 'remark', }, ] /** @@ -554,7 +554,7 @@ { label: "托标签", prop: "rawContainerCode", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, // { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, - // { type: "dateTime", label: "生产日期", prop: "creationTime", }, + // { type: "dateTime", label: "生产日期", prop: "createTime", }, { label: "备注", prop: 'remark', }, ] /** @@ -659,7 +659,7 @@ { label: "仓库", prop: 'warehouseCode' }, { label: "操作员", prop: 'worker' }, { label: "任务ID", prop: 'jobNumber',}, - { type: "dateTime", label: "创建时间", prop: "creationTime",}, + { type: "dateTime", label: "创建时间", prop: "createTime",}, { label: "备注", prop: "remark",}, ] @@ -1428,4 +1428,4 @@ export const InventoryTransferNote = [ // { label: "到事务编号", prop: "toTransNumber", }, // { type: "dateTime", label: "事务时间", prop: "transferTime", }, // { type: "dateTime", label: "生效日期", prop: "activeDate", }, -] \ No newline at end of file +] diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts index 802f66211..0ac0f6a72 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts @@ -695,7 +695,7 @@ export const InspectRecordDetail = useCrudSchemas(reactive([ }, { label: '创建时间', - field: 'creationTime', + field: 'createTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index fa4cbdeca..cf857c523 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -125,6 +125,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => item.batch = item.toBatch item.packingNumber = item.toPackingNumber item.containerNumber = item.toContainerNumber + let fromLocationCode = item.fromLocationCode + item.fromLocationCode = item.toLocationCode + item.toLocationCode = fromLocationCode }) PurchasereturnRequestDetail.allSchemas.tableFormColumns.map(item => { if(item.field == 'remark') { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 33e08f770..0f7164eff 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -904,7 +904,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, { label: '不合格原因', - field: 'failedReason', + field: 'reason', dictType: DICT_TYPE.PURCHASE_RETURN_REASON, dictClass: 'string', isSearch: true, @@ -914,7 +914,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ - disabled:true + disabled: false, + type: 'Select' } }, { @@ -1088,4 +1089,4 @@ export const PurchasereturnRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请输入物品代码', trigger: 'blur' } ], -}) \ No newline at end of file +})