diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts index f856e1a44..9629bcc5a 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts @@ -55,6 +55,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -77,6 +78,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -99,6 +101,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -151,6 +154,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, + }, { label: '承接时间', @@ -163,6 +168,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -191,6 +197,8 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, + }, { label: '完成时间', @@ -203,6 +211,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -367,6 +376,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -380,6 +390,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -398,6 +409,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -411,6 +423,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -429,6 +442,39 @@ export const ProductredressJobDetailRules = reactive({ }) export const ProductredressJobDetail = useCrudSchemas(reactive([ + + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '回收数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '包装号', field: 'packingNumber', @@ -438,8 +484,44 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ }, }, { - label: '批次', - field: 'batch', + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 @@ -489,22 +571,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ // }, // isForm: false // }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '物品描述1', field: 'itemDesc1', @@ -512,6 +579,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '物品描述2', @@ -520,6 +589,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '项目代码', @@ -528,40 +599,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '包装规格', - field: 'packUnit', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, + isTable:false, + hiddenInMain:true, }, // { // label: '单据号', @@ -571,24 +610,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '订单号', field: 'woNumber', @@ -596,6 +618,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '订单行', @@ -604,6 +628,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '备注', @@ -612,6 +638,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '创建者', @@ -620,6 +648,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '创建时间', @@ -632,6 +662,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -651,6 +683,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '最后更新时间', @@ -663,6 +697,8 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts index 7ad1d9b66..af0629dc4 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts @@ -43,6 +43,18 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ width: 180, }, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isForm:false, + isTable: true, + sort: 'custom', + table: { + width: 150 + } + }, // { // label: '生产计划单号', // field: 'productionPlanNumber', @@ -93,6 +105,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -115,6 +128,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -144,6 +158,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -166,6 +181,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -255,6 +271,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ field: 'creator', sort: 'custom', isForm: false, + isTable:false, table: { width: 150 }, @@ -270,6 +287,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -289,6 +307,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '最后更新时间', @@ -301,6 +320,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -323,13 +343,20 @@ export const ProductredressRecordDetailRules = reactive({ export const ProductredressRecordDetail = useCrudSchemas(reactive([ { - label: '包装号', - field: 'packingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { - width: 180 + width: 150 + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 }, - isForm: false, }, { label: '批次', @@ -341,62 +368,117 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( isForm: false, }, { - label: '物品代码', - field: 'itemCode', + label: '回收数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '包装规格', + field: 'packUnit', sort: 'custom', table: { width: 150 } }, { - label: '物品名称', - field: 'itemName', + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '库存状态', + field: 'inventoryStatus', + sort: 'custom', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + table: { + width: 150 + } + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '到库位组代码', + field: 'toLocationGroupCode', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain: true }, { - label: '物品描述2', - field: 'itemDesc2', + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain: true }, + + { - label: '项目代码', - field: 'projectCode', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain: true }, { - label: '数量', - field: 'qty', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain: true }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain: true }, { label: '生产日期', @@ -418,6 +500,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable:false, + hiddenInMain: true, isForm: false }, { @@ -431,6 +515,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable:false, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -442,64 +528,20 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( }, isForm: false }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '包装规格', - field: 'packUnit', - sort: 'custom', - table: { - width: 150 - } - }, + + { label: 'BOM版本', field: 'bomVersion', sort: 'custom', table: { width: 150 - } - }, - { - label: '库存状态', - field: 'inventoryStatus', - sort: 'custom', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - table: { - width: 150 - } - }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '到库位组代码', - field: 'toLocationGroupCode', - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '到库区代码', - field: 'toAreaCode', - sort: 'custom', - table: { - width: 150 - } + }, + isTable:false, + hiddenInMain: true, }, + + // { // label: '到货主代码', // field: 'toOwnerCode', @@ -514,7 +556,9 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( sort: 'custom', table: { width: 150 - } + }, + isTable:false, + hiddenInMain: true, }, { label: '创建者', @@ -524,6 +568,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, + hiddenInMain: true, }, { label: '创建时间', @@ -545,7 +591,9 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( valueFormat: 'x', } }, - isForm: false + isForm: false, + isTable:false, + hiddenInMain: true, }, { label: '最后更新者', @@ -555,6 +603,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, + hiddenInMain: true, }, { label: '最后更新时间', @@ -576,6 +626,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( valueFormat: 'x', } }, - isForm: false + isForm: false, + isTable:false, + hiddenInMain: true, } ])) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index b06172a41..b70dabe87 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -75,6 +75,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -97,6 +98,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -172,7 +174,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ isTable:false, }, { - label: '备注', + label: '原因', field: 'remark', sort: 'custom', isTable:false, @@ -216,6 +218,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ field: 'creator', sort: 'custom', isForm: false, + isTable: false, table: { width: 150 }, @@ -231,6 +234,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -250,6 +254,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '最后更新时间', @@ -262,6 +267,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -294,16 +300,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive // field: 'bomVersion', // sort: 'custom', // }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - isForm: false, - isTableForm: false, - }, + { label: '物料代码', field: 'itemCode', @@ -374,6 +371,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive }, isForm: false, isTableForm: false, + hiddenInMain:true, }, { label: '物品描述2', @@ -384,21 +382,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive }, isForm: false, isTableForm: false, + hiddenInMain:true, }, { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - isTableForm: false, - }, - { - label: '数量', - field: 'qty', + label: '批次', + field: 'batch', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -412,10 +402,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', + label: '回收数量', + field: 'qty', sort: 'custom', table: { width: 150 @@ -430,8 +418,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, { - label: '库位', - field: 'toLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 @@ -446,8 +434,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, { - label: '包装号', - field: 'packingNumber', + label: '包装规格', + field: 'packUnit', sort: 'custom', table: { width: 150 @@ -462,10 +450,9 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, { - label: '批次', - field: 'batch', + label: '包装数量', + field: 'packQty', sort: 'custom', - isSearch: true, table: { width: 150 }, @@ -479,8 +466,10 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, { - label: '包装数量', - field: 'packQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 @@ -495,8 +484,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, { - label: '包装规格', - field: 'packUnit', + label: '库存状态', + field: 'inventoryStatus', sort: 'custom', table: { width: 150 @@ -511,8 +500,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } }, { - label: '库存状态', - field: 'inventoryStatus', + label: '库位', + field: 'toLocationCode', sort: 'custom', table: { width: 150 @@ -526,6 +515,29 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } } }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTableForm: false, + hiddenInMain:true, + + },{ + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + isTableForm: false, + hiddenInMain:true, + }, + { label: '备注', field: 'remark', @@ -533,6 +545,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, + hiddenInMain:true }, { label: '创建者', @@ -543,6 +557,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isForm: false, + isTable:false, + hiddenInMain:true }, { label: '创建时间', @@ -555,6 +571,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive table: { width: 180 }, + isTable:false, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -574,6 +592,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, + hiddenInMain:true, isForm: false, isTableForm: false, }, @@ -588,6 +608,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive table: { width: 180 }, + isTable:false, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -600,11 +622,13 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, + { label: '操作', field: 'action', isForm: false, isTableForm: false, + hiddenInMain:true, table: { width: 150, fixed: 'right'