lab_qyk 部署微服务应用

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

@@ -39,6 +39,14 @@
         "viewname": "IBZDepartmentEditView",
         "viewtag": "21259e2d03645750f1d3d71839f1223b"
     },
+    "ibzteammembergridview": {
+        "title": "组成员表格视图",
+        "caption": "组成员",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "ou",
+        "viewname": "IBZTeamMemberGridView",
+        "viewtag": "221800117f6cfa4296a3f7e5dc99ce44"
+    },
     "ibzemployeegridview": {
         "title": "人员表格视图",
         "caption": "人员",
@@ -111,6 +119,14 @@
         "viewname": "IBZTeamEditView",
         "viewtag": "7eef7d5d59785f49c66786ad4ba827b0"
     },
+    "ibzteammembereditview": {
+        "title": "组成员编辑视图",
+        "caption": "组成员",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "ou",
+        "viewname": "IBZTeamMemberEditView",
+        "viewtag": "89b1f5e74703dab0fca756ece369b57d"
+    },
     "ibzdepartmentmpickupview": {
         "title": "部门数据多项选择视图",
         "caption": "部门",

app_web/src/locale/lanres/entities/ibzpost/ibzpost_en_US.ts

@@ -21,8 +21,6 @@ export default {
 		details: {
 			group1: "岗位基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srforikey: "", 
 			srfkey: "岗位标识", 
 			srfmajortext: "岗位名称", 
@@ -30,6 +28,10 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			postcode: "岗位编码", 
+			postname: "岗位名称", 
+			domains: "区属", 
+			memo: "备注", 
 			postid: "岗位标识", 
 		},
 		uiactions: {
@@ -37,6 +39,9 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			postcode: "岗位编码",
+			postname: "岗位名称",
+			domains: "区属",
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/ibzpost/ibzpost_zh_CN.ts

@@ -20,8 +20,6 @@ export default {
 		details: {
 			group1: "岗位基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srforikey: "", 
 			srfkey: "岗位标识", 
 			srfmajortext: "岗位名称", 
@@ -29,6 +27,10 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			postcode: "岗位编码", 
+			postname: "岗位名称", 
+			domains: "区属", 
+			memo: "备注", 
 			postid: "岗位标识", 
 		},
 		uiactions: {
@@ -36,6 +38,9 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			postcode: "岗位编码",
+			postname: "岗位名称",
+			domains: "区属",
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_en_US.ts

@@ -10,4 +10,99 @@ export default {
     postname: "岗位标识",
     domains: "区属",
   },
+	views: {
+		gridview: {
+			caption: "组成员",
+      		title: "组成员表格视图",
+		},
+		editview: {
+			caption: "组成员",
+      		title: "组成员编辑视图",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "组成员基本信息", 
+			formpage1: "基本信息", 
+			srforikey: "", 
+			srfkey: "组成员标识", 
+			srfmajortext: "姓名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			teammemberid: "组成员标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_zh_CN.ts

@@ -9,4 +9,99 @@ export default {
     postname: "岗位标识",
     domains: "区属",
   },
+	views: {
+		gridview: {
+			caption: "组成员",
+      		title: "组成员表格视图",
+		},
+		editview: {
+			caption: "组成员",
+      		title: "组成员编辑视图",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "组成员基本信息", 
+			formpage1: "基本信息", 
+			srforikey: "", 
+			srfkey: "组成员标识", 
+			srfmajortext: "姓名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			teammemberid: "组成员标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/ibzteam/ibzteam_en_US.ts

@@ -19,6 +19,8 @@ export default {
 	main_form: {
 		details: {
 			group1: "组基本信息", 
+			druipart1: "", 
+			grouppanel1: "组成员", 
 			formpage1: "基本信息", 
 			srforikey: "", 
 			srfkey: "组标识", 
@@ -27,6 +29,9 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			teamname: "组名称", 
+			domains: "区属", 
+			memo: "备注", 
 			teamid: "组标识", 
 		},
 		uiactions: {
@@ -34,6 +39,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			teamname: "组名称",
+			domains: "区属",
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/ibzteam/ibzteam_zh_CN.ts

@@ -18,6 +18,8 @@ export default {
 	main_form: {
 		details: {
 			group1: "组基本信息", 
+			druipart1: "", 
+			grouppanel1: "组成员", 
 			formpage1: "基本信息", 
 			srforikey: "", 
 			srfkey: "组标识", 
@@ -26,6 +28,9 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			teamname: "组名称", 
+			domains: "区属", 
+			memo: "备注", 
 			teamid: "组标识", 
 		},
 		uiactions: {
@@ -33,6 +38,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			teamname: "组名称",
+			domains: "区属",
 		},
 		uiactions: {
 		},

app_web/src/mock/viewconfig/viewconfig.ts

@@ -47,6 +47,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBZDepartmentEditView",
             "viewtag": "21259e2d03645750f1d3d71839f1223b"
         },
+        "ibzteammembergridview": {
+            "title": "组成员表格视图",
+            "caption": "组成员",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "ou",
+            "viewname": "IBZTeamMemberGridView",
+            "viewtag": "221800117f6cfa4296a3f7e5dc99ce44"
+        },
         "ibzemployeegridview": {
             "title": "人员表格视图",
             "caption": "人员",
@@ -119,6 +127,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBZTeamEditView",
             "viewtag": "7eef7d5d59785f49c66786ad4ba827b0"
         },
+        "ibzteammembereditview": {
+            "title": "组成员编辑视图",
+            "caption": "组成员",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "ou",
+            "viewname": "IBZTeamMemberEditView",
+            "viewtag": "89b1f5e74703dab0fca756ece369b57d"
+        },
         "ibzdepartmentmpickupview": {
             "title": "部门数据多项选择视图",
             "caption": "部门",

app_web/src/pages/ou/ibzpost-edit-view/ibzpost-edit-view.less

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+
+.ibzpost-edit-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/ou/ibzpost-edit-view/ibzpost-edit-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBZPostEditViewBase from './ibzpost-edit-view-base.vue';
+
+import view_form from '@widgets/ibzpost/main-form/main-form.vue';
+@Component({
+    components: {
+        view_form, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBZPostEditView extends IBZPostEditViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/ou/ibzpost-grid-view/ibzpost-grid-view.less

+.ibzpost-grid-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/ou/ibzpost-grid-view/ibzpost-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBZPostGridViewBase from './ibzpost-grid-view-base.vue';
+
+import view_grid from '@widgets/ibzpost/main-grid/main-grid.vue';
+import view_searchform from '@widgets/ibzpost/default-searchform/default-searchform.vue';
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBZPostGridView extends IBZPostGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/ou/ibzteam-edit-view/ibzteam-edit-view.less

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+
+.ibzteam-edit-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/ou/ibzteam-edit-view/ibzteam-edit-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBZTeamEditViewBase from './ibzteam-edit-view-base.vue';
+
+import view_form from '@widgets/ibzteam/main-form/main-form.vue';
+@Component({
+    components: {
+        view_form, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBZTeamEditView extends IBZTeamEditViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/ou/ibzteam-grid-view/ibzteam-grid-view.less

+.ibzteam-grid-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/ou/ibzteam-grid-view/ibzteam-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBZTeamGridViewBase from './ibzteam-grid-view-base.vue';
+
+import view_grid from '@widgets/ibzteam/main-grid/main-grid.vue';
+import view_searchform from '@widgets/ibzteam/default-searchform/default-searchform.vue';
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBZTeamGridView extends IBZTeamGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/ou/ouindex-view/page-register.ts

@@ -2,6 +2,8 @@ export const PageComponents = {
     install(Vue: any, opt: any) {
                 Vue.component('ibzdepartment-option-view', () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'));
         Vue.component('ibzemployee-grid-view', () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'));
+        Vue.component('ibzteam-member-edit-view', () => import('@pages/ou/ibzteam-member-edit-view/ibzteam-member-edit-view.vue'));
+        Vue.component('ibzteam-member-grid-view', () => import('@pages/ou/ibzteam-member-grid-view/ibzteam-member-grid-view.vue'));
         Vue.component('ibzdept-member-grid-view', () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'));
         Vue.component('ibzpost-grid-view', () => import('@pages/ou/ibzpost-grid-view/ibzpost-grid-view.vue'));
         Vue.component('ibzorganization-tree-exp-view', () => import('@pages/ou/ibzorganization-tree-exp-view/ibzorganization-tree-exp-view.vue'));

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

@@ -68,6 +68,16 @@ export const viewstate: any = {
                 'd2cc126cb4bcf523d72509bef0183ee0',
             ],
         },
+        {
+            viewtag: '364460c8f6afc2c459f8857a6d228b1a',
+            viewmodule: 'ou',
+            viewname: 'IBZTeamGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '7eef7d5d59785f49c66786ad4ba827b0',
+            ],
+        },
         {
             viewtag: '4c3fc434585ac656b753c26c1f10482b',
             viewmodule: 'ou',
@@ -108,6 +118,16 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '7eef7d5d59785f49c66786ad4ba827b0',
+            viewmodule: 'ou',
+            viewname: 'IBZTeamEditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '221800117f6cfa4296a3f7e5dc99ce44',
+            ],
+        },
         {
             viewtag: '95a44e1851d28a16a90965f60d6ff4ae',
             viewmodule: 'ou',
@@ -228,6 +248,25 @@ export const viewstate: any = {
                 '21259e2d03645750f1d3d71839f1223b',
             ],
         },
+        {
+            viewtag: 'e87180c121ce75a22893d5e3ce0951fc',
+            viewmodule: 'ou',
+            viewname: 'IBZPostGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'f12a26ca0dafa7b439840dbc629c07cc',
+            ],
+        },
+        {
+            viewtag: 'f12a26ca0dafa7b439840dbc629c07cc',
+            viewmodule: 'ou',
+            viewname: 'IBZPostEditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'f1bebdb9438783db0010d34aa03092c8',
             viewmodule: 'ou',

app_web/src/uiservice/ibzteam-member/ibzteam-member-ui-service-base.ts

@@ -79,6 +79,8 @@ export default class IBZTeamMemberUIServiceBase extends UIService {
      * @memberof  IBZTeamMemberUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'ibzteammembers'});
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'ibzteammembers'});
     }
 
     /**

app_web/src/widgets/ibzpost/default-searchform/default-searchform-model.ts

+/**
+ * Default 部件模型
+ *
+ * @export
+ * @class DefaultModel
+ */
+export default class DefaultModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof DefaultModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+    ]
+  }
+
+}
\ No newline at end of file