jackwang 部署微服务应用

app_PIM/src/pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view-base.tsx

@@ -610,7 +610,7 @@ export class HROMHierarchyCatGridViewBase extends GridViewBase {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
-            { pathName: 'dashboardview', parameterName: 'dashboardview' },
+            { pathName: 'v_002', parameterName: 'v_002' },
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {

app_PIM/src/pages/base/hromhierarchy-cat-v-002/hromhierarchy-cat-v-002.html

-<studio-view-style2 viewName="hromhierarchycatv_002" viewTitle="结构层次类别编辑视图" class='deeditview hromhierarchy-cat-v-002 from-dashboard-style'>
+<studio-view-style2 viewName="hromhierarchycatv_002" viewTitle="结构层次类别编辑视图" class='deeditview hromhierarchy-cat-v-002'>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_form 

app_PIM/src/pages/ungroup/pim/page-register.ts

@@ -18,13 +18,12 @@ export const PageComponents = {
         Vue.component('hroperation-unit-v-002', () => import('@pages/base/hroperation-unit-v-002/hroperation-unit-v-002.vue'));
         Vue.component('hromhierarchy-cat-pickup-view', () => import('@pages/base/hromhierarchy-cat-pickup-view/hromhierarchy-cat-pickup-view.vue'));
         Vue.component('hrlegal-edit-view', () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'));
-        Vue.component('hromhierarchy-cat-dashboard-view', () => import('@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'));
         Vue.component('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'));
         Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
         Vue.component('hromhierarchy-edit-view', () => import('@pages/base/hromhierarchy-edit-view/hromhierarchy-edit-view.vue'));
         Vue.component('hromhierarchy-cat-edit-view', () => import('@pages/base/hromhierarchy-cat-edit-view/hromhierarchy-cat-edit-view.vue'));
-        Vue.component('hromhierarchy-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'));
         Vue.component('hrorg-contact-edit-view', () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'));
+        Vue.component('hromhierarchy-tree-exp-view', () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'));
         Vue.component('hrlegal-grid-view', () => import('@pages/base/hrlegal-grid-view/hrlegal-grid-view.vue'));
         Vue.component('hrlegal-v-002', () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'));
         Vue.component('hroperation-unit-tab-exp-view', () => import('@pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.vue'));

app_PIM/src/pages/ungroup/pim/router.ts

@@ -445,20 +445,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'),
                 },
-                {
-                    path: 'hromhierarchycats/:hromhierarchycat?/dashboardview/:dashboardview?',
-                    meta: {
-                        caption: 'entities.hromhierarchycat.views.dashboardview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
-                            { pathName: 'dashboardview', parameterName: 'dashboardview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'),
-                },
                 {
                     path: 'hrorganizations/:hrorganization?/pickupview/:pickupview?',
                     meta: {
@@ -531,42 +517,42 @@ const router = new Router({
                     component: () => import('@pages/base/hromhierarchy-cat-edit-view/hromhierarchy-cat-edit-view.vue'),
                 },
                 {
-                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
+                    path: 'hroperationunits/:hroperationunit?/hrorgcontacts/:hrorgcontact?/editview/:editview?',
                     meta: {
-                        caption: 'entities.hromhierarchy.views.treeexpview.title',
+                        caption: 'entities.hrorgcontact.views.editview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
-                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
-                            { pathName: 'treeexpview', parameterName: 'treeexpview' },
+                            { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
+                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+                            { pathName: 'editview', parameterName: 'editview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
+                    component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
                 },
                 {
-                    path: 'hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
+                    path: 'hrlegals/:hrlegal?/hrorgcontacts/:hrorgcontact?/editview/:editview?',
                     meta: {
-                        caption: 'entities.hromhierarchy.views.treeexpview.title',
+                        caption: 'entities.hrorgcontact.views.editview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
-                            { pathName: 'treeexpview', parameterName: 'treeexpview' },
+                            { pathName: 'hrlegals', parameterName: 'hrlegal' },
+                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+                            { pathName: 'editview', parameterName: 'editview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
+                    component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
                 },
                 {
-                    path: 'hroperationunits/:hroperationunit?/hrorgcontacts/:hrorgcontact?/editview/:editview?',
+                    path: 'hrorgcontacts/:hrorgcontact?/editview/:editview?',
                     meta: {
                         caption: 'entities.hrorgcontact.views.editview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hroperationunits', parameterName: 'hroperationunit' },
                             { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
                             { pathName: 'editview', parameterName: 'editview' },
                         ],
@@ -575,33 +561,33 @@ const router = new Router({
                     component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
                 },
                 {
-                    path: 'hrlegals/:hrlegal?/hrorgcontacts/:hrorgcontact?/editview/:editview?',
+                    path: 'hromhierarchycats/:hromhierarchycat?/hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
                     meta: {
-                        caption: 'entities.hrorgcontact.views.editview.title',
+                        caption: 'entities.hromhierarchy.views.treeexpview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrlegals', parameterName: 'hrlegal' },
-                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
-                            { pathName: 'editview', parameterName: 'editview' },
+                            { pathName: 'hromhierarchycats', parameterName: 'hromhierarchycat' },
+                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+                            { pathName: 'treeexpview', parameterName: 'treeexpview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
+                    component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
                 },
                 {
-                    path: 'hrorgcontacts/:hrorgcontact?/editview/:editview?',
+                    path: 'hromhierarchies/:hromhierarchy?/treeexpview/:treeexpview?',
                     meta: {
-                        caption: 'entities.hrorgcontact.views.editview.title',
+                        caption: 'entities.hromhierarchy.views.treeexpview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
-                            { pathName: 'editview', parameterName: 'editview' },
+                            { pathName: 'hromhierarchies', parameterName: 'hromhierarchy' },
+                            { pathName: 'treeexpview', parameterName: 'treeexpview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
+                    component: () => import('@pages/base/hromhierarchy-tree-exp-view/hromhierarchy-tree-exp-view.vue'),
                 },
                 {
                     path: 'hrlegals/:hrlegal?/gridview/:gridview?',

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

@@ -49,8 +49,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'c62ff001669cca98c0a2a7bc3383c775',
                 'aa2c4d945f9d880dd836ebe74ca9f547',
+                '1316a3add8f01af03edf978ef21af6b1',
             ],
         },
         {
@@ -313,16 +313,6 @@ export const viewstate: any = {
                 '2b64c322042da1808776304d21c90e45',
             ],
         },
-        {
-            viewtag: 'c62ff001669cca98c0a2a7bc3383c775',
-            viewmodule: 'Base',
-            viewname: 'HROMHierarchyCatDashboardView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '1316a3add8f01af03edf978ef21af6b1',
-            ],
-        },
         {
             viewtag: 'd32b549b3c49b790b092eca97d1de2c1',
             viewmodule: 'Base',

app_PIM/src/widgets/hromhierarchy-cat/ef-001-form/ef-001-form.html

@@ -31,7 +31,7 @@
 </app-form-group>
 
 </i-col>
-<i-col class="form-layout-container" v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+<i-col class="form-layout-container" v-show="detailsModel.grouppanel1.visible" :style="{'height': '700px !important',}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :model="detailsModel.grouppanel1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.hromhierarchycat.ef_001_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel1" :data="data" :context="context" :viewparams="viewparams"/>
     <row>