xignzi006 发布系统代码

app_AssetManagement/public/assets/json/data-dictionary.json

  [
         {
-        "srfkey": "SysOperator",
-        "emptytext": "未定义",
-        "codelisttype":"dynamic",
-        "appdataentity":"",
-        "appdedataset":"",
-        "items": []
-    }, 
-    {
         "srfkey": "YesNo",
         "emptytext": "未定义",
         "codelisttype":"static",

app_AssetManagement/public/assets/json/view-config.json

@@ -429,6 +429,16 @@
         "viewtag": "6e69be88d76554770ec8448800b6881d",
         "memo": ""
     },
+    "eamplaneditview": {
+        "title": "维护计划编辑视图",
+        "caption": "维护计划",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Plan",
+        "viewname": "EAMPlanEditView",
+        "viewfilename": "eamplan-edit-view",
+        "viewtag": "71e5025e5eabed8ee7dbaff4bf24a189",
+        "memo": "系统自动添加"
+    },
     "eamsparepartsproeditview": {
         "title": "备件包物料编辑视图",
         "caption": "备件包物料",
@@ -610,7 +620,7 @@
         "memo": ""
     },
     "eamdocumentgridview": {
-        "title": "文档表格视图",
+        "title": "文档信息",
         "caption": "文档",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Asset",

app_AssetManagement/src/engine/view/edit-view-engine.ts

@@ -195,12 +195,11 @@ export default class EditViewEngine extends ViewEngine {
      */
     public setTabCaption(info: string, isNew: boolean): void {
         let viewdata: any = this.view.model;
-        if (viewdata && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
+        if (viewdata && info && !Object.is(info, '')) {
             if (this.view.$route) {
                 this.view.$route.meta.info = info;
             }
-            const title = this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
-            this.view.$emit('viewModelChange', title);
+            this.view.$emit('viewModelChange', this.view.viewCaption);
             this.view.$appService.navHistory.setCaption({ tag: this.view.viewtag, info: viewdata.dataInfo });
         }
     }

app_AssetManagement/src/interface/entity/eamwork-order.ts

@@ -205,4 +205,36 @@ export interface EAMWorkOrder {
      * @memberof EAMWorkOrder
      */
     description?: any;
+
+    /**
+     * 组织标识
+     *
+     * @returns {*}
+     * @memberof EAMWorkOrder
+     */
+    orgid?: any;
+
+    /**
+     * 组织
+     *
+     * @returns {*}
+     * @memberof EAMWorkOrder
+     */
+    orgname?: any;
+
+    /**
+     * 部门标识
+     *
+     * @returns {*}
+     * @memberof EAMWorkOrder
+     */
+    deptid?: any;
+
+    /**
+     * 部门
+     *
+     * @returns {*}
+     * @memberof EAMWorkOrder
+     */
+    deptname?: any;
 }
\ No newline at end of file

app_AssetManagement/src/locale/lanres/codelist/codelist_en_US.ts

 export default {
-    SysOperator: {
-        "empty": "",
-    },
     YesNo: {
         "1": "是",
         "0": "否",

app_AssetManagement/src/locale/lanres/codelist/codelist_zh_CN.ts

 export default {
-    SysOperator: {
-        "empty": "",
-    },
     YesNo: {
         "1": "是",
         "0": "否",

app_AssetManagement/src/locale/lanres/entities/eamdocument/eamdocument_en_US.ts

@@ -26,7 +26,7 @@ export default {
 		},
 		gridview: {
 			caption: "文档",
-      		title: "文档表格视图",
+      		title: "文档信息",
 		},
 	},
 	main_form: {

app_AssetManagement/src/locale/lanres/entities/eamdocument/eamdocument_zh_CN.ts

@@ -25,7 +25,7 @@ export default {
 		},
 		gridview: {
 			caption: "文档",
-      		title: "文档表格视图",
+      		title: "文档信息",
 		},
 	},
 	main_form: {

app_AssetManagement/src/locale/lanres/entities/eamlocation/eamlocation_en_US.ts

@@ -111,8 +111,6 @@ export default {
 		details: {
 			group1: "功能位置基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "功能位置标识", 
@@ -124,10 +122,6 @@ export default {
 			locationnumber: "功能位置编号", 
 			eamlocationname: "功能位置名称", 
 			eamlocationtypename: "功能位置类型", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
 			eamlocationid: "功能位置标识", 
 			eamlocationtypeid: "功能位置类型标识", 
 		},
@@ -218,6 +212,28 @@ export default {
 			tip: "关闭",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openeditview: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	treechildgridviewtoolbar_toolbar: {
 		tbitem5: {
 			caption: "New",

app_AssetManagement/src/locale/lanres/entities/eamlocation/eamlocation_zh_CN.ts

@@ -110,8 +110,6 @@ export default {
 		details: {
 			group1: "功能位置基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "功能位置标识", 
@@ -123,10 +121,6 @@ export default {
 			locationnumber: "功能位置编号", 
 			eamlocationname: "功能位置名称", 
 			eamlocationtypename: "功能位置类型", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
 			eamlocationid: "功能位置标识", 
 			eamlocationtypeid: "功能位置类型标识", 
 		},
@@ -217,6 +211,28 @@ export default {
 			tip: "关闭",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openeditview: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	treechildgridviewtoolbar_toolbar: {
 		tbitem5: {
 			caption: "新建",

app_AssetManagement/src/locale/lanres/entities/eamplan/eamplan_en_US.ts

@@ -31,6 +31,10 @@ export default {
 			caption: "维护计划",
       		title: "维护计划主信息看板",
 		},
+		editview: {
+			caption: "维护计划",
+      		title: "维护计划编辑视图",
+		},
 		info_mainview: {
 			caption: "维护计划",
       		title: "维护计划主信息",
@@ -102,6 +106,25 @@ export default {
 		uiactions: {
 		},
 	},
+	main_form: {
+		details: {
+			group1: "维护计划基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "维护计划标识", 
+			srfmajortext: "维护计划名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			eamplanid: "维护计划标识", 
+		},
+		uiactions: {
+		},
+	},
 	grid_001_grid: {
 		columns: {
 			assetname: "资产",
@@ -131,6 +154,94 @@ export default {
 		uiactions: {
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem10: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem12: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem11: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem18: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem9: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem19: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem5: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem21: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem22: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "第一个记录",
+			tip: "第一个记录",
+		},
+		tbitem7: {
+			caption: "上一个记录",
+			tip: "上一个记录",
+		},
+		tbitem6: {
+			caption: "下一个记录",
+			tip: "下一个记录",
+		},
+		tbitem4: {
+			caption: "最后一个记录",
+			tip: "最后一个记录",
+		},
+		tbitem25: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem3: {
+			caption: "Help",
+			tip: "Help",
+		},
+	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openmaineditview: {
+			caption: "打开主编辑界面",
+			tip: "打开主编辑界面",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	assetplangridviewtoolbar_toolbar: {
 		tbitem12_openquickcreateview: {
 			caption: "新建",

app_AssetManagement/src/locale/lanres/entities/eamplan/eamplan_zh_CN.ts

@@ -30,6 +30,10 @@ export default {
 			caption: "维护计划",
       		title: "维护计划主信息看板",
 		},
+		editview: {
+			caption: "维护计划",
+      		title: "维护计划编辑视图",
+		},
 		info_mainview: {
 			caption: "维护计划",
       		title: "维护计划主信息",
@@ -101,6 +105,25 @@ export default {
 		uiactions: {
 		},
 	},
+	main_form: {
+		details: {
+			group1: "维护计划基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "维护计划标识", 
+			srfmajortext: "维护计划名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			eamplanid: "维护计划标识", 
+		},
+		uiactions: {
+		},
+	},
 	grid_001_grid: {
 		columns: {
 			assetname: "资产",
@@ -130,6 +153,94 @@ export default {
 		uiactions: {
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem10: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem12: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem11: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem18: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem9: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem19: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem5: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem21: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem22: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem2: {
+			caption: "第一个记录",
+			tip: "第一个记录",
+		},
+		tbitem7: {
+			caption: "上一个记录",
+			tip: "上一个记录",
+		},
+		tbitem6: {
+			caption: "下一个记录",
+			tip: "下一个记录",
+		},
+		tbitem4: {
+			caption: "最后一个记录",
+			tip: "最后一个记录",
+		},
+		tbitem25: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem3: {
+			caption: "帮助",
+			tip: "帮助",
+		},
+	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openmaineditview: {
+			caption: "打开主编辑界面",
+			tip: "打开主编辑界面",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	assetplangridviewtoolbar_toolbar: {
 		tbitem12_openquickcreateview: {
 			caption: "新建",

app_AssetManagement/src/locale/lanres/entities/eamwork-order/eamwork-order_en_US.ts

@@ -26,6 +26,10 @@ export default {
     eamwotypename: "工单类型",
     pworkordername: "上级工单",
     description: "描述",
+    orgid: "组织标识",
+    orgname: "组织",
+    deptid: "部门标识",
+    deptname: "部门",
   },
 	views: {
 		infoview: {
@@ -249,6 +253,38 @@ export default {
 			tip: "Filter",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem2: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openeditview: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	assetwogridviewtoolbar_toolbar: {
 		tbitem12_openquickcreateview: {
 			caption: "新建",
@@ -387,14 +423,4 @@ export default {
 			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/eamwork-order/eamwork-order_zh_CN.ts

@@ -25,6 +25,10 @@ export default {
     eamwotypename: "工单类型",
     pworkordername: "上级工单",
     description: "描述",
+    orgid: "组织标识",
+    orgname: "组织",
+    deptid: "部门标识",
+    deptname: "部门",
   },
 	views: {
 		infoview: {
@@ -248,6 +252,38 @@ export default {
 			tip: "过滤",
 		},
 	},
+	editviewtoolbar_toolbar: {
+		tbitem2: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
+	infoviewtoolbar_toolbar: {
+		tbitem15_openeditview: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem15_remove_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem15_remove: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem17: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem1: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	assetwogridviewtoolbar_toolbar: {
 		tbitem12_openquickcreateview: {
 			caption: "新建",
@@ -386,14 +422,4 @@ export default {
 			tip: "过滤",
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem2: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem1: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
 };
\ No newline at end of file

app_AssetManagement/src/mock/codelist/codelist.ts

@@ -8,14 +8,6 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status, [
         {
-        "srfkey": "SysOperator",
-        "emptytext": "未定义",
-        "codelisttype":"dynamic",
-        "appdataentity":"",
-        "appdedataset":"",
-        "items": []
-    },
-    {
         srfkey: "YesNo",
         emptytext: "未定义",
         "codelisttype":"static",

app_AssetManagement/src/mock/viewconfig/viewconfig.ts

@@ -351,6 +351,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMPlanSummaryView",
             "viewtag": "6e69be88d76554770ec8448800b6881d"
         },
+        "eamplaneditview": {
+            "title": "维护计划编辑视图",
+            "caption": "维护计划",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Plan",
+            "viewname": "EAMPlanEditView",
+            "viewtag": "71e5025e5eabed8ee7dbaff4bf24a189"
+        },
         "eamsparepartsproeditview": {
             "title": "备件包物料编辑视图",
             "caption": "备件包物料",
@@ -496,7 +504,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "96e58ee9a57415beb8209aae53b14926"
         },
         "eamdocumentgridview": {
-            "title": "文档表格视图",
+            "title": "文档信息",
             "caption": "文档",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Asset",

app_AssetManagement/src/pages/apply/eamapply-grid-view/eamapply-grid-view.html

 <studio-view-style2 viewName="eamapplygridview" viewTitle="维护申请信息" class='degridview eamapply-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="维护申请名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/apply/eamapply-info-view/eamapply-info-view.html

 <studio-view-style2 viewName="eamapplyinfoview" viewTitle="维护申请信息" class='detabexpview eamapply-info-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_tabexppanel 
         :viewState="viewState"  

app_AssetManagement/src/pages/apply/eamapply-quick-create-view/eamapply-quick-create-view.html

 <studio-view-style2 viewName="eamapplyquickcreateview" viewTitle="快速新建" class='deoptview eamapply-quick-create-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_AssetManagement/src/pages/apply/eamapply-type-edit-view/eamapply-type-edit-view.html

 <studio-view-style2 viewName="eamapplytypeeditview" viewTitle="维护申请类型编辑" class='deeditview eamapply-type-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/apply/eamapply-type-grid-view/eamapply-type-grid-view.html

 <studio-view-style2 viewName="eamapplytypegridview" viewTitle="维护申请类型信息" class='degridview eamapply-type-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="维护申请类型名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/apply/eamapply-type-pickup-grid-view/eamapply-type-pickup-grid-view.html

 <studio-view-style2 viewName="eamapplytypepickupgridview" viewTitle="维护申请类型选择表格视图" class='depickupgridview eamapply-type-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/asset/eamasset-info-view/eamasset-info-view.html

 <studio-view-style2 viewName="eamassetinfoview" viewTitle="资产信息" class='detabexpview eamasset-info-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamasset-location-asset-grid-view/eamasset-location-asset-grid-view.html

 <studio-view-style2 viewName="eamassetlocationassetgridview" viewTitle="资产信息" class='degridview eamasset-location-asset-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="资产名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/asset/eamasset-parts-group-edit-view/eamasset-parts-group-edit-view.html

 <studio-view-style2 viewName="eamassetpartsgroupeditview" viewTitle="资产备件包编辑视图" class='deeditview eamasset-parts-group-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamasset-quick-create-view/eamasset-quick-create-view.html

 <studio-view-style2 viewName="eamassetquickcreateview" viewTitle="资产快速新建视图" class='deoptview eamasset-quick-create-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_AssetManagement/src/pages/asset/eamasset-state-edit-view/eamasset-state-edit-view.html

 <studio-view-style2 viewName="eamassetstateeditview" viewTitle="资产状态信息" class='deeditview eamasset-state-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamasset-state-grid-view/eamasset-state-grid-view.html

 <studio-view-style2 viewName="eamassetstategridview" viewTitle="资产状态信息" class='degridview eamasset-state-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="资产状态名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/asset/eamasset-state-model-edit-view/eamasset-state-model-edit-view.html

 <studio-view-style2 viewName="eamassetstatemodeleditview" viewTitle="资产状态模型编辑视图" class='deeditview eamasset-state-model-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamasset-state-model-grid-view/eamasset-state-model-grid-view.html

 <studio-view-style2 viewName="eamassetstatemodelgridview" viewTitle="资产状态模型信息" class='degridview eamasset-state-model-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="资产状态模型名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/asset/eamasset-state-model-line-edit-view/eamasset-state-model-line-edit-view.html

 <studio-view-style2 viewName="eamassetstatemodellineeditview" viewTitle="资产状态模型明细编辑视图" class='deeditview eamasset-state-model-line-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamasset-state-model-pickup-grid-view/eamasset-state-model-pickup-grid-view.html

 <studio-view-style2 viewName="eamassetstatemodelpickupgridview" viewTitle="资产状态模型选择表格视图" class='depickupgridview eamasset-state-model-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/asset/eamasset-state-pickup-grid-view/eamasset-state-pickup-grid-view.html

 <studio-view-style2 viewName="eamassetstatepickupgridview" viewTitle="资产状态选择表格视图" class='depickupgridview eamasset-state-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/asset/eamasset-tree-exp-view/eamasset-tree-exp-view.html

 <studio-view-style2 viewName="eamassettreeexpview" viewTitle="资产信息" class='detreeexpview eamasset-tree-exp-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_treeexpbar 
                     :viewState="viewState"  

app_AssetManagement/src/pages/asset/eamasset-type-edit-view/eamasset-type-edit-view.html

 <studio-view-style2 viewName="eamassettypeeditview" viewTitle="资产类型信息" class='deeditview eamasset-type-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamasset-type-grid-view/eamasset-type-grid-view.html

 <studio-view-style2 viewName="eamassettypegridview" viewTitle="资产类型信息" class='degridview eamasset-type-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="资产类型名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/asset/eamasset-type-info-view/eamasset-type-info-view.html

 <studio-view-style2 viewName="eamassettypeinfoview" viewTitle="资产类型信息" class='detabexpview eamasset-type-info-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_tabexppanel 
         :viewState="viewState"  

app_AssetManagement/src/pages/asset/eamasset-type-pickup-grid-view/eamasset-type-pickup-grid-view.html

 <studio-view-style2 viewName="eamassettypepickupgridview" viewTitle="资产类型选择表格视图" class='depickupgridview eamasset-type-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/asset/eamasset-type-summary-view/eamasset-type-summary-view.html

 <studio-view-style2 viewName="eamassettypesummaryview" viewTitle="资产类型主信息看板" class='deportalview eamasset-type-summary-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_dashboard 
                     :viewState="viewState"  

app_AssetManagement/src/pages/asset/eamdocument-edit-view/eamdocument-edit-view.html

 <studio-view-style2 viewName="eamdocumenteditview" viewTitle="文档编辑视图" class='deeditview eamdocument-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamdocument-grid-view/eamdocument-grid-view-base.tsx

@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service";
 
 
 /**
- * 文档表格视图视图基类
+ * 文档信息视图基类
  *
  * @export
  * @class EAMDocumentGridViewBase

app_AssetManagement/src/pages/asset/eamdocument-grid-view/eamdocument-grid-view.html

-<studio-view-style2 viewName="eamdocumentgridview" viewTitle="文档表格视图" class='degridview eamdocument-grid-view'>
+<studio-view-style2 viewName="eamdocumentgridview" viewTitle="文档信息" class='degridview eamdocument-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="文档名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/asset/eamdocument-grid-view/eamdocument-grid-view.vue

@@ -7,7 +7,7 @@ import view_grid from '@widgets/eamdocument/main-grid/main-grid.vue';
 import view_searchform from '@widgets/eamdocument/default-searchform/default-searchform.vue';
 
 /**
- * 文档表格视图视图
+ * 文档信息视图
  *
  * @export
  * @class EAMDocumentGridView

app_AssetManagement/src/pages/asset/eamdocument-type-edit-view/eamdocument-type-edit-view.html

 <studio-view-style2 viewName="eamdocumenttypeeditview" viewTitle="文档类型编辑" class='deeditview eamdocument-type-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamdocument-type-grid-view/eamdocument-type-grid-view.html

 <studio-view-style2 viewName="eamdocumenttypegridview" viewTitle="文档类型信息" class='degridview eamdocument-type-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="文档类型名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/asset/eamdocument-type-pickup-grid-view/eamdocument-type-pickup-grid-view.html

 <studio-view-style2 viewName="eamdocumenttypepickupgridview" viewTitle="文档类型选择表格视图" class='depickupgridview eamdocument-type-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/asset/eamproductpickup-grid-view/eamproductpickup-grid-view.html

 <studio-view-style2 viewName="eamproductpickupgridview" viewTitle="产品选择表格视图" class='depickupgridview eamproductpickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/asset/eamspare-parts-group-edit-view/eamspare-parts-group-edit-view.html

 <studio-view-style2 viewName="eamsparepartsgroupeditview" viewTitle="备件包编辑视图" class='deeditview eamspare-parts-group-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/asset/eamspare-parts-group-grid-view/eamspare-parts-group-grid-view.html

 <studio-view-style2 viewName="eamsparepartsgroupgridview" viewTitle="备件包信息" class='degridview eamspare-parts-group-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="备件包名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/asset/eamspare-parts-group-info-view/eamspare-parts-group-info-view.html

 <studio-view-style2 viewName="eamsparepartsgroupinfoview" viewTitle="备件包信息" class='detabexpview eamspare-parts-group-info-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_tabexppanel 
         :viewState="viewState"  

app_AssetManagement/src/pages/asset/eamspare-parts-group-pickup-grid-view/eamspare-parts-group-pickup-grid-view.html

 <studio-view-style2 viewName="eamsparepartsgrouppickupgridview" viewTitle="备件包选择表格视图" class='depickupgridview eamspare-parts-group-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/base/app-index-view/page-register.ts

@@ -32,6 +32,7 @@ export const PageComponents = {
         Vue.component('eamlocation-type-pickup-grid-view', () => import('@pages/location/eamlocation-type-pickup-grid-view/eamlocation-type-pickup-grid-view.vue'));
         Vue.component('eamwork-order-summary-view', () => import('@pages/work-order/eamwork-order-summary-view/eamwork-order-summary-view.vue'));
         Vue.component('eamasset-summary-view', () => import('@pages/asset/eamasset-summary-view/eamasset-summary-view.vue'));
+        Vue.component('eamplan-edit-view', () => import('@pages/plan/eamplan-edit-view/eamplan-edit-view.vue'));
         Vue.component('eamasset-state-model-line-grid-view', () => import('@pages/asset/eamasset-state-model-line-grid-view/eamasset-state-model-line-grid-view.vue'));
         Vue.component('eamlocation-type-grid-view', () => import('@pages/location/eamlocation-type-grid-view/eamlocation-type-grid-view.vue'));
         Vue.component('eamasset-info-view', () => import('@pages/asset/eamasset-info-view/eamasset-info-view.vue'));
@@ -39,6 +40,7 @@ export const PageComponents = {
         Vue.component('eamasset-state-pickup-grid-view', () => import('@pages/asset/eamasset-state-pickup-grid-view/eamasset-state-pickup-grid-view.vue'));
         Vue.component('eamwork-order-info-view', () => import('@pages/work-order/eamwork-order-info-view/eamwork-order-info-view.vue'));
         Vue.component('eamwotype-pickup-view', () => import('@pages/work-order/eamwotype-pickup-view/eamwotype-pickup-view.vue'));
+        Vue.component('eamwork-order-edit-view', () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-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('eamdocument-grid-view', () => import('@pages/asset/eamdocument-grid-view/eamdocument-grid-view.vue'));

app_AssetManagement/src/pages/base/app-index-view/router.ts

@@ -895,6 +895,51 @@ const router = new Router({
                     },
                     component: () => import('@pages/asset/eamasset-summary-view/eamasset-summary-view.vue'),
                 },
+                {
+                    path: 'eamlocations/:eamlocation?/eamassets/:eamasset?/eamplans/:eamplan?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamplan.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-edit-view/eamplan-edit-view.vue'),
+                },
+                {
+                    path: 'eamassets/:eamasset?/eamplans/:eamplan?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamplan.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-edit-view/eamplan-edit-view.vue'),
+                },
+                {
+                    path: 'eamplans/:eamplan?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamplan.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/plan/eamplan-edit-view/eamplan-edit-view.vue'),
+                },
                 {
                     path: 'eamassetstatemodellines/:eamassetstatemodelline?/gridview/:gridview?',
                     meta: {
@@ -1135,6 +1180,147 @@ const router = new Router({
                     },
                     component: () => import('@pages/work-order/eamwotype-pickup-view/eamwotype-pickup-view.vue'),
                 },
+                {
+                    path: 'eamlocations/:eamlocation?/eamassets/:eamasset?/eamplans/:eamplan?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamlocations/:eamlocation?/eamassets/:eamasset?/eamapplies/:eamapply?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamapplies', parameterName: 'eamapply' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamassets/:eamasset?/eamplans/:eamplan?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamlocations/:eamlocation?/eamassets/:eamasset?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamassets/:eamasset?/eamapplies/:eamapply?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamapplies', parameterName: 'eamapply' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamplans/:eamplan?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamplans', parameterName: 'eamplan' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamassets/:eamasset?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamassets', parameterName: 'eamasset' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamapplies/:eamapply?/eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamapplies', parameterName: 'eamapply' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
+                {
+                    path: 'eamworkorders/:eamworkorder?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.eamworkorder.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.vue'),
+                },
                 {
                     path: 'eamlocations/:eamlocation?/eamassets/:eamasset?/eamapplies/:eamapply?/quickcreateview/:quickcreateview?',
                     meta: {

app_AssetManagement/src/pages/location/eamlocation-edit-view/eamlocation-edit-view.html

 <studio-view-style2 viewName="eamlocationeditview" viewTitle="功能位置编辑" class='deeditview eamlocation-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/location/eamlocation-info-view/eamlocation-info-view-base.tsx

@@ -88,9 +88,28 @@ export class EAMLocationInfoViewBase extends TabExpViewBase {
      * @memberof EAMLocationInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof EAMLocationInfoView
+     */
+    public toolBarModels: any = {
+        tbitem15_openeditview: { name: 'tbitem15_openeditview', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'OpenEditView', target: 'SINGLEKEY', class: '' } },
+
+        tbitem15_remove_sep: {  name: 'tbitem15_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem15_remove: { name: 'tbitem15_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
+
+        tbitem17: {  name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem1: { name: 'tbitem1', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -126,5 +145,125 @@ export class EAMLocationInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMLocationInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem15_openeditview')) {
+            this.toolbar_tbitem15_openeditview_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem15_remove')) {
+            this.toolbar_tbitem15_remove_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_openeditview_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMLocationUIService  = new EAMLocationUIService();
+        curUIService.EAMLocation_OpenEditView(datas,contextJO, paramJO,  $event, xData,this,"EAMLocation");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_remove_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMLocationUIService  = new EAMLocationUIService();
+        curUIService.EAMLocation_Remove(datas,contextJO, paramJO,  $event, xData,this,"EAMLocation");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"EAMLocation");
+    }
+
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMLocationInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 }
\ No newline at end of file

app_AssetManagement/src/pages/location/eamlocation-info-view/eamlocation-info-view.html

 <studio-view-style2 viewName="eamlocationinfoview" viewTitle="功能位置信息" class='detabexpview eamlocation-info-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_AssetManagement/src/pages/location/eamlocation-pickup-grid-view/eamlocation-pickup-grid-view.html

 <studio-view-style2 viewName="eamlocationpickupgridview" viewTitle="功能位置选择表格视图" class='depickupgridview eamlocation-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/location/eamlocation-quick-create-view/eamlocation-quick-create-view.html

 <studio-view-style2 viewName="eamlocationquickcreateview" viewTitle="快速新建" class='deoptview eamlocation-quick-create-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_AssetManagement/src/pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view.html

 <studio-view-style2 viewName="eamlocationstateeditview" viewTitle="功能位置状态信息" class='deeditview eamlocation-state-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                 :viewState="viewState"  

app_AssetManagement/src/pages/location/eamlocation-state-model-edit-view/eamlocation-state-model-edit-view.html

 <studio-view-style2 viewName="eamlocationstatemodeleditview" viewTitle="功能位置状态模型信息" class='deeditview eamlocation-state-model-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/location/eamlocation-state-model-grid-view/eamlocation-state-model-grid-view.html

 <studio-view-style2 viewName="eamlocationstatemodelgridview" viewTitle="功能位置状态模型信息" class='degridview eamlocation-state-model-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="功能位置状态模型名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/location/eamlocation-state-model-line-edit-view/eamlocation-state-model-line-edit-view.html

 <studio-view-style2 viewName="eamlocationstatemodellineeditview" viewTitle="功能位置状态模型明细编辑视图" class='deeditview eamlocation-state-model-line-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/location/eamlocation-state-model-pickup-grid-view/eamlocation-state-model-pickup-grid-view.html

 <studio-view-style2 viewName="eamlocationstatemodelpickupgridview" viewTitle="功能位置状态模型选择表格视图" class='depickupgridview eamlocation-state-model-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/location/eamlocation-state-pickup-grid-view/eamlocation-state-pickup-grid-view.html

 <studio-view-style2 viewName="eamlocationstatepickupgridview" viewTitle="功能位置状态信息" class='depickupgridview eamlocation-state-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/location/eamlocation-tree-exp-view/eamlocation-tree-exp-view.html

 <studio-view-style2 viewName="eamlocationtreeexpview" viewTitle="功能位置信息" class='detreeexpview eamlocation-tree-exp-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_treeexpbar 
                     :viewState="viewState"  

app_AssetManagement/src/pages/location/eamlocation-type-edit-view/eamlocation-type-edit-view.html

 <studio-view-style2 viewName="eamlocationtypeeditview" viewTitle="功能位置类型信息" class='deeditview eamlocation-type-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/location/eamlocation-type-grid-view/eamlocation-type-grid-view.html

 <studio-view-style2 viewName="eamlocationtypegridview" viewTitle="功能位置类型信息" class='degridview eamlocation-type-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="功能位置类型名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/location/eamlocation-type-pickup-grid-view/eamlocation-type-pickup-grid-view.html

 <studio-view-style2 viewName="eamlocationtypepickupgridview" viewTitle="功能位置类型选择表格视图" class='depickupgridview eamlocation-type-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/plan/eamplan-edit-view/eamplan-edit-view-base.tsx

+import { Subject } from 'rxjs';
+import { EditViewBase } from '@/studio-core';
+import EAMPlanService from '@/service/eamplan/eamplan-service';
+import EAMPlanAuthService from '@/authservice/eamplan/eamplan-auth-service';
+import EditViewEngine from '@engine/view/edit-view-engine';
+import EAMPlanUIService from '@/uiservice/eamplan/eamplan-ui-service';
+
+/**
+ * 维护计划编辑视图视图基类
+ *
+ * @export
+ * @class EAMPlanEditViewBase
+ * @extends {EditViewBase}
+ */
+export class EAMPlanEditViewBase extends EditViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanEditViewBase
+     */
+    protected appDeName: string = 'eamplan';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanEditViewBase
+     */
+    protected appDeKey: string = 'eamplanid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof EAMPlanEditViewBase
+     */
+    protected appDeMajor: string = 'eamplanname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMPlanService}
+     * @memberof EAMPlanEditViewBase
+     */
+    protected appEntityService: EAMPlanService = new EAMPlanService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type EAMPlanUIService
+     * @memberof EAMPlanEditViewBase
+     */
+    public appUIService: EAMPlanUIService = new EAMPlanUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof EAMPlanEditViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanEditViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.eamplan.views.editview.caption',
+        srfTitle: 'entities.eamplan.views.editview.title',
+        srfSubTitle: 'entities.eamplan.views.editview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof EAMPlanEditViewBase
+     */
+    protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_form: { name: 'form', type: 'FORM' },
+    };
+
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof EAMPlanEditView
+     */
+    public toolBarModels: any = {
+        tbitem10: { name: 'tbitem10', caption: '保存', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存', iconcls: 'fa fa-save', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '', class: '' } },
+
+        tbitem12: { name: 'tbitem12', caption: '保存并新建', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并新建', iconcls: 'sx-tb-saveandnew', icon: '../sasrfex/images/default/icon_saveandnew.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '', class: '' } },
+
+        tbitem11: { name: 'tbitem11', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'sx-tb-saveandclose', icon: '../sasrfex/images/default/icon_saveandclose.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
+
+        tbitem18: {  name: 'tbitem18', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem9: { name: 'tbitem9', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY', class: '' } },
+
+        tbitem19: {  name: 'tbitem19', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem5: { name: 'tbitem5', caption: '新建', 'isShowCaption': true, 'isShowIcon': true, tooltip: '新建', iconcls: 'fa fa-file-text-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '', class: '' } },
+
+        tbitem21: {  name: 'tbitem21', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem1: { name: 'tbitem1', caption: '拷贝', 'isShowCaption': true, 'isShowIcon': true, tooltip: '拷贝', iconcls: 'fa fa-copy', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY', class: '' } },
+
+        tbitem22: {  name: 'tbitem22', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem2: { name: 'tbitem2', caption: '第一个记录', 'isShowCaption': false, 'isShowIcon': true, tooltip: '第一个记录', iconcls: 'fa fa-fast-backward', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY', class: '' } },
+
+        tbitem7: { name: 'tbitem7', caption: '上一个记录', 'isShowCaption': false, 'isShowIcon': true, tooltip: '上一个记录', iconcls: 'fa fa-step-backward', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY', class: '' } },
+
+        tbitem6: { name: 'tbitem6', caption: '下一个记录', 'isShowCaption': false, 'isShowIcon': true, tooltip: '下一个记录', iconcls: 'fa fa-step-forward', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY', class: '' } },
+
+        tbitem4: { name: 'tbitem4', caption: '最后一个记录', 'isShowCaption': false, 'isShowIcon': true, tooltip: '最后一个记录', iconcls: 'fa fa-fast-forward', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'LastRecord', target: 'SINGLEKEY', class: '' } },
+
+        tbitem25: {  name: 'tbitem25', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem3: { name: 'tbitem3', caption: '帮助', 'isShowCaption': true, 'isShowIcon': true, tooltip: '帮助', iconcls: 'fa fa-question', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Help', target: '', class: '' } },
+
+    };
+
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '71e5025e5eabed8ee7dbaff4bf24a189';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof EAMPlanEditViewBase
+     */
+    public engine: EditViewEngine = new EditViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof EAMPlanEditViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'eamplan',
+            majorPSDEField: 'eamplanname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanEditViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem10')) {
+            this.toolbar_tbitem10_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem9')) {
+            this.toolbar_tbitem9_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem14')) {
+            this.toolbar_tbitem14_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem2')) {
+            this.toolbar_tbitem2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem7')) {
+            this.toolbar_tbitem7_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem3')) {
+            this.toolbar_tbitem3_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanEditViewBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanEditViewBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanEditViewBase
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem10_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Save(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndNew(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem11_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem13_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem14_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ViewWFStep(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.New(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Copy(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Print(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem7_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.PrevRecord(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem6_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.NextRecord(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.LastRecord(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem3_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Help(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 保存
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public Save(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                _this.$emit('viewdataschange', [{ ...response.data }]);
+            });
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
+
+    /**
+     * 保存并新建
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public SaveAndNew(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (!xData || !(xData.saveAndNew instanceof Function)) {
+            return;
+        }
+        xData.saveAndNew().then((response: any) => {
+            if (!response || response.status !== 200) {
+                _this.$emit('viewdataschange', JSON.stringify({status:'error',action:'saveAndNew'}));
+                return;
+            }
+            _this.$emit('viewdataschange', JSON.stringify({status:'success',action:'saveAndNew',data:response.data}));
+            if (xData.autoLoad instanceof Function) {
+                xData.autoLoad();
+            }
+        });
+    }
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 开始流程
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (!xData || !(xData.wfstart instanceof Function)) {
+            return;
+        }
+        xData.wfstart(args).then((response: any) => {
+            if (!response || response.status !== 200) {
+                return;
+            }
+            const { data: _data } = response;
+            if(window.parent){
+                window.parent.postMessage({ ..._data },'*');
+            }
+            if (_this.viewdata) {
+                _this.$emit('viewdataschange', [{ ..._data }]);
+                _this.$emit('close');
+            }else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
+            }
+        });
+    }
+    /**
+     * 当前流程步骤
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public ViewWFStep(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        let _this:any = this;
+        if (!xData || !(xData.wfsubmit instanceof Function)) {
+            return;
+        }
+        xData.wfsubmit(args).then((response: any) => {
+            if (!response || response.status !== 200) {
+                return;
+            }
+            const { data: _data } = response;
+
+            if (_this.viewdata) {
+                _this.$emit('viewdataschange', [{ ..._data }]);
+                _this.$emit('close');
+            } else if (_this.$tabPageExp) {
+                _this.$tabPageExp.onClose(_this.$route.fullPath);
+            }
+        });
+    }
+    /**
+     * 新建
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+         const _this: any = this;
+        if (_this.newdata && _this.newdata instanceof Function) {
+            const data: any = {};
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 拷贝
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public Copy(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { eamplan: args[0].eamplan });
+            }
+            if(!params) params = {};
+            Object.assign(params,{copymode:true});
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            Object.assign(this.viewparams,{copymode:true});
+        }
+    }
+    /**
+     * 打印
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public Print(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        let _this:any = this;
+        if (!xData || !(xData.print instanceof Function) || !$event) {
+            return ;
+        }
+        xData.print();
+    }
+
+
+
+
+    /**
+     * 帮助
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanEditViewBase
+     */
+    public Help(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.$Notice.error({ title: '错误', desc: '帮助未支持' });
+    }
+
+}
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-edit-view/eamplan-edit-view.html

+<studio-view-style2 viewName="eamplaneditview" viewTitle="维护计划编辑视图" class='deeditview eamplan-edit-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{viewCaption}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-edit-view/eamplan-edit-view.vue

+<template src="./eamplan-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { EAMPlanEditViewBase } from './eamplan-edit-view-base';
+import view_form from '@widgets/eamplan/main-form/main-form.vue';
+
+/**
+ * 维护计划编辑视图视图
+ *
+ * @export
+ * @class EAMPlanEditView
+ * @extends {EAMPlanEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class EAMPlanEditView extends EAMPlanEditViewBase { }
+</script>

app_AssetManagement/src/pages/plan/eamplan-grid-view/eamplan-grid-view.html

 <studio-view-style2 viewName="eamplangridview" viewTitle="维护计划信息" class='degridview eamplan-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="维护计划名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/plan/eamplan-info-view/eamplan-info-view-base.tsx

@@ -88,9 +88,28 @@ export class EAMPlanInfoViewBase extends TabExpViewBase {
      * @memberof EAMPlanInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof EAMPlanInfoView
+     */
+    public toolBarModels: any = {
+        tbitem15_openmaineditview: { name: 'tbitem15_openmaineditview', caption: '打开主编辑界面', 'isShowCaption': true, 'isShowIcon': true, tooltip: '打开主编辑界面', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'OpenMainEditView', target: 'SINGLEKEY', class: '' } },
+
+        tbitem15_remove_sep: {  name: 'tbitem15_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem15_remove: { name: 'tbitem15_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
+
+        tbitem17: {  name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem1: { name: 'tbitem1', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -126,5 +145,125 @@ export class EAMPlanInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMPlanInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem15_openmaineditview')) {
+            this.toolbar_tbitem15_openmaineditview_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem15_remove')) {
+            this.toolbar_tbitem15_remove_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_openmaineditview_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMPlanUIService  = new EAMPlanUIService();
+        curUIService.EAMPlan_OpenMainEditView(datas,contextJO, paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_remove_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMPlanUIService  = new EAMPlanUIService();
+        curUIService.EAMPlan_Remove(datas,contextJO, paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"EAMPlan");
+    }
+
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMPlanInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 }
\ No newline at end of file

app_AssetManagement/src/pages/plan/eamplan-info-view/eamplan-info-view.html

 <studio-view-style2 viewName="eamplaninfoview" viewTitle="维护计划信息" class='detabexpview eamplan-info-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_AssetManagement/src/pages/plan/eamplan-line-edit-view/eamplan-line-edit-view.html

 <studio-view-style2 viewName="eamplanlineeditview" viewTitle="计划步骤编辑" class='deeditview eamplan-line-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/plan/eamplan-pickup-grid-view/eamplan-pickup-grid-view.html

 <studio-view-style2 viewName="eamplanpickupgridview" viewTitle="维护计划选择表格视图" class='depickupgridview eamplan-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/plan/eamplan-quick-create-view/eamplan-quick-create-view.html

 <studio-view-style2 viewName="eamplanquickcreateview" viewTitle="快速新建" class='deoptview eamplan-quick-create-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_AssetManagement/src/pages/work-order/eammonitor-point-pickup-grid-view/eammonitor-point-pickup-grid-view.html

 <studio-view-style2 viewName="eammonitorpointpickupgridview" viewTitle="测点选择表格视图" class='depickupgridview eammonitor-point-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/pages/work-order/eamservice-level-edit-view/eamservice-level-edit-view.html

 <studio-view-style2 viewName="eamserviceleveleditview" viewTitle="服务等级编辑" class='deeditview eamservice-level-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/work-order/eamservice-level-grid-view/eamservice-level-grid-view.html

 <studio-view-style2 viewName="eamservicelevelgridview" viewTitle="服务等级信息" class='degridview eamservice-level-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="服务等级名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/work-order/eamwork-order-child-wogrid-view/eamwork-order-child-wogrid-view.html

 <studio-view-style2 viewName="eamworkorderchildwogridview" viewTitle="子工单表格" class='degridview eamwork-order-child-wogrid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="工单名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/work-order/eamwork-order-edit-view/eamwork-order-edit-view.html

 <studio-view-style2 viewName="eamworkordereditview" viewTitle="工单编辑视图" class='deeditview eamwork-order-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
-                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <view_form 
                 :viewState="viewState"  
                 :viewparams="viewparams" 

app_AssetManagement/src/pages/work-order/eamwork-order-grid-view/eamwork-order-grid-view.html

 <studio-view-style2 viewName="eamworkordergridview" viewTitle="工单信息" class='degridview eamwork-order-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="工单名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/work-order/eamwork-order-info-view/eamwork-order-info-view-base.tsx

@@ -88,9 +88,28 @@ export class EAMWorkOrderInfoViewBase extends TabExpViewBase {
      * @memberof EAMWorkOrderInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof EAMWorkOrderInfoView
+     */
+    public toolBarModels: any = {
+        tbitem15_openeditview: { name: 'tbitem15_openeditview', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'OpenEditView', target: 'SINGLEKEY', class: '' } },
+
+        tbitem15_remove_sep: {  name: 'tbitem15_remove_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem15_remove: { name: 'tbitem15_remove', caption: '删除并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'SINGLEKEY', class: '' } },
+
+        tbitem17: {  name: 'tbitem17', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem1: { name: 'tbitem1', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -126,5 +145,125 @@ export class EAMWorkOrderInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof EAMWorkOrderInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem15_openeditview')) {
+            this.toolbar_tbitem15_openeditview_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem15_remove')) {
+            this.toolbar_tbitem15_remove_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_openeditview_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMWorkOrderUIService  = new EAMWorkOrderUIService();
+        curUIService.EAMWorkOrder_OpenEditView(datas,contextJO, paramJO,  $event, xData,this,"EAMWorkOrder");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem15_remove_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:EAMWorkOrderUIService  = new EAMWorkOrderUIService();
+        curUIService.EAMWorkOrder_Remove(datas,contextJO, paramJO,  $event, xData,this,"EAMWorkOrder");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"EAMWorkOrder");
+    }
+
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMWorkOrderInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 }
\ No newline at end of file

app_AssetManagement/src/pages/work-order/eamwork-order-info-view/eamwork-order-info-view.html

 <studio-view-style2 viewName="eamworkorderinfoview" viewTitle="工单信息" class='detabexpview eamwork-order-info-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_AssetManagement/src/pages/work-order/eamwork-order-quick-create-view/eamwork-order-quick-create-view.html

 <studio-view-style2 viewName="eamworkorderquickcreateview" viewTitle="快速新建" class='deoptview eamwork-order-quick-create-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <view_form 
                     :viewState="viewState"  

app_AssetManagement/src/pages/work-order/eamwotype-edit-view/eamwotype-edit-view.html

 <studio-view-style2 viewName="eamwotypeeditview" viewTitle="工单类型编辑视图" class='deeditview eamwotype-edit-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/>    </template>

app_AssetManagement/src/pages/work-order/eamwotype-grid-view/eamwotype-grid-view.html

 <studio-view-style2 viewName="eamwotypegridview" viewTitle="工单类型表格视图" class='degridview eamwotype-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="工单类型名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">

app_AssetManagement/src/pages/work-order/eamwotype-pickup-grid-view/eamwotype-pickup-grid-view.html

 <studio-view-style2 viewName="eamwotypepickupgridview" viewTitle="工单类型选择表格视图" class='depickupgridview eamwotype-pickup-grid-view'>
     <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    <span class='caption-info'>{{viewCaption}}</span>
     </template>
     <template slot="searchForm">
                 <view_searchform 

app_AssetManagement/src/service/app/codelist-service.ts

-import SysOperator from '@/codelist/sys-operator';   
 import { Store } from 'vuex';
 
 /**
@@ -50,14 +49,6 @@ export default class CodeListService {
     public static codelistCached:Map<string,any> = new Map();
 
 
-    /**
-     * 代码表--云系统操作者
-     *
-     * @type {SysOperator}
-     * @memberof CodeListService
-     */
-    public SysOperator: SysOperator = new SysOperator();
-
     /**
      * 获取动态代码表
      *

app_AssetManagement/src/store/modules/view-action/state.ts

@@ -197,6 +197,7 @@ export const viewstate: any = {
             refviews: [
                 '8a03ef5ec2679c20c8072339004dcaaf',
                 'b1d6c73a4090f7747188a191cbb59000',
+                '8e9374f1a99e9f5e7b70b37ea8c6936c',
             ],
         },
         {
@@ -372,6 +373,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '71e5025e5eabed8ee7dbaff4bf24a189',
                 '7ecd11c1c5ee3add05dd5915be17cdb7',
                 'f51a84e7a2149cb66cb5db8370abb115',
                 '6e69be88d76554770ec8448800b6881d',
@@ -442,6 +444,15 @@ export const viewstate: any = {
                 '77a4e1c6dd284b75b0db1c44937f3d8b',
             ],
         },
+        {
+            viewtag: '71e5025e5eabed8ee7dbaff4bf24a189',
+            viewmodule: 'Plan',
+            viewname: 'EAMPlanEditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '720d2effd5c5d4802fb833e4506e6153',
             viewmodule: 'Asset',
@@ -589,6 +600,15 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '8e9374f1a99e9f5e7b70b37ea8c6936c',
+            viewmodule: 'WorkOrder',
+            viewname: 'EAMWorkOrderEditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '906130a9861c2b0cff3173c9e171c1d1',
             viewmodule: 'Asset',
@@ -943,6 +963,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'b24fce391aeca43222a1017b50ba40e2',
+                '1769804cd7ab51624ac3c88c2090363b',
                 'fc4b884f4116e498cafad375e0b6cb7d',
                 'cc29cbcb0398aa069d4b05f3469f0377',
             ],

app_AssetManagement/src/studio-core/utils/studio-drawer/studio-drawer.tsx

@@ -236,7 +236,7 @@ export class StudioDrawer extends Vue {
                             }
                             this.closeByIndex(i);
                         }}>
-                            {this.$t(ref.model.srfTitle)}
+                            {this.$t(ref.viewCaption)}
                         </span>
                     </span>;
                 })}

app_AssetManagement/src/studio-core/view/DashboardViewBase.tsx

@@ -52,7 +52,6 @@ export class DashboardViewBase extends ViewBase {
                     if (this.$route) {
                         this.$route.meta.info = this.model.dataInfo;
                     }
-                    Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });
                     this.$appService.navHistory.setCaption({ tag: this.viewtag, info: this.model.dataInfo });
                     this.$emit(events.view.MODEL_LOADED, data);
                 }

app_AssetManagement/src/studio-core/view/ExpViewBase.tsx

@@ -52,7 +52,6 @@ export class ExpViewBase extends ViewBase {
                     if (this.$route) {
                         this.$route.meta.info = this.model.dataInfo;
                     }
-                    Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfCaption)} - ${this.model.dataInfo}` });
                     this.$appService.navHistory.setCaption({ tag: this.viewtag, info: this.model.dataInfo });
                     this.$emit(events.view.MODEL_LOADED, data);
                 }

app_AssetManagement/src/studio-core/view/ViewBase.tsx

@@ -18,6 +18,20 @@ export class ViewBase extends Vue {
      */
     public viewState: Subject<ViewState> = new Subject();
 
+    /**
+     * 视图标题
+     *
+     * @readonly
+     * @type {string}
+     * @memberof ViewBase
+     */
+    get viewCaption(): string {
+        if (isExistAndNotEmpty(this.model.dataInfo)) {
+            return `${this.model.srfCaption} - ${this.model.dataInfo}`;
+        }
+        return this.model.srfCaption;
+    }
+
     /**
      * 视图对应应用实体名称
      *
@@ -52,7 +66,12 @@ export class ViewBase extends Vue {
      * @type {*}
      * @memberof ViewBase
      */
-    protected model: any = {};
+    protected model: any = {
+        srfTitle: null,
+        srfCaption: null,
+        srfSubTitle: null,
+        dataInfo: null
+    };
 
     /**
      * 在消息中心订阅的本地消息实例标识
@@ -347,6 +366,17 @@ export class ViewBase extends Vue {
         if (this.viewUsage === 1) {
             this.$appService.navHistory.setViewContext(this.context, this.viewtag);
         }
+        if (this.model) {
+            if (isExistAndNotEmpty(this.model.srfTitle)) {
+                this.model.srfTitle = this.$t(this.model.srfTitle);
+            }
+            if (isExistAndNotEmpty(this.model.srfCaption)) {
+                this.model.srfCaption = this.$t(this.model.srfCaption);
+            }
+            if (isExistAndNotEmpty(this.model.srfSubTitle)) {
+                this.model.srfSubTitle = this.$t(this.model.srfSubTitle);
+            }
+        }
         this.viewCreated();
     }
 

app_AssetManagement/src/uiservice/eamlocation/eamlocation-ui-service-base.ts

@@ -166,6 +166,74 @@ export default class EAMLocationUIServiceBase extends UIService {
         openIndexViewTab(data);
     }
 
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMLocation_Remove(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamlocation: '%eamlocation%' });
+        Object.assign(params, { eamlocationid: '%eamlocation%' });
+        Object.assign(params, { eamlocationname: '%eamlocationname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        // 直接调实体服务需要转换的数据
+        if(context && context.srfsessionid){
+          context.srfsessionkey = context.srfsessionid;
+            delete context.srfsessionid;
+        }
+              actionContext.closeView(null);
+        const backend = () => {
+            const curService:EAMLocationService =  new EAMLocationService();
+            curService.Remove(context,data, true).then((response: any) => {
+                if (!response || response.status !== 200) {
+                    actionContext.$Notice.error({ title: '错误', desc: response.message });
+                    return;
+                }
+                actionContext.$Notice.success({ title: '成功', desc: '删除并关闭成功！' });
+
+                const _this: any = actionContext;
+                if (xData && xData.refresh && xData.refresh instanceof Function) {
+                    xData.refresh(args);
+                }
+                return response;
+            }).catch((response: any) => {
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
+                    return;
+                }
+                if (response.status === 401) {
+                    return;
+                }
+                return response;
+            });
+        };
+        backend();
+    }
+
     /**
      * 新建
      *
@@ -228,6 +296,54 @@ export default class EAMLocationUIServiceBase extends UIService {
             openDrawer(view, data);
     }
 
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMLocation_OpenEditView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamlocation: '%eamlocation%' });
+        Object.assign(params, { eamlocationid: '%eamlocation%' });
+        Object.assign(params, { eamlocationname: '%eamlocationname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
 
     /**
      * 获取指定数据的重定向页面

app_AssetManagement/src/uiservice/eamplan/eamplan-ui-service-base.ts

@@ -92,6 +92,7 @@ export default class EAMPlanUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'assetplangridview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'infoview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'summaryview',srfappde:'eamplans'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'info_mainview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eamplans'});
         this.allViewMap.set(':',{viewname:'quickcreateview',srfappde:'eamplans'});
@@ -115,6 +116,74 @@ export default class EAMPlanUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMPlan_Remove(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamplan: '%eamplan%' });
+        Object.assign(params, { eamplanid: '%eamplan%' });
+        Object.assign(params, { eamplanname: '%eamplanname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        // 直接调实体服务需要转换的数据
+        if(context && context.srfsessionid){
+          context.srfsessionkey = context.srfsessionid;
+            delete context.srfsessionid;
+        }
+              actionContext.closeView(null);
+        const backend = () => {
+            const curService:EAMPlanService =  new EAMPlanService();
+            curService.Remove(context,data, true).then((response: any) => {
+                if (!response || response.status !== 200) {
+                    actionContext.$Notice.error({ title: '错误', desc: response.message });
+                    return;
+                }
+                actionContext.$Notice.success({ title: '成功', desc: '删除并关闭成功！' });
+
+                const _this: any = actionContext;
+                if (xData && xData.refresh && xData.refresh instanceof Function) {
+                    xData.refresh(args);
+                }
+                return response;
+            }).catch((response: any) => {
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
+                    return;
+                }
+                if (response.status === 401) {
+                    return;
+                }
+                return response;
+            });
+        };
+        backend();
+    }
+
     /**
      * 新建
      *
@@ -182,6 +251,63 @@ export default class EAMPlanUIServiceBase extends UIService {
             openDrawer(view, data);
     }
 
+    /**
+     * 打开主编辑界面
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMPlan_OpenMainEditView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamplan: '%eamplan%' });
+        Object.assign(params, { eamplanid: '%eamplan%' });
+        Object.assign(params, { eamplanname: '%eamplanname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        if(context.eamasset && true){
+            deResParameters = [
+            { pathName: 'eamassets', parameterName: 'eamasset' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'eamplans', parameterName: 'eamplan' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+            actionContext.closeView(null);
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            if (xData && xData.refresh && xData.refresh instanceof Function) {
+                xData.refresh(args);
+            }
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
     /**
      * 打开主信息界面
      *

app_AssetManagement/src/uiservice/eamwork-order/eamwork-order-ui-service-base.ts

@@ -116,6 +116,74 @@ export default class EAMWorkOrderUIServiceBase extends UIService {
     public initDeMainStateOPPrivsMap(){
     }
 
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMWorkOrder_Remove(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamworkorder: '%eamworkorder%' });
+        Object.assign(params, { workorderid: '%eamworkorder%' });
+        Object.assign(params, { workordername: '%workordername%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        // 直接调实体服务需要转换的数据
+        if(context && context.srfsessionid){
+          context.srfsessionkey = context.srfsessionid;
+            delete context.srfsessionid;
+        }
+              actionContext.closeView(null);
+        const backend = () => {
+            const curService:EAMWorkOrderService =  new EAMWorkOrderService();
+            curService.Remove(context,data, true).then((response: any) => {
+                if (!response || response.status !== 200) {
+                    actionContext.$Notice.error({ title: '错误', desc: response.message });
+                    return;
+                }
+                actionContext.$Notice.success({ title: '成功', desc: '删除并关闭成功！' });
+
+                const _this: any = actionContext;
+                if (xData && xData.refresh && xData.refresh instanceof Function) {
+                    xData.refresh(args);
+                }
+                return response;
+            }).catch((response: any) => {
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
+                    return;
+                }
+                if (response.status === 401) {
+                    return;
+                }
+                return response;
+            });
+        };
+        backend();
+    }
+
     /**
      * 新建
      *
@@ -236,6 +304,59 @@ export default class EAMWorkOrderUIServiceBase extends UIService {
         openIndexViewTab(data);
     }
 
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async EAMWorkOrder_OpenEditView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { eamworkorder: '%eamworkorder%' });
+        Object.assign(params, { workorderid: '%eamworkorder%' });
+        Object.assign(params, { workordername: '%workordername%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        if(context.eamapply && true){
+            deResParameters = [
+            { pathName: 'eamapplies', parameterName: 'eamapply' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'eamworkorders', parameterName: 'eamworkorder' },
+            { pathName: 'editview', parameterName: 'editview' },
+        ];
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
+            return null;
+        }
+        openIndexViewTab(data);
+    }
+
 
     /**
      * 获取指定数据的重定向页面

app_AssetManagement/src/widgets/eamlocation/ef-001-form/ef-001-form-base.tsx

@@ -85,10 +85,6 @@ export class EF_001EditFormBase extends EditFormControlBase {
         locationnumber: null,
         eamlocationname: null,
         eamlocationtypename: null,
-        createman: null,
-        createdate: null,
-        updateman: null,
-        updatedate: null,
         eamlocationid: null,
         eamlocationtypeid: null,
         eamlocation:null,
@@ -131,14 +127,10 @@ export class EF_001EditFormBase extends EditFormControlBase {
      * @memberof EF_001EditFormBase
      */
     public detailsModel: any = {
-        group1: new FormGroupPanelModel({ caption: '功能位置基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamlocation.ef_001_form', extractMode: 'ITEM', details: [] } }),
+        group1: new FormGroupPanelModel({ caption: '功能位置基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamlocation.ef_001_form', extractMode: 'ITEM', details: [] } }),
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
-        group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamlocation.ef_001_form', extractMode: 'ITEM', details: [] } }),
-
-        formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
-
         srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
@@ -161,18 +153,9 @@ export class EF_001EditFormBase extends EditFormControlBase {
 
         eamlocationtypename: new FormItemModel({ caption: '功能位置类型', detailType: 'FORMITEM', name: 'eamlocationtypename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        createman: new FormItemModel({ caption: '建立人', detailType: 'FORMITEM', name: 'createman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
-
-        createdate: new FormItemModel({ caption: '建立时间', detailType: 'FORMITEM', name: 'createdate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
-
-        updateman: new FormItemModel({ caption: '更新人', detailType: 'FORMITEM', name: 'updateman', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
-
-        updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', 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 }),
 
         eamlocationtypeid: new FormItemModel({ caption: '功能位置类型标识', detailType: 'FORMITEM', name: 'eamlocationtypeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
 }
\ No newline at end of file

app_AssetManagement/src/widgets/eamlocation/ef-001-form/ef-001-form-model.ts

@@ -70,26 +70,6 @@ export default class EF_001Model {
         prop: 'eamlocationtypename',
         dataType: 'PICKUPTEXT',
       },
-      {
-        name: 'createman',
-        prop: 'createman',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'createdate',
-        prop: 'createdate',
-        dataType: 'DATETIME',
-      },
-      {
-        name: 'updateman',
-        prop: 'updateman',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'updatedate',
-        prop: 'updatedate',
-        dataType: 'DATETIME',
-      },
       {
         name: 'eamlocationid',
         prop: 'eamlocationid',

app_AssetManagement/src/widgets/eamlocation/ef-001-form/ef-001-form.html

 <i-form :model="this.data" class='app-form' ref='form'  id='eamlocation_ef_001' style="">
     <input style="display:none;" />
     <row >
-    <tabs :animated="false" size="small" name='ef_001' :value="detailsModel.form.activiedPage" 
-        @on-click="detailsModel.form.clickPage($event)">
-            <tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='ef_001' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.eamlocation.ef_001_form.details.formpage1')
-                    ])
-                }">
-                    
+            
 <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamlocation.ef_001_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamlocation.ef_001_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>
         <i-col class="form-layout-container" v-show="detailsModel.locationnumber.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
@@ -77,68 +67,5 @@
 </i-col>
 
 
-            </tab-pane> 
-            <tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='ef_001' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.eamlocation.ef_001_form.details.formpage2')
-                    ])
-                }">
-                    
-<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamlocation.ef_001_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
-    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
-    <row>
-        <i-col class="form-layout-container" v-show="detailsModel.createman.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='createman' :itemRules="this.rules.createman" class='' :caption="$t('entities.eamlocation.ef_001_form.details.createman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createman.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='createman' :value="data.createman" dataType="TEXT"     :precision="0"
-tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
-</i-col>
-<i-col class="form-layout-container" v-show="detailsModel.createdate.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='createdate' :itemRules="this.rules.createdate" class='' :caption="$t('entities.eamlocation.ef_001_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='createdate' :value="data.createdate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
-</i-col>
-<i-col class="form-layout-container" v-show="detailsModel.updateman.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='updateman' :itemRules="this.rules.updateman" class='' :caption="$t('entities.eamlocation.ef_001_form.details.updateman')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updateman.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='updateman' :value="data.updateman" dataType="TEXT"     :precision="0"
-tag='SysOperator' codelistType='DYNAMIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
-</i-col>
-<i-col class="form-layout-container" v-show="detailsModel.updatedate.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='updatedate' :itemRules="this.rules.updatedate" class='' :caption="$t('entities.eamlocation.ef_001_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='updatedate' :value="data.updatedate" dataType="DATETIME" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
-</i-col>
-    
-    </row>
-</app-form-group>
-
-</i-col>
-
-
-            </tab-pane> 
-    </tabs>
     </row>
 </i-form>
\ No newline at end of file

app_AssetManagement/src/widgets/eamplan/main-form/main-form-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, EditFormControlBase } from '@/studio-core';
+import EAMPlanService from '@/service/eamplan/eamplan-service';
+import MainService from './main-form-service';
+import EAMPlanUIService from '@/uiservice/eamplan/eamplan-ui-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+
+
+/**
+ * form部件基类
+ *
+ * @export
+ * @class EditFormControlBase
+ * @extends {MainEditFormBase}
+ */
+export class MainEditFormBase extends EditFormControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainEditFormBase
+     */
+    protected controlType: string = 'FORM';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {MainService}
+     * @memberof MainEditFormBase
+     */
+    public service: MainService = new MainService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMPlanService}
+     * @memberof MainEditFormBase
+     */
+    public appEntityService: EAMPlanService = new EAMPlanService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainEditFormBase
+     */
+    protected appDeName: string = 'eamplan';
+
+    /**
+     * 应用实体中文名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainEditFormBase
+     */
+    protected appDeLogicName: string = '维护计划';
+    /**
+     * 界面UI服务对象
+     *
+     * @type {EAMPlanUIService}
+     * @memberof MainEditFormBase
+     */  
+    public appUIService:EAMPlanUIService = new EAMPlanUIService(this.$store);
+
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof MainEditFormBase
+     */
+    public data: any = {
+        srfupdatedate: null,
+        srforikey: null,
+        srfkey: null,
+        srfmajortext: null,
+        srftempmode: null,
+        srfuf: null,
+        srfdeid: null,
+        srfsourcekey: null,
+        eamplanid: null,
+        eamplan:null,
+    };
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof MainEditFormBase
+     */
+    public rules: any = {
+    }
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
+    public deRules:any = {
+    };
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof MainEditFormBase
+     */
+    public detailsModel: any = {
+        group1: new FormGroupPanelModel({ caption: '维护计划基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamplan.main_form', extractMode: 'ITEM', details: [] } }),
+
+        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamplan.main_form', extractMode: 'ITEM', details: [] } }),
+
+        formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfkey: new FormItemModel({ caption: '维护计划标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfmajortext: new FormItemModel({ caption: '维护计划名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamplanid: new FormItemModel({ caption: '维护计划标识', detailType: 'FORMITEM', name: 'eamplanid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
+    };
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eamplan/main-form/main-form-model.ts

+/**
+ * Main 部件模型
+ *
+ * @export
+ * @class MainModel
+ */
+export default class MainModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof MainModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'eamplanid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'eamplanname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'eamplanid',
+        prop: 'eamplanid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'eamplan',
+        prop: 'eamplanid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eamplan/main-form/main-form-service.ts

+import { Http,Util,Errorlog } from '@/utils';
+import ControlService from '@/widgets/control-service';
+import EAMPlanService from '@/service/eamplan/eamplan-service';
+import MainModel from './main-form-model';
+
+
+/**
+ * Main 部件服务对象
+ *
+ * @export
+ * @class MainService
+ */
+export default class MainService extends ControlService {
+
+    /**
+     * 维护计划服务对象
+     *
+     * @type {EAMPlanService}
+     * @memberof MainService
+     */
+    public appEntityService: EAMPlanService = new EAMPlanService({ $store: this.getStore() });
+
+    /**
+     * 设置从数据模式
+     *
+     * @type {boolean}
+     * @memberof MainService
+     */
+    public setTempMode(){
+        this.isTempMode = false;
+    }
+
+    /**
+     * Creates an instance of MainService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof MainService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.model = new MainModel();
+    }
+
+    /**
+     * 处理数据
+     *
+     * @private
+     * @param {Promise<any>} promise
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data = response.data;
+                    data.forEach((item:any,index:number) =>{
+                        item[deName] = item[deKeyField];
+                        data[index] = item;
+                    });
+                    resolve(data);
+                } else {
+                    reject([])
+                }
+            }).catch((response: any) => {
+                reject([])
+            });
+        });
+    }
+
+    /**
+     * 获取跨实体数据集合
+     *
+     * @param {string} serviceName 服务名称
+     * @param {string} interfaceName 接口名称
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any[]>}
+     * @memberof  MainService
+     */
+    @Errorlog
+    public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        data.page = data.page ? data.page : 0;
+        data.size = data.size ? data.size : 1000;
+
+        return Promise.reject([])
+    }
+
+    /**
+     * 启动工作流
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @param {*} [localdata]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
+        data = this.handleWFData(data);
+        context = this.handleRequestData(action,context,data).context;
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](context,data, isloading,localdata);
+            } else {
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 提交工作流
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @param {*} [localdata]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
+        data = this.handleWFData(data,true);
+        context = this.handleRequestData(action,context,data,true).context;
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](context,data, isloading,localdata);
+            } else {
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 添加数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Create(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public delete(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Remove(Context,Data, isloading);
+            }
+            result.then((response) => {
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Update(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 查询数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public get(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Get(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 加载草稿
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        //仿真主键数据
+        const PrimaryKey = Util.createUUID();
+        Data.eamplanid = PrimaryKey;
+        Data.eamplan = PrimaryKey;
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.GetDraft(Context,Data, isloading);
+            }
+            result.then((response) => {
+                response.data.eamplanid = PrimaryKey;
+                this.handleResponse(action, response, true);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+     /**
+     * 前台逻辑
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof MainService
+     */
+    @Errorlog
+    public frontLogic(action:string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any)=>{
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                return Promise.reject({ status: 500, data: { title: '失败', message: '系统异常' } });
+            }
+            result.then((response) => {
+                this.handleResponse(action, response,true);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        })
+    }
+
+    /**
+     * 处理请求数据
+     * 
+     * @param action 行为 
+     * @param data 数据
+     * @memberof MainService
+     */
+    public handleRequestData(action: string,context:any, data: any = {},isMerge:boolean = false){
+        let mode: any = this.getMode();
+        if (!mode && mode.getDataItems instanceof Function) {
+            return data;
+        }
+        let formItemItems: any[] = mode.getDataItems();
+        let requestData:any = {};
+        if(isMerge && (data && data.viewparams)){
+            Object.assign(requestData,data.viewparams);
+        }
+        formItemItems.forEach((item:any) =>{
+            if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
+                if(item && item.prop){
+                    requestData[item.prop] = context[item.name];
+                }
+            }else{
+                if(item && item.prop){
+                    requestData[item.prop] = data[item.name];
+                }
+            }
+        });
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        if(tempContext && tempContext.srfsessionid){
+            tempContext.srfsessionkey = tempContext.srfsessionid;
+            delete tempContext.srfsessionid;
+        }
+        return {context:tempContext,data:requestData};
+    }
+
+    /**
+     * 通过属性名称获取表单项名称
+     * 
+     * @param name 实体属性名称 
+     * @memberof MainService
+     */
+    public getItemNameByDeName(name:string) :string{
+        let itemName = name;
+        let mode: any = this.getMode();
+        if (!mode && mode.getDataItems instanceof Function) {
+            return name;
+        }
+        let formItemItems: any[] = mode.getDataItems();
+        formItemItems.forEach((item:any)=>{
+            if(item.prop === name){
+                itemName = item.name;
+            }
+        });
+        return itemName.trim();
+    }
+
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eamplan/main-form/main-form.html

+<i-form :model="this.data" class='app-form' ref='form'  id='eamplan_main' style="">
+    <input style="display:none;" />
+    <row >
+    <tabs :animated="false" size="small" name='main' :value="detailsModel.form.activiedPage" 
+        @on-click="detailsModel.form.clickPage($event)">
+            <tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''  
+                :label="(h) =>{
+                    return h('span',{
+                        class:'caption'
+                    },[
+                    $t('entities.eamplan.main_form.details.formpage1')
+                    ])
+                }">
+                    
+<i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamplan.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
+    <row>
+            
+    </row>
+</app-form-group>
+
+</i-col>
+
+
+            </tab-pane> 
+            <tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class=''  
+                :label="(h) =>{
+                    return h('span',{
+                        class:'caption'
+                    },[
+                    $t('entities.eamplan.main_form.details.formpage2')
+                    ])
+                }">
+                    
+<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamplan.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
+    <row>
+            
+    </row>
+</app-form-group>
+
+</i-col>
+
+
+            </tab-pane> 
+    </tabs>
+    </row>
+</i-form>
\ No newline at end of file

app_AssetManagement/src/widgets/eamplan/main-form/main-form.vue

+<template src="./main-form.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { MainEditFormBase } from './main-form-base';
+ 
+
+/**
+ * form部件
+ *
+ * @export
+ * @class MainEditForm
+ * @extends {MainEditFormBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class MainEditForm extends MainEditFormBase { }
+</script>

app_AssetManagement/src/widgets/eamwork-order/board-001-dashboard/board-001-dashboard-model.ts

@@ -90,6 +90,18 @@ export default class BOARD_001Model {
       {
         name: 'description',
       },
+      {
+        name: 'orgid',
+      },
+      {
+        name: 'orgname',
+      },
+      {
+        name: 'deptid',
+      },
+      {
+        name: 'deptname',
+      },
     ]
   }
 

app_AssetManagement/src/widgets/eamwork-order/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel-model.ts

@@ -90,6 +90,18 @@ export default class InfoViewtabexppanelModel {
       {
         name: 'description',
       },
+      {
+        name: 'orgid',
+      },
+      {
+        name: 'orgname',
+      },
+      {
+        name: 'deptid',
+      },
+      {
+        name: 'deptname',
+      },
     ]
   }
 

app_AssetManagement/src/widgets/eamwork-order/info-viewtabviewpanel-tabviewpanel/info-viewtabviewpanel-tabviewpanel-model.ts

@@ -90,6 +90,18 @@ export default class InfoViewtabviewpanelModel {
       {
         name: 'description',
       },
+      {
+        name: 'orgid',
+      },
+      {
+        name: 'orgname',
+      },
+      {
+        name: 'deptid',
+      },
+      {
+        name: 'deptname',
+      },
     ]
   }
 

app_AssetManagement/src/widgets/eamwork-order/info-viewtabviewpanel2-tabviewpanel/info-viewtabviewpanel2-tabviewpanel-model.ts

@@ -90,6 +90,18 @@ export default class InfoViewtabviewpanel2Model {
       {
         name: 'description',
       },
+      {
+        name: 'orgid',
+      },
+      {
+        name: 'orgname',
+      },
+      {
+        name: 'deptid',
+      },
+      {
+        name: 'deptname',
+      },
     ]
   }
 

app_AssetManagement/src/widgets/eamwork-order/main-form/main-form-base.tsx

@@ -49,6 +49,15 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     protected appDeName: string = 'eamworkorder';
+
+    /**
+     * 应用实体中文名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainEditFormBase
+     */
+    protected appDeLogicName: string = '工单';
     /**
      * 界面UI服务对象
      *

app_AssetManagement/src/widgets/eamwork-order/part-v-001-portlet/part-v-001-portlet-model.ts

@@ -90,6 +90,18 @@ export default class PART_V_001Model {
       {
         name: 'description',
       },
+      {
+        name: 'orgid',
+      },
+      {
+        name: 'orgname',
+      },
+      {
+        name: 'deptid',
+      },
+      {
+        name: 'deptname',
+      },
     ]
   }
 

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /assetmanagement-app-assetmanagement.jar
 
-EXPOSE 10325
+EXPOSE 8080
 
 ADD assetmanagement-app-assetmanagement.jar /assetmanagement-app-assetmanagement.jar

assetmanagement-app/assetmanagement-app-assetmanagement/src/main/docker/assetmanagement-app-assetmanagement.yaml

@@ -3,25 +3,9 @@ services:
   assetmanagement-app-assetmanagement:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/assetmanagement-app-assetmanagement:latest
     ports:
-      - "10325:10325"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10325
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

assetmanagement-core/src/main/java/cn/ibizlab/assetmanagement/core/workorder/domain/EAMWorkOrder.java

@@ -227,6 +227,38 @@ public class EAMWorkOrder extends EntityMP implements Serializable {
     @JSONField(name = "description")
     @JsonProperty("description")
     private String description;
+    /**
+     * 组织标识
+     */
+    @DEField(preType = DEPredefinedFieldType.ORGID)
+    @TableField(value = "orgid")
+    @JSONField(name = "orgid")
+    @JsonProperty("orgid")
+    private String orgid;
+    /**
+     * 组织
+     */
+    @DEField(preType = DEPredefinedFieldType.ORGNAME)
+    @TableField(value = "orgname")
+    @JSONField(name = "orgname")
+    @JsonProperty("orgname")
+    private String orgname;
+    /**
+     * 部门标识
+     */
+    @DEField(preType = DEPredefinedFieldType.ORGSECTORID)
+    @TableField(value = "deptid")
+    @JSONField(name = "deptid")
+    @JsonProperty("deptid")
+    private String deptid;
+    /**
+     * 部门
+     */
+    @DEField(preType = DEPredefinedFieldType.ORGSECTORNAME)
+    @TableField(value = "deptname")
+    @JSONField(name = "deptname")
+    @JsonProperty("deptname")
+    private String deptname;
 
     /**
      * 

assetmanagement-core/src/main/resources/liquibase/h2_table.xml

@@ -276,7 +276,7 @@
 
 
     <!--输出实体[EAMDOCUMENT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamdocument-29-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamdocument-30-12">
         <createTable tableName="EAMDOCUMENT">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -328,7 +328,7 @@
 
 
     <!--输出实体[EAMLOCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-113-14">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-116-14">
         <createTable tableName="EAMLOCATION">
                 <column name="EAMLOCATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMLOCATION_EAMLOCATIONID"/>
@@ -492,7 +492,7 @@
 
 
     <!--输出实体[EAMPLAN]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamplan-57-21">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamplan-65-21">
         <createTable tableName="EAMPLAN">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -756,7 +756,7 @@
 
 
     <!--输出实体[EAMWORKORDER]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-87-32">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamworkorder-101-32">
         <createTable tableName="WORKORDER">
                 <column name="WORKORDERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMWORKORDER_WORKORDERID"/>
@@ -797,6 +797,14 @@
                 </column>
                 <column name="DESCRIPTION" remarks="" type="VARCHAR(2000)">
                 </column>
+                <column name="ORGID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="ORGNAME" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="DEPTID" remarks="" type="VARCHAR(100)">
+                </column>
+                <column name="DEPTNAME" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -876,10 +884,10 @@
        <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEMODELID" baseTableName="EAMASSETTYPE" constraintName="DER1N_EAMASSETTYPE_EAMASSETSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEMODELID" referencedTableName="EAMASSETSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMDOCUMENT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamdocument-29-50">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamdocument-30-50">
        <addForeignKeyConstraint baseColumnNames="EAMASSETTYPEID" baseTableName="EAMDOCUMENT" constraintName="DER1N_EAMDOCUMENT_EAMASSETTYPE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETTYPEID" referencedTableName="EAMASSETTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamdocument-29-51">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamdocument-30-51">
        <addForeignKeyConstraint baseColumnNames="EAMDOCUMENTTYPEID" baseTableName="EAMDOCUMENT" constraintName="DER1N_EAMDOCUMENT_EAMDOCUMENTT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMDOCUMENTTYPEID" referencedTableName="EAMDOCUMENTTYPE" validate="true"/>
     </changeSet>
         <!--输出实体[EAMDOCUMENTTYPE]外键关系 -->
@@ -887,13 +895,13 @@
        <addForeignKeyConstraint baseColumnNames="PEAMDOCUMENTTYPEID" baseTableName="EAMDOCUMENTTYPE" constraintName="DER1N_EAMDOCUMENTTYPE_EAMDOCUM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMDOCUMENTTYPEID" referencedTableName="EAMDOCUMENTTYPE" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-113-53">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-116-53">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEID" referencedTableName="EAMLOCATIONSTATE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-113-54">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-116-54">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONTYPEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONTYPEID" referencedTableName="EAMLOCATIONTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-113-55">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-116-55">
        <addForeignKeyConstraint baseColumnNames="PEAMLOCATIONID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATION_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONSTATE]外键关系 -->
@@ -909,13 +917,13 @@
         <!--输出实体[EAMMONITORPOINT]外键关系 -->
         <!--输出实体[EAMPRODUCT]外键关系 -->
         <!--输出实体[EAMPLAN]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-57-59">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-65-59">
        <addForeignKeyConstraint baseColumnNames="ASSETID" baseTableName="EAMPLAN" constraintName="DER1N_EAMPLAN_EAMASSET_ASSETID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ASSETID" referencedTableName="ASSET" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-57-60">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-65-60">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONID" baseTableName="EAMPLAN" constraintName="DER1N_EAMPLAN_EAMLOCATION_EAML" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-57-61">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamplan-65-61">
        <addForeignKeyConstraint baseColumnNames="EAMMONITORPOINTID" baseTableName="EAMPLAN" constraintName="DER1N_EAMPLAN_EAMMONITORPOINT_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMMONITORPOINTID" referencedTableName="EAMMONITORPOINT" validate="true"/>
     </changeSet>
         <!--输出实体[EAMPLANCDT]外键关系 -->
@@ -959,22 +967,22 @@
        <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-87-73">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-73">
        <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-87-74">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-74">
        <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-87-75">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-75">
        <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-87-76">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-76">
        <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-87-77">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-77">
        <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-87-78">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamworkorder-101-78">
        <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/mapper/workorder/eamworkorder/EAMWorkOrderMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="EAMWorkOrderResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  ) t1 where workorderid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEPTID`, t1.`DEPTNAME`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  ) t1 where workorderid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -97,18 +97,18 @@
 
     <!--数据查询[ChildWO]-->
     <sql id="ChildWO" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  
+		<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEPTID`, t1.`DEPTNAME`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  
 					 WHERE 	( t1.`PWORKORDERID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  
+		<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEPTID`, t1.`DEPTNAME`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  
+		<![CDATA[ SELECT t1.`ASSETID`, t11.`ASSETNAME`, t1.`BEGINTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEPTID`, t1.`DEPTNAME`, t1.`DESCRIPTION`, t1.`EAMLOCATIONID`, t21.`EAMLOCATIONNAME`, t1.`EAMSERVICELEVELID`, t31.`EAMSERVICELEVELNAME`, t1.`EAMWOORIGINID`, t41.`EAMWOORIGINNAME`, t1.`EAMWOTYPEID`, t51.`EAMWOTYPENAME`, t1.`ENDTIME`, t1.`MDATE`, t1.`ORGID`, t1.`ORGNAME`, t1.`PWORKORDERID`, t61.`WORKORDERNAME` AS `PWORKORDERNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`WODATE`, t1.`WONUMBER`, t1.`WORKLENGTH`, t1.`WORKORDERID`, t1.`WORKORDERNAME` FROM `WORKORDER` t1  LEFT JOIN ASSET t11 ON t1.ASSETID = t11.ASSETID  LEFT JOIN EAMLOCATION t21 ON t1.EAMLOCATIONID = t21.EAMLOCATIONID  LEFT JOIN EAMSERVICELEVEL t31 ON t1.EAMSERVICELEVELID = t31.EAMSERVICELEVELID  LEFT JOIN EAMWOORIGIN t41 ON t1.EAMWOORIGINID = t41.EAMWOORIGINID  LEFT JOIN EAMWOTYPE t51 ON t1.EAMWOTYPEID = t51.EAMWOTYPEID  LEFT JOIN WORKORDER t61 ON t1.PWORKORDERID = t61.WORKORDERID  
 			]]>
     </sql>
 </mapper>

assetmanagement-core/src/main/resources/permission/systemResource.json

     {
     "systemid":"iBizAssetManagement",
-    "systemname":"iBiz资产管理",
     "unires":[
     ],
     "entities":[
@@ -34,7 +33,7 @@
     "sysmoudle":{"id":"WORKORDER","name":"工单管理"},
     "dedataset":[{"id":"ChildWO" , "name":"下级工单"},{"id":"Default" , "name":"DEFAULT"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
-    "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"curorg","name":"当前单位"},{"id":"porg","name":"上级单位"},{"id":"sorg","name":"下级单位"} , {"id":"curorgdept","name":"当前部门"},{"id":"porgdept","name":"上级部门"},{"id":"sorgdept","name":"下级部门"} , {"id":"createman","name":"创建人"}]
      }
     ,    {
     "dename":"EAMLocation",

assetmanagement-provider/assetmanagement-provider-assetapi/src/main/java/cn/ibizlab/assetmanagement/assetapi/dto/EAMWorkOrderDTO.java

@@ -230,6 +230,38 @@ public class EAMWorkOrderDTO extends DTOBase implements Serializable {
     @JsonProperty("description")
     private String description;
 
+    /**
+     * 属性 [ORGID]
+     *
+     */
+    @JSONField(name = "orgid")
+    @JsonProperty("orgid")
+    private String orgid;
+
+    /**
+     * 属性 [ORGNAME]
+     *
+     */
+    @JSONField(name = "orgname")
+    @JsonProperty("orgname")
+    private String orgname;
+
+    /**
+     * 属性 [DEPTID]
+     *
+     */
+    @JSONField(name = "deptid")
+    @JsonProperty("deptid")
+    private String deptid;
+
+    /**
+     * 属性 [DEPTNAME]
+     *
+     */
+    @JSONField(name = "deptname")
+    @JsonProperty("deptname")
+    private String deptname;
+
 
     /**
      * 设置 [WORKORDERNAME]

assetmanagement-util/src/main/java/cn/ibizlab/assetmanagement/util/job/PermissionSyncJob.java

@@ -30,7 +30,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.systemid:iBizAssetManagement}")
     private String systemId;
     
-    @Value("${ibiz.systemid:iBiz资产管理}")
+    @Value("${ibiz.systemname:iBiz资产管理}")
     private String systemName;
 
 

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibizassetmanagement/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizassetmanagement/
-      mvn clean package -Passetmanagement
-      cd assetmanagement-app/assetmanagement-app-assetmanagement
-      mvn -Passetmanagement docker:build
-      mvn -Passetmanagement docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/assetmanagement-app-assetmanagement.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>