提交 b3d8553e 编写于 作者: ibizdev's avatar ibizdev

lab_gzf 部署微服务应用

上级 61ff9297
...@@ -63,7 +63,7 @@ export default { ...@@ -63,7 +63,7 @@ export default {
title: "资产信息", title: "资产信息",
}, },
}, },
quickcreate_form: { info_main_form: {
details: { details: {
group1: "基本信息", group1: "基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -81,14 +81,13 @@ export default { ...@@ -81,14 +81,13 @@ export default {
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产", passetname: "上级资产",
eamlocationid: "功能位置标识", eamlocationid: "功能位置标识",
eamassettypeid: "资产类型标识",
passetid: "上级资产标识", passetid: "上级资产标识",
assetid: "资产标识", assetid: "资产标识",
}, },
uiactions: { uiactions: {
}, },
}, },
info_main_form: { main_form: {
details: { details: {
group1: "基本信息", group1: "基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -105,12 +104,17 @@ export default { ...@@ -105,12 +104,17 @@ export default {
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产", passetname: "上级资产",
eamassetstatename: "资产状态",
eamlocationid: "功能位置标识",
eamassettypeid: "资产类型标识",
eamassetstateid: "资产状态标识",
passetid: "上级资产标识",
assetid: "资产标识", assetid: "资产标识",
}, },
uiactions: { uiactions: {
}, },
}, },
main_form: { quickcreate_form: {
details: { details: {
group1: "基本信息", group1: "基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -127,35 +131,33 @@ export default { ...@@ -127,35 +131,33 @@ export default {
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产", passetname: "上级资产",
eamassetstatename: "资产状态",
eamlocationid: "功能位置标识", eamlocationid: "功能位置标识",
eamassettypeid: "资产类型标识", eamassettypeid: "资产类型标识",
eamassetstateid: "资产状态标识",
passetid: "上级资产标识", passetid: "上级资产标识",
assetid: "资产标识", assetid: "资产标识",
}, },
uiactions: { uiactions: {
}, },
}, },
main_grid: { childgrid_grid: {
columns: { columns: {
passetname: "上级资产",
assetnumber: "资产编号", assetnumber: "资产编号",
assetname: "资产名称", assetname: "资产名称",
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产",
eamassetstatename: "资产状态", eamassetstatename: "资产状态",
}, },
uiactions: { uiactions: {
}, },
}, },
childgrid_grid: { main_grid: {
columns: { columns: {
passetname: "上级资产",
assetnumber: "资产编号", assetnumber: "资产编号",
assetname: "资产名称", assetname: "资产名称",
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产",
eamassetstatename: "资产状态", eamassetstatename: "资产状态",
}, },
uiactions: { uiactions: {
...@@ -174,13 +176,13 @@ export default { ...@@ -174,13 +176,13 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: { childgridviewtoolbar_toolbar: {
tbitem12_openquickcreateview: { tbitem5: {
caption: "新建", caption: "New",
tip: "新建", tip: "New",
}, },
tbitem14: { seperator1: {
caption: "-", caption: "",
tip: "", tip: "",
}, },
tbitem2: { tbitem2: {
...@@ -220,15 +222,47 @@ export default { ...@@ -220,15 +222,47 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
childgridviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem5: { tbitem2: {
caption: "New", caption: "Save And Close",
tip: "New", tip: "Save And Close Window",
}, },
seperator1: { tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
infoviewtoolbar_toolbar: {
tbitem15_openmaineditview: {
caption: "编辑",
tip: "编辑",
},
tbitem15_remove_sep: {
caption: "", caption: "",
tip: "", tip: "",
}, },
tbitem15_remove: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
gridviewtoolbar_toolbar: {
tbitem12_openquickcreateview: {
caption: "新建",
tip: "新建",
},
tbitem14: {
caption: "-",
tip: "",
},
tbitem2: { tbitem2: {
caption: "Edit", caption: "Edit",
tip: "Edit {0}", tip: "Edit {0}",
...@@ -266,38 +300,6 @@ export default { ...@@ -266,38 +300,6 @@ export default {
tip: "Filter", tip: "Filter",
}, },
}, },
editviewtoolbar_toolbar: {
tbitem2: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
infoviewtoolbar_toolbar: {
tbitem15_openmaineditview: {
caption: "编辑",
tip: "编辑",
},
tbitem15_remove_sep: {
caption: "",
tip: "",
},
tbitem15_remove: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
locationassetgridviewtoolbar_toolbar: { locationassetgridviewtoolbar_toolbar: {
tbitem5: { tbitem5: {
caption: "New", caption: "New",
......
...@@ -62,7 +62,7 @@ export default { ...@@ -62,7 +62,7 @@ export default {
title: "资产信息", title: "资产信息",
}, },
}, },
quickcreate_form: { info_main_form: {
details: { details: {
group1: "基本信息", group1: "基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -80,14 +80,13 @@ export default { ...@@ -80,14 +80,13 @@ export default {
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产", passetname: "上级资产",
eamlocationid: "功能位置标识", eamlocationid: "功能位置标识",
eamassettypeid: "资产类型标识",
passetid: "上级资产标识", passetid: "上级资产标识",
assetid: "资产标识", assetid: "资产标识",
}, },
uiactions: { uiactions: {
}, },
}, },
info_main_form: { main_form: {
details: { details: {
group1: "基本信息", group1: "基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -104,12 +103,17 @@ export default { ...@@ -104,12 +103,17 @@ export default {
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产", passetname: "上级资产",
eamassetstatename: "资产状态",
eamlocationid: "功能位置标识",
eamassettypeid: "资产类型标识",
eamassetstateid: "资产状态标识",
passetid: "上级资产标识",
assetid: "资产标识", assetid: "资产标识",
}, },
uiactions: { uiactions: {
}, },
}, },
main_form: { quickcreate_form: {
details: { details: {
group1: "基本信息", group1: "基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -126,35 +130,33 @@ export default { ...@@ -126,35 +130,33 @@ export default {
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产", passetname: "上级资产",
eamassetstatename: "资产状态",
eamlocationid: "功能位置标识", eamlocationid: "功能位置标识",
eamassettypeid: "资产类型标识", eamassettypeid: "资产类型标识",
eamassetstateid: "资产状态标识",
passetid: "上级资产标识", passetid: "上级资产标识",
assetid: "资产标识", assetid: "资产标识",
}, },
uiactions: { uiactions: {
}, },
}, },
main_grid: { childgrid_grid: {
columns: { columns: {
passetname: "上级资产",
assetnumber: "资产编号", assetnumber: "资产编号",
assetname: "资产名称", assetname: "资产名称",
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产",
eamassetstatename: "资产状态", eamassetstatename: "资产状态",
}, },
uiactions: { uiactions: {
}, },
}, },
childgrid_grid: { main_grid: {
columns: { columns: {
passetname: "上级资产",
assetnumber: "资产编号", assetnumber: "资产编号",
assetname: "资产名称", assetname: "资产名称",
eamassettypename: "资产类型", eamassettypename: "资产类型",
eamlocationname: "功能位置", eamlocationname: "功能位置",
passetname: "上级资产",
eamassetstatename: "资产状态", eamassetstatename: "资产状态",
}, },
uiactions: { uiactions: {
...@@ -173,13 +175,13 @@ export default { ...@@ -173,13 +175,13 @@ export default {
uiactions: { uiactions: {
}, },
}, },
gridviewtoolbar_toolbar: { childgridviewtoolbar_toolbar: {
tbitem12_openquickcreateview: { tbitem5: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
}, },
tbitem14: { seperator1: {
caption: "-", caption: "",
tip: "", tip: "",
}, },
tbitem2: { tbitem2: {
...@@ -219,13 +221,45 @@ export default { ...@@ -219,13 +221,45 @@ export default {
tip: "过滤", tip: "过滤",
}, },
}, },
childgridviewtoolbar_toolbar: { editviewtoolbar_toolbar: {
tbitem5: { tbitem2: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
infoviewtoolbar_toolbar: {
tbitem15_openmaineditview: {
caption: "编辑",
tip: "编辑",
},
tbitem15_remove_sep: {
caption: "",
tip: "",
},
tbitem15_remove: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
gridviewtoolbar_toolbar: {
tbitem12_openquickcreateview: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
}, },
seperator1: { tbitem14: {
caption: "", caption: "-",
tip: "", tip: "",
}, },
tbitem2: { tbitem2: {
...@@ -265,38 +299,6 @@ export default { ...@@ -265,38 +299,6 @@ export default {
tip: "过滤", tip: "过滤",
}, },
}, },
editviewtoolbar_toolbar: {
tbitem2: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
infoviewtoolbar_toolbar: {
tbitem15_openmaineditview: {
caption: "编辑",
tip: "编辑",
},
tbitem15_remove_sep: {
caption: "",
tip: "",
},
tbitem15_remove: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
locationassetgridviewtoolbar_toolbar: { locationassetgridviewtoolbar_toolbar: {
tbitem5: { tbitem5: {
caption: "新建", caption: "新建",
......
...@@ -57,7 +57,7 @@ export default { ...@@ -57,7 +57,7 @@ export default {
title: "功能位置选择表格视图", title: "功能位置选择表格视图",
}, },
}, },
edit_main_form: { info_main_form: {
details: { details: {
group1: "功能位置基本信息", group1: "功能位置基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -69,17 +69,17 @@ export default { ...@@ -69,17 +69,17 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
eamlocationid: "功能位置标识", locationnumber: "功能位置编号",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置", peamlocationname: "上级位置",
eamlocationid: "功能位置标识",
peamlocationid: "上级功能位置标识", peamlocationid: "上级功能位置标识",
eamlocationtypeid: "功能位置类型标识",
}, },
uiactions: { uiactions: {
}, },
}, },
info_main_form: { edit_main_form: {
details: { details: {
group1: "功能位置基本信息", group1: "功能位置基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -91,32 +91,33 @@ export default { ...@@ -91,32 +91,33 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
locationnumber: "功能位置编号", eamlocationid: "功能位置标识",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置", peamlocationname: "上级位置",
eamlocationid: "功能位置标识", peamlocationid: "上级功能位置标识",
eamlocationtypeid: "功能位置类型标识",
}, },
uiactions: { uiactions: {
}, },
}, },
main_grid: { childgrid_grid: {
columns: { columns: {
locationnumber: "功能位置编号", peamlocationname: "上级位置",
eamlocationid: "功能位置标识",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置",
eamlocationstatename: "功能位置状态",
}, },
uiactions: { uiactions: {
}, },
}, },
childgrid_grid: { main_grid: {
columns: { columns: {
peamlocationname: "上级位置", locationnumber: "功能位置编号",
eamlocationid: "功能位置标识",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置",
eamlocationstatename: "功能位置状态",
}, },
uiactions: { uiactions: {
}, },
...@@ -128,7 +129,7 @@ export default { ...@@ -128,7 +129,7 @@ export default {
uiactions: { uiactions: {
}, },
}, },
treechildgridviewtoolbar_toolbar: { childgridviewtoolbar_toolbar: {
tbitem5: { tbitem5: {
caption: "New", caption: "New",
tip: "New", tip: "New",
...@@ -184,7 +185,7 @@ export default { ...@@ -184,7 +185,7 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
childgridviewtoolbar_toolbar: { treechildgridviewtoolbar_toolbar: {
tbitem5: { tbitem5: {
caption: "New", caption: "New",
tip: "New", tip: "New",
......
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
title: "功能位置选择表格视图", title: "功能位置选择表格视图",
}, },
}, },
edit_main_form: { info_main_form: {
details: { details: {
group1: "功能位置基本信息", group1: "功能位置基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -68,17 +68,17 @@ export default { ...@@ -68,17 +68,17 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
eamlocationid: "功能位置标识", locationnumber: "功能位置编号",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置", peamlocationname: "上级位置",
eamlocationid: "功能位置标识",
peamlocationid: "上级功能位置标识", peamlocationid: "上级功能位置标识",
eamlocationtypeid: "功能位置类型标识",
}, },
uiactions: { uiactions: {
}, },
}, },
info_main_form: { edit_main_form: {
details: { details: {
group1: "功能位置基本信息", group1: "功能位置基本信息",
formpage1: "基本信息", formpage1: "基本信息",
...@@ -90,32 +90,33 @@ export default { ...@@ -90,32 +90,33 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
locationnumber: "功能位置编号", eamlocationid: "功能位置标识",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置", peamlocationname: "上级位置",
eamlocationid: "功能位置标识", peamlocationid: "上级功能位置标识",
eamlocationtypeid: "功能位置类型标识",
}, },
uiactions: { uiactions: {
}, },
}, },
main_grid: { childgrid_grid: {
columns: { columns: {
locationnumber: "功能位置编号", peamlocationname: "上级位置",
eamlocationid: "功能位置标识",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置",
eamlocationstatename: "功能位置状态",
}, },
uiactions: { uiactions: {
}, },
}, },
childgrid_grid: { main_grid: {
columns: { columns: {
peamlocationname: "上级位置", locationnumber: "功能位置编号",
eamlocationid: "功能位置标识",
eamlocationname: "功能位置名称", eamlocationname: "功能位置名称",
eamlocationtypename: "功能位置类型", eamlocationtypename: "功能位置类型",
peamlocationname: "上级位置",
eamlocationstatename: "功能位置状态",
}, },
uiactions: { uiactions: {
}, },
...@@ -127,7 +128,7 @@ export default { ...@@ -127,7 +128,7 @@ export default {
uiactions: { uiactions: {
}, },
}, },
treechildgridviewtoolbar_toolbar: { childgridviewtoolbar_toolbar: {
tbitem5: { tbitem5: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
...@@ -183,7 +184,7 @@ export default { ...@@ -183,7 +184,7 @@ export default {
tip: "关闭", tip: "关闭",
}, },
}, },
childgridviewtoolbar_toolbar: { treechildgridviewtoolbar_toolbar: {
tbitem5: { tbitem5: {
caption: "新建", caption: "新建",
tip: "新建", tip: "新建",
......
...@@ -257,6 +257,7 @@ export const viewstate: any = { ...@@ -257,6 +257,7 @@ export const viewstate: any = {
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'd3466c5c60a573062d543896976bf68c',
], ],
}, },
{ {
...@@ -305,6 +306,8 @@ export const viewstate: any = { ...@@ -305,6 +306,8 @@ export const viewstate: any = {
viewaction: '', viewaction: '',
viewdatachange: false, viewdatachange: false,
refviews: [ refviews: [
'd3466c5c60a573062d543896976bf68c',
'6c816d46a07d56b2a9afca077d9bbfc3',
], ],
}, },
{ {
......
...@@ -31,7 +31,15 @@ ...@@ -31,7 +31,15 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.passetname}}</span> <app-column-link deKeyField='eamasset' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamasset-info-view', height: 0,width: 0,title: $t('entities.eamasset.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
]
,parameters: [
{ pathName: 'eamassets', parameterName: 'eamasset' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="passetid">
<span>{{row.passetname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -55,7 +63,15 @@ ...@@ -55,7 +63,15 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.assetname}}</span> <app-column-link deKeyField='eamasset' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamasset-info-view', height: 0,width: 0,title: $t('entities.eamasset.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
]
,parameters: [
{ pathName: 'eamassets', parameterName: 'eamasset' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="srfkey">
<span>{{row.assetname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -79,7 +95,14 @@ ...@@ -79,7 +95,14 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.eamlocationname}}</span> <app-column-link deKeyField='eamlocation' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamlocation-info-view', height: 0,width: 0,title: $t('entities.eamlocation.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
]
,parameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="eamlocationid">
<span>{{row.eamlocationname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
...@@ -78,6 +78,8 @@ export class Info_MainEditFormBase extends EditFormControlBase { ...@@ -78,6 +78,8 @@ export class Info_MainEditFormBase extends EditFormControlBase {
eamassettypename: null, eamassettypename: null,
eamlocationname: null, eamlocationname: null,
passetname: null, passetname: null,
eamlocationid: null,
passetid: null,
assetid: null, assetid: null,
eamasset:null, eamasset:null,
}; };
...@@ -137,6 +139,10 @@ export class Info_MainEditFormBase extends EditFormControlBase { ...@@ -137,6 +139,10 @@ export class Info_MainEditFormBase extends EditFormControlBase {
passetname: new FormItemModel({ caption: '上级资产', detailType: 'FORMITEM', name: 'passetname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), passetname: new FormItemModel({ caption: '上级资产', detailType: 'FORMITEM', name: 'passetname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
passetid: new FormItemModel({ caption: '上级资产标识', detailType: 'FORMITEM', name: 'passetid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
assetid: new FormItemModel({ caption: '资产标识', detailType: 'FORMITEM', name: 'assetid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), assetid: new FormItemModel({ caption: '资产标识', detailType: 'FORMITEM', name: 'assetid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
}; };
......
...@@ -80,6 +80,16 @@ export default class Info_MainModel { ...@@ -80,6 +80,16 @@ export default class Info_MainModel {
prop: 'passetname', prop: 'passetname',
dataType: 'PICKUPTEXT', dataType: 'PICKUPTEXT',
}, },
{
name: 'eamlocationid',
prop: 'eamlocationid',
dataType: 'PICKUP',
},
{
name: 'passetid',
prop: 'passetid',
dataType: 'PICKUP',
},
{ {
name: 'assetid', name: 'assetid',
prop: 'assetid', prop: 'assetid',
......
...@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils'; ...@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service'; import ControlService from '@/widgets/control-service';
import EAMAssetService from '@/service/eamasset/eamasset-service'; import EAMAssetService from '@/service/eamasset/eamasset-service';
import Info_MainModel from './info-main-form-model'; import Info_MainModel from './info-main-form-model';
import EAMLocationService from '@/service/eamlocation/eamlocation-service';
/** /**
...@@ -41,6 +42,14 @@ export default class Info_MainService extends ControlService { ...@@ -41,6 +42,14 @@ export default class Info_MainService extends ControlService {
this.model = new Info_MainModel(); this.model = new Info_MainModel();
} }
/**
* 功能位置服务对象
*
* @type {EAMLocationService}
* @memberof Info_MainService
*/
public eamlocationService: EAMLocationService = new EAMLocationService();
/** /**
* 处理数据 * 处理数据
* *
...@@ -82,6 +91,12 @@ export default class Info_MainService extends ControlService { ...@@ -82,6 +91,12 @@ export default class Info_MainService extends ControlService {
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> { public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0; data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000; data.size = data.size ? data.size : 1000;
if (Object.is(serviceName, 'EAMLocationService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.eamlocationService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'eamlocationid', 'eamlocation');
}
if (Object.is(serviceName, 'EAMAssetService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.appEntityService.FetchDefault(JSON.parse(JSON.stringify(context)), data, isloading), 'assetid', 'eamasset');
}
return Promise.reject([]) return Promise.reject([])
} }
......
...@@ -39,9 +39,24 @@ ...@@ -39,9 +39,24 @@
<i-col class="form-layout-container" v-show="detailsModel.eamlocationname.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.eamlocationname.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='eamlocationname' :itemRules="this.rules.eamlocationname" class='' :caption="$t('entities.eamasset.info_main_form.details.eamlocationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationname.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='eamlocationname' :itemRules="this.rules.eamlocationname" class='' :caption="$t('entities.eamasset.info_main_form.details.eamlocationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='eamlocationname' :value="data.eamlocationname" dataType="PICKUPTEXT" :precision="0" <app-picker
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> :formState="formState"
</app-span> :data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.eamlocationname.disabled"
name='eamlocationname'
deMajorField='eamlocationname'
deKeyField='eamlocation'
valueitem='eamlocationid'
:value="data.eamlocationname"
editortype="linkonly"
:linkview="{ viewname: 'EAMLocationInfoView', title: $t('entities.eamlocation.views.infoview.title'), deResParameters: [], parameters: [{ pathName: 'eamlocations', parameterName: 'eamlocation' }, { pathName: 'infoview', parameterName: 'infoview' } ], width: 0, height: 0, placement: '', isRedirectView: false }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
</app-form-item> </app-form-item>
...@@ -49,9 +64,24 @@ ...@@ -49,9 +64,24 @@
<i-col class="form-layout-container" v-show="detailsModel.passetname.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.passetname.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='passetname' :itemRules="this.rules.passetname" class='' :caption="$t('entities.eamasset.info_main_form.details.passetname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.passetname.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='passetname' :itemRules="this.rules.passetname" class='' :caption="$t('entities.eamasset.info_main_form.details.passetname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.passetname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='passetname' :value="data.passetname" dataType="PICKUPTEXT" :precision="0" <app-picker
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> :formState="formState"
</app-span> :data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.passetname.disabled"
name='passetname'
deMajorField='assetname'
deKeyField='eamasset'
valueitem='passetid'
:value="data.passetname"
editortype="linkonly"
:linkview="{ viewname: 'EAMAssetInfoView', title: $t('entities.eamasset.views.infoview.title'), deResParameters: [{ pathName: 'eamlocations', parameterName: 'eamlocation' }, ], parameters: [{ pathName: 'eamassets', parameterName: 'eamasset' }, { pathName: 'infoview', parameterName: 'infoview' } ], width: 0, height: 0, placement: '', isRedirectView: false }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
</app-form-item> </app-form-item>
......
...@@ -43,7 +43,15 @@ ...@@ -43,7 +43,15 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.assetname}}</span> <app-column-link deKeyField='eamasset' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamasset-info-view', height: 0,width: 0,title: $t('entities.eamasset.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
]
,parameters: [
{ pathName: 'eamassets', parameterName: 'eamasset' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="srfkey">
<span>{{row.assetname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -67,7 +75,14 @@ ...@@ -67,7 +75,14 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.eamlocationname}}</span> <app-column-link deKeyField='eamlocation' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamlocation-info-view', height: 0,width: 0,title: $t('entities.eamlocation.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
]
,parameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="eamlocationid">
<span>{{row.eamlocationname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -79,7 +94,15 @@ ...@@ -79,7 +94,15 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.passetname}}</span> <app-column-link deKeyField='eamasset' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamasset-info-view', height: 0,width: 0,title: $t('entities.eamasset.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
]
,parameters: [
{ pathName: 'eamassets', parameterName: 'eamasset' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="passetid">
<span>{{row.passetname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
...@@ -31,7 +31,14 @@ ...@@ -31,7 +31,14 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.peamlocationname}}</span> <app-column-link deKeyField='eamlocation' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamlocation-info-view', height: 0,width: 0,title: $t('entities.eamlocation.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
]
,parameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="peamlocationid">
<span>{{row.peamlocationname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -55,7 +62,14 @@ ...@@ -55,7 +62,14 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.eamlocationname}}</span> <app-column-link deKeyField='eamlocation' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamlocation-info-view', height: 0,width: 0,title: $t('entities.eamlocation.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
]
,parameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="srfkey">
<span>{{row.eamlocationname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
...@@ -78,6 +78,7 @@ export class Info_MainEditFormBase extends EditFormControlBase { ...@@ -78,6 +78,7 @@ export class Info_MainEditFormBase extends EditFormControlBase {
eamlocationtypename: null, eamlocationtypename: null,
peamlocationname: null, peamlocationname: null,
eamlocationid: null, eamlocationid: null,
peamlocationid: null,
eamlocation:null, eamlocation:null,
}; };
...@@ -136,5 +137,7 @@ export class Info_MainEditFormBase extends EditFormControlBase { ...@@ -136,5 +137,7 @@ export class Info_MainEditFormBase extends EditFormControlBase {
eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }), eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
peamlocationid: new FormItemModel({ caption: '上级功能位置标识', detailType: 'FORMITEM', name: 'peamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
}; };
} }
\ No newline at end of file
...@@ -80,6 +80,11 @@ export default class Info_MainModel { ...@@ -80,6 +80,11 @@ export default class Info_MainModel {
prop: 'eamlocationid', prop: 'eamlocationid',
dataType: 'GUID', dataType: 'GUID',
}, },
{
name: 'peamlocationid',
prop: 'peamlocationid',
dataType: 'PICKUP',
},
{ {
name: 'eamlocation', name: 'eamlocation',
prop: 'eamlocationid', prop: 'eamlocationid',
......
...@@ -82,6 +82,9 @@ export default class Info_MainService extends ControlService { ...@@ -82,6 +82,9 @@ export default class Info_MainService extends ControlService {
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> { public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0; data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000; data.size = data.size ? data.size : 1000;
if (Object.is(serviceName, 'EAMLocationService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.appEntityService.FetchDefault(JSON.parse(JSON.stringify(context)), data, isloading), 'eamlocationid', 'eamlocation');
}
return Promise.reject([]) return Promise.reject([])
} }
......
...@@ -39,9 +39,24 @@ ...@@ -39,9 +39,24 @@
<i-col class="form-layout-container" v-show="detailsModel.peamlocationname.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }"> <i-col class="form-layout-container" v-show="detailsModel.peamlocationname.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='peamlocationname' :itemRules="this.rules.peamlocationname" class='' :caption="$t('entities.eamlocation.info_main_form.details.peamlocationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.peamlocationname.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='peamlocationname' :itemRules="this.rules.peamlocationname" class='' :caption="$t('entities.eamlocation.info_main_form.details.peamlocationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.peamlocationname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='peamlocationname' :value="data.peamlocationname" dataType="PICKUPTEXT" :precision="0" <app-picker
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""> :formState="formState"
</app-span> :data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.peamlocationname.disabled"
name='peamlocationname'
deMajorField='eamlocationname'
deKeyField='eamlocation'
valueitem='peamlocationid'
:value="data.peamlocationname"
editortype="linkonly"
:linkview="{ viewname: 'EAMLocationInfoView', title: $t('entities.eamlocation.views.infoview.title'), deResParameters: [], parameters: [{ pathName: 'eamlocations', parameterName: 'eamlocation' }, { pathName: 'infoview', parameterName: 'infoview' } ], width: 0, height: 0, placement: '', isRedirectView: false }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
</app-form-item> </app-form-item>
......
...@@ -43,7 +43,14 @@ ...@@ -43,7 +43,14 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.eamlocationname}}</span> <app-column-link deKeyField='eamlocation' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamlocation-info-view', height: 0,width: 0,title: $t('entities.eamlocation.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
]
,parameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="srfkey">
<span>{{row.eamlocationname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -67,7 +74,14 @@ ...@@ -67,7 +74,14 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.peamlocationname}}</span> <app-column-link deKeyField='eamlocation' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{viewname: 'eamlocation-info-view', height: 0,width: 0,title: $t('entities.eamlocation.views.infoview.title'),placement: '', isRedirectView: false,deResParameters: [
]
,parameters: [
{ pathName: 'eamlocations', parameterName: 'eamlocation' },
{ pathName: 'infoview', parameterName: 'infoview' }
]}" valueitem="peamlocationid">
<span>{{row.peamlocationname}}</span>
</app-column-link >
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册