From 3bafe325b1e9255a4af90beaa6736b94dfacf1dd Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 4 Jul 2024 17:36:15 +0800 Subject: [PATCH] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=20=E7=82=B9=E6=A3=80=20=E4=BF=9D=E5=85=BB=20=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=20=E9=97=AE=E9=A2=98=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/disposition/defaultButtons.ts | 4 ++-- .../equipmentAccounts/equipmentAccounts.data.ts | 8 +++++++- src/views/eam/equipmentAccounts/index.vue | 16 +++++++++++++++- .../equipmentSigning/equipmentSigning.data.ts | 9 ++++++--- src/views/eam/equipmentSigning/index.vue | 4 ++-- src/views/eam/equipmentTransferRecord/index.vue | 6 +++--- 6 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 145a6d9fb..896e1b77c 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -1154,7 +1154,7 @@ export function mainCopyBtn(option:any) { // 主列表-部件 export function componentBtn(option:any) { return __defaultBtnOption(option,{ - label: '部件', + label: '关联部件', name: 'component', hide: false, type: 'primary', @@ -1166,7 +1166,7 @@ export function componentBtn(option:any) { // 主列表-备件 export function sparePartBtn(option:any) { return __defaultBtnOption(option,{ - label: '备件', + label: '关联备件', name: 'sparePart', hide: false, type: 'primary', diff --git a/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts b/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts index e8e9609dd..2c9115f5e 100644 --- a/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts +++ b/src/views/eam/equipmentAccounts/equipmentAccounts.data.ts @@ -62,6 +62,12 @@ export const EquipmentAccounts = useCrudSchemas(reactive([ sort: 'custom', isSearch: false }, + { + label: '出厂编号', + field: 'factoryCode', + sort: 'custom', + isSearch: false + }, { label: '设备类型', field: 'type', @@ -625,7 +631,7 @@ export const EquipmentAccounts = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 150, + width: 200, fixed: 'right' } } diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue index 08cac0893..e17ae39a8 100644 --- a/src/views/eam/equipmentAccounts/index.vue +++ b/src/views/eam/equipmentAccounts/index.vue @@ -33,7 +33,7 @@ @@ -250,6 +250,20 @@ const openForm = async (type: string, row?: any) => { row.lineName = productionlineNoPage?.find(item=>item.code == row.lineCode)?.name row.manufactureName = equipmentManufacturerNoPage?.find(item=>item.number == row.manufactureCode)?.name row.supplierName = equipmentSupplierNoPage?.find(item=>item.number == row.supplierCode)?.name + + EquipmentAccounts.allSchemas.formSchema.forEach((item) => { + if (item.field == 'status') { + item.componentProps.disabled = false + + } + }) + }else{ + EquipmentAccounts.allSchemas.formSchema.forEach((item) => { + if (item.field == 'status') { + item.componentProps.disabled = true + item.value = 'TOACCEPT' + } + }) } basicFormRef.value.open(type, row) } diff --git a/src/views/eam/equipmentSigning/equipmentSigning.data.ts b/src/views/eam/equipmentSigning/equipmentSigning.data.ts index 2eb131ff6..b5d9eb86c 100644 --- a/src/views/eam/equipmentSigning/equipmentSigning.data.ts +++ b/src/views/eam/equipmentSigning/equipmentSigning.data.ts @@ -136,19 +136,22 @@ export const EquipmentSigning = useCrudSchemas(reactive([ label: '供应商编号', field: 'supplierCode', sort: 'custom', - isSearch: true + isSearch: true, + isForm: false }, { label: '供应商联系人', field: 'supplierPeople', sort: 'custom', - isSearch: true + isSearch: true, + isForm: false }, { label: '供应商联系方式', field: 'supplierTelephone', sort: 'custom', - isSearch: false + isSearch: false, + isForm: false, }, // { // label: '流程状态', diff --git a/src/views/eam/equipmentSigning/index.vue b/src/views/eam/equipmentSigning/index.vue index d2968ff35..479a60349 100644 --- a/src/views/eam/equipmentSigning/index.vue +++ b/src/views/eam/equipmentSigning/index.vue @@ -140,8 +140,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-signing:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-signing:delete'}), // 删除 + // defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-signing:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-signing:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/equipmentTransferRecord/index.vue b/src/views/eam/equipmentTransferRecord/index.vue index e1b220f06..c3fd5c72e 100644 --- a/src/views/eam/equipmentTransferRecord/index.vue +++ b/src/views/eam/equipmentTransferRecord/index.vue @@ -113,7 +113,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-transfer-record:create'}), // 新增 + //defaultButtons.defaultAddBtn({hasPermi:'eam:equipment-transfer-record:create'}), // 新增 // defaultButtons.defaultImportBtn({hasPermi:'eam:equipment-transfer-record:import'}), // 导入 // defaultButtons.defaultExportBtn({hasPermi:'eam:equipment-transfer-record:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 @@ -147,8 +147,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-transfer-record:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-transfer-record:delete'}), // 删除 + //defaultButtons.mainListEditBtn({hasPermi:'eam:equipment-transfer-record:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipment-transfer-record:delete'}), // 删除 ] // 列表-操作按钮事件