xignzi006 发布系统代码

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

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

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

@@ -7,14 +7,6 @@ import Mock from 'mockjs'
 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: "未定义",

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/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.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',