From 0a7a2407f6bbc6f868bb7f6a9f7aaf7aa43c76b9 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 10 Feb 2025 09:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=87=87=E8=B4=AD=E6=96=B9=E5=BC=8F=EF=BC=88OA?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E3=80=81=E7=94=B5=E5=95=86=E9=87=87=E8=B4=AD?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 2 ++ src/views/eam/basic/item/item.data.ts | 21 ++++++++++++++ src/views/eam/basic/location/location.data.ts | 6 ++++ .../itemInLocation/itemInLocation.data.ts | 28 ------------------- .../itemOutLocation/itemOutLocation.data.ts | 19 ------------- 5 files changed, 29 insertions(+), 47 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index e198991..e4bda70 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -313,5 +313,7 @@ export enum DICT_TYPE { ITEM_OUT_IN_TYPE = 'item_out_in_type',//备件出入库类型 PUSH_STATUS = 'push_status',//推送状态 MOLD_TIME_SYNC_STATUS = 'mold_time_sync_status',//模具时间同步状态 + PURCHASE_WAY = 'purchase_way',//模具时间同步状态 + } diff --git a/src/views/eam/basic/item/item.data.ts b/src/views/eam/basic/item/item.data.ts index 4e95cfc..942a1e3 100644 --- a/src/views/eam/basic/item/item.data.ts +++ b/src/views/eam/basic/item/item.data.ts @@ -142,6 +142,27 @@ export const Item = useCrudSchemas(reactive([ type: 'Select' } }, + { + label: '采购方式', + field: 'purchaseWay', + sort: 'custom', + dictType: DICT_TYPE.PURCHASE_WAY, + dictClass: 'string', + isSearch: false, + isTable: true, + tableForm: { + type: 'Select' + } + }, + { + label: '物料类型', + field: 'itemType', + sort: 'custom', + isSearch: true, + table: { + width: 110, + }, + }, { label: '单价', field: 'singlePrice', diff --git a/src/views/eam/basic/location/location.data.ts b/src/views/eam/basic/location/location.data.ts index 4834ec0..d4dba5d 100644 --- a/src/views/eam/basic/location/location.data.ts +++ b/src/views/eam/basic/location/location.data.ts @@ -38,6 +38,12 @@ export const Location = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, + { + label: '备件编号', + field: 'itemNumber', + sort: 'custom', + isSearch: true, + }, { label: '库区编号', field: 'areaNumber', diff --git a/src/views/eam/item/itemInLocation/itemInLocation.data.ts b/src/views/eam/item/itemInLocation/itemInLocation.data.ts index 26c0112..88c235f 100644 --- a/src/views/eam/item/itemInLocation/itemInLocation.data.ts +++ b/src/views/eam/item/itemInLocation/itemInLocation.data.ts @@ -16,45 +16,30 @@ export const ItemInLocation = useCrudSchemas(reactive([ field: 'number', sort: 'custom', isSearch: true, - table: { - width: 150 - }, }, { label: '备件编号', field: 'itemNumber', sort: 'custom', isSearch: true, - table: { - width: 150 - }, }, { label: '备件名称', field: 'name', sort: 'custom', isSearch: true, - table: { - width: 180, - }, }, { label: '库位编号', field: 'locationNumber', sort: 'custom', isSearch: true, - table: { - width: 150 - }, }, { label: '规格型号', field: 'specifications', sort: 'custom', isTable: true, - table: { - width: 150 - }, }, { label: '类型', @@ -63,9 +48,6 @@ export const ItemInLocation = useCrudSchemas(reactive([ isSearch: false, dictType: DICT_TYPE.ITEM_OUT_IN_TYPE, dictClass: 'string', - table: { - width: 150 - }, form: { component: 'Select' }, @@ -75,9 +57,6 @@ export const ItemInLocation = useCrudSchemas(reactive([ field: 'qty', sort: 'custom', isSearch: false, - table: { - width: 150 - }, }, { label: '创建人', @@ -87,9 +66,6 @@ export const ItemInLocation = useCrudSchemas(reactive([ formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return userListAll.find((account) => account.id == cellValue)?.nickname }, - table: { - width: 150 - }, }, { label: '创建时间', @@ -97,9 +73,6 @@ export const ItemInLocation = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: true, - table: { - width: 150 - }, search: { component: 'DatePicker', componentProps: { @@ -115,7 +88,6 @@ export const ItemInLocation = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, fixed: 'right' } } diff --git a/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts b/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts index c15a94f..68f40e4 100644 --- a/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts +++ b/src/views/eam/item/itemOutLocation/itemOutLocation.data.ts @@ -14,27 +14,18 @@ export const ItemOutLocation = useCrudSchemas(reactive([ field: 'number', sort: 'custom', isSearch: true, - table: { - width: 180, - }, }, { label: '备件名称', field: 'name', sort: 'custom', isSearch: true, - table: { - width: 180, - }, }, { label: '库位编号', field: 'locationNumber', sort: 'custom', isSearch: true, - table: { - width: 180, - }, }, { label: '类型', @@ -46,18 +37,12 @@ export const ItemOutLocation = useCrudSchemas(reactive([ form: { component: 'Select' }, - table: { - width: 180, - }, }, { label: '数量', field: 'qty', sort: 'custom', isSearch: false, - table: { - width: 180, - }, }, { @@ -66,9 +51,6 @@ export const ItemOutLocation = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isTable: true, - table: { - width: 180, - }, isForm: false }, { @@ -76,7 +58,6 @@ export const ItemOutLocation = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, fixed: 'right' } }