Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

master_hella_20240701
gaojs 6 months ago
parent
commit
5e0fa93b3f
  1. 10
      src/views/wms/basicDataManage/subject/subjectAccount/index.vue
  2. 78
      src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

10
src/views/wms/basicDataManage/subject/subjectAccount/index.vue

@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:subjectAccount:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:subjectAccount:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:subjectAccount:export'}), //
defaultButtons.defaultAddBtn({hasPermi:'wms:subject-account:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:subject-account:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:subject-account:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
// -
const butttondata = [
defaultButtons.mainListEditBtn({hasPermi:'wms:subjectAccount:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:subjectAccount:delete'}), //
defaultButtons.mainListEditBtn({hasPermi:'wms:subject-account:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:subject-account:delete'}), //
]
// -

78
src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

@ -33,20 +33,19 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
field: 'usageDescription',
sort: 'custom',
isSearch: true,
form: {
component: 'Editor',
componentProps: {
valueHtml: '',
height: 200
}
},
},
{
label: '成本中心ID',
label: '成本中心ID111',
field: 'costecentreId',
sort: 'custom',
isSearch: false,
isTable:false,
disabled:true,
from:{
componentProps:{
disabled:true
}
}
},
{
label: '成本中心代码',
@ -59,9 +58,6 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
field: 'costecentreType',
sort: 'custom',
isSearch: false,
form: {
component: 'SelectV2'
},
},
{
label: '项目ID',
@ -69,6 +65,12 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: false,
isTable:false,
disabled:true,
from:{
componentProps:{
disabled:true
}
}
},
{
label: '项目代码',
@ -107,60 +109,6 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
},
isForm: false,
},
{
label: '删除时间',
field: 'deletionTime',
sort: 'custom',
formatter: dateFormatter,
isTable:false,
search: {
component: 'DatePicker',
componentProps: {
valueFormat: 'YYYY-MM-DD HH:mm:ss',
type: 'daterange',
defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
}
},
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
},
{
label: '删除者ID',
field: 'deleterId',
sort: 'custom',
isSearch: false,
isTable:false,
},
{
label: '扩展属性',
field: 'extraProperties',
sort: 'custom',
isSearch: false,
isTable:false,
},
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
isSearch: false,
form: {
component: 'InputNumber',
value: 0
},
isTable:false,
},
{
label: '地点ID',
field: 'siteId',
sort: 'custom',
isSearch: false,
isTable:false
},
{
label: '操作',
field: 'action',

Loading…
Cancel
Save