lab_gzf 部署微服务应用

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

@@ -19,6 +19,16 @@
         "viewtag": "1769804cd7ab51624ac3c88c2090363b",
         "memo": "系统自动添加"
     },
+    "eamlocationpickupview": {
+        "title": "功能位置数据选择视图",
+        "caption": "功能位置",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Location",
+        "viewname": "EAMLocationPickupView",
+        "viewfilename": "eamlocation-pickup-view",
+        "viewtag": "2b28313d0f3925fa44b8683eb5ea54d6",
+        "memo": "系统自动添加"
+    },
     "eamlocationstatemodelpickupview": {
         "title": "功能位置状态模型数据选择视图",
         "caption": "功能位置状态模型",
@@ -29,6 +39,16 @@
         "viewtag": "3d676a12800fca23bec463d5c5217413",
         "memo": "系统自动添加"
     },
+    "eamlocationtypepickupview": {
+        "title": "功能位置类型数据选择视图",
+        "caption": "功能位置类型",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Location",
+        "viewname": "EAMLocationTypePickupView",
+        "viewfilename": "eamlocation-type-pickup-view",
+        "viewtag": "4a5dd0204cc256862db03b36fc570e71",
+        "memo": "系统自动添加"
+    },
     "eamlocationtypegridview": {
         "title": "功能位置类型表格视图",
         "caption": "功能位置类型",
@@ -39,6 +59,16 @@
         "viewtag": "4c95ec14aa2de5370d9d81f7d85f4bd5",
         "memo": ""
     },
+    "eamlocationtypepickupgridview": {
+        "title": "功能位置类型选择表格视图",
+        "caption": "功能位置类型",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "Location",
+        "viewname": "EAMLocationTypePickupGridView",
+        "viewfilename": "eamlocation-type-pickup-grid-view",
+        "viewtag": "6a395ea52232233416d9c7120518863d",
+        "memo": "系统自动添加"
+    },
     "eamlocationstatemodeleditview": {
         "title": "功能位置状态模型编辑视图",
         "caption": "功能位置状态模型",
@@ -179,6 +209,16 @@
         "viewtag": "eee617336f6dc6e5e97835d6309fd452",
         "memo": ""
     },
+    "eamlocationpickupgridview": {
+        "title": "功能位置选择表格视图",
+        "caption": "功能位置",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "Location",
+        "viewname": "EAMLocationPickupGridView",
+        "viewfilename": "eamlocation-pickup-grid-view",
+        "viewtag": "f572d337efac74735bf54b199e054081",
+        "memo": "系统自动添加"
+    },
     "eamlocationstategridview": {
         "title": "功能位置状态信息",
         "caption": "功能位置状态",

app_AssetManagement/src/locale/lanres/entities/eamlocation-type/eamlocation-type_en_US.ts

@@ -11,10 +11,18 @@ export default {
     eamlocationstatemodelname: "功能位置状态模型",
   },
 	views: {
+		pickupview: {
+			caption: "功能位置类型",
+      		title: "功能位置类型数据选择视图",
+		},
 		gridview: {
 			caption: "功能位置类型",
       		title: "功能位置类型表格视图",
 		},
+		pickupgridview: {
+			caption: "功能位置类型",
+      		title: "功能位置类型选择表格视图",
+		},
 		editview: {
 			caption: "功能位置类型",
       		title: "功能位置类型编辑视图",

app_AssetManagement/src/locale/lanres/entities/eamlocation-type/eamlocation-type_zh_CN.ts

@@ -10,10 +10,18 @@ export default {
     eamlocationstatemodelname: "功能位置状态模型",
   },
 	views: {
+		pickupview: {
+			caption: "功能位置类型",
+      		title: "功能位置类型数据选择视图",
+		},
 		gridview: {
 			caption: "功能位置类型",
       		title: "功能位置类型表格视图",
 		},
+		pickupgridview: {
+			caption: "功能位置类型",
+      		title: "功能位置类型选择表格视图",
+		},
 		editview: {
 			caption: "功能位置类型",
       		title: "功能位置类型编辑视图",

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

@@ -19,6 +19,10 @@ export default {
 			caption: "功能位置",
       		title: "功能位置编辑视图",
 		},
+		pickupview: {
+			caption: "功能位置",
+      		title: "功能位置数据选择视图",
+		},
 		info_mainview: {
 			caption: "功能位置",
       		title: "功能位置编辑视图",
@@ -39,13 +43,15 @@ export default {
 			caption: "功能位置",
       		title: "功能位置表格视图",
 		},
+		pickupgridview: {
+			caption: "功能位置",
+      		title: "功能位置选择表格视图",
 		},
-	main_form: {
+	},
+	edit_main_form: {
 		details: {
 			group1: "功能位置基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "功能位置标识", 
@@ -55,6 +61,11 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			eamlocationid: "功能位置标识", 
+			eamlocationname: "功能位置名称", 
+			eamlocationtypename: "功能位置类型", 
+			peamlocationname: "上级位置", 
+			peamlocationid: "上级功能位置标识", 
+			eamlocationtypeid: "功能位置类型标识", 
 		},
 		uiactions: {
 		},
@@ -79,23 +90,23 @@ export default {
 		uiactions: {
 		},
 	},
-	childgrid_grid: {
+	main_grid: {
 		columns: {
-			peamlocationname: "上级位置",
 			eamlocationid: "功能位置标识",
 			eamlocationname: "功能位置名称",
 			eamlocationtypename: "功能位置类型",
+			peamlocationname: "上级位置",
+			eamlocationstatename: "功能位置状态",
 		},
 		uiactions: {
 		},
 	},
-	main_grid: {
+	childgrid_grid: {
 		columns: {
+			peamlocationname: "上级位置",
 			eamlocationid: "功能位置标识",
 			eamlocationname: "功能位置名称",
 			eamlocationtypename: "功能位置类型",
-			peamlocationname: "上级位置",
-			eamlocationstatename: "功能位置状态",
 		},
 		uiactions: {
 		},

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

@@ -18,6 +18,10 @@ export default {
 			caption: "功能位置",
       		title: "功能位置编辑视图",
 		},
+		pickupview: {
+			caption: "功能位置",
+      		title: "功能位置数据选择视图",
+		},
 		info_mainview: {
 			caption: "功能位置",
       		title: "功能位置编辑视图",
@@ -38,13 +42,15 @@ export default {
 			caption: "功能位置",
       		title: "功能位置表格视图",
 		},
+		pickupgridview: {
+			caption: "功能位置",
+      		title: "功能位置选择表格视图",
 		},
-	main_form: {
+	},
+	edit_main_form: {
 		details: {
 			group1: "功能位置基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "功能位置标识", 
@@ -54,6 +60,11 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			eamlocationid: "功能位置标识", 
+			eamlocationname: "功能位置名称", 
+			eamlocationtypename: "功能位置类型", 
+			peamlocationname: "上级位置", 
+			peamlocationid: "上级功能位置标识", 
+			eamlocationtypeid: "功能位置类型标识", 
 		},
 		uiactions: {
 		},
@@ -78,23 +89,23 @@ export default {
 		uiactions: {
 		},
 	},
-	childgrid_grid: {
+	main_grid: {
 		columns: {
-			peamlocationname: "上级位置",
 			eamlocationid: "功能位置标识",
 			eamlocationname: "功能位置名称",
 			eamlocationtypename: "功能位置类型",
+			peamlocationname: "上级位置",
+			eamlocationstatename: "功能位置状态",
 		},
 		uiactions: {
 		},
 	},
-	main_grid: {
+	childgrid_grid: {
 		columns: {
+			peamlocationname: "上级位置",
 			eamlocationid: "功能位置标识",
 			eamlocationname: "功能位置名称",
 			eamlocationtypename: "功能位置类型",
-			peamlocationname: "上级位置",
-			eamlocationstatename: "功能位置状态",
 		},
 		uiactions: {
 		},

app_AssetManagement/src/mock/viewconfig/viewconfig.ts

@@ -23,6 +23,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationEditView",
             "viewtag": "1769804cd7ab51624ac3c88c2090363b"
         },
+        "eamlocationpickupview": {
+            "title": "功能位置数据选择视图",
+            "caption": "功能位置",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Location",
+            "viewname": "EAMLocationPickupView",
+            "viewtag": "2b28313d0f3925fa44b8683eb5ea54d6"
+        },
         "eamlocationstatemodelpickupview": {
             "title": "功能位置状态模型数据选择视图",
             "caption": "功能位置状态模型",
@@ -31,6 +39,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationStateModelPickupView",
             "viewtag": "3d676a12800fca23bec463d5c5217413"
         },
+        "eamlocationtypepickupview": {
+            "title": "功能位置类型数据选择视图",
+            "caption": "功能位置类型",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Location",
+            "viewname": "EAMLocationTypePickupView",
+            "viewtag": "4a5dd0204cc256862db03b36fc570e71"
+        },
         "eamlocationtypegridview": {
             "title": "功能位置类型表格视图",
             "caption": "功能位置类型",
@@ -39,6 +55,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationTypeGridView",
             "viewtag": "4c95ec14aa2de5370d9d81f7d85f4bd5"
         },
+        "eamlocationtypepickupgridview": {
+            "title": "功能位置类型选择表格视图",
+            "caption": "功能位置类型",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "Location",
+            "viewname": "EAMLocationTypePickupGridView",
+            "viewtag": "6a395ea52232233416d9c7120518863d"
+        },
         "eamlocationstatemodeleditview": {
             "title": "功能位置状态模型编辑视图",
             "caption": "功能位置状态模型",
@@ -151,6 +175,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "EAMLocationGridView",
             "viewtag": "eee617336f6dc6e5e97835d6309fd452"
         },
+        "eamlocationpickupgridview": {
+            "title": "功能位置选择表格视图",
+            "caption": "功能位置",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "Location",
+            "viewname": "EAMLocationPickupGridView",
+            "viewtag": "f572d337efac74735bf54b199e054081"
+        },
         "eamlocationstategridview": {
             "title": "功能位置状态信息",
             "caption": "功能位置状态",

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

@@ -5,12 +5,16 @@ export const PageComponents = {
         Vue.component('eamlocation-child-grid-view', () => import('@pages/location/eamlocation-child-grid-view/eamlocation-child-grid-view.vue'));
         Vue.component('eamlocation-info-view', () => import('@pages/location/eamlocation-info-view/eamlocation-info-view.vue'));
         Vue.component('eamlocation-state-grid-view', () => import('@pages/location/eamlocation-state-grid-view/eamlocation-state-grid-view.vue'));
+        Vue.component('eamlocation-type-pickup-grid-view', () => import('@pages/location/eamlocation-type-pickup-grid-view/eamlocation-type-pickup-grid-view.vue'));
+        Vue.component('eamlocation-pickup-view', () => import('@pages/location/eamlocation-pickup-view/eamlocation-pickup-view.vue'));
         Vue.component('eamlocation-state-model-line-grid-view', () => import('@pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.vue'));
         Vue.component('eamlocation-type-edit-view', () => import('@pages/location/eamlocation-type-edit-view/eamlocation-type-edit-view.vue'));
         Vue.component('eamlocation-state-pickup-view', () => import('@pages/location/eamlocation-state-pickup-view/eamlocation-state-pickup-view.vue'));
         Vue.component('eamlocation-state-model-pickup-view', () => import('@pages/location/eamlocation-state-model-pickup-view/eamlocation-state-model-pickup-view.vue'));
         Vue.component('eamlocation-info-main-view', () => import('@pages/location/eamlocation-info-main-view/eamlocation-info-main-view.vue'));
+        Vue.component('eamlocation-pickup-grid-view', () => import('@pages/location/eamlocation-pickup-grid-view/eamlocation-pickup-grid-view.vue'));
         Vue.component('eamlocation-summary-view', () => import('@pages/location/eamlocation-summary-view/eamlocation-summary-view.vue'));
+        Vue.component('eamlocation-type-pickup-view', () => import('@pages/location/eamlocation-type-pickup-view/eamlocation-type-pickup-view.vue'));
         Vue.component('eamlocation-grid-view', () => import('@pages/location/eamlocation-grid-view/eamlocation-grid-view.vue'));
         Vue.component('eamlocation-edit-view', () => import('@pages/location/eamlocation-edit-view/eamlocation-edit-view.vue'));
         Vue.component('eamlocation-type-grid-view', () => import('@pages/location/eamlocation-type-grid-view/eamlocation-type-grid-view.vue'));

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

@@ -113,6 +113,34 @@ const router = new Router({
                     },
                     component: () => import('@pages/location/eamlocation-state-grid-view/eamlocation-state-grid-view.vue'),
                 },
+                {
+                    path: 'eamlocationtypes/:eamlocationtype?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.eamlocationtype.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocationtypes', parameterName: 'eamlocationtype' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/location/eamlocation-type-pickup-grid-view/eamlocation-type-pickup-grid-view.vue'),
+                },
+                {
+                    path: 'eamlocations/:eamlocation?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.eamlocation.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/location/eamlocation-pickup-view/eamlocation-pickup-view.vue'),
+                },
                 {
                     path: 'eamlocationstatemodellines/:eamlocationstatemodelline?/gridview/:gridview?',
                     meta: {
@@ -183,6 +211,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/location/eamlocation-info-main-view/eamlocation-info-main-view.vue'),
                 },
+                {
+                    path: 'eamlocations/:eamlocation?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.eamlocation.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocations', parameterName: 'eamlocation' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/location/eamlocation-pickup-grid-view/eamlocation-pickup-grid-view.vue'),
+                },
                 {
                     path: 'eamlocations/:eamlocation?/summaryview/:summaryview?',
                     meta: {
@@ -197,6 +239,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/location/eamlocation-summary-view/eamlocation-summary-view.vue'),
                 },
+                {
+                    path: 'eamlocationtypes/:eamlocationtype?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.eamlocationtype.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'eamlocationtypes', parameterName: 'eamlocationtype' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/location/eamlocation-type-pickup-view/eamlocation-type-pickup-view.vue'),
+                },
                 {
                     path: 'eamlocations/:eamlocation?/gridview/:gridview?',
                     meta: {

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

@@ -3,7 +3,7 @@
 import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { EAMLocationEditViewBase } from './eamlocation-edit-view-base';
-import view_form from '@widgets/eamlocation/main-form/main-form.vue';
+import view_form from '@widgets/eamlocation/edit-main-form/edit-main-form.vue';
 
 /**
  * 功能位置编辑视图视图

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

@@ -19,6 +19,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '4a5dd0204cc256862db03b36fc570e71',
+                '2b28313d0f3925fa44b8683eb5ea54d6',
             ],
         },
         {

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

@@ -89,7 +89,9 @@ export default class EAMLocationTypeUIServiceBase extends UIService {
      * @memberof  EAMLocationTypeUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'eamlocationtypes'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamlocationtypes'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eamlocationtypes'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamlocationtypes'});
     }
 

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

@@ -90,11 +90,13 @@ export default class EAMLocationUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'eamlocations'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'eamlocations'});
         this.allViewMap.set(':',{viewname:'info_mainview',srfappde:'eamlocations'});
         this.allViewMap.set(':',{viewname:'childgridview',srfappde:'eamlocations'});
         this.allViewMap.set(':',{viewname:'summaryview',srfappde:'eamlocations'});
         this.allViewMap.set(':',{viewname:'infoview',srfappde:'eamlocations'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'eamlocations'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'eamlocations'});
     }
 
     /**

app_AssetManagement/src/widgets/eamlocation/edit-main-form/edit-main-form-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, EditFormControlBase } from '@/studio-core';
+import EAMLocationService from '@/service/eamlocation/eamlocation-service';
+import Edit_MainService from './edit-main-form-service';
+import EAMLocationUIService from '@/uiservice/eamlocation/eamlocation-ui-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+
+
+/**
+ * form部件基类
+ *
+ * @export
+ * @class EditFormControlBase
+ * @extends {Edit_MainEditFormBase}
+ */
+export class Edit_MainEditFormBase extends EditFormControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof Edit_MainEditFormBase
+     */
+    protected controlType: string = 'FORM';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {Edit_MainService}
+     * @memberof Edit_MainEditFormBase
+     */
+    public service: Edit_MainService = new Edit_MainService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {EAMLocationService}
+     * @memberof Edit_MainEditFormBase
+     */
+    public appEntityService: EAMLocationService = new EAMLocationService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof Edit_MainEditFormBase
+     */
+    protected appDeName: string = 'eamlocation';
+
+    /**
+     * 界面UI服务对象
+     *
+     * @type {EAMLocationUIService}
+     * @memberof Edit_MainEditFormBase
+     */  
+    public appUIService:EAMLocationUIService = new EAMLocationUIService(this.$store);
+
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof Edit_MainEditFormBase
+     */
+    public data: any = {
+        srfupdatedate: null,
+        srforikey: null,
+        srfkey: null,
+        srfmajortext: null,
+        srftempmode: null,
+        srfuf: null,
+        srfdeid: null,
+        srfsourcekey: null,
+        eamlocationid: null,
+        eamlocationname: null,
+        eamlocationtypename: null,
+        peamlocationname: null,
+        peamlocationid: null,
+        eamlocationtypeid: null,
+        eamlocation:null,
+    };
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof Edit_MainEditFormBase
+     */
+    public rules: any = {
+        eamlocationname: [
+            { required: true, type: 'string', message: '功能位置名称 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '功能位置名称 值不能为空', trigger: 'blur' },
+        ],
+        eamlocationtypename: [
+            { required: true, type: 'string', message: '功能位置类型 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '功能位置类型 值不能为空', trigger: 'blur' },
+        ],
+    }
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof Edit_MainEditFormBase
+     */
+    public detailsModel: any = {
+        group1: new FormGroupPanelModel({ caption: '功能位置基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamlocation.edit_main_form', extractMode: 'ITEM', details: [] } }),
+
+        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfkey: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfmajortext: new FormItemModel({ caption: '功能位置名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamlocationid: new FormItemModel({ caption: '功能位置标识', detailType: 'FORMITEM', name: 'eamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamlocationname: new FormItemModel({ caption: '功能位置名称', detailType: 'FORMITEM', name: 'eamlocationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamlocationtypename: new FormItemModel({ caption: '功能位置类型', detailType: 'FORMITEM', name: 'eamlocationtypename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        peamlocationname: new FormItemModel({ caption: '上级位置', detailType: 'FORMITEM', name: 'peamlocationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        peamlocationid: new FormItemModel({ caption: '上级功能位置标识', detailType: 'FORMITEM', name: 'peamlocationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        eamlocationtypeid: new FormItemModel({ caption: '功能位置类型标识', detailType: 'FORMITEM', name: 'eamlocationtypeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+    };
+}
\ No newline at end of file

app_AssetManagement/src/widgets/eamlocation/edit-main-form/edit-main-form-model.ts

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

app_AssetManagement/src/widgets/eamlocation/edit-main-form/edit-main-form.html

+<i-form :model="this.data" class='app-form' ref='form'  id='eamlocation_edit_main' style="">
+    <input style="display:none;" />
+    <row >
+            
+<i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamlocation.edit_main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="1" :isInfoGroupMode="false" >    
+    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
+    <row>
+        <i-col class="form-layout-container" v-show="detailsModel.eamlocationid.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='eamlocationid' :itemRules="this.rules.eamlocationid" class='' :caption="$t('entities.eamlocation.edit_main_form.details.eamlocationid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationid.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.eamlocationid"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.eamlocationid.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.eamlocationname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='eamlocationname' :itemRules="this.rules.eamlocationname" class='' :caption="$t('entities.eamlocation.edit_main_form.details.eamlocationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationname.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.eamlocationname"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.eamlocationname.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.eamlocationtypename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='eamlocationtypename' :itemRules="this.rules.eamlocationtypename" class='' :caption="$t('entities.eamlocation.edit_main_form.details.eamlocationtypename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationtypename.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.eamlocationtypename.disabled"
+  name='eamlocationtypename'
+  deMajorField='eamlocationtypename'
+  deKeyField='eamlocationtype'
+  :service="service"
+  :acParams="{ serviceName: 'EAMLocationTypeService', interfaceName: 'FetchDefault'}"
+  valueitem='eamlocationtypeid' 
+  :value="data.eamlocationtypename"
+  :pickupView="{ viewname: 'eamlocation-type-pickup-view', title: $t('entities.eamlocationtype.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'eamlocationtypes', parameterName: 'eamlocationtype' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col class="form-layout-container" v-show="detailsModel.peamlocationname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+    <app-form-item name='peamlocationname' :itemRules="this.rules.peamlocationname" class='' :caption="$t('entities.eamlocation.edit_main_form.details.peamlocationname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.peamlocationname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.peamlocationname.disabled"
+  name='peamlocationname'
+  deMajorField='eamlocationname'
+  deKeyField='eamlocation'
+  :service="service"
+  :acParams="{ serviceName: 'EAMLocationService', interfaceName: 'FetchDefault'}"
+  valueitem='peamlocationid' 
+  :value="data.peamlocationname"
+  :pickupView="{ viewname: 'eamlocation-pickup-view', title: $t('entities.eamlocation.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'eamlocations', parameterName: 'eamlocation' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+
+
+    </row>
+</i-form>
\ No newline at end of file

app_AssetManagement/src/widgets/eamlocation/edit-main-form/edit-main-form.vue

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

app_AssetManagement/src/widgets/eamlocation/info-main-form/info-main-form.html

@@ -8,7 +8,8 @@
     <row>
         <i-col class="form-layout-container" v-show="detailsModel.eamlocationid.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='eamlocationid' :itemRules="this.rules.eamlocationid" class='' :caption="$t('entities.eamlocation.info_main_form.details.eamlocationid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.eamlocationid.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.eamlocationid"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.eamlocationid.disabled" type='text'  style=""></input-box>
+    
+<app-span name='eamlocationid' :value="data.eamlocationid" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

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

@@ -228,7 +228,7 @@
 
 
     <!--输出实体[EAMLOCATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-42-11">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocation-51-11">
         <createTable tableName="EAMLOCATION">
                 <column name="EAMLOCATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMLOCATION_EAMLOCATIONID"/>
@@ -322,7 +322,7 @@
 
 
     <!--输出实体[EAMLOCATIONTYPE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationtype-15-15">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationtype-17-15">
         <createTable tableName="EAMLOCATIONTYPE">
                 <column name="EAMLOCATIONTYPENAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -591,13 +591,13 @@
        <addForeignKeyConstraint baseColumnNames="EAMASSETSTATEMODELID" baseTableName="EAMASSETTYPE" constraintName="DER1N_EAMASSETTYPE_EAMASSETSTA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMASSETSTATEMODELID" referencedTableName="EAMASSETSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-42-37">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-51-37">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEID" referencedTableName="EAMLOCATIONSTATE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-42-38">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-51-38">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONTYPEID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATIONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONTYPEID" referencedTableName="EAMLOCATIONTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-42-39">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocation-51-39">
        <addForeignKeyConstraint baseColumnNames="PEAMLOCATIONID" baseTableName="EAMLOCATION" constraintName="DER1N_EAMLOCATION_EAMLOCATION_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONID" referencedTableName="EAMLOCATION" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONSTATE]外键关系 -->
@@ -607,7 +607,7 @@
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONSTATEMODELLINE" constraintName="DER1N_EAMLOCATIONSTATEMODELLIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONTYPE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationtype-15-42">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationtype-17-42">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONTYPE" constraintName="DER1N_EAMLOCATIONTYPE_EAMLOCAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMPLAN]外键关系 -->