diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index 530508ffc..37126a53c 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -13,58 +13,44 @@ export const IssueJobMain = useCrudSchemas(reactive([ width: 180, fixed: 'left' }, + sortSearchDefault:1, isSearch: true, }, { label: '申请单号', field: 'requestNumber', sort: 'custom', - isSearch: true, table: { width: 180 }, + isTable: false, }, { - label: '车间代码', - field: 'workShopCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到仓库代码', - field: 'toWarehouseCode', + label: '供应商代码', + field: 'supplierCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '生产线代码', - field: 'detailProductionLineCode', + label: '车间代码', + field: 'workShopCode', sort: 'custom', - isSearch: true, table: { width: 150 }, + isTable: false, }, { - label: '工位代码', - field: 'detailWorkStationCode', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', - isSearch: true, table: { width: 150 }, + isTable: false, }, { label: '申请时间', @@ -77,6 +63,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -105,6 +92,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, }, { label: '过期时间', @@ -117,6 +105,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -126,6 +115,48 @@ export const IssueJobMain = useCrudSchemas(reactive([ } }, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1, + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '生产线代码', + field: 'detailProductionLineCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + isTable: false, + }, + { + label: '工位代码', + field: 'detailWorkStationCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + isTable: false, + }, + { label: '最后更新时间', field: 'updateTime', @@ -137,6 +168,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -153,18 +185,10 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '优先级', field: 'priority', @@ -172,6 +196,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -183,6 +208,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -194,6 +220,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承接人用户名', @@ -202,6 +229,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承接时间', @@ -214,6 +242,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -230,6 +259,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '完成时间', @@ -242,6 +272,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -256,7 +287,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -267,7 +298,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -280,6 +311,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -288,6 +320,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -300,6 +333,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -316,6 +350,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区代码范围', @@ -324,6 +359,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -332,17 +368,18 @@ export const IssueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '使用在途库', field: 'useOnTheWayLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 }, + isTable: false, form: { component: 'Switch', value: 'TRUE', @@ -357,7 +394,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -376,7 +413,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -395,7 +432,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -414,7 +451,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -433,7 +470,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -452,7 +489,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -471,7 +508,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -490,7 +527,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -509,7 +546,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -528,7 +565,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -620,6 +657,8 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '工位代码', @@ -628,138 +667,155 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '在途库库位', + field: 'onTheWayLocationCode', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { - label: '在途库库位', - field: 'onTheWayLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, + isSearch: true, + sortTableDefault:5, }, { - label: '包装号', - field: 'packingNumber', + label: '包装规格', + field: 'packUnit', sort: 'custom', table: { width: 150 }, + sortTableDefault:5, }, { - label: '器具号', - field: 'containerNumber', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + }, + sortTableDefault:5, }, { - label: '批次', - field: 'batch', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + isTable:false, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, + isSearch: true, + sortSearchDefault:3, + sortTableDefault:4, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '物料代码', - field: 'itemCode', + label: '采购订单号', + field: 'poNumber', sort: 'custom', table: { width: 150 }, + sortTableDefault:2, }, { - label: '物料名称', - field: 'itemName', + label: '订单行', + field: 'poLine', sort: 'custom', table: { width: 150 }, + sortTableDefault:2, }, { - label: '物料描述1', - field: 'itemDesc1', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, + isSearch: true, }, { - label: '物料描述2', - field: 'itemDesc2', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, + isSearch: true, }, { - label: '包装数量', - field: 'packQty', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } + sortSearchDefault:2, + isSearch: true, + sortTableDefault:3, }, { - label: '包装规格', - field: 'packUnit', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, + sortTableDefault:3, }, { - label: '供应商计量数量', - field: 'supplierQty', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } + hiddenInMain: true, }, { - label: '供应商计量单位', - field: 'supplierUom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, }, { label: '项目代码', @@ -768,6 +824,7 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '数量', @@ -778,7 +835,8 @@ export const IssueJobDetail = useCrudSchemas(reactive([ }, form: { component: 'InputNumber', - } + }, + hiddenInMain: true, }, { label: '计量单位', @@ -790,6 +848,7 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:6, }, { label: '单据号', @@ -798,6 +857,7 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, }, { label: '备注', @@ -806,6 +866,25 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, }, { label: '创建时间', @@ -818,6 +897,7 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -834,23 +914,35 @@ export const IssueJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '供应商计量数量', + field: 'supplierQty', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain: true, + form: { + component: 'InputNumber', + } }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '供应商计量单位', + field: 'supplierUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, + + ])) //表单校验 diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index eb4fe8576..68a181041 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -62,6 +62,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -91,6 +92,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1, form: { value: '1', componentProps: { @@ -109,6 +111,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -130,6 +133,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -146,7 +150,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -158,7 +162,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -172,6 +176,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false }, { @@ -181,6 +186,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false }, { @@ -190,6 +196,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -214,6 +221,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { componentProps: { disabled: true @@ -227,6 +235,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { value: 'Issue', componentProps: { @@ -243,6 +252,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name }, @@ -274,7 +284,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -293,7 +303,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, isForm:false, sort: 'custom', table: { @@ -315,7 +325,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isForm:false, - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -336,7 +346,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isForm:false, - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -383,6 +393,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -400,6 +411,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -413,6 +425,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -430,6 +443,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -441,7 +455,25 @@ export const IssueRequestMain = useCrudSchemas(reactive([ width: 200, fixed: 'right' }, - } + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:7, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:8, + }, ])) export const IssueRequestMainRules = reactive({ @@ -470,6 +502,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 @@ -517,6 +551,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', // 输入框占位文本 @@ -564,9 +600,9 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:6, isTableForm: false, isForm: false, - isTable: false }, { label: '器具号', @@ -575,9 +611,11 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false, - isTable: false + isTable: false, + }, { label: '批次', @@ -586,6 +624,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:5, + sortSearchDefault:3, isTableForm: false, isForm: false }, @@ -602,6 +642,15 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + }, { label: '到库位代码', field: 'toLocationCode', @@ -609,6 +658,9 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + sortSearchDefault:6, + sortTableDefault:1100, isTableForm: false, isForm: false }, @@ -619,6 +671,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortSearchDefault:2, + sortTableDefault:3, tableForm:{ isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 @@ -650,66 +704,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ } } }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 6 - } - } - }, + + { label: '计量单位', field: 'uom', @@ -720,6 +716,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:9, tableForm:{ type: 'Select', disabled: true @@ -731,24 +728,22 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ } }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '采购订单号', + field: 'poNumber', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false + sortTableDefault:1, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '订单行', + field: 'poLine', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false + sortTableDefault:2, }, { label: '单据号', @@ -758,6 +753,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ width: 180 }, isTableForm: false, + hiddenInMain:true, form: { componentProps: { disabled: true @@ -771,6 +767,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, }, { label: '创建时间', @@ -791,6 +788,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -801,6 +799,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -823,6 +822,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable:false, + hiddenInMain:true, isTableForm: false, isForm: false, }, @@ -833,6 +834,95 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:4, + isTableForm: false, + isForm: false + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + } + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, isTableForm: false, isForm: false }, diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts index 961dcab60..7aa47aac0 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -22,6 +22,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, isSearch: true, }, { @@ -31,6 +32,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从仓库代码', @@ -39,6 +41,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -47,6 +50,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '申请时间', @@ -59,6 +63,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -79,6 +84,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -99,6 +105,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1, }, { label: '过期时间', @@ -107,6 +114,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -127,6 +135,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -143,6 +152,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, // { // label: '状态', @@ -159,6 +169,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -170,6 +181,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -181,6 +193,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承接人', @@ -189,6 +202,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承接时间', @@ -201,6 +215,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -217,6 +232,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '完成时间', @@ -229,6 +245,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -243,7 +260,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -254,7 +271,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -267,6 +284,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -275,6 +293,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -287,6 +306,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -303,6 +323,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区代码范围', @@ -311,6 +332,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -319,6 +341,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '使用在途库', @@ -326,7 +349,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -345,7 +368,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -364,7 +387,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -383,7 +406,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -402,7 +425,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -421,7 +444,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -440,7 +463,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -459,7 +482,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -478,7 +501,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -497,7 +520,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -516,7 +539,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -572,6 +595,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '工位代码', @@ -580,6 +605,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '在途库库位', @@ -588,6 +615,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, + hiddenInMain:true, }, { label: '包装号', @@ -596,6 +625,26 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + isSearch: true, + sortTableDefault:5, + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, }, { label: '器具号', @@ -604,6 +653,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain: true, + isTable:false, }, { label: '批次', @@ -612,6 +663,9 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + isSearch: true, + sortSearchDefault:3, + sortTableDefault:4, }, { label: '库存状态', @@ -624,6 +678,24 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:2, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:2, + }, { label: '从库位代码', field: 'fromLocationCode', @@ -631,6 +703,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + isSearch: true, }, { label: '到库位代码', @@ -639,6 +712,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + isSearch: true, }, { label: '物料代码', @@ -647,6 +721,9 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + sortSearchDefault:2, + isSearch: true, + sortTableDefault:3, }, { label: '物料名称', @@ -655,6 +732,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:3, }, { label: '物料描述1', @@ -663,6 +741,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain: true, }, { label: '物料描述2', @@ -671,6 +750,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain: true, }, { label: '项目代码', @@ -679,6 +759,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain: true, }, { label: '数量', @@ -689,7 +770,8 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( }, form: { component: 'InputNumber', - } + }, + hiddenInMain: true, }, { label: '计量单位', @@ -701,6 +783,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:6, }, { label: '单据号', @@ -709,6 +792,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 180 }, + hiddenInMain: true, }, { label: '备注', @@ -717,6 +801,25 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain: true, + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, }, { label: '创建时间', @@ -729,6 +832,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -745,23 +849,9 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( table: { width: 150 }, + hiddenInMain: true, }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, + ])) //表单校验 diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index 81d9c430d..07e268b41 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -13,6 +13,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ width: 180, fixed: 'left' }, + sortSearchDefault:1, isSearch: true, }, { @@ -22,19 +23,25 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isSearch: true, + isTable: false, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '供应商代码', + field: 'supplierCode', sort: 'custom', table: { width: 150 }, + isTable: false, + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false }, { label: '申请时间', @@ -47,6 +54,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -67,6 +75,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -95,6 +104,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -104,6 +114,19 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ } }, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1, + }, { label: '优先级', field: 'priority', @@ -111,10 +134,10 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', }, - isTable:false }, { label: '优先级增量', @@ -123,35 +146,58 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', }, - isTable:false }, { - label: '业务类型', - field: 'businessType', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '备注', - field: 'remark', + label: '承接时间', + field: 'acceptTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '业务类型', + field: 'businessType', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '从仓库代码', - field: 'fromWarehouseCode', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isTable: false + isTable: false, }, { label: '到仓库代码', @@ -167,7 +213,6 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isSearch: true, isTable: false, sort: 'custom', table: { @@ -393,14 +438,6 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ } } }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '承接人用户名', field: 'acceptUserId', @@ -408,26 +445,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - }, - { - label: '承接时间', - field: 'acceptTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, + isTable: false, }, { label: '完成人用户名', @@ -436,6 +454,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '完成时间', @@ -448,6 +467,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -464,6 +484,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '来源库位', @@ -472,6 +493,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '目标库位', @@ -480,6 +502,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '数量', @@ -488,6 +511,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '单位', @@ -499,6 +523,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -507,6 +532,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '创建时间', @@ -519,6 +546,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -535,6 +563,8 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '最后更新时间', @@ -547,6 +577,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -634,6 +665,26 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, + sortTableDefault:5, + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, }, { label: '器具号', @@ -642,6 +693,8 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, + isTable:false, }, { label: '批次', @@ -650,6 +703,8 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortSearchDefault:3, + sortTableDefault:4, }, { label: '库存状态', @@ -662,6 +717,24 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:2, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:2, + }, { label: '从库位代码', field: 'fromLocationCode', @@ -669,6 +742,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, }, { label: '到库位代码', @@ -677,6 +751,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, }, { label: '物料代码', @@ -685,6 +760,9 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortSearchDefault:2, + isSearch: true, + sortTableDefault:3, }, { label: '物料名称', @@ -693,6 +771,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:3, }, { label: '物料描述1', @@ -701,6 +780,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '物料描述2', @@ -709,6 +789,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '项目代码', @@ -717,6 +798,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '数量', @@ -727,7 +809,8 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ }, form: { component: 'InputNumber', - } + }, + hiddenInMain: true, }, { label: '计量单位', @@ -739,6 +822,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:6, }, { label: '单据号', @@ -747,6 +831,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, }, { label: '备注', @@ -755,6 +840,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '从货主代码', @@ -763,6 +849,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '到货主代码', @@ -771,6 +858,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '创建时间', @@ -783,6 +871,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -799,6 +888,7 @@ export const RepleinshJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, ])) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index c27fc759c..55ec5f36c 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -45,6 +45,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ }, isForm: false, isSearch: true, + sortSearchDefault:1, }, { label: '状态', @@ -55,6 +56,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ isForm:false, isTable: true, sort: 'custom', + sortTableDefault:1, table: { width: 150 }, @@ -70,7 +72,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -83,7 +85,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -97,6 +99,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -106,6 +109,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -119,6 +123,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -141,6 +146,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -159,6 +165,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userDeptArray.find((account) => account.id == cellValue)?.name }, @@ -182,6 +189,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { value: 'Repleinment', componentProps: { @@ -206,6 +214,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -230,6 +239,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { componentProps: { disabled: true @@ -241,7 +251,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -263,7 +273,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isForm:false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -284,7 +294,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isForm:false, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -330,6 +340,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -347,6 +358,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -360,6 +372,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain:true, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -378,6 +392,8 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, + isTable: false, isForm: false, }, { @@ -389,7 +405,25 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ width: 300, fixed: 'right' }, - } + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:7, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:8, + }, ])) //表单校验 @@ -440,6 +474,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, + sortSearchDefault:6, + sortTableDefault:1100, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -470,6 +507,60 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }] }, }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isSearch: true, + sortTableDefault:6, + sortSearchDefault:4, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortTableDefault:5, + sortSearchDefault:3, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + form: { + value: 'OK', + componentProps: { + disabled: true + } + }, + table: { + width: 150 + }, + tableForm: { + type: 'Select', + default: 'OK', + disabled: true + } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '单据号', field: 'number', @@ -477,6 +568,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain:true, isTableForm: false, form: { componentProps: { @@ -491,6 +583,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:3, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -528,6 +621,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, }, { label: '创建时间', @@ -540,6 +634,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -559,6 +654,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -569,6 +665,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:4, isTableForm: false, isForm: false, }, @@ -579,6 +676,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false, }, @@ -589,6 +687,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false, }, @@ -599,6 +698,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, isTableForm: false, isForm: false, }, @@ -609,6 +709,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain:true, form: { component: 'InputNumber', componentProps: { @@ -632,6 +733,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:9, tableForm: { type: 'Select', disabled: true @@ -643,27 +745,24 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ } }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '采购订单号', + field: 'poNumber', sort: 'custom', - form: { - value: 'OK', - componentProps: { - disabled: true - } + table: { + width: 150 }, + sortTableDefault:1, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', table: { width: 150 }, - tableForm: { - type: 'Select', - default: 'OK', - disabled: true - } + sortTableDefault:2, }, + { label: '从货主代码', field: 'fromOwnerCode', @@ -673,6 +772,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }, isTableForm: false, isForm: false, + hiddenInMain:true, }, { label: '到货主代码', @@ -683,6 +783,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }, isTableForm: false, isForm: false, + hiddenInMain:true, }, { label: '最后更新时间', @@ -695,6 +796,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -704,6 +806,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -715,6 +818,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ width: 150 }, isTableForm: false, + hiddenInMain:true, isForm: false }, { diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index 5d44addc2..c3a8be664 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -308,12 +308,12 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ field: 'status', dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', - isTable: false, isForm:false, sort: 'custom', table: { width: 150 }, + sortTableDefault:1, form: { value: '1', componentProps: { @@ -444,6 +444,7 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isSearch: true, sortSearchDefault:6, sortTableDefault:1100,