Browse Source

生产问题修复:SBBJ-732,SBBJ-730,SBBJ-729,SBBJ-726,SBBJ-723,SBBJ-717

master
ljlong_2630 2 months ago
parent
commit
0791e21939
  1. 16
      src/views/eam/basic/assetsAccount/assetsAccount.data.ts
  2. 29
      src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts
  3. 16
      src/views/eam/basic/fixedAssets/fixedAssets.data.ts
  4. 35
      src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts
  5. 6
      src/views/eam/item/itemInLocation/index.vue
  6. 4
      src/views/eam/item/itemLocationReplace/index.vue
  7. 16
      src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts
  8. 6
      src/views/eam/item/itemMaintenance/index.vue
  9. 18
      src/views/eam/item/itemMaintenance/itemMaintenance.data.ts
  10. 6
      src/views/eam/item/itemOutLocation/index.vue

16
src/views/eam/basic/assetsAccount/assetsAccount.data.ts

@ -52,7 +52,15 @@ export const AssetsAccountRules = reactive({
required, required,
{ validator:validateNumDot, message: '请输入数字格式', trigger: 'blur'} { 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<CrudSchema[]>([ export const AssetsAccount = useCrudSchemas(reactive<CrudSchema[]>([
@ -92,6 +100,12 @@ export const AssetsAccount = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: '150', width: '150',
}, },
form: {
component: 'Input',
componentProps: {
type: 'textarea',
}
},
isSearch: false, isSearch: false,
}, },
{ {

29
src/views/eam/basic/assetsAccountControlsHistory/assetsAccountControlsHistory.data.ts

@ -43,6 +43,24 @@ export const AssetsAccountControlsHistory = useCrudSchemas(reactive<CrudSchema[]
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
}, },
{
label: '位置',
field: 'site',
sort: 'custom',
table: {
width: '150',
},
isSearch: false,
},
{
label: '描述',
field: 'description',
sort: 'custom',
table: {
width: '150',
},
isSearch: false,
},
{ {
label: '会计单位', label: '会计单位',
field: 'accountingUnit', field: 'accountingUnit',
@ -89,6 +107,17 @@ export const AssetsAccountControlsHistory = useCrudSchemas(reactive<CrudSchema[]
} }
}, },
}, },
{
label: '制造商',
field: 'manufacturer',
sort: 'custom',
table: {
width: '150',
},
form:{
component: 'Input',
},
},
{ {
label: '管理部门', label: '管理部门',
field: 'manageDept', field: 'manageDept',

16
src/views/eam/basic/fixedAssets/fixedAssets.data.ts

@ -52,7 +52,15 @@ export const FixedAssetsRules = reactive({
required, required,
{ validator:validateNumDot, message: '请输入数字格式', trigger: 'blur'} { 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 FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
@ -92,6 +100,12 @@ export const FixedAssets = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: '150', width: '150',
}, },
form: {
component: 'Input',
componentProps: {
type: 'textarea',
}
},
isSearch: false, isSearch: false,
}, },
{ {

35
src/views/eam/basic/fixedAssetsControlsHistory/fixedAssetsControlsHistory.data.ts

@ -47,6 +47,30 @@ export const FixedAssetsControlsHistory = useCrudSchemas(reactive<CrudSchema[]>(
sort: 'custom', sort: 'custom',
isSearch: true, 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: '会计单位', label: '会计单位',
field: 'accountingUnit', field: 'accountingUnit',
@ -93,6 +117,17 @@ export const FixedAssetsControlsHistory = useCrudSchemas(reactive<CrudSchema[]>(
} }
}, },
}, },
{
label: '制造商',
field: 'manufacturer',
sort: 'custom',
table: {
width: '150',
},
form:{
component: 'Input',
},
},
{ {
label: '管理部门', label: '管理部门',
field: 'manageDept', field: 'manageDept',

6
src/views/eam/item/itemInLocation/index.vue

@ -81,7 +81,7 @@
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({ hasPermi: 'item:itemInLocation:create' }), // // defaultButtons.defaultAddBtn({ hasPermi: 'item:itemInLocation:create' }), //
defaultButtons.defaultExportBtn({ hasPermi: 'item:itemInLocation:export' }), // defaultButtons.defaultExportBtn({ hasPermi: 'item:itemInLocation:export' }), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
@ -114,8 +114,8 @@
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({ hasPermi: 'item:itemInLocation:update' }), // // defaultButtons.mainListEditBtn({ hasPermi: 'item:itemInLocation:update' }), //
defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemInLocation:delete' }), // // defaultButtons.mainListDeleteBtn({ hasPermi: 'item:itemInLocation:delete' }), //
] ]
// - // -

4
src/views/eam/item/itemLocationReplace/index.vue

@ -149,8 +149,8 @@ const buttonBaseClick = (val, item) => {
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'item:itemLocationReplace:update'}), // // defaultButtons.mainListEditBtn({hasPermi:'item:itemLocationReplace:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'item:itemLocationReplace:delete'}), // // defaultButtons.mainListDeleteBtn({hasPermi:'item:itemLocationReplace:delete'}), //
] ]
// - // -

16
src/views/eam/item/itemLocationReplace/itemLocationReplace.data.ts

@ -141,12 +141,12 @@ export const ItemLocationReplace = useCrudSchemas(reactive<CrudSchema[]>([
width: 170 width: 170
}, },
}, },
{ // {
label: '操作', // label: '操作',
field: 'action', // field: 'action',
isForm: false, // isForm: false,
table: { // table: {
fixed: 'right' // fixed: 'right'
} // }
} // }
])) ]))

6
src/views/eam/item/itemMaintenance/index.vue

@ -99,7 +99,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'item:itemMaintenance:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'item:itemMaintenance:create'}), //
defaultButtons.defaultExportBtn({hasPermi:'item:itemMaintenance:export'}), // defaultButtons.defaultExportBtn({hasPermi:'item:itemMaintenance:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
@ -132,8 +132,8 @@ const buttonBaseClick = (val, item) => {
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'item:itemMaintenance:update'}), // // defaultButtons.mainListEditBtn({hasPermi:'item:itemMaintenance:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'item:itemMaintenance:delete'}), // // defaultButtons.mainListDeleteBtn({hasPermi:'item:itemMaintenance:delete'}), //
] ]
// - // -

18
src/views/eam/item/itemMaintenance/itemMaintenance.data.ts

@ -110,13 +110,13 @@ export const ItemMaintenance = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{ // {
label: '操作', // label: '操作',
field: 'action', // field: 'action',
isForm: false, // isForm: false,
table: { // table: {
width: 150, // width: 150,
fixed: 'right' // fixed: 'right'
} // }
} // }
])) ]))

6
src/views/eam/item/itemOutLocation/index.vue

@ -99,7 +99,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'item:itemOutLocation:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'item:itemOutLocation:create'}), //
defaultButtons.defaultExportBtn({hasPermi:'item:itemOutLocation:export'}), // defaultButtons.defaultExportBtn({hasPermi:'item:itemOutLocation:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
@ -132,8 +132,8 @@ const buttonBaseClick = (val, item) => {
// - // -
const butttondata = [ const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'item:itemOutLocation:update'}), // // defaultButtons.mainListEditBtn({hasPermi:'item:itemOutLocation:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'item:itemOutLocation:delete'}), // // defaultButtons.mainListDeleteBtn({hasPermi:'item:itemOutLocation:delete'}), //
] ]
// - // -

Loading…
Cancel
Save