Miracle 部署微服务应用

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_en_US.ts

@@ -261,6 +261,8 @@ export default {
 	},
 	wfdynaexpgridviewtoolbar_toolbar: {
 	},
+	wfdynaeditviewtoolbar_toolbar: {
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "New",
@@ -425,6 +427,4 @@ export default {
 			tip: "Help",
 		},
 	},
-	wfdynaeditviewtoolbar_toolbar: {
-	},
 };
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrtransfer-apply/hrtransfer-apply_zh_CN.ts

@@ -260,6 +260,8 @@ export default {
 	},
 	wfdynaexpgridviewtoolbar_toolbar: {
 	},
+	wfdynaeditviewtoolbar_toolbar: {
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "新建",
@@ -424,6 +426,4 @@ export default {
 			tip: "帮助",
 		},
 	},
-	wfdynaeditviewtoolbar_toolbar: {
-	},
 };
\ No newline at end of file

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view-base.tsx

+import { Subject } from 'rxjs';
+import { ViewBase } from '@/studio-core';
+import HRTransferApplyService from '@/service/hrtransfer-apply/hrtransfer-apply-service';
+import HRTransferApplyAuthService from '@/authservice/hrtransfer-apply/hrtransfer-apply-auth-service';
+import WFDynaEditViewEngine from '@engine/view/wfdyna-edit-view-engine';
+import HRTransferApplyUIService from '@/uiservice/hrtransfer-apply/hrtransfer-apply-ui-service';
+
+/**
+ * 调动申请视图基类
+ *
+ * @export
+ * @class HRTransferApplyWFDynaEditViewBase
+ * @extends {ViewBase}
+ */
+export class HRTransferApplyWFDynaEditViewBase extends ViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    protected appDeName: string = 'hrtransferapply';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    protected appDeKey: string = 'hrtransferapplyid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    protected appDeMajor: string = 'hrtransferapplyname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {HRTransferApplyService}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    protected appEntityService: HRTransferApplyService = new HRTransferApplyService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type HRTransferApplyUIService
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public appUIService: HRTransferApplyUIService = new HRTransferApplyUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.hrtransferapply.views.wfdynaeditview.caption',
+        srfTitle: 'entities.hrtransferapply.views.wfdynaeditview.title',
+        srfSubTitle: 'entities.hrtransferapply.views.wfdynaeditview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_form: { name: 'form', type: 'FORM' },
+        wflinks: [],
+    };
+
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof HRTransferApplyWFDynaEditView
+     */
+    public toolBarModels: any = {
+    };
+
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = 'c8310acd7e65d023051725aac59122d9';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public engine: WFDynaEditViewEngine = new WFDynaEditViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'hrtransferapply',
+            majorPSDEField: 'hrtransferapplyname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+    /**
+     * 工具栏模型数据
+     * 
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public linkModel:Array<any> = [];
+
+    /**
+     * 获取工具栏按钮
+     * 
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public getWFLinkModel():Promise<any>{
+        return new Promise((resolve:any, reject:any) =>{
+            let datas: any[] = [];
+            let xData: any = this.$refs.form;
+            if (xData.getDatas && xData.getDatas instanceof Function) {
+                datas = [...xData.getDatas()];
+            }
+            if(Object.keys(this.viewparams).length > 0){
+                Object.assign(datas,{'taskDefinitionKey':this.viewparams.userTaskId});
+            }
+            this.appEntityService.GetWFLink(JSON.parse(JSON.stringify(this.context)),datas,true).then((response:any) =>{
+                if (response && response.status === 200) {
+                    this.linkModel = response.data;
+                    resolve(response.data);
+                }
+            }).catch((response: any) => {
+                if (response && response.status) {
+                    this.$Notice.error({ title: '错误', desc: response.message });
+                    return;
+                }
+                if (!response || !response.status || !response.data) {
+                    this.$Notice.error({ title: '错误', desc: '系统异常' });
+                    return;
+                }
+            });
+        });
+    }
+
+    /**
+     * 动态工具栏点击
+     * 
+     * @memberof HRTransferApplyWFDynaEditViewBase
+     */
+    public dynamic_toolbar_click(linkItem:any, $event:any){
+        let datas: any[] = [];
+        let xData: any = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        xData.wfsubmit(datas,linkItem).then((response: any) => {
+            if (!response || response.status !== 200) {
+                return;
+            }
+            const { data: _data } = response;
+
+            if (this.viewdata) {
+                this.$emit('viewdataschange', [{ ..._data }]);
+                this.$emit('close');
+            } else if (this.$tabPageExp) {
+                this.$tabPageExp.onClose(this.$route.fullPath);
+            }
+        });
+    }
+
+
+
+}
\ No newline at end of file

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.less

+!!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${P.getLayoutCode().code}  [in template "TEMPLCODE_en_US" at line 1, column 1]
+----
+无法获取指定部件[VIEWLAYOUTPANEL#APPDEWFDYNAEDITVIEW_STYLE2]发布代码[VIEW.less]
\ No newline at end of file

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.vue

+<template src="./hrtransfer-apply-wfdyna-edit-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { HRTransferApplyWFDynaEditViewBase } from './hrtransfer-apply-wfdyna-edit-view-base';
+import view_form from '@widgets/hrtransfer-apply/main-form/main-form.vue';
+
+/**
+ * 调动申请视图
+ *
+ * @export
+ * @class HRTransferApplyWFDynaEditView
+ * @extends {HRTransferApplyWFDynaEditViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class HRTransferApplyWFDynaEditView extends HRTransferApplyWFDynaEditViewBase { }
+</script>

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view-base.tsx

@@ -304,12 +304,12 @@ export class HRTransferApplyWFDynaExpGridViewBase extends ViewBase {
         }
         const parameters: any[] = [
             { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
-            { pathName: 'editview', parameterName: 'editview' },
+            { pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {
             const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+            this.$router.push(routePath+'?userTaskId='+this.viewparams.userTaskId);
         }
         openIndexViewTab(data);
     }

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

@@ -31,6 +31,7 @@ export const PageComponents = {
         Vue.component('hrorganization-edit-view', () => import('@pages/base/hrorganization-edit-view/hrorganization-edit-view.vue'));
         Vue.component('hromhierarchy-cat-grid-view', () => import('@pages/base/hromhierarchy-cat-grid-view/hromhierarchy-cat-grid-view.vue'));
         Vue.component('hrpost-rel-v-001', () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'));
+        Vue.component('hrtransfer-apply-wfdyna-edit-view', () => import('@pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.vue'));
         Vue.component('hrtransfer-apply-v-002', () => import('@pages/pcm/hrtransfer-apply-v-002/hrtransfer-apply-v-002.vue'));
         Vue.component('hrresearch-grid-view', () => import('@pages/human-resource/hrresearch-grid-view/hrresearch-grid-view.vue'));
         Vue.component('hrpost-v-003', () => import('@pages/human-resource/hrpost-v-003/hrpost-v-003.vue'));
@@ -58,8 +59,8 @@ export const PageComponents = {
         Vue.component('hremployee-pickup-view', () => import('@pages/human-resource/hremployee-pickup-view/hremployee-pickup-view.vue'));
         Vue.component('hrtransfer-apply-v-005', () => import('@pages/pcm/hrtransfer-apply-v-005/hrtransfer-apply-v-005.vue'));
         Vue.component('hroperation-unit-edit-view', () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'));
-        Vue.component('hrpost-grid-view', () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'));
         Vue.component('hrwork-record-edit-view', () => import('@pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.vue'));
+        Vue.component('hrpost-grid-view', () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'));
         Vue.component('hremployee-v-004', () => import('@pages/human-resource/hremployee-v-004/hremployee-v-004.vue'));
         Vue.component('hrpost-v-002', () => import('@pages/human-resource/hrpost-v-002/hrpost-v-002.vue'));
         Vue.component('hremployee-v-005', () => import('@pages/human-resource/hremployee-v-005/hremployee-v-005.vue'));

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

@@ -672,6 +672,65 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrpost-rel-v-001/hrpost-rel-v-001.vue'),
                 },
+                {
+                    path: 'hrposts/:hrpost?/hrtransferapplies/:hrtransferapply?/wfdynaeditview/:wfdynaeditview?',
+                    meta: {
+                        caption: 'entities.hrtransferapply.views.wfdynaeditview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrposts', parameterName: 'hrpost' },
+                            { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
+                            { pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.vue'),
+                },
+                {
+                    path: 'hremployees/:hremployee?/hrtransferapplies/:hrtransferapply?/wfdynaeditview/:wfdynaeditview?',
+                    meta: {
+                        caption: 'entities.hrtransferapply.views.wfdynaeditview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
+                            { pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.vue'),
+                },
+                {
+                    path: 'hrorganizations/:hrorganization?/hrtransferapplies/:hrtransferapply?/wfdynaeditview/:wfdynaeditview?',
+                    meta: {
+                        caption: 'entities.hrtransferapply.views.wfdynaeditview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
+                            { pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.vue'),
+                },
+                {
+                    path: 'hrtransferapplies/:hrtransferapply?/wfdynaeditview/:wfdynaeditview?',
+                    meta: {
+                        caption: 'entities.hrtransferapply.views.wfdynaeditview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrtransferapplies', parameterName: 'hrtransferapply' },
+                            { pathName: 'wfdynaeditview', parameterName: 'wfdynaeditview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/pcm/hrtransfer-apply-wfdyna-edit-view/hrtransfer-apply-wfdyna-edit-view.vue'),
+                },
                 {
                     path: 'hrposts/:hrpost?/hrtransferapplies/:hrtransferapply?/v_002/:v_002?',
                     meta: {
@@ -1351,27 +1410,27 @@ const router = new Router({
                     component: () => import('@pages/base/hroperation-unit-edit-view/hroperation-unit-edit-view.vue'),
                 },
                 {
-                    path: 'hrposts/:hrpost?/gridview/:gridview?',
+                    path: 'hremployees/:hremployee?/hrworkrecords/:hrworkrecord?/editview/:editview?',
                     meta: {
-                        caption: 'entities.hrpost.views.gridview.title',
+                        caption: 'entities.hrworkrecord.views.editview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrposts', parameterName: 'hrpost' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'hremployees', parameterName: 'hremployee' },
+                            { pathName: 'hrworkrecords', parameterName: 'hrworkrecord' },
+                            { pathName: 'editview', parameterName: 'editview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'),
+                    component: () => import('@pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.vue'),
                 },
                 {
-                    path: 'hremployees/:hremployee?/hrworkrecords/:hrworkrecord?/editview/:editview?',
+                    path: 'hrworkrecords/:hrworkrecord?/editview/:editview?',
                     meta: {
                         caption: 'entities.hrworkrecord.views.editview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hremployees', parameterName: 'hremployee' },
                             { pathName: 'hrworkrecords', parameterName: 'hrworkrecord' },
                             { pathName: 'editview', parameterName: 'editview' },
                         ],
@@ -1380,18 +1439,18 @@ const router = new Router({
                     component: () => import('@pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.vue'),
                 },
                 {
-                    path: 'hrworkrecords/:hrworkrecord?/editview/:editview?',
+                    path: 'hrposts/:hrpost?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.hrworkrecord.views.editview.title',
+                        caption: 'entities.hrpost.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrworkrecords', parameterName: 'hrworkrecord' },
-                            { pathName: 'editview', parameterName: 'editview' },
+                            { pathName: 'hrposts', parameterName: 'hrpost' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/human-resource/hrwork-record-edit-view/hrwork-record-edit-view.vue'),
+                    component: () => import('@pages/human-resource/hrpost-grid-view/hrpost-grid-view.vue'),
                 },
                 {
                     path: 'hremployees/:hremployee?/v_004/:v_004?',

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

@@ -152,6 +152,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'c8310acd7e65d023051725aac59122d9',
                 '0dbdd98c4946bd6e79feb18e32dd387b',
             ],
         },
@@ -1028,6 +1029,18 @@ export const viewstate: any = {
                 '1316a3add8f01af03edf978ef21af6b1',
             ],
         },
+        {
+            viewtag: 'c8310acd7e65d023051725aac59122d9',
+            viewmodule: 'Pcm',
+            viewname: 'HRTransferApplyWFDynaEditView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '04c02737ae62a4f4c014607441ee0401',
+                'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
+                'e7ba37699bd458dc8dd5c02abac8dadd',
+            ],
+        },
         {
             viewtag: 'cb76a18e2c82d318acd00a4ae7c63e8f',
             viewmodule: 'HumanResource',

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

@@ -994,7 +994,7 @@
 
 
     <!--输出实体[HRTRANSFERAPPLY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-139-33">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-142-33">
         <createTable tableName="T_HRTRANSFERAPPLY">
                 <column name="HRTRANSFERAPPLYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_HRTRANSFERAPPLY_HRTRANSFERA"/>
@@ -1203,13 +1203,13 @@
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRAININGRECORD" constraintName="DER1N_HRTRAININGRECORD_HREMPLO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
         <!--输出实体[HRTRANSFERAPPLY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-139-69">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-142-69">
        <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HREMPLOY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-139-70">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-142-70">
        <addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRORGANI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-139-71">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-142-71">
        <addForeignKeyConstraint baseColumnNames="HRPOSTID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRPOST_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
     </changeSet>
         <!--输出实体[HRWORKRECORD]外键关系 -->