diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index fabd59e4a..3ecc36f5d 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -25,8 +25,12 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '生产线代码', - field: 'productionPlanNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 @@ -40,10 +44,20 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '生产线代码', + field: 'productionPlanNumber', + isTable:false, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '班组', field: 'team', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -52,6 +66,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '班次', field: 'shift', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -62,6 +77,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, dictClass: 'string', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -71,6 +87,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '到仓库代码', field: 'toWarehouseCode', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -83,6 +100,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', + isTable:false, table: { width: 180 }, @@ -98,6 +116,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '要求截止时间', field: 'requestDueTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -115,21 +134,11 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '过期时间', field: 'expiredTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -150,6 +159,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '最后更新时间', field: 'updateTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -170,23 +180,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '最后更新者', field: 'updater', + isTable:false, sort: 'custom', table: { width: 150 }, }, - // { - // label: '状态', - // field: 'jobStageStatus', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { label: '优先级', field: 'priority', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -198,6 +202,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '优先级增量', field: 'priorityIncrement', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -209,6 +214,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -216,6 +222,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '承接人', field: 'acceptUserId', + isTable:false, sort: 'custom', table: { width: 150 @@ -224,6 +231,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '承接时间', field: 'acceptTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -244,6 +252,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '完成人', field: 'completeUserId', + isTable:false, sort: 'custom', table: { width: 150 @@ -252,6 +261,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '完成时间', field: 'completeTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -272,9 +282,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', + isTable:false, dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 @@ -285,7 +295,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -294,6 +304,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '业务类型', field: 'businessType', + isTable:false, sort: 'custom', table: { width: 150 @@ -302,6 +313,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '备注', field: 'remark', + isTable:false, sort: 'custom', table: { width: 150 @@ -310,6 +322,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -330,6 +343,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '创建者', field: 'creator', + isTable:false, sort: 'custom', table: { width: 150 @@ -338,6 +352,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '到库区代码范围', field: 'toAreaCodes', + isTable:false, sort: 'custom', table: { width: 150 @@ -348,7 +363,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -367,7 +382,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -386,7 +401,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -405,7 +420,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -424,7 +439,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -443,7 +458,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -462,7 +477,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -481,7 +496,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -500,7 +515,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -519,7 +534,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -628,6 +643,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '包装号', field: 'packingNumber', + sortTableDefault:1003, sort: 'custom', table: { width: 150 @@ -636,6 +652,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '器具号', field: 'containerNumber', + hiddenInMain:true, sort: 'custom', table: { width: 150 @@ -644,6 +661,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '批次', field: 'batch', + sortTableDefault:1002, sort: 'custom', table: { width: 150 @@ -704,6 +722,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ }, { label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { @@ -751,6 +770,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '物料代码', field: 'itemCode', + sortTableDefault:1000, sort: 'custom', table: { width: 150 @@ -759,6 +779,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '物料名称', field: 'itemName', + sortTableDefault:1001, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index 2e0f56b99..27f646072 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -25,8 +25,12 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '生产线代码', - field: 'productionPlanNumber', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 @@ -35,6 +39,15 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '车间代码', field: 'workshopCode', + isTable:false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '生产线代码', + field: 'productionPlanNumber', sort: 'custom', table: { width: 150 @@ -44,6 +57,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '班组', field: 'team', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -52,6 +66,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '班次', field: 'shift', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -62,6 +77,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, dictClass: 'string', + isTable:false, table: { width: 150 }, @@ -74,6 +90,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '到仓库代码', field: 'toWarehouseCode', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -86,6 +103,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', + isTable:false, table: { width: 180 }, @@ -101,6 +119,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '要求截止时间', field: 'requestDueTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -118,21 +137,10 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '过期时间', field: 'expiredTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -153,6 +161,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '最后更新时间', field: 'updateTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -173,23 +182,17 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '最后更新者', field: 'updater', + isTable:false, sort: 'custom', table: { width: 150 }, }, - // { - // label: '状态', - // field: 'jobStageStatus', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { label: '优先级', field: 'priority', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -201,6 +204,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '优先级增量', field: 'priorityIncrement', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -212,6 +216,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -219,6 +224,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '承接人', field: 'acceptUserId', + isTable:false, sort: 'custom', table: { width: 150 @@ -227,6 +233,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '承接时间', field: 'acceptTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -247,6 +254,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '完成人', field: 'completeUserId', + isTable:false, sort: 'custom', table: { width: 150 @@ -255,6 +263,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '完成时间', field: 'completeTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -275,9 +284,9 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', + isTable:false, dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 @@ -288,7 +297,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -297,6 +306,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '业务类型', field: 'businessType', + isTable:false, sort: 'custom', table: { width: 150 @@ -305,6 +315,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '备注', field: 'remark', + isTable:false, sort: 'custom', table: { width: 150 @@ -313,6 +324,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -333,6 +345,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '创建者', field: 'creator', + isTable:false, sort: 'custom', table: { width: 150 @@ -341,6 +354,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ { label: '到库区代码范围', field: 'toAreaCodes', + isTable:false, sort: 'custom', table: { width: 150 @@ -351,7 +365,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -370,7 +384,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -389,7 +403,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -408,7 +422,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -427,7 +441,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -446,7 +460,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -465,7 +479,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -484,7 +498,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -503,7 +517,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -522,7 +536,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -631,6 +645,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '包装号', field: 'packingNumber', + sortTableDefault:1003, sort: 'custom', table: { width: 150 @@ -639,6 +654,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '器具号', field: 'containerNumber', + hiddenInMain:true, sort: 'custom', table: { width: 150 @@ -647,6 +663,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '批次', field: 'batch', + sortTableDefault:1002, sort: 'custom', table: { width: 150 @@ -754,6 +771,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '物料代码', field: 'itemCode', + sortTableDefault:1000, sort: 'custom', table: { width: 150 @@ -762,6 +780,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '物料名称', field: 'itemName', + sortTableDefault:1001, sort: 'custom', table: { width: 150