Skip to content

资
资产管理
提交 fcf36ded 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lab_gzf 部署微服务应用

上级 03a9391e
隐藏空白字符变更
内嵌 并排
正在显示 包含 438 行增加 和 57 行删除
app_AssetManagement/public/assets/json/view-config.json
浏览文件 @ fcf36ded
......@@ -199,6 +199,16 @@
"viewtag": "3d676a12800fca23bec463d5c5217413",
"memo": "系统自动添加"
},
"eamwotypegridview": {
"title": "工单类型表格视图",
"caption": "工单类型",
"viewtype": "DEGRIDVIEW",
"viewmodule": "WorkOrder",
"viewname": "EAMWOTypeGridView",
"viewfilename": "eamwotype-grid-view",
"viewtag": "47c5acae861f30987e0ef5e7c4cc0b21",
"memo": ""
},
"eamlocationtypepickupview": {
"title": "功能位置类型数据选择视图",
"caption": "功能位置类型",
......@@ -868,5 +878,15 @@
"viewfilename": "eamasset-grid-view",
"viewtag": "fc4b884f4116e498cafad375e0b6cb7d",
"memo": "系统自动添加"
},
"eamwotypeeditview": {
"title": "工单类型编辑视图",
"caption": "工单类型",
"viewtype": "DEEDITVIEW",
"viewmodule": "WorkOrder",
"viewname": "EAMWOTypeEditView",
"viewfilename": "eamwotype-edit-view",
"viewtag": "fc86dc7e981c8fcc8533f992bd51ce5c",
"memo": "系统自动添加"
}
}
\ No newline at end of file
app_AssetManagement/src/locale/lang/en-US.ts
浏览文件 @ fcf36ded
......@@ -147,6 +147,7 @@ export default {
menuitem15: "系统设置",
menuitem16: "服务等级",
menuitem17: "维护申请类型",
menuitem19: "工单类型",
left_exp: "左侧菜单",
menuitem1: "功能位置",
menuitem6: "功能位置状态",
......
app_AssetManagement/src/locale/lang/zh-CN.ts
浏览文件 @ fcf36ded
......@@ -147,6 +147,7 @@ export default {
menuitem15: "系统设置",
menuitem16: "服务等级",
menuitem17: "维护申请类型",
menuitem19: "工单类型",
left_exp: "左侧菜单",
menuitem1: "功能位置",
menuitem6: "功能位置状态",
......
app_AssetManagement/src/locale/lanres/entities/eamwotype/eamwotype_en_US.ts
浏览文件 @ fcf36ded
......@@ -10,6 +10,10 @@ export default {
eamwostatemodelid: "工单状态模型标识",
},
views: {
gridview: {
caption: "工单类型",
title: "工单类型表格视图",
},
pickupview: {
caption: "工单类型",
title: "工单类型数据选择视图",
......@@ -18,9 +22,33 @@ export default {
caption: "工单类型",
title: "工单类型选择表格视图",
},
editview: {
caption: "工单类型",
title: "工单类型编辑视图",
},
},
main_form: {
details: {
group1: "工单类型基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "工单类型标识",
srfmajortext: "工单类型名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
eamwotypeid: "工单类型标识",
eamwotypename: "工单类型名称",
},
uiactions: {
},
},
main_grid: {
columns: {
eamwotypeid: "工单类型标识",
eamwotypename: "工单类型名称",
},
uiactions: {
},
......@@ -32,4 +60,60 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem5: {
caption: "New",
tip: "New",
},
seperator1: {
caption: "",
tip: "",
},
tbitem2: {
caption: "Edit",
tip: "Edit {0}",
},
seperator2: {
caption: "",
tip: "",
},
tbitem1: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem15: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem10: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: {
tbitem2: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
};
\ No newline at end of file
app_AssetManagement/src/locale/lanres/entities/eamwotype/eamwotype_zh_CN.ts
浏览文件 @ fcf36ded
......@@ -9,6 +9,10 @@ export default {
eamwostatemodelid: "工单状态模型标识",
},
views: {
gridview: {
caption: "工单类型",
title: "工单类型表格视图",
},
pickupview: {
caption: "工单类型",
title: "工单类型数据选择视图",
......@@ -17,9 +21,33 @@ export default {
caption: "工单类型",
title: "工单类型选择表格视图",
},
editview: {
caption: "工单类型",
title: "工单类型编辑视图",
},
},
main_form: {
details: {
group1: "工单类型基本信息",
formpage1: "基本信息",
srfupdatedate: "更新时间",
srforikey: "",
srfkey: "工单类型标识",
srfmajortext: "工单类型名称",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
eamwotypeid: "工单类型标识",
eamwotypename: "工单类型名称",
},
uiactions: {
},
},
main_grid: {
columns: {
eamwotypeid: "工单类型标识",
eamwotypename: "工单类型名称",
},
uiactions: {
},
......@@ -31,4 +59,60 @@ export default {
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem5: {
caption: "新建",
tip: "新建",
},
seperator1: {
caption: "",
tip: "",
},
tbitem2: {
caption: "编辑",
tip: "编辑",
},
seperator2: {
caption: "",
tip: "",
},
tbitem1: {
caption: "拷贝",
tip: "拷贝",
},
tbitem15: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem3: {
caption: "导出",
tip: "导出",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem10: {
caption: "过滤",
tip: "过滤",
},
},
editviewtoolbar_toolbar: {
tbitem2: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem1: {
caption: "关闭",
tip: "关闭",
},
},
};
\ No newline at end of file
app_AssetManagement/src/mock/app/app-index-view-appmenu/app-index-view-appmenu.ts
浏览文件 @ fcf36ded
......@@ -79,7 +79,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-server',
icon: '',
textcls: '',
appfunctag: '_14',
appfunctag: '_15',
resourcetag: '',
},
{
......@@ -99,6 +99,24 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
textcls: '',
appfunctag: '_4',
resourcetag: '',
},
{
id: '736DEC4C-072F-49B9-AAD5-C8B13A10B55C',
name: 'menuitem19',
text: '工单类型',
type: 'MENUITEM',
counterid: '',
tooltip: '工单类型',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-legal',
icon: '',
textcls: '',
appfunctag: '_6',
resourcetag: '',
},
],
},
......@@ -155,7 +173,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-life-ring',
icon: '',
textcls: '',
appfunctag: '_8',
appfunctag: '_9',
resourcetag: '',
},
{
......@@ -173,7 +191,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-cube',
icon: '',
textcls: '',
appfunctag: '_7',
appfunctag: '_8',
resourcetag: '',
},
{
......@@ -191,7 +209,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-legal',
icon: '',
textcls: '',
appfunctag: '_10',
appfunctag: '_11',
resourcetag: '',
},
{
......@@ -209,7 +227,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-navicon',
icon: '',
textcls: '',
appfunctag: '_13',
appfunctag: '_14',
resourcetag: '',
},
],
......@@ -283,7 +301,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-legal',
icon: '',
textcls: '',
appfunctag: '_12',
appfunctag: '_13',
resourcetag: '',
},
{
......@@ -301,7 +319,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-rocket',
icon: '',
textcls: '',
appfunctag: '_11',
appfunctag: '_12',
resourcetag: '',
},
{
......@@ -319,7 +337,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-instagram',
icon: '',
textcls: '',
appfunctag: '_6',
appfunctag: '_7',
resourcetag: '',
},
],
......@@ -357,7 +375,7 @@ mock.onGet('v7/app-index-viewappmenu').reply((config: any) => {
iconcls: 'fa fa-share-square',
icon: '',
textcls: '',
appfunctag: '_9',
appfunctag: '_10',
resourcetag: '',
},
{
......
app_AssetManagement/src/mock/viewconfig/viewconfig.ts
浏览文件 @ fcf36ded
......@@ -167,6 +167,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "EAMLocationStateModelPickupView",
"viewtag": "3d676a12800fca23bec463d5c5217413"
},
"eamwotypegridview": {
"title": "工单类型表格视图",
"caption": "工单类型",
"viewtype": "DEGRIDVIEW",
"viewmodule": "WorkOrder",
"viewname": "EAMWOTypeGridView",
"viewtag": "47c5acae861f30987e0ef5e7c4cc0b21"
},
"eamlocationtypepickupview": {
"title": "功能位置类型数据选择视图",
"caption": "功能位置类型",
......@@ -702,6 +710,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewmodule": "Asset",
"viewname": "EAMAssetGridView",
"viewtag": "fc4b884f4116e498cafad375e0b6cb7d"
},
"eamwotypeeditview": {
"title": "工单类型编辑视图",
"caption": "工单类型",
"viewtype": "DEEDITVIEW",
"viewmodule": "WorkOrder",
"viewname": "EAMWOTypeEditView",
"viewtag": "fc86dc7e981c8fcc8533f992bd51ce5c"
}
}];
});
\ No newline at end of file
app_AssetManagement/src/pages/base/app-index-view/page-register.ts
浏览文件 @ fcf36ded
......@@ -35,6 +35,7 @@ export const PageComponents = {
Vue.component('eamwork-order-grid-view', () => import('@pages/work-order/eamwork-order-grid-view/eamwork-order-grid-view.vue'));
Vue.component('eamasset-info-main-view', () => import('@pages/asset/eamasset-info-main-view/eamasset-info-main-view.vue'));
Vue.component('eamasset-state-model-grid-view', () => import('@pages/asset/eamasset-state-model-grid-view/eamasset-state-model-grid-view.vue'));
Vue.component('eamwotype-grid-view', () => import('@pages/work-order/eamwotype-grid-view/eamwotype-grid-view.vue'));
Vue.component('eamasset-edit-view', () => import('@pages/asset/eamasset-edit-view/eamasset-edit-view.vue'));
Vue.component('eamasset-type-grid-view', () => import('@pages/asset/eamasset-type-grid-view/eamasset-type-grid-view.vue'));
Vue.component('eamasset-state-model-pickup-grid-view', () => import('@pages/asset/eamasset-state-model-pickup-grid-view/eamasset-state-model-pickup-grid-view.vue'));
......@@ -61,6 +62,7 @@ export const PageComponents = {
Vue.component('eamasset-state-model-pickup-view', () => import('@pages/asset/eamasset-state-model-pickup-view/eamasset-state-model-pickup-view.vue'));
Vue.component('eamapply-quick-create-view', () => import('@pages/apply/eamapply-quick-create-view/eamapply-quick-create-view.vue'));
Vue.component('eamspare-parts-group-pickup-grid-view', () => import('@pages/asset/eamspare-parts-group-pickup-grid-view/eamspare-parts-group-pickup-grid-view.vue'));
Vue.component('eamwotype-edit-view', () => import('@pages/work-order/eamwotype-edit-view/eamwotype-edit-view.vue'));
Vue.component('eamwork-order-apply-wogrid-view', () => import('@pages/work-order/eamwork-order-apply-wogrid-view/eamwork-order-apply-wogrid-view.vue'));
Vue.component('eamasset-pickup-grid-view', () => import('@pages/asset/eamasset-pickup-grid-view/eamasset-pickup-grid-view.vue'));
Vue.component('eamlocation-child-grid-view', () => import('@pages/location/eamlocation-child-grid-view/eamlocation-child-grid-view.vue'));
......
app_AssetManagement/src/pages/base/app-index-view/router.ts
浏览文件 @ fcf36ded
......@@ -653,6 +653,20 @@ const router = new Router({
},
component: () => import('@pages/asset/eamasset-state-model-grid-view/eamasset-state-model-grid-view.vue'),
},
{
path: 'eamwotypes/:eamwotype?/gridview/:gridview?',
meta: {
caption: 'entities.eamwotype.views.gridview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamwotypes', parameterName: 'eamwotype' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/work-order/eamwotype-grid-view/eamwotype-grid-view.vue'),
},
{
path: 'eamlocations/:eamlocation?/eamassets/:eamasset?/editview/:editview?',
meta: {
......@@ -1137,6 +1151,20 @@ const router = new Router({
},
component: () => import('@pages/asset/eamspare-parts-group-pickup-grid-view/eamspare-parts-group-pickup-grid-view.vue'),
},
{
path: 'eamwotypes/:eamwotype?/editview/:editview?',
meta: {
caption: 'entities.eamwotype.views.editview.title',
info:'',
parameters: [
{ pathName: 'appindexview', parameterName: 'appindexview' },
{ pathName: 'eamwotypes', parameterName: 'eamwotype' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/work-order/eamwotype-edit-view/eamwotype-edit-view.vue'),
},
{
path: 'eamapplies/:eamapply?/eamworkorders/:eamworkorder?/applywogridview/:applywogridview?',
meta: {
......
app_AssetManagement/src/store/modules/view-action/state.ts
浏览文件 @ fcf36ded
......@@ -728,6 +728,7 @@ export const viewstate: any = {
'78b197ae25df6180e6c02c8b1b670a29',
'30027967566375f388f110149cf48b49',
'135343573fd869053d84ecc2f48ffd49',
'47c5acae861f30987e0ef5e7c4cc0b21',
'b4c8e0e90e3940abee6c5f4909fd0e00',
'4c95ec14aa2de5370d9d81f7d85f4bd5',
'a3d6a9a21765dd59afa2d3d20a99096c',
......
app_AssetManagement/src/uiservice/eamwotype/eamwotype-ui-service-base.ts
浏览文件 @ fcf36ded
......@@ -89,8 +89,10 @@ export default class EAMWOTypeUIServiceBase extends UIService {
* @memberof EAMWOTypeUIServiceBase
*/
public initViewMap(){
this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamwotypes'});
this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'eamwotypes'});
this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eamwotypes'});
this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamwotypes'});
}
/**
......
app_AssetManagement/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-base.tsx
浏览文件 @ fcf36ded
......@@ -15,32 +15,34 @@ export class AppIndexViewBase extends Vue {
if (item) {
let judge = true;
switch (item.appfunctag) {
case '_12':
this.click_12(item); break;
case '_13':
this.click_13(item); break;
case '_14':
this.click_14(item); break;
case '_2':
this.click_2(item); break;
case '_4':
this.click_4(item); break;
case '_14':
this.click_14(item); break;
case '_11':
this.click_11(item); break;
case '_15':
this.click_15(item); break;
case '_12':
this.click_12(item); break;
case '_5':
this.click_5(item); break;
case '_7':
this.click_7(item); break;
case '_8':
this.click_8(item); break;
case '_10':
this.click_10(item); break;
case '_9':
this.click_9(item); break;
case '_11':
this.click_11(item); break;
case '_3':
this.click_3(item); break;
case '_6':
this.click_6(item); break;
case '_9':
this.click_9(item); break;
case '_7':
this.click_7(item); break;
case '_10':
this.click_10(item); break;
default:
judge = false;
console.warn('未指定应用功能');
......@@ -57,7 +59,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_12(item: any = {}) {
public click_13(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -80,7 +82,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_13(item: any = {}) {
public click_14(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -149,7 +151,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_14(item: any = {}) {
public click_15(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -172,7 +174,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_11(item: any = {}) {
public click_12(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -218,7 +220,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_7(item: any = {}) {
public click_8(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -241,7 +243,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_8(item: any = {}) {
public click_9(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -264,7 +266,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_10(item: any = {}) {
public click_11(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -305,12 +307,35 @@ export class AppIndexViewBase extends Vue {
}
/**
* 备件包
* 工单类型
*
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_6(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'eamwotypes', parameterName: 'eamwotype' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 备件包
*
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_7(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......@@ -333,7 +358,7 @@ export class AppIndexViewBase extends Vue {
* @param {*} [item={}]
* @memberof AppIndexView
*/
public click_9(item: any = {}) {
public click_10(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
......
app_AssetManagement/src/widgets/app/app-index-view-appmenu/app-index-view-appmenu-model.ts
浏览文件 @ fcf36ded
......@@ -86,7 +86,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-server',
icon: '',
textcls: '',
appfunctag: '_14',
appfunctag: '_15',
appfuncyype: 'APPVIEW',
viewname: 'eamservice-level-grid-view',
resourcetag: '',
......@@ -112,6 +112,27 @@ export default class AppIndexViewModel {
viewname: 'eamapply-type-grid-view',
resourcetag: '',
}
,
{
id: '736DEC4C-072F-49B9-AAD5-C8B13A10B55C',
name: 'menuitem19',
text: '工单类型',
type: 'MENUITEM',
counterid: '',
tooltip: '工单类型',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-legal',
icon: '',
textcls: '',
appfunctag: '_6',
appfuncyype: 'APPVIEW',
viewname: 'eamwotype-grid-view',
resourcetag: '',
}
,
],
}
......@@ -170,7 +191,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-life-ring',
icon: '',
textcls: '',
appfunctag: '_8',
appfunctag: '_9',
appfuncyype: 'APPVIEW',
viewname: 'eamlocation-state-list-exp-view',
resourcetag: '',
......@@ -191,7 +212,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-cube',
icon: '',
textcls: '',
appfunctag: '_7',
appfunctag: '_8',
appfuncyype: 'APPVIEW',
viewname: 'eamlocation-state-model-grid-view',
resourcetag: '',
......@@ -212,7 +233,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-legal',
icon: '',
textcls: '',
appfunctag: '_10',
appfunctag: '_11',
appfuncyype: 'APPVIEW',
viewname: 'eamlocation-type-grid-view',
resourcetag: '',
......@@ -233,7 +254,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-navicon',
icon: '',
textcls: '',
appfunctag: '_13',
appfunctag: '_14',
appfuncyype: 'APPVIEW',
viewname: 'eamlocation-tree-exp-view',
resourcetag: '',
......@@ -317,7 +338,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-legal',
icon: '',
textcls: '',
appfunctag: '_12',
appfunctag: '_13',
appfuncyype: 'APPVIEW',
viewname: 'eamasset-type-grid-view',
resourcetag: '',
......@@ -338,7 +359,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-rocket',
icon: '',
textcls: '',
appfunctag: '_11',
appfunctag: '_12',
appfuncyype: 'APPVIEW',
viewname: 'eamasset-tree-exp-view',
resourcetag: '',
......@@ -359,7 +380,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-instagram',
icon: '',
textcls: '',
appfunctag: '_6',
appfunctag: '_7',
appfuncyype: 'APPVIEW',
viewname: 'eamspare-parts-group-grid-view',
resourcetag: '',
......@@ -401,7 +422,7 @@ export default class AppIndexViewModel {
iconcls: 'fa fa-share-square',
icon: '',
textcls: '',
appfunctag: '_9',
appfunctag: '_10',
appfuncyype: 'APPVIEW',
viewname: 'eamapply-grid-view',
resourcetag: '',
......@@ -464,7 +485,7 @@ export default class AppIndexViewModel {
*/
private funcs: any[] = [
{
appfunctag: '_12',
appfunctag: '_13',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamassettypegridview',
......@@ -476,7 +497,7 @@ export default class AppIndexViewModel {
],
},
{
appfunctag: '_13',
appfunctag: '_14',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamlocationtreeexpview',
......@@ -512,7 +533,7 @@ export default class AppIndexViewModel {
],
},
{
appfunctag: '_14',
appfunctag: '_15',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamservicelevelgridview',
......@@ -524,7 +545,7 @@ export default class AppIndexViewModel {
],
},
{
appfunctag: '_11',
appfunctag: '_12',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamassettreeexpview',
......@@ -548,7 +569,7 @@ export default class AppIndexViewModel {
],
},
{
appfunctag: '_7',
appfunctag: '_8',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamlocationstatemodelgridview',
......@@ -560,7 +581,7 @@ export default class AppIndexViewModel {
],
},
{
appfunctag: '_8',
appfunctag: '_9',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamlocationstatelistexpview',
......@@ -572,7 +593,7 @@ export default class AppIndexViewModel {
],
},
{
appfunctag: '_10',
appfunctag: '_11',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamlocationtypegridview',
......@@ -599,6 +620,18 @@ export default class AppIndexViewModel {
appfunctag: '_6',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamwotypegridview',
deResParameters: [],
routepath: '/appindexview/:appindexview?/eamwotypes/:eamwotype?/gridview/:gridview?',
parameters: [
{ pathName: 'eamwotypes', parameterName: 'eamwotype' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: '_7',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamsparepartsgroupgridview',
deResParameters: [],
routepath: '/appindexview/:appindexview?/eamsparepartsgroups/:eamsparepartsgroup?/gridview/:gridview?',
......@@ -608,7 +641,7 @@ export default class AppIndexViewModel {
],
},
{
appfunctag: '_9',
appfunctag: '_10',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'eamapplygridview',
......
app_AssetManagement/src/widgets/eamwotype/main-grid/main-grid-base.tsx
浏览文件 @ fcf36ded
......@@ -83,6 +83,22 @@ export class MainGridBase extends GridControlBase {
* @memberof MainGridBase
*/
public allColumns: any[] = [
{
name: 'eamwotypeid',
label: '工单类型标识',
langtag: 'entities.eamwotype.main_grid.columns.eamwotypeid',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
{
name: 'eamwotypename',
label: '工单类型名称',
langtag: 'entities.eamwotype.main_grid.columns.eamwotypename',
show: true,
util: 'PX',
isEnableRowEdit: false,
},
]
/**
......@@ -117,6 +133,8 @@ export class MainGridBase extends GridControlBase {
* @memberof MainBase
*/
public hasRowEdit: any = {
'eamwotypeid':false,
'eamwotypename':false,
};
/**
......@@ -131,4 +149,18 @@ export class MainGridBase extends GridControlBase {
}
/**
* 导出数据格式化
*
* @param {*} filterVal
* @param {*} jsonData
* @param {any[]} [codelistColumns=[]]
* @returns {Promise<any>}
* @memberof MainGridBase
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
]);
}
}
\ No newline at end of file
app_AssetManagement/src/widgets/eamwotype/main-grid/main-grid-model.ts
浏览文件 @ fcf36ded
......@@ -31,6 +31,16 @@ export default class MainModel {
prop: 'eamwostatemodelid',
dataType: 'PICKUP',
},
{
name: 'eamwotypename',
prop: 'eamwotypename',
dataType: 'TEXT',
},
{
name: 'eamwotypeid',
prop: 'eamwotypeid',
dataType: 'GUID',
},
{
name: 'srfmajortext',
prop: 'eamwotypename',
......
app_AssetManagement/src/widgets/eamwotype/main-grid/main-grid.html
浏览文件 @ fcf36ded
......@@ -23,6 +23,30 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('eamwotypeid')">
<el-table-column show-overflow-tooltip :prop="'eamwotypeid'" :label="$t('entities.eamwotype.main_grid.columns.eamwotypeid')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.eamwotype.main_grid.columns.eamwotypeid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.eamwotypeid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('eamwotypename')">
<el-table-column show-overflow-tooltip :prop="'eamwotypename'" :label="$t('entities.eamwotype.main_grid.columns.eamwotypename')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.eamwotype.main_grid.columns.eamwotypename')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.eamwotypename}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......
assetmanagement-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ fcf36ded
......@@ -642,7 +642,7 @@
<!--输出实体[EAMWOTYPE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamwotype-10-28">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamwotype-15-28">
<createTable tableName="EAMWOTYPE">
<column name="EAMWOTYPENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -664,7 +664,7 @@
<!--输出实体[EAMWORKORDER]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-69-29">
<changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-75-29">
<createTable tableName="WORKORDER">
<column name="WORKORDERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_EAMWORKORDER_WORKORDERID"/>
......@@ -843,26 +843,26 @@
<addForeignKeyConstraint baseColumnNames="EAMWOSTATEMODELID" baseTableName="EAMWOSTATEMODELLINE" constraintName="DER1N_EAMWOSTATEMODELLINE_EAMW" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOSTATEMODELID" referencedTableName="EAMWOSTATEMODEL" validate="true"/>
</changeSet>
<!--输出实体[EAMWOTYPE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamwotype-10-64">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamwotype-15-64">
<addForeignKeyConstraint baseColumnNames="EAMWOSTATEMODELID" baseTableName="EAMWOTYPE" constraintName="DER1N_EAMWOTYPE_EAMWOSTATEMODE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOSTATEMODELID" referencedTableName="EAMWOSTATEMODEL" validate="true"/>
</changeSet>
<!--输出实体[EAMWORKORDER]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-69-65">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-65">
<addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMASSET_AS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-69-66">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-66">
<addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMLOCATION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-69-67">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-67">
<addForeignKeyConstraint baseColumnNames="EAMSERVICELEVELID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMSERVICEL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMSERVICELEVELID" referencedTableName="EAMSERVICELEVEL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-69-68">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-68">
<addForeignKeyConstraint baseColumnNames="EAMWOORIGINID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWOORIGIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOORIGINID" referencedTableName="EAMWOORIGIN" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-69-69">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-69">
<addForeignKeyConstraint baseColumnNames="PWORKORDERID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWORKORDE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WORKORDERID" referencedTableName="WORKORDER" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-69-70">
<changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-75-70">
<addForeignKeyConstraint baseColumnNames="EAMWOTYPEID" baseTableName="WORKORDER" constraintName="DER1N_EAMWORKORDER_EAMWOTYPE_E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMWOTYPEID" referencedTableName="EAMWOTYPE" validate="true"/>
</changeSet>
<!--输出实体[EAMWOORIGIN]外键关系 -->
......
assetmanagement-core/src/main/resources/permission/systemResource.json
浏览文件 @ fcf36ded
......@@ -193,7 +193,7 @@
{
"appid":"AssetManagement",
"appname":"资产管理",
"appmenu":[{"menuid":"AppIndexView", "menuname":"AppIndexView", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem15" , "name":"系统设置" , "items":[{ "id":"menuitem16" , "name":"服务等级" },{ "id":"menuitem17" , "name":"维护申请类型" }]}]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem1" , "name":"功能位置" , "items":[{ "id":"menuitem6" , "name":"功能位置状态" },{ "id":"menuitem7" , "name":"功能位置状态模型" },{ "id":"menuitem8" , "name":"功能位置类型" },{ "id":"menuitem9" , "name":"功能位置" }]},{ "id":"menuitem2" , "name":"资产管理" , "items":[{ "id":"menuitem10" , "name":"资产状态" },{ "id":"menuitem11" , "name":"资产状态模型" },{ "id":"menuitem12" , "name":"资产类型" },{ "id":"menuitem13" , "name":"资产管理" },{ "id":"menuitem14" , "name":"备件包" }]},{ "id":"menuitem4" , "name":"工单管理" , "items":[{ "id":"menuitem3" , "name":"维护申请" },{ "id":"menuitem18" , "name":"工单" }]},{ "id":"menuitem5" , "name":"维护计划" }]}] }]
"appmenu":[{"menuid":"AppIndexView", "menuname":"AppIndexView", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" },{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem15" , "name":"系统设置" , "items":[{ "id":"menuitem16" , "name":"服务等级" },{ "id":"menuitem17" , "name":"维护申请类型" },{ "id":"menuitem19" , "name":"工单类型" }]}]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem1" , "name":"功能位置" , "items":[{ "id":"menuitem6" , "name":"功能位置状态" },{ "id":"menuitem7" , "name":"功能位置状态模型" },{ "id":"menuitem8" , "name":"功能位置类型" },{ "id":"menuitem9" , "name":"功能位置" }]},{ "id":"menuitem2" , "name":"资产管理" , "items":[{ "id":"menuitem10" , "name":"资产状态" },{ "id":"menuitem11" , "name":"资产状态模型" },{ "id":"menuitem12" , "name":"资产类型" },{ "id":"menuitem13" , "name":"资产管理" },{ "id":"menuitem14" , "name":"备件包" }]},{ "id":"menuitem4" , "name":"工单管理" , "items":[{ "id":"menuitem3" , "name":"维护申请" },{ "id":"menuitem18" , "name":"工单" }]},{ "id":"menuitem5" , "name":"维护计划" }]}] }]
}
]
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或