jackwang 部署微服务应用

app_PIM/src/interface/entity/hrorg-address.ts

@@ -85,4 +85,12 @@ export interface HROrgAddress {
      * @memberof HROrgAddress
      */
     mainaddress?: any;
+
+    /**
+     * 组织
+     *
+     * @returns {*}
+     * @memberof HROrgAddress
+     */
+    hrorganizationid?: any;
 }
\ No newline at end of file

app_PIM/src/interface/entity/hrorg-contact.ts

@@ -77,4 +77,12 @@ export interface HROrgContact {
      * @memberof HROrgContact
      */
     maincontact?: any;
+
+    /**
+     * 组织
+     *
+     * @returns {*}
+     * @memberof HROrgContact
+     */
+    hrorganizationid?: any;
 }
\ No newline at end of file

app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_en_US.ts

@@ -62,6 +62,7 @@ export default {
 			orgcode: "组织编码", 
 			shortname: "组织简称", 
 			showorder: "排序号", 
+			organizationtype: "组织类型", 
 			bank: "开户行", 
 			bankaccount: "银行账号", 
 			uscc: "统一社会信用代码", 

app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_zh_CN.ts

@@ -61,6 +61,7 @@ export default {
 			orgcode: "组织编码", 
 			shortname: "组织简称", 
 			showorder: "排序号", 
+			organizationtype: "组织类型", 
 			bank: "开户行", 
 			bankaccount: "银行账号", 
 			uscc: "统一社会信用代码", 

app_PIM/src/locale/lanres/entities/hrorg-address/hrorg-address_en_US.ts

@@ -11,6 +11,7 @@ export default {
     postcode: "邮政编码",
     uses: "用途",
     mainaddress: "主要",
+    hrorganizationid: "组织",
   },
 	views: {
 		gridview: {

app_PIM/src/locale/lanres/entities/hrorg-address/hrorg-address_zh_CN.ts

@@ -10,6 +10,7 @@ export default {
     postcode: "邮政编码",
     uses: "用途",
     mainaddress: "主要",
+    hrorganizationid: "组织",
   },
 	views: {
 		gridview: {

app_PIM/src/locale/lanres/entities/hrorg-contact/hrorg-contact_en_US.ts

@@ -10,6 +10,7 @@ export default {
     contacttype: "类型",
     contactinfo: "联系信息",
     maincontact: "主要",
+    hrorganizationid: "组织",
   },
 	views: {
 		editview: {

app_PIM/src/locale/lanres/entities/hrorg-contact/hrorg-contact_zh_CN.ts

@@ -9,6 +9,7 @@ export default {
     contacttype: "类型",
     contactinfo: "联系信息",
     maincontact: "主要",
+    hrorganizationid: "组织",
   },
 	views: {
 		editview: {

app_PIM/src/pages/base/hrorg-address-grid-view/hrorg-address-grid-view-base.tsx

@@ -563,7 +563,12 @@ export class HROrgAddressGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrorganization && true){
+            deResParameters = [
+            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
         ];
@@ -609,7 +614,12 @@ export class HROrgAddressGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrorganization && true){
+            deResParameters = [
+            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
         ];

app_PIM/src/pages/base/hrorg-address-v-001/hrorg-address-v-001-base.tsx

@@ -206,7 +206,12 @@ export class HROrgAddressV_001Base extends GridView9Base {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrorganization && true){
+            deResParameters = [
+            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
         ];

app_PIM/src/pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view-base.tsx

@@ -563,7 +563,12 @@ export class HROrgContactGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrorganization && true){
+            deResParameters = [
+            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
         ];
@@ -609,7 +614,12 @@ export class HROrgContactGridViewBase extends GridViewBase {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrorganization && true){
+            deResParameters = [
+            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
         ];

app_PIM/src/pages/base/hrorg-contact-v-001/hrorg-contact-v-001-base.tsx

@@ -213,7 +213,12 @@ export class HROrgContactV_001Base extends GridView9Base {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrorganization && true){
+            deResParameters = [
+            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
         ];
@@ -259,7 +264,12 @@ export class HROrgContactV_001Base extends GridView9Base {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.hrorganization && true){
+            deResParameters = [
+            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
         ];

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

@@ -85,6 +85,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'),
                 },
+                {
+                    path: 'hrorganizations/:hrorganization?/hrorgcontacts/:hrorgcontact?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.hrorgcontact.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-contact-edit-view/hrorg-contact-edit-view.vue'),
+                },
                 {
                     path: 'hrorgcontacts/:hrorgcontact?/editview/:editview?',
                     meta: {
@@ -127,6 +142,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrlegal-v-002/hrlegal-v-002.vue'),
                 },
+                {
+                    path: 'hrorganizations/:hrorganization?/hrorgaddresses/:hrorgaddress?/editview/:editview?',
+                    meta: {
+                        caption: 'entities.hrorgaddress.views.editview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
+                            { pathName: 'editview', parameterName: 'editview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'),
+                },
                 {
                     path: 'hrorgaddresses/:hrorgaddress?/editview/:editview?',
                     meta: {
@@ -141,6 +171,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrorg-address-edit-view/hrorg-address-edit-view.vue'),
                 },
+                {
+                    path: 'hrorganizations/:hrorganization?/hrorgcontacts/:hrorgcontact?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.hrorgcontact.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'),
+                },
                 {
                     path: 'hrorgcontacts/:hrorgcontact?/gridview/:gridview?',
                     meta: {
@@ -155,6 +200,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrorg-contact-grid-view/hrorg-contact-grid-view.vue'),
                 },
+                {
+                    path: 'hrorganizations/:hrorganization?/hrorgaddresses/:hrorgaddress?/gridview/:gridview?',
+                    meta: {
+                        caption: 'entities.hrorgaddress.views.gridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'),
+                },
                 {
                     path: 'hrorgaddresses/:hrorgaddress?/gridview/:gridview?',
                     meta: {
@@ -239,6 +299,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.vue'),
                 },
+                {
+                    path: 'hrorganizations/:hrorganization?/hrorgcontacts/:hrorgcontact?/v_001/:v_001?',
+                    meta: {
+                        caption: 'entities.hrorgcontact.views.v_001.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'hrorgcontacts', parameterName: 'hrorgcontact' },
+                            { pathName: 'v_001', parameterName: 'v_001' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'),
+                },
                 {
                     path: 'hrorgcontacts/:hrorgcontact?/v_001/:v_001?',
                     meta: {
@@ -253,6 +328,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/hrorg-contact-v-001/hrorg-contact-v-001.vue'),
                 },
+                {
+                    path: 'hrorganizations/:hrorganization?/hrorgaddresses/:hrorgaddress?/v_001/:v_001?',
+                    meta: {
+                        caption: 'entities.hrorgaddress.views.v_001.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'hrorgaddresses', parameterName: 'hrorgaddress' },
+                            { pathName: 'v_001', parameterName: 'v_001' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorg-address-v-001/hrorg-address-v-001.vue'),
+                },
                 {
                     path: 'hrorgaddresses/:hrorgaddress?/v_001/:v_001?',
                     meta: {

app_PIM/src/service/hrorg-address/hrorg-address-service-base.ts

@@ -48,6 +48,11 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgaddress){
+            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrorgaddresses/${context.hrorgaddress}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgaddress){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrorgaddresses/${context.hrorgaddress}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgaddress){
+            let res:any = Http.getInstance().delete(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrorgaddresses/${context.hrorgaddress}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgaddress){
+            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrorgaddresses/${context.hrorgaddress}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && true){
+            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/getdraft`,isloading);
+            res.data.hrorgaddress = data.hrorgaddress;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrorgaddresses/getdraft`,isloading);
         res.data.hrorgaddress = data.hrorgaddress;
         
@@ -149,6 +190,13 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgaddress){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrorgaddresses/${context.hrorgaddress}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgaddress){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrorgaddresses/${context.hrorgaddress}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HROrgAddressServiceBase extends EntityService {
      * @memberof HROrgAddressServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgaddresses/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrorgaddresses/fetchdefault`,tempData,isloading);
         return res;

app_PIM/src/service/hrorg-contact/hrorg-contact-service-base.ts

@@ -48,6 +48,11 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgcontact){
+            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/select`,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().get(`/hrorgcontacts/${context.hrorgcontact}/select`,isloading);
             
             return res;
@@ -63,6 +68,20 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && true){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
@@ -87,6 +106,13 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgcontact){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/hrorgcontacts/${context.hrorgcontact}`,data,isloading);
@@ -104,6 +130,10 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgcontact){
+            let res:any = Http.getInstance().delete(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,isloading);
+            return res;
+        }
             let res:any = Http.getInstance().delete(`/hrorgcontacts/${context.hrorgcontact}`,isloading);
             return res;
     }
@@ -118,6 +148,11 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgcontact){
+            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}`,isloading);
+            
+            return res;
+        }
             let res:any = await Http.getInstance().get(`/hrorgcontacts/${context.hrorgcontact}`,isloading);
             
             return res;
@@ -133,6 +168,12 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && true){
+            let res:any = await Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/getdraft`,isloading);
+            res.data.hrorgcontact = data.hrorgcontact;
+            
+            return res;
+        }
         let res:any = await  Http.getInstance().get(`/hrorgcontacts/getdraft`,isloading);
         res.data.hrorgcontact = data.hrorgcontact;
         
@@ -149,6 +190,13 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgcontact){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading);
+            
+            return res;
+        }
             let res:any = Http.getInstance().post(`/hrorgcontacts/${context.hrorgcontact}/checkkey`,data,isloading);
             return res;
     }
@@ -163,6 +211,13 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && context.hrorgcontact){
+            let masterData:any = {};
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/hrorganizations/${context.hrorganization}/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading);
+            
+            return res;
+        }
         let masterData:any = {};
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/hrorgcontacts/${context.hrorgcontact}/save`,data,isloading);
@@ -180,6 +235,11 @@ export default class HROrgContactServiceBase extends EntityService {
      * @memberof HROrgContactServiceBase
      */
     public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        if(context.hrorganization && true){
+            let tempData:any = JSON.parse(JSON.stringify(data));
+            let res:any = Http.getInstance().get(`/hrorganizations/${context.hrorganization}/hrorgcontacts/fetchdefault`,tempData,isloading);
+            return res;
+        }
         let tempData:any = JSON.parse(JSON.stringify(data));
         let res:any = Http.getInstance().get(`/hrorgcontacts/fetchdefault`,tempData,isloading);
         return res;

app_PIM/src/service/hrorganization/hrorganization-service-base.ts

@@ -73,6 +73,8 @@ export default class HROrganizationServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/hrorganizations`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgaddresses',JSON.stringify(res.data.hrorgaddresses?res.data.hrorgaddresses:[]));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_hrorgcontacts',JSON.stringify(res.data.hrorgcontacts?res.data.hrorgcontacts:[]));
         
         return res;
     }

app_PIM/src/widgets/hrlegal/if-001-form/if-001-form.html

@@ -112,6 +112,7 @@
     paramItem='hrlegal' 
     :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
     :parameters="[
+        { pathName: 'hrorganizations', parameterName: 'hrorganization' },
     ]"
     :context="context"
     :viewparams="viewparams"
@@ -146,6 +147,7 @@
     paramItem='hrlegal' 
     :parentdata='{"srfparentdename":"HRLEGAL","SRFPARENTTYPE":"CUSTOM"}'
     :parameters="[
+        { pathName: 'hrorganizations', parameterName: 'hrorganization' },
     ]"
     :context="context"
     :viewparams="viewparams"

app_PIM/src/widgets/hrlegal/main-form/main-form-base.tsx

@@ -77,6 +77,7 @@ export class MainEditFormBase extends EditFormControlBase {
         orgcode: null,
         shortname: null,
         showorder: null,
+        organizationtype: null,
         bank: null,
         bankaccount: null,
         uscc: null,
@@ -142,6 +143,8 @@ export class MainEditFormBase extends EditFormControlBase {
 
         showorder: new FormItemModel({ caption: '排序号', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
+        organizationtype: new FormItemModel({ caption: '组织类型', detailType: 'FORMITEM', name: 'organizationtype', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
         bank: new FormItemModel({ caption: '开户行', detailType: 'FORMITEM', name: 'bank', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         bankaccount: new FormItemModel({ caption: '银行账号', detailType: 'FORMITEM', name: 'bankaccount', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
@@ -153,4 +156,24 @@ export class MainEditFormBase extends EditFormControlBase {
         legalid: new FormItemModel({ caption: '法人标识', detailType: 'FORMITEM', name: 'legalid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };
+
+    /**
+     * 新建默认值
+     * @memberof MainEditFormBase
+     */
+    public createDefault(){                    
+        if (this.data.hasOwnProperty('organizationtype')) {
+            this.data['organizationtype'] = 'LEGAL';
+        }
+    }
+
+    /**
+     * 更新默认值
+     * @memberof MainEditFormBase
+     */
+    public updateDefault(){                    
+        if (this.data.hasOwnProperty('organizationtype') && !this.data.organizationtype) {
+            this.data['organizationtype'] = 'LEGAL';
+        }
+    }
 }
\ No newline at end of file

app_PIM/src/widgets/hrlegal/main-form/main-form-model.ts

@@ -75,6 +75,11 @@ export default class MainModel {
         prop: 'showorder',
         dataType: 'INHERIT',
       },
+      {
+        name: 'organizationtype',
+        prop: 'organizationtype',
+        dataType: 'INHERIT',
+      },
       {
         name: 'bank',
         prop: 'bank',

app_PIM/src/widgets/hrorg-address/main-grid/main-grid-model.ts

@@ -36,6 +36,11 @@ export default class MainModel {
           prop: 'hrorgaddressname',
           dataType: 'TEXT',
         },
+        {
+          name: 'hrorganizationid',
+          prop: 'hrorganizationid',
+          dataType: 'PICKUP',
+        },
         {
           name: 'mainaddress',
           prop: 'mainaddress',

app_PIM/src/widgets/hrorg-contact/main-grid/main-grid-model.ts

@@ -31,6 +31,11 @@ export default class MainModel {
           prop: 'maincontact',
           dataType: 'YESNO',
         },
+        {
+          name: 'hrorganizationid',
+          prop: 'hrorganizationid',
+          dataType: 'PICKUP',
+        },
         {
           name: 'contactinfo',
           prop: 'contactinfo',

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibizhumanresources/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizhumanresources/
-      mvn clean package -Phrapi
-      cd humanresource-provider/humanresource-provider-hrapi
-      mvn -Phrapi docker:build
-      mvn -Phrapi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth      
+      mvn clean package -Ppim
+      cd humanresource-app/humanresource-app-pim
+      mvn -Ppim docker:build
+      mvn -Ppim docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
 
-EXPOSE 8080
+EXPOSE 10327
 
 ADD humanresource-app-pim.jar /humanresource-app-pim.jar

humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml

@@ -3,9 +3,25 @@ services:
   humanresource-app-pim:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
     ports:
-      - "8080:8080"
+      - "10327:10327"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=10327
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
+      - SPRING_DATASOURCE_PASSWORD=b1@@@772
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
 
-EXPOSE 10317
+EXPOSE 8081
 
 ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar

humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml

@@ -3,25 +3,9 @@ services:
   humanresource-provider-hrapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
     ports:
-      - "10317:10317"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10317
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: