From 0791e219396fdd718618830c86eeebba60fde206 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Fri, 13 Dec 2024 11:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9ASBBJ-732=EF=BC=8CSBBJ-730=EF=BC=8CSBBJ-729?= =?UTF-8?q?=EF=BC=8CSBBJ-726=EF=BC=8CSBBJ-723=EF=BC=8CSBBJ-717?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/assetsAccount/assetsAccount.data.ts | 16 ++++++++- .../assetsAccountControlsHistory.data.ts | 29 +++++++++++++++ .../eam/basic/fixedAssets/fixedAssets.data.ts | 16 ++++++++- .../fixedAssetsControlsHistory.data.ts | 35 +++++++++++++++++++ src/views/eam/item/itemInLocation/index.vue | 6 ++-- .../eam/item/itemLocationReplace/index.vue | 4 +-- .../itemLocationReplace.data.ts | 16 ++++----- src/views/eam/item/itemMaintenance/index.vue | 6 ++-- .../itemMaintenance/itemMaintenance.data.ts | 18 +++++----- src/views/eam/item/itemOutLocation/index.vue | 6 ++-- 10 files changed, 122 insertions(+), 30 deletions(-) diff --git a/src/views/eam/basic/assetsAccount/assetsAccount.data.ts b/src/views/eam/basic/assetsAccount/assetsAccount.data.ts index 14f7e1d..bda74e3 100644 --- a/src/views/eam/basic/assetsAccount/assetsAccount.data.ts +++ b/src/views/eam/basic/assetsAccount/assetsAccount.data.ts @@ -52,7 +52,15 @@ export const AssetsAccountRules = reactive({ required, { validator:validateNumDot, message: '请输入数字格式', trigger: 'blur'} ], - + site: [ + { max: 256, message: '不得超过256个字符', trigger: 'blur' }, + ], + manufacturer: [ + { max: 100, message: '不得超过100个字符', trigger: 'blur' }, + ], + description: [ + { max: 2000, message: '不得超过2000个字符', trigger: 'blur' }, + ], }) export const AssetsAccount = useCrudSchemas(reactive([ @@ -92,6 +100,12 @@ export const AssetsAccount = useCrudSchemas(reactive([ table: { width: '150', }, + form: { + component: 'Input', + componentProps: { + type: 'textarea', + } + }, isSearch: false, }, { diff --git a/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts b/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts index 2d8d837..92de219 100644 --- a/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts +++ b/src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts @@ -43,6 +43,24 @@ export const AssetsAccountControlsHistory = useCrudSchemas(reactive([ @@ -92,6 +100,12 @@ export const FixedAssets = useCrudSchemas(reactive([ table: { width: '150', }, + form: { + component: 'Input', + componentProps: { + type: 'textarea', + } + }, isSearch: false, }, { diff --git a/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts b/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts index 4067ea3..77142fa 100644 --- a/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts +++ b/src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts @@ -47,6 +47,30 @@ export const FixedAssetsControlsHistory = useCrudSchemas(reactive( sort: 'custom', isSearch: true, }, + { + label: '位置', + field: 'site', + sort: 'custom', + table: { + width: '150', + }, + isSearch: false, + }, + { + label: '描述', + field: 'description', + sort: 'custom', + table: { + width: '150', + }, + form: { + component: 'Input', + componentProps: { + type: 'textarea', + } + }, + isSearch: false, + }, { label: '会计单位', field: 'accountingUnit', @@ -93,6 +117,17 @@ export const FixedAssetsControlsHistory = useCrudSchemas(reactive( } }, }, + { + label: '制造商', + field: 'manufacturer', + sort: 'custom', + table: { + width: '150', + }, + form:{ + component: 'Input', + }, + }, { label: '管理部门', field: 'manageDept', diff --git a/src/views/eam/item/itemInLocation/index.vue b/src/views/eam/item/itemInLocation/index.vue index 5b1b7ca..e4681fa 100644 --- a/src/views/eam/item/itemInLocation/index.vue +++ b/src/views/eam/item/itemInLocation/index.vue @@ -81,7 +81,7 @@ // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hasPermi: 'item:itemInLocation:create' }), // 新增 + // defaultButtons.defaultAddBtn({ hasPermi: 'item:itemInLocation:create' }), // 新增 defaultButtons.defaultExportBtn({ hasPermi: 'item:itemInLocation:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -114,8 +114,8 @@ // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({ hasPermi: 'item:itemInLocation:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemInLocation:delete' }), // 删除 + // defaultButtons.mainListEditBtn({ hasPermi: 'item:itemInLocation:update' }), // 编辑 + // defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemInLocation:delete' }), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/itemLocationReplace/index.vue b/src/views/eam/item/itemLocationReplace/index.vue index 1f961ae..392d8b2 100644 --- a/src/views/eam/item/itemLocationReplace/index.vue +++ b/src/views/eam/item/itemLocationReplace/index.vue @@ -149,8 +149,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'item:itemLocationReplace:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'item:itemLocationReplace:delete'}), // 删除 + // defaultButtons.mainListEditBtn({hasPermi:'item:itemLocationReplace:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'item:itemLocationReplace:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts b/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts index fbaff8d..916b737 100644 --- a/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts +++ b/src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts @@ -141,12 +141,12 @@ export const ItemLocationReplace = useCrudSchemas(reactive([ width: 170 }, }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - fixed: 'right' - } - } + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // fixed: 'right' + // } + // } ])) diff --git a/src/views/eam/item/itemMaintenance/index.vue b/src/views/eam/item/itemMaintenance/index.vue index 9118985..a54d483 100644 --- a/src/views/eam/item/itemMaintenance/index.vue +++ b/src/views/eam/item/itemMaintenance/index.vue @@ -99,7 +99,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'item:itemMaintenance:create'}), // 新增 + // defaultButtons.defaultAddBtn({hasPermi:'item:itemMaintenance:create'}), // 新增 defaultButtons.defaultExportBtn({hasPermi:'item:itemMaintenance:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -132,8 +132,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'item:itemMaintenance:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'item:itemMaintenance:delete'}), // 删除 + // defaultButtons.mainListEditBtn({hasPermi:'item:itemMaintenance:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'item:itemMaintenance:delete'}), // 删除 ] // 列表-操作按钮事件 diff --git a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts index c61c89f..29f6ffe 100644 --- a/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts +++ b/src/views/eam/item/itemMaintenance/itemMaintenance.data.ts @@ -110,13 +110,13 @@ export const ItemMaintenance = useCrudSchemas(reactive([ } } }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - width: 150, - fixed: 'right' - } - } + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // width: 150, + // fixed: 'right' + // } + // } ])) diff --git a/src/views/eam/item/itemOutLocation/index.vue b/src/views/eam/item/itemOutLocation/index.vue index 2d56d2d..a1236fb 100644 --- a/src/views/eam/item/itemOutLocation/index.vue +++ b/src/views/eam/item/itemOutLocation/index.vue @@ -99,7 +99,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'item:itemOutLocation:create'}), // 新增 + // defaultButtons.defaultAddBtn({hasPermi:'item:itemOutLocation:create'}), // 新增 defaultButtons.defaultExportBtn({hasPermi:'item:itemOutLocation:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -132,8 +132,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'item:itemOutLocation:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'item:itemOutLocation:delete'}), // 删除 + // defaultButtons.mainListEditBtn({hasPermi:'item:itemOutLocation:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'item:itemOutLocation:delete'}), // 删除 ] // 列表-操作按钮事件