diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 907eaef3e..af732e6da 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'predict', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -61,7 +79,6 @@ export const ProductionMain = useCrudSchemas(reactive([ // disabled: true // } // }, - isForm:false, isSearch: true, }, { @@ -78,7 +95,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '机台', + label: '车间', field: 'workshop', sort: 'custom', table: { @@ -101,6 +118,15 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, + { + label: '机台', + field: 'abc', + sort: 'custom', + table: { + width: 150 + }, + isForm: true + }, { label: '生产线', field: 'productionLine', @@ -131,8 +157,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -141,11 +167,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -155,8 +181,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -165,11 +191,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -186,6 +212,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -195,6 +222,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -208,6 +236,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -229,6 +258,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -250,6 +280,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -267,6 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { value: 'ProductReceipt', componentProps: { @@ -275,24 +307,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'predict', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -307,7 +322,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -326,7 +341,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -347,7 +362,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -368,7 +383,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -478,6 +493,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -491,6 +507,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -509,6 +526,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -522,6 +540,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -634,6 +653,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -682,8 +709,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -691,25 +718,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -726,26 +767,38 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + isTableForm: false, + isForm: false, }, { label: '创建时间', @@ -758,6 +811,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -771,49 +825,55 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + hiddenInMain: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, }, { label: '最后更新时间', @@ -826,6 +886,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -845,35 +906,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, + { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 87e117682..42815a1fb 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'assemble', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -61,7 +79,6 @@ export const ProductionMain = useCrudSchemas(reactive([ // disabled: true // } // }, - isForm:false, isSearch: true, }, { @@ -131,8 +148,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -141,11 +158,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -155,8 +172,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -165,11 +182,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -186,6 +203,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -195,6 +213,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -208,6 +227,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -229,6 +249,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -250,6 +271,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -267,6 +289,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { value: 'ProductReceipt', componentProps: { @@ -275,24 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'assemble', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -307,7 +313,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -326,7 +332,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -347,7 +353,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -368,7 +374,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -478,6 +484,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -491,6 +498,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -509,6 +517,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -522,6 +531,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -634,6 +644,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -682,8 +700,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -691,25 +709,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -726,26 +758,38 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + isTableForm: false, + isForm: false, + hiddenInMain: true, }, { label: '创建时间', @@ -758,6 +802,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -771,49 +816,56 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + hiddenInMain: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, + }, { label: '最后更新时间', @@ -826,6 +878,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -845,35 +898,10 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 0fdb4e951..08b6d9f17 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'assembleSparePart', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -130,8 +148,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -140,11 +158,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -154,8 +172,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -164,11 +182,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -185,6 +203,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -194,6 +213,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -207,6 +227,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -228,6 +249,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -249,6 +271,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -272,26 +295,10 @@ export const ProductionMain = useCrudSchemas(reactive([ disabled: true } }, + isTable: false, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'assembleSparePart', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -306,7 +313,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -325,7 +332,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -346,7 +353,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -367,7 +374,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -477,6 +484,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -490,6 +498,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -508,6 +517,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -521,6 +531,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -633,6 +644,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -681,8 +700,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -690,25 +709,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -725,26 +758,38 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + isTableForm: false, + isForm: false, }, { label: '创建时间', @@ -757,6 +802,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -770,49 +816,55 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + hiddenInMain: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, }, { label: '最后更新时间', @@ -825,6 +877,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -844,35 +897,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, + { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 4121421c6..a8d893c0a 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -44,6 +44,24 @@ export const ProductionMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '计划类型', + field: 'planType', + dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value: 'predictSparePart', + componentProps: { + disabled: true + } + } + }, { label: '状态', field: 'status', @@ -61,7 +79,6 @@ export const ProductionMain = useCrudSchemas(reactive([ // disabled: true // } // }, - isForm:false, isSearch: true, }, { @@ -78,7 +95,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '机台', + label: '车间', field: 'workshop', sort: 'custom', table: { @@ -131,8 +148,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班次', - field: 'shift', + label: '班组', + field: 'team', sort: 'custom', table: { width: 150 @@ -141,11 +158,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班次', + searchListPlaceholder: '请选择班组', searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, + searchTitle: '班组信息', + searchAllSchemas: Team.allSchemas, + searchPage: TeamApi.getTeamPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -155,8 +172,8 @@ export const ProductionMain = useCrudSchemas(reactive([ } }, { - label: '班组', - field: 'team', + label: '班次', + field: 'shift', sort: 'custom', table: { width: 150 @@ -165,11 +182,11 @@ export const ProductionMain = useCrudSchemas(reactive([ // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, - searchListPlaceholder: '请选择班组', + searchListPlaceholder: '请选择班次', searchField: 'code', - searchTitle: '班组信息', - searchAllSchemas: Team.allSchemas, - searchPage: TeamApi.getTeamPage, + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, searchCondition:[{ key: 'available', value: 'TRUE', @@ -178,6 +195,7 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, + { label: '物料代码', field: 'detailItemCode', @@ -186,6 +204,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -195,6 +214,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -208,6 +228,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 120 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -229,6 +250,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -250,6 +272,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1000, form: { component: 'DatePicker', componentProps: { @@ -267,6 +290,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { value: 'ProductReceipt', componentProps: { @@ -275,24 +299,7 @@ export const ProductionMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '计划类型', - field: 'planType', - dictType: DICT_TYPE.PLAN_PRODUCTION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Select', - value: 'predictSparePart', - componentProps: { - disabled: true - } - } - }, + { label: '备注', field: 'remark', @@ -307,7 +314,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -326,7 +333,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -347,7 +354,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -368,7 +375,7 @@ export const ProductionMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -478,6 +485,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -491,6 +499,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -509,6 +518,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -522,6 +532,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -634,6 +645,14 @@ export const ProductionDetail = useCrudSchemas(reactive([ }], }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, { label: 'Bom版本', field: 'bomVersion', @@ -682,8 +701,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, }, { - label: '合格数量', - field: 'goodQty', + label: '计划数量', + field: 'planQty', sort: 'custom', table: { width: 150 @@ -691,25 +710,39 @@ export const ProductionDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - min: 1, + min: 0, precision: 6 } }, tableForm: { type: 'InputNumber', - min: 1, + min: 0, precision: 6 }, - isTableForm: false, - isForm: false }, { - label: '不合格数量', - field: 'notGoodQty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select' + } + }, + { + label: '合格数量', + field: 'goodQty', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -726,27 +759,40 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', + label: '不合格数量', + field: 'notGoodQty', sort: 'custom', table: { - width: 180 + width: 150 }, - isTableForm: false, + hiddenInMain: true, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } - } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false }, { - label: '备注', - field: 'remark', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + hiddenInMain: true, + isTableForm: false, + isForm: false, }, + { label: '创建时间', field: 'createTime', @@ -758,6 +804,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -771,49 +818,55 @@ export const ProductionDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isSearch: true, + isTable: true, + hiddenInMain: true, sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + tableForm: { + type: 'Select', + default: 'TRUE' + }, + // isTableForm: false, + // isForm: false }, { - label: '计划数量', - field: 'planQty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, + isTable: false, + isTableForm: false, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6 + disabled: true } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - }, + } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm:{ - type: 'Select' - } + isTable: false, }, { label: '最后更新时间', @@ -826,6 +879,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -845,35 +899,10 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false, }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - tableForm: { - type: 'Select', - default: 'TRUE' - }, - // isTableForm: false, - // isForm: false - }, { label: '操作', hiddenInMain:true, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index fdc79bef9..a4002349f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -16,7 +16,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ isSearch: true }, { - label: '申请单号', + label: '申请单据号', field: 'requestNumber', sort: 'custom', table: { @@ -40,6 +40,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '车间代码', @@ -48,6 +49,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班组', @@ -56,6 +58,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班次', @@ -64,6 +67,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '收货类型', @@ -74,6 +78,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -83,6 +88,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -91,6 +97,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '执行时间', @@ -103,6 +110,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -123,6 +131,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -144,6 +153,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -164,6 +174,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -180,13 +191,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -199,6 +211,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -207,6 +220,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -215,6 +229,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -223,6 +238,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -251,13 +267,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -270,6 +287,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', @@ -277,7 +295,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -371,147 +389,129 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '包装号', - field: 'packingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '批次', - field: 'batch', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - }, - { - label: '过期日期', - field: 'expireDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } + width: 150 }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '包装规格', + field: 'packUnit', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到库位组代码', - field: 'toLocationGroupCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到库区代码', - field: 'toAreaCode', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '订单号', - field: 'woNumber', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '订单行', - field: 'woLine', + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, sort: 'custom', table: { - width: 150 + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } }, }, { - label: '包装数量', - field: 'packQty', + label: '目标库位', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '包装规格', - field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -526,102 +526,134 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, + isTable: false }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, }, + { - label: '创建者', - field: 'creator', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, + isTable: false, + }, + { - label: '物料名称', - field: 'itemName', + label: '到库位组代码', + field: 'toLocationGroupCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '物料描述1', - field: 'itemDesc1', + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '物料描述2', - field: 'itemDesc2', + label: '订单号', + field: 'woNumber', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '项目代码', - field: 'projectCode', + label: '订单行', + field: 'woLine', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '数量', - field: 'qty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '创建时间', + field: 'createTime', + 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: 'creator', sort: 'custom', table: { width: 150 }, + isTable: false, }, // { // label: '任务明细ID', @@ -644,7 +676,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 0de0fb58e..cda78051b 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -40,6 +40,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '车间代码', @@ -48,6 +49,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '班组', @@ -56,6 +58,8 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, + }, { label: '班次', @@ -64,6 +68,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '收货类型', @@ -77,6 +82,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ tableForm: { disabled: true }, + isTable: false, isForm: false }, { @@ -86,6 +92,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -94,6 +101,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '执行时间', @@ -106,6 +114,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -126,6 +135,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -147,6 +157,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -167,6 +178,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -183,13 +195,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -202,6 +215,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -210,6 +224,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -218,6 +233,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -230,6 +246,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -254,13 +271,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -273,6 +291,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', @@ -280,7 +299,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -374,16 +393,32 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '包装号', - field: 'packingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 @@ -397,6 +432,67 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '包装规格', + field: 'packUnit', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '器具号', + field: 'containerNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, { label: '生产日期', field: 'produceDate', @@ -418,6 +514,30 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '过期日期', field: 'expireDate', @@ -429,6 +549,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -439,17 +560,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '到货主代码', field: 'toOwnerCode', @@ -457,15 +568,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, - { - label: '到库位代码', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '到库位组代码', field: 'toLocationGroupCode', @@ -473,6 +578,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到库区代码', @@ -481,6 +587,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单号', @@ -489,6 +596,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单行', @@ -497,6 +605,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '包装数量', @@ -505,37 +614,13 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } }, - { - label: '包装规格', - field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, + + { label: '备注', field: 'remark', @@ -543,6 +628,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -555,6 +641,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -571,60 +658,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, + isTable: false, }, // { // label: '任务明细ID', @@ -647,7 +681,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -662,6 +696,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150, fixed: 'right' }, + hiddenInMain: true, isTableForm:false, } ])) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts index 6c3fc3bcf..ddab2a7b8 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts @@ -40,6 +40,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '车间代码', @@ -48,6 +49,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班组', @@ -56,6 +58,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '班次', @@ -64,6 +67,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '出库事务类型', @@ -72,6 +76,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '入库事务类型', @@ -80,6 +85,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '执行时间', @@ -92,6 +98,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -112,6 +119,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -133,6 +141,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -153,6 +162,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -169,13 +179,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '接口类型', field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -188,6 +199,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -196,6 +208,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -204,6 +217,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -216,6 +230,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -240,13 +255,14 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区类型范围', field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -259,6 +275,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '是否可用', @@ -266,7 +283,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -360,16 +377,32 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '包装号', - field: 'packingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 @@ -383,6 +416,58 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '包装规格', + field: 'packUnit', + // dictType: DICT_TYPE.PACK_UNIT, + // dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '生产日期', field: 'produceDate', @@ -404,6 +489,30 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, + { + label: '目标库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '项目', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '过期日期', field: 'expireDate', @@ -415,6 +524,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -426,32 +536,36 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, + isTable: false, + form: { + component: 'InputNumber', + } }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, + isTable: false, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, + isTable: false, }, + { label: '到库位组代码', field: 'toLocationGroupCode', @@ -459,6 +573,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '到库区代码', @@ -467,6 +582,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单号', @@ -475,6 +591,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '订单行', @@ -483,44 +600,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, - }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '包装规格', - field: 'packUnit', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, + isTable: false, }, { label: '备注', @@ -529,6 +609,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -541,6 +622,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -557,61 +639,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { // label: '任务明细ID', // field: 'jobDetailId', @@ -633,7 +663,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -648,6 +678,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150, fixed: 'right' }, + hiddenInMain:true, isTableForm:false, } ]))