From 7c8a5ad94091b723f8e721cc51d141a814539342 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 26 Apr 2024 14:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7/?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7/=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E4=B8=BB=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 113 +++++++++++++----- .../productreceiptAssembleRequestMain.data.ts | 106 +++++++++++----- 2 files changed, 162 insertions(+), 57 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index b0c562826..2b2d3db60 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -67,6 +67,25 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, { label: '生产计划单号', field: 'productionPlanNumber', @@ -76,6 +95,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ }, isSearch: true, isForm: false, + isTable:false, }, { label: '车间代码', @@ -109,6 +129,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault: 1000, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -133,6 +154,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault: 1001, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -159,6 +181,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false }, { @@ -168,6 +191,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -175,11 +199,11 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -189,6 +213,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -204,6 +229,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ disabled: true } }, + isTable: false, isForm: false, }, { @@ -213,7 +239,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false + isTable: false, }, { label: '创建时间', @@ -235,6 +261,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -244,6 +271,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -266,6 +294,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -288,6 +317,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, }, { label: '部门', @@ -311,26 +341,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueField: 'id' } } - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - isForm:false, - sort: 'custom', - table: { - width: 150 }, - form: { - value: '1', - componentProps: { - disabled: true - } - } + isTable: false, }, { label: '最后更新时间', @@ -352,7 +364,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isForm: false + isForm: false, + isTable: false, }, { label: '最后更新者', @@ -361,14 +374,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + isForm: false, + isTable: false, }, { label: '自动提交', field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -382,14 +396,14 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ activeValue: 'TRUE', disabled: true } - } + }, }, { label: '自动通过', field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -403,14 +417,14 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ activeValue: 'TRUE', disabled: true } - } + }, }, { label: '自动执行', field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -632,6 +646,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, + isTable:false, isTableForm: false, isForm: false }, @@ -639,6 +655,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '器具号', field: 'containerNumber', sort: 'custom', + hiddenInMain:true, + isTable:false, table: { width: 150 }, @@ -650,8 +668,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', + hiddenInMain:true, table: { width: 150 }, @@ -662,6 +681,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '订单号', field: 'woNumber', sort: 'custom', + isTable: false, + hiddenInMain:true, table: { width: 150 }, @@ -672,6 +693,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '订单行', field: 'woLine', sort: 'custom', + isTable: false, + hiddenInMain:true, table: { width: 150 }, @@ -682,6 +705,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '包装数量', field: 'packQty', sort: 'custom', + isTable: false, + hiddenInMain:true, table: { width: 150 }, @@ -700,8 +725,9 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive field: 'packUnit', // dictType: DICT_TYPE.PACK_UNIT, // dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', + hiddenInMain:true, table: { width: 150 }, @@ -712,6 +738,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '到货主代码', field: 'toOwnerCode', sort: 'custom', + isTable: false, + hiddenInMain:true, table: { width: 150 }, @@ -722,6 +750,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '单据号', field: 'number', sort: 'custom', + isTable: false, + hiddenInMain:true, table: { width: 180 }, @@ -736,6 +766,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '物料代码', field: 'itemCode', sort: 'custom', + sortTableDefault:1003, table: { width: 150 }, @@ -786,6 +817,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + sortTableDefault:1004, tableForm: { isInpuFocusShow: true, searchListPlaceholder: '请选择Bom版本', // 输入框占位文本 @@ -830,6 +862,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '批次', field: 'batch', sort: 'custom', + sortTableDefault:1006, table: { width: 150 }, @@ -838,6 +871,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '物料名称', field: 'itemName', sort: 'custom', + sortTableDefault:1005, table: { width: 150 }, @@ -847,6 +881,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '物料描述1', field: 'itemDesc1', + hiddenInMain:true, + isTable: false, sort: 'custom', table: { width: 150 @@ -857,6 +893,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '物料描述2', field: 'itemDesc2', + hiddenInMain:true, + isTable: false, sort: 'custom', table: { width: 150 @@ -867,6 +905,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '项目代码', field: 'projectCode', + hiddenInMain:true, + isTable: false, sort: 'custom', table: { width: 150 @@ -878,6 +918,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '数量', field: 'qty', sort: 'custom', + sortTableDefault:1006, table: { width: 150 }, @@ -899,6 +940,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', + sortTableDefault:1007, isTable: true, sort: 'custom', table: { @@ -916,6 +958,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive detail: { dateFormat: 'YYYY-MM-DD' }, + sortTableDefault:1008, sort: 'custom', table: { width: 180 @@ -937,6 +980,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '过期日期', field: 'expireDate', + hiddenInMain:true, + isTable: false, formatter: dateFormatter2, detail: { dateFormat: 'YYYY-MM-DD' @@ -963,14 +1008,17 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '备注', field: 'remark', sort: 'custom', + isTable: false, table: { width: 150 }, + hiddenInMain:true, }, { label: '创建时间', field: 'createTime', formatter: dateFormatter, + sortTableDefault:1009, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -994,6 +1042,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '创建者', field: 'creator', sort: 'custom', + sortTableDefault:1010, table: { width: 150 }, @@ -1003,6 +1052,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '最后更新时间', field: 'updateTime', + isTable: false, + hiddenInMain:true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -1027,6 +1078,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '最后更新者', field: 'updater', sort: 'custom', + hiddenInMain:true, + isTable: false, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index b0c562826..b494d6f41 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -67,6 +67,25 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isForm: false, isSearch: true, }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, { label: '生产计划单号', field: 'productionPlanNumber', @@ -76,6 +95,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ }, isSearch: true, isForm: false, + isTable:false, }, { label: '车间代码', @@ -133,6 +153,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault: 1001, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -159,6 +180,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false }, { @@ -168,6 +190,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -175,11 +198,11 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -189,6 +212,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { @@ -204,6 +228,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ disabled: true } }, + isTable: false, isForm: false, }, { @@ -235,6 +260,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -244,6 +270,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false }, { @@ -266,6 +293,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, isForm: false }, { @@ -288,6 +316,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, }, { label: '部门', @@ -311,27 +340,10 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueField: 'id' } } - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - isForm:false, - sort: 'custom', - table: { - width: 150 }, - form: { - value: '1', - componentProps: { - disabled: true - } - } + isTable: false, }, + { label: '最后更新时间', field: 'updateTime', @@ -352,7 +364,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isForm: false + isForm: false, + isTable: false, }, { label: '最后更新者', @@ -361,14 +374,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isForm: false + isForm: false, + isTable: false, }, { label: '自动提交', field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -389,7 +403,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -410,7 +424,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -632,6 +646,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, + isTable:false, isTableForm: false, isForm: false }, @@ -642,6 +658,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, + isTable:false, isTableForm: false, isForm: false }, @@ -650,11 +668,12 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 }, + hiddenInMain:true, + isTable: false, isTableForm: false, isForm: false }, @@ -665,6 +684,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -675,6 +696,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -692,6 +715,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive precision: 6 }, }, + isTable: false, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -700,11 +725,12 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive field: 'packUnit', // dictType: DICT_TYPE.PACK_UNIT, // dictClass: 'string', - isTable: true, sort: 'custom', table: { width: 150 }, + isTable: false, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -715,6 +741,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, + hiddenInMain:true, isTableForm: false, isForm: false }, @@ -725,6 +753,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 180 }, + isTable: false, + hiddenInMain:true, isTableForm: false, form: { componentProps: { @@ -739,6 +769,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + sortTableDefault:1003, tableForm:{ isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', @@ -786,6 +817,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + sortTableDefault:1004, tableForm: { isInpuFocusShow: true, searchListPlaceholder: '请选择Bom版本', // 输入框占位文本 @@ -830,6 +862,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '批次', field: 'batch', sort: 'custom', + sortTableDefault:1006, table: { width: 150 }, @@ -837,6 +870,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '物料名称', field: 'itemName', + sortTableDefault:1005, sort: 'custom', table: { width: 150 @@ -847,6 +881,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '物料描述1', field: 'itemDesc1', + hiddenInMain:true, + isTable: false, sort: 'custom', table: { width: 150 @@ -857,6 +893,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '物料描述2', field: 'itemDesc2', + hiddenInMain:true, + isTable: false, sort: 'custom', table: { width: 150 @@ -867,6 +905,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '项目代码', field: 'projectCode', + hiddenInMain:true, + isTable: false, sort: 'custom', table: { width: 150 @@ -878,6 +918,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '数量', field: 'qty', sort: 'custom', + sortTableDefault:1006, table: { width: 150 }, @@ -898,6 +939,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '计量单位', field: 'uom', dictType: DICT_TYPE.UOM, + sortTableDefault:1007, dictClass: 'string', isTable: true, sort: 'custom', @@ -916,6 +958,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive detail: { dateFormat: 'YYYY-MM-DD' }, + sortTableDefault:1008, sort: 'custom', table: { width: 180 @@ -937,6 +980,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '过期日期', field: 'expireDate', + hiddenInMain:true, + isTable: false, formatter: dateFormatter2, detail: { dateFormat: 'YYYY-MM-DD' @@ -963,6 +1008,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive label: '备注', field: 'remark', sort: 'custom', + hiddenInMain:true, table: { width: 150 }, @@ -970,6 +1016,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '创建时间', field: 'createTime', + sortTableDefault:1009, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -993,6 +1040,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '创建者', field: 'creator', + sortTableDefault:1010, sort: 'custom', table: { width: 150 @@ -1003,6 +1051,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '最后更新时间', field: 'updateTime', + isTable: false, + hiddenInMain:true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -1030,6 +1080,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, + isTable: false, isTableForm: false, isForm: false },