xignzi006 发布系统代码

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

@@ -409,6 +409,16 @@
         "viewtag": "2665d630c1446030eab8f52c5ebca818",
         "memo": "系统自动添加"
     },
+    "incidentbyparentkey": {
+        "title": "服务案例信息",
+        "caption": "案例",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentByParentKey",
+        "viewfilename": "incident-by-parent-key",
+        "viewtag": "26e0707950d8676b9a9363c6bc46ee89",
+        "memo": ""
+    },
     "accountpickupview": {
         "title": "客户数据选择视图",
         "caption": "客户",

app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts

@@ -109,6 +109,10 @@ export default {
 			caption: "案例",
       		title: "子案例信息",
 		},
+		byparentkey: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		gridview: {
 			caption: "案例",
       		title: "服务案例信息",
@@ -142,12 +146,10 @@ export default {
       		title: "案例数据看板视图",
 		},
 	},
-	main_form: {
+	quickcreate_form: {
 		details: {
-			group1: "incident基本信息", 
+			group1: "案例基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "案例", 
@@ -157,18 +159,23 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			subjectname: "主题", 
+			customerid: "客户", 
+			caseorigincode: "起源", 
+			productname: "产品", 
+			entitlementname: "权利", 
+			productid: "产品", 
 			incidentid: "案例", 
+			subjectid: "主题", 
+			entitlementid: "权利", 
 		},
 		uiactions: {
 		},
 	},
-	edit_childincident_form: {
+	info_incident_form: {
 		details: {
-			group1: "案例信息", 
+			group1: "案例基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -179,25 +186,25 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			customerid: "客户", 
 			subjectname: "主题", 
-			casetypecode: "案例类型", 
-			primarycontactname: "联系人", 
+			customerid: "客户", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 
-			productid: "产品", 
+			primarycontactname: "联系人", 
+			casetypecode: "案例类型", 
+			parentcasename: "上级案例", 
+			escalated: "已升级", 
+			followupby: "跟进工作截止日期", 
+			description: "说明", 
 			incidentid: "案例", 
-			primarycontactid: "联系人", 
-			subjectid: "主题", 
-			entitlementid: "权利", 
 		},
 		uiactions: {
 		},
 	},
-	quickcreate_form: {
+	edit_childincident_form: {
 		details: {
-			group1: "案例基本信息", 
+			group1: "案例信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -208,24 +215,28 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			subjectname: "主题", 
 			customerid: "客户", 
+			subjectname: "主题", 
+			casetypecode: "案例类型", 
+			primarycontactname: "联系人", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 
 			productid: "产品", 
 			incidentid: "案例", 
+			primarycontactid: "联系人", 
 			subjectid: "主题", 
 			entitlementid: "权利", 
 		},
 		uiactions: {
 		},
 	},
-	info_incident_form: {
+	main_form: {
 		details: {
-			group1: "案例基本信息", 
-			grouppanel1: "详细信息", 
+			group1: "incident基本信息", 
 			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "案例", 
@@ -235,17 +246,10 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			subjectname: "主题", 
-			customerid: "客户", 
-			caseorigincode: "起源", 
-			productname: "产品", 
-			entitlementname: "权利", 
-			primarycontactname: "联系人", 
-			casetypecode: "案例类型", 
-			parentcasename: "上级案例", 
-			escalated: "已升级", 
-			followupby: "跟进工作截止日期", 
-			description: "说明", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
 			incidentid: "案例", 
 		},
 		uiactions: {
@@ -270,6 +274,60 @@ export default {
 		uiactions: {
 		},
 	},
+	childincidentgridviewtoolbar_toolbar: {
+	},
+	edit_chlidincidenttoolbar_toolbar: {
+		tbitem1: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
+	byparentkeytoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		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",
@@ -308,18 +366,6 @@ export default {
 			tip: "Copy {0}",
 		},
 	},
-	edit_chlidincidenttoolbar_toolbar: {
-		tbitem1: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
-	childincidentgridviewtoolbar_toolbar: {
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts

@@ -108,6 +108,10 @@ export default {
 			caption: "案例",
       		title: "子案例信息",
 		},
+		byparentkey: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		gridview: {
 			caption: "案例",
       		title: "服务案例信息",
@@ -141,12 +145,10 @@ export default {
       		title: "案例数据看板视图",
 		},
 	},
-	main_form: {
+	quickcreate_form: {
 		details: {
-			group1: "incident基本信息", 
+			group1: "案例基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "案例", 
@@ -156,18 +158,23 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			subjectname: "主题", 
+			customerid: "客户", 
+			caseorigincode: "起源", 
+			productname: "产品", 
+			entitlementname: "权利", 
+			productid: "产品", 
 			incidentid: "案例", 
+			subjectid: "主题", 
+			entitlementid: "权利", 
 		},
 		uiactions: {
 		},
 	},
-	edit_childincident_form: {
+	info_incident_form: {
 		details: {
-			group1: "案例信息", 
+			group1: "案例基本信息", 
+			grouppanel1: "详细信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -178,25 +185,25 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			customerid: "客户", 
 			subjectname: "主题", 
-			casetypecode: "案例类型", 
-			primarycontactname: "联系人", 
+			customerid: "客户", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 
-			productid: "产品", 
+			primarycontactname: "联系人", 
+			casetypecode: "案例类型", 
+			parentcasename: "上级案例", 
+			escalated: "已升级", 
+			followupby: "跟进工作截止日期", 
+			description: "说明", 
 			incidentid: "案例", 
-			primarycontactid: "联系人", 
-			subjectid: "主题", 
-			entitlementid: "权利", 
 		},
 		uiactions: {
 		},
 	},
-	quickcreate_form: {
+	edit_childincident_form: {
 		details: {
-			group1: "案例基本信息", 
+			group1: "案例信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -207,24 +214,28 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			subjectname: "主题", 
 			customerid: "客户", 
+			subjectname: "主题", 
+			casetypecode: "案例类型", 
+			primarycontactname: "联系人", 
 			caseorigincode: "起源", 
 			productname: "产品", 
 			entitlementname: "权利", 
 			productid: "产品", 
 			incidentid: "案例", 
+			primarycontactid: "联系人", 
 			subjectid: "主题", 
 			entitlementid: "权利", 
 		},
 		uiactions: {
 		},
 	},
-	info_incident_form: {
+	main_form: {
 		details: {
-			group1: "案例基本信息", 
-			grouppanel1: "详细信息", 
+			group1: "incident基本信息", 
 			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "案例", 
@@ -234,17 +245,10 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			title: "案例标题", 
-			subjectname: "主题", 
-			customerid: "客户", 
-			caseorigincode: "起源", 
-			productname: "产品", 
-			entitlementname: "权利", 
-			primarycontactname: "联系人", 
-			casetypecode: "案例类型", 
-			parentcasename: "上级案例", 
-			escalated: "已升级", 
-			followupby: "跟进工作截止日期", 
-			description: "说明", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
 			incidentid: "案例", 
 		},
 		uiactions: {
@@ -269,6 +273,60 @@ export default {
 		uiactions: {
 		},
 	},
+	childincidentgridviewtoolbar_toolbar: {
+	},
+	edit_chlidincidenttoolbar_toolbar: {
+		tbitem1: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
+	byparentkeytoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		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: "保存",
@@ -307,18 +365,6 @@ export default {
 			tip: "拷贝",
 		},
 	},
-	edit_chlidincidenttoolbar_toolbar: {
-		tbitem1: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
-	childincidentgridviewtoolbar_toolbar: {
-	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/mock/entity/incidents/incidents.ts

@@ -271,6 +271,50 @@ mock.onPost(new RegExp(/^\/incidents\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((
     return [status, data];
 });
     
+// FetchByParentKey
+mock.onGet(new RegExp(/^\/incidents\/fetchbyparentkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:incident 方法: FetchByParentKey");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchByParentKey
+mock.onGet(new RegExp(/^\/incidents\/fetchbyparentkey(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:incident 方法: FetchByParentKey");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
+    
 // FetchDefault
 mock.onGet(new RegExp(/^\/incidents\/fetchdefault$/)).reply((config: any) => {
     console.groupCollapsed("实体:incident 方法: FetchDefault");

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -335,6 +335,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "GoalPickupView",
             "viewtag": "2665d630c1446030eab8f52c5ebca818"
         },
+        "incidentbyparentkey": {
+            "title": "服务案例信息",
+            "caption": "案例",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentByParentKey",
+            "viewtag": "26e0707950d8676b9a9363c6bc46ee89"
+        },
         "accountpickupview": {
             "title": "客户数据选择视图",
             "caption": "客户",

app_CRM/src/pages/service/incident-by-parent-key/incident-by-parent-key-base.tsx

+
+import { Subject } from 'rxjs';
+import { GridViewBase } from '@/studio-core';
+import IncidentService from '@/service/incident/incident-service';
+import GridViewEngine from '@engine/view/grid-view-engine';
+import IncidentUIService from '@/uiservice/incident/incident-ui-service';
+import CodeListService from "@service/app/codelist-service";
+
+
+/**
+ * 服务案例信息视图基类
+ *
+ * @export
+ * @class IncidentByParentKeyBase
+ * @extends {GridViewBase}
+ */
+export class IncidentByParentKeyBase extends GridViewBase {
+
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentByParentKeyBase
+     */
+    protected appDeName: string = 'incident';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentService}
+     * @memberof IncidentByParentKeyBase
+     */
+    protected appEntityService: IncidentService = new IncidentService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof IncidentByParentKeyBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentByParentKeyBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.incident.views.byparentkey.caption',
+        srfTitle: 'entities.incident.views.byparentkey.title',
+        srfSubTitle: 'entities.incident.views.byparentkey.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentByParentKeyBase
+     */
+    protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_grid: { name: 'grid', type: 'GRID' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+    };
+
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof IncidentByParentKey
+     */
+    public toolBarModels: any = {
+        tbitem1_openquickcreateview: { name: 'tbitem1_openquickcreateview', caption: '新建','isShowCaption':true,'isShowIcon':true, tooltip: '新建', iconcls: 'fa fa-user-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenQuickCreateView', target: 'NONE' }, class: '' },
+
+        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem4: { name: 'tbitem4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        tbitem6: { name: 'tbitem6', caption: '拷贝','isShowCaption':true,'isShowIcon':true, tooltip: '拷贝', iconcls: 'fa fa-copy', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' }, class: '' },
+
+        tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem8: { name: 'tbitem8', caption: '删除','isShowCaption':true,'isShowIcon':true, tooltip: '删除', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' }, class: '' },
+
+        tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem13: { name: 'tbitem13', caption: '导出','isShowCaption':true,'isShowIcon':true, tooltip: '导出', iconcls: 'fa fa-file-excel-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000, class: '' },
+
+        tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem19: { name: 'tbitem19', caption: '过滤','isShowCaption':true,'isShowIcon':true, tooltip: '过滤', iconcls: 'fa fa-filter', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' }, class: '' },
+
+    };
+
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '26e0707950d8676b9a9363c6bc46ee89';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof IncidentByParentKeyBase
+     */
+    public engine: GridViewEngine = new GridViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof IncidentByParentKeyBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            opendata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.opendata(args,fullargs, params, $event, xData);
+            },
+            newdata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.newdata(args,fullargs, params, $event, xData);
+            },
+            grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
+            keyPSDEField: 'incident',
+            majorPSDEField: 'title',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem1_openquickcreateview')) {
+            this.toolbar_tbitem1_openquickcreateview_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem19')) {
+            this.toolbar_tbitem19_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public grid_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public searchform_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public searchform_search($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentByParentKeyBase
+     */
+    public searchform_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_openquickcreateview_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:IncidentUIService  = new IncidentUIService();
+        curUIService.Incident_OpenQuickCreateView(datas,contextJO, paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem6_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Copy(datas, contextJO,paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Remove(datas, contextJO,paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem13_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem11_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Print(datas, contextJO,paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem19_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 打开新建数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IncidentByParentKey
+     */
+    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.incident;
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'incidents', parameterName: 'incident' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'incident-quick-create-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.incident.views.quickcreateview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof IncidentByParentKey
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'incidents', parameterName: 'incident' },
+            { pathName: 'infoview', parameterName: 'infoview' },
+        ];
+        const _this: any = this;
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
+        }
+        openIndexViewTab(data);
+    }
+
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IncidentByParentKeyBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { incident: args[0].incident })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 拷贝
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IncidentByParentKeyBase
+     */
+    public Copy(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.newdata && _this.newdata instanceof Function) {
+            const data: any = {};
+            if (args.length > 0) {
+                Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
+            }
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
+        } else if (xData && xData.copy instanceof Function) {
+            if (args.length > 0) {
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
+            }
+            xData.copy(args[0].srfkey);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IncidentByParentKeyBase
+     */
+    public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (!xData || !(xData.remove instanceof Function)) {
+            return ;
+        }
+        xData.remove(args);
+    }
+
+    /**
+     * 导出
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IncidentByParentKeyBase
+     */
+    public ExportExcel(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (!xData || !(xData.exportExcel instanceof Function) || !$event) {
+            return ;
+        }
+        xData.exportExcel($event.exportparms);
+    }
+    /**
+     * 打印
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IncidentByParentKeyBase
+     */
+    public Print(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        let _this:any = this;
+        if (!xData || !(xData.print instanceof Function) || !$event) {
+            return ;
+        }
+        xData.print();
+    }
+    /**
+     * 过滤
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IncidentByParentKeyBase
+     */
+    public ToggleFilter(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (_this.hasOwnProperty('isExpandSearchForm')) {
+            _this.isExpandSearchForm = !_this.isExpandSearchForm;
+        }
+    }
+}
\ No newline at end of file

app_CRM/src/pages/service/incident-by-parent-key/incident-by-parent-key.html

+<studio-view-style2 viewName="incidentbyparentkey" viewTitle="服务案例信息" class='degridview incident-by-parent-key'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchByParentKey"
+        :newdata="newdata"
+        :opendata="opendata"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/service/incident-by-parent-key/incident-by-parent-key.vue

+<template src="./incident-by-parent-key.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IncidentByParentKeyBase } from './incident-by-parent-key-base';
+import view_grid from '@widgets/incident/main-grid/main-grid.vue';
+import view_searchform from '@widgets/incident/default-searchform/default-searchform.vue';
+
+/**
+ * 服务案例信息视图
+ *
+ * @export
+ * @class IncidentByParentKey
+ * @extends {IncidentByParentKeyBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class IncidentByParentKey extends IncidentByParentKeyBase { }
+</script>

app_CRM/src/pages/ungroup/central/page-register.ts

@@ -132,6 +132,7 @@ export const PageComponents = {
         Vue.component('invoice-info-view', () => import('@pages/finance/invoice-info-view/invoice-info-view.vue'));
         Vue.component('contact-by-account', () => import('@pages/base/contact-by-account/contact-by-account.vue'));
         Vue.component('lead-qualification', () => import('@pages/sales/lead-qualification/lead-qualification.vue'));
+        Vue.component('incident-by-parent-key', () => import('@pages/service/incident-by-parent-key/incident-by-parent-key.vue'));
         Vue.component('account-status-tab-view', () => import('@pages/base/account-status-tab-view/account-status-tab-view.vue'));
         Vue.component('ibiz-list-summary', () => import('@pages/marketing/ibiz-list-summary/ibiz-list-summary.vue'));
         Vue.component('sales-literature-item-grid-view', () => import('@pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view.vue'));

app_CRM/src/pages/ungroup/central/router.ts

@@ -3612,6 +3612,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/lead-qualification/lead-qualification.vue'),
                 },
+                {
+                    path: 'incidents/:incident?/byparentkey/:byparentkey?',
+                    meta: {
+                        caption: 'entities.incident.views.byparentkey.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'incidents', parameterName: 'incident' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/service/incident-by-parent-key/incident-by-parent-key.vue'),
+                },
                 {
                     path: 'salesliteratures/:salesliterature?/competitorsalesliteratures/:competitorsalesliterature?/sallitcompgridview/:sallitcompgridview?',
                     meta: {

app_CRM/src/service/account/account-service-base.ts

@@ -64,36 +64,36 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let contactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
+            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
+            if(contactsData && contactsData.length && contactsData.length > 0){
+                contactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.contactid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let contactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
-            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
-            if(contactsData && contactsData.length && contactsData.length > 0){
-                contactsData.forEach((item:any) => {
+        masterData.contacts = contactsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.contactid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.contacts = contactsData;
+        masterData.listaccounts = listaccountsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -103,8 +103,8 @@ export default class AccountServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/accounts`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         return res;
     }
 
@@ -119,40 +119,40 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let contactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
+            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
+            if(contactsData && contactsData.length && contactsData.length > 0){
+                contactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.contactid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let contactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
-            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
-            if(contactsData && contactsData.length && contactsData.length > 0){
-                contactsData.forEach((item:any) => {
+        masterData.contacts = contactsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.contactid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.contacts = contactsData;
+        masterData.listaccounts = listaccountsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/accounts/${context.account}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             return res;
     }
 
@@ -180,8 +180,8 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             return res;
     }
 
@@ -197,8 +197,8 @@ export default class AccountServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/accounts/getdraft`,isloading);
         res.data.account = data.account;
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         return res;
     }
 
@@ -269,40 +269,40 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let contactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
+            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
+            if(contactsData && contactsData.length && contactsData.length > 0){
+                contactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.contactid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let contactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
-            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
-            if(contactsData && contactsData.length && contactsData.length > 0){
-                contactsData.forEach((item:any) => {
+        masterData.contacts = contactsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.contactid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.contacts = contactsData;
+        masterData.listaccounts = listaccountsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/accounts/${context.account}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             return res;
     }
 

app_CRM/src/service/campaign/campaign-service-base.ts

@@ -62,21 +62,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -107,6 +92,21 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class CampaignServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -133,21 +133,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -178,11 +163,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class CampaignServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -258,21 +258,6 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let campaigncampaignsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
             campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
@@ -303,11 +288,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 

app_CRM/src/service/contact/contact-service-base.ts

@@ -68,21 +68,6 @@ export default class ContactServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && true){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -113,21 +98,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-            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(`/accounts/${context.account}/contacts`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            return res;
-        }
-        let masterData:any = {};
         let opportunitiesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
             opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
@@ -143,6 +113,21 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+            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(`/accounts/${context.account}/contacts`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            return res;
+        }
+        let masterData:any = {};
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -173,6 +158,21 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -182,9 +182,9 @@ export default class ContactServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/contacts`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         return res;
     }
 
@@ -200,21 +200,6 @@ export default class ContactServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -245,14 +230,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            return res;
-        }
-        let masterData:any = {};
         let opportunitiesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
             opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
@@ -268,6 +245,14 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            return res;
+        }
+        let masterData:any = {};
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -298,11 +283,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/contacts/${context.contact}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -334,15 +334,15 @@ export default class ContactServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -359,16 +359,16 @@ export default class ContactServiceBase extends EntityService {
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/getdraft`,isloading);
             res.data.contact = data.contact;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/contacts/getdraft`,isloading);
         res.data.contact = data.contact;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
         return res;
     }
 
@@ -399,21 +399,6 @@ export default class ContactServiceBase extends EntityService {
     public async AddList(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -444,11 +429,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/addlist`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/addlist`,data,isloading);
@@ -466,21 +466,6 @@ export default class ContactServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -511,11 +496,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/checkkey`,data,isloading);
@@ -548,21 +548,6 @@ export default class ContactServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -593,14 +578,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            return res;
-        }
-        let masterData:any = {};
         let opportunitiesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
             opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
@@ -616,6 +593,14 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            return res;
+        }
+        let masterData:any = {};
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -646,11 +631,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/contacts/${context.contact}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
     }
 
@@ -666,21 +666,6 @@ export default class ContactServiceBase extends EntityService {
     public async SetPrimary(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let opportunitiesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
-            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunities = opportunitiesData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -711,11 +696,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunities = opportunitiesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/setprimary`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/setprimary`,data,isloading);

app_CRM/src/service/incident/incident-service-base.ts

@@ -211,6 +211,20 @@ export default class IncidentServiceBase extends EntityService {
             return res;
     }
 
+    /**
+     * FetchByParentKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IncidentServiceBase
+     */
+    public async FetchByParentKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/incidents/fetchbyparentkey`,tempData,isloading);
+    }
+
     /**
      * FetchDefault接口方法
      *

app_CRM/src/service/opportunity/opportunity-service-base.ts

@@ -69,6 +69,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && true){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -99,21 +114,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -123,13 +123,28 @@ export default class OpportunityServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && true){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -160,6 +175,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            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(`/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -175,21 +205,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            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(`/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -220,21 +235,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -244,9 +244,9 @@ export default class OpportunityServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         return res;
     }
 
@@ -262,6 +262,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -292,6 +307,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -307,15 +331,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -346,6 +361,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -361,14 +384,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -399,26 +414,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 
@@ -453,22 +453,22 @@ export default class OpportunityServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 
@@ -485,24 +485,24 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         return res;
     }
 
@@ -518,6 +518,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -548,6 +563,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -563,15 +587,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -602,26 +617,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/active`,data,isloading);
@@ -639,6 +639,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -669,6 +684,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -684,15 +708,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -723,26 +738,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/checkkey`,data,isloading);
@@ -760,6 +760,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Lose(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -790,6 +805,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -805,15 +829,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -844,26 +859,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/lose`,data,isloading);
@@ -881,6 +881,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -911,6 +926,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -926,15 +950,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -965,6 +980,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -980,14 +1003,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1018,26 +1033,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 
@@ -1053,6 +1053,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Win(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1083,6 +1098,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1098,15 +1122,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1137,26 +1152,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/win`,data,isloading);

app_CRM/src/service/product/product-service-base.ts

@@ -62,6 +62,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -92,21 +107,6 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class ProductServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/products`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
 
@@ -133,6 +133,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -163,26 +178,11 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/products/${context.product}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/products/${context.product}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class ProductServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/products/getdraft`,isloading);
         res.data.product = data.product;
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
 
@@ -258,6 +258,21 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let productassociationsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
+            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
+            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
+                productassociationsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.productassociationid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.productassociations = productassociationsData;
         let productsubstitutesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
             productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
@@ -288,26 +303,11 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productpricelevels = productpricelevelsData;
-        let productassociationsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
-            productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
-            if(productassociationsData && productassociationsData.length && productassociationsData.length > 0){
-                productassociationsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.productassociationid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/products/${context.product}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
-            this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
 

app_CRM/src/service/sales-literature/sales-literature-service-base.ts

@@ -62,21 +62,6 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -107,6 +92,21 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.productsalesliteratures = productsalesliteraturesData;
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesliteratures`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
         return res;
     }
 
@@ -133,21 +133,6 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -178,11 +163,26 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.productsalesliteratures = productsalesliteraturesData;
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesliteratures/${context.salesliterature}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/salesliteratures/${context.salesliterature}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class SalesLiteratureServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/salesliteratures/getdraft`,isloading);
         res.data.salesliterature = data.salesliterature;
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
         return res;
     }
 
@@ -258,21 +258,6 @@ export default class SalesLiteratureServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -303,11 +288,26 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.productsalesliteratures = productsalesliteraturesData;
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesliteratures/${context.salesliterature}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             return res;
     }
 

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

@@ -355,6 +355,17 @@ export const viewstate: any = {
                 '2d001ccdcb51e48a9d4273278b26d782',
             ],
         },
+        {
+            viewtag: '26e0707950d8676b9a9363c6bc46ee89',
+            viewmodule: 'Service',
+            viewname: 'IncidentByParentKey',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '540213698dac06ea2ef3193da7fe9b11',
+                'f440f1d3b950a89e6cb72cadea120b74',
+            ],
+        },
         {
             viewtag: '29bfcd628ab25e297248ff0524d12908',
             viewmodule: 'Base',
@@ -438,6 +449,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'fb06f2c1cea1ac2a5a70c20f4a277ae5',
+                '26e0707950d8676b9a9363c6bc46ee89',
                 '5c7e90ccfaeb49b5bd84ae6c17b479e3',
                 'bae77557d2f7a7852b634dc5d5a93435',
                 '016e75bb460270519a0ee9dda57b2c90',
@@ -2019,6 +2031,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '6f35f461b53398775ff2f1a563776fa3',
+                '26e0707950d8676b9a9363c6bc46ee89',
                 'bae77557d2f7a7852b634dc5d5a93435',
                 '50138c2b066081ec8b6fe67c88af5371',
                 '6168a7e787ead13b1e0f9a55007bc68c',

app_CRM/src/uiservice/incident/incident-ui-service-base.ts

@@ -81,6 +81,7 @@ export default class IncidentUIServiceBase extends UIService {
     public initViewMap(){
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'incidents'});
         this.allViewMap.set(':',{viewname:'edit_chlidincident',srfappde:'incidents'});
+        this.allViewMap.set(':',{viewname:'byparentkey',srfappde:'incidents'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'incidents'});
         this.allViewMap.set(':',{viewname:'quickcreateview',srfappde:'incidents'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'incidents'});

app_CRM/src/widgets/account/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel-base.tsx

@@ -50,6 +50,7 @@ export class InfotabexppanelTabexppanelBase extends TabExpPanelControlBase {
         tabviewpanel2:  false ,
         tabviewpanel3:  false ,
         tabviewpanel4:  false ,
+        tabviewpanel5:  false ,
     }
 
     /**

app_CRM/src/widgets/account/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.html

@@ -120,5 +120,29 @@
     @closeview="closeView($event)">
 </view_tabviewpanel4>
         </tab-pane>
+        <tab-pane :index="4" name='tabviewpanel5' tab='infotabexppanel' class=''  
+            :label="(h) =>{
+                return h('div', [
+                    h('span', '服务案例'),
+                    h('Badge', {
+                        props: {
+                            count: undefined,
+                            type: 'primary'
+                        }
+                    })
+                ])
+            }" >
+            <view_tabviewpanel5 
+    :viewState="viewState"  
+    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+    :context="JSON.parse(JSON.stringify(context))" 
+    v-if="isInit.tabviewpanel5"
+    name="tabviewpanel5"  
+    ref='tabviewpanel5'
+    :expActive="activatedTabViewPanel === 'tabviewpanel5'"
+    @viewpanelDatasChange = "tabViewPanelDatasChange"
+    @closeview="closeView($event)">
+</view_tabviewpanel5>
+        </tab-pane>
     </tabs>
 </div>
\ No newline at end of file

app_CRM/src/widgets/account/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.vue

@@ -7,6 +7,7 @@ import view_tabviewpanel from '@widgets/account/infotabviewpanel-tabviewpanel/in
 import view_tabviewpanel2 from '@widgets/account/infotabviewpanel2-tabviewpanel/infotabviewpanel2-tabviewpanel.vue';
 import view_tabviewpanel3 from '@widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel.vue';
 import view_tabviewpanel4 from '@widgets/account/infotabviewpanel4-tabviewpanel/infotabviewpanel4-tabviewpanel.vue';
+import view_tabviewpanel5 from '@widgets/account/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel.vue';
  
 
 /**
@@ -22,6 +23,7 @@ import view_tabviewpanel4 from '@widgets/account/infotabviewpanel4-tabviewpanel/
         view_tabviewpanel2, 
         view_tabviewpanel3, 
         view_tabviewpanel4, 
+        view_tabviewpanel5, 
          
     }
 })

app_CRM/src/widgets/account/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, MainControlBase } from '@/studio-core';
+import AccountService from '@/service/account/account-service';
+import Infotabviewpanel5Service from './infotabviewpanel5-tabviewpanel-service';
+
+
+/**
+ * tabviewpanel5部件基类
+ *
+ * @export
+ * @class MainControlBase
+ * @extends {Infotabviewpanel5TabviewpanelBase}
+ */
+export class Infotabviewpanel5TabviewpanelBase extends MainControlBase {
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {Infotabviewpanel5Service}
+     * @memberof Infotabviewpanel5TabviewpanelBase
+     */
+    public service: Infotabviewpanel5Service = new Infotabviewpanel5Service({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {AccountService}
+     * @memberof Infotabviewpanel5TabviewpanelBase
+     */
+    public appEntityService: AccountService = new AccountService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof Infotabviewpanel5TabviewpanelBase
+     */
+    protected appDeName: string = 'account';
+
+    /**
+     * 导航模式下项是否激活
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel5
+     */
+    @Prop()
+    public expActive!: any;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof Infotabviewpanel5
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof Infotabviewpanel5
+     */
+    public getData(): any {
+        return null;
+    }
+
+    /**
+     * 是否被激活
+     *
+     * @type {boolean}
+     * @memberof Infotabviewpanel5
+     */
+    public isActivied: boolean = true;
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel5
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel5
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 传入上下文
+     *
+     * @type {string}
+     * @memberof TabExpViewtabviewpanel
+     */
+    public viewdata: string = JSON.stringify(this.context);
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string = JSON.stringify(this.viewparams);
+
+    /**
+     * 视图面板过滤项
+     *
+     * @type {string}
+     * @memberof Infotabviewpanel5
+     */
+    public navfilter: string = "";
+             
+    /**
+     * vue 生命周期
+     *
+     * @returns
+     * @memberof Infotabviewpanel5
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof Infotabviewpanel5
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                this.$forceUpdate();
+                this.initNavParam();
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     * @memberof Infotabviewpanel5
+     */
+    public initNavParam(){
+        if(!Object.is(this.navfilter,"")){
+            Object.assign(this.viewparams,{[this.navfilter]:this.context['majorentity']})
+        }
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata =JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+    /**
+     * 视图数据变化
+     *
+     * @memberof  Infotabviewpanel5
+     */
+    public viewDatasChange($event:any){
+        this.$emit('viewpanelDatasChange',$event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof Infotabviewpanel5
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof Infotabviewpanel5
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+}
\ No newline at end of file

app_CRM/src/widgets/account/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel-model.ts

+/**
+ * Infotabviewpanel5 部件模型
+ *
+ * @export
+ * @class Infotabviewpanel5Model
+ */
+export default class Infotabviewpanel5Model {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof Infotabviewpanel5Model
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'address1_primarycontactname',
+      },
+      {
+        name: 'openrevenue_date',
+      },
+      {
+        name: 'address2_utcoffset',
+      },
+      {
+        name: 'fax',
+      },
+      {
+        name: 'address1_composite',
+      },
+      {
+        name: 'entityimage',
+      },
+      {
+        name: 'emailaddress1',
+      },
+      {
+        name: 'overriddencreatedon',
+      },
+      {
+        name: 'address1_stateorprovince',
+      },
+      {
+        name: 'openrevenue',
+      },
+      {
+        name: 'address1_upszone',
+      },
+      {
+        name: 'followemail',
+      },
+      {
+        name: 'marketingonly',
+      },
+      {
+        name: 'numberofemployees',
+      },
+      {
+        name: 'telephone1',
+      },
+      {
+        name: 'aging60',
+      },
+      {
+        name: 'sharesoutstanding',
+      },
+      {
+        name: 'address2_freighttermscode',
+      },
+      {
+        name: 'entityimage_timestamp',
+      },
+      {
+        name: 'revenue_base',
+      },
+      {
+        name: 'accountratingcode',
+      },
+      {
+        name: 'donotbulkemail',
+      },
+      {
+        name: 'aging30',
+      },
+      {
+        name: 'donotbulkpostalmail',
+      },
+      {
+        name: 'creditlimit_base',
+      },
+      {
+        name: 'timezoneruleversionnumber',
+      },
+      {
+        name: 'customertypecode',
+      },
+      {
+        name: 'address2_longitude',
+      },
+      {
+        name: 'accountname',
+      },
+      {
+        name: 'participatesinworkflow',
+      },
+      {
+        name: 'preferredcontactmethodcode',
+      },
+      {
+        name: 'preferredappointmentdaycode',
+      },
+      {
+        name: 'marketcap',
+      },
+      {
+        name: 'address2_telephone1',
+      },
+      {
+        name: 'businesstypecode',
+      },
+      {
+        name: 'entityimageid',
+      },
+      {
+        name: 'address2_city',
+      },
+      {
+        name: 'ownershipcode',
+      },
+      {
+        name: 'utcconversiontimezonecode',
+      },
+      {
+        name: 'accountnumber',
+      },
+      {
+        name: 'address1_telephone2',
+      },
+      {
+        name: 'address1_line1',
+      },
+      {
+        name: 'donotphone',
+      },
+      {
+        name: 'address1_telephone3',
+      },
+      {
+        name: 'exchangerate',
+      },
+      {
+        name: 'address2_line2',
+      },
+      {
+        name: 'address2_telephone3',
+      },
+      {
+        name: 'address1_telephone1',
+      },
+      {
+        name: 'address1_fax',
+      },
+      {
+        name: 'address1_freighttermscode',
+      },
+      {
+        name: 'description',
+      },
+      {
+        name: 'merged',
+      },
+      {
+        name: 'address1_shippingmethodcode',
+      },
+      {
+        name: 'address1_name',
+      },
+      {
+        name: 'aging30_base',
+      },
+      {
+        name: 'address2_telephone2',
+      },
+      {
+        name: 'account',
+        prop: 'accountid',
+      },
+      {
+        name: 'primarytwitterid',
+      },
+      {
+        name: 'tickersymbol',
+      },
+      {
+        name: 'stockexchange',
+      },
+      {
+        name: 'address2_stateorprovince',
+      },
+      {
+        name: 'ftpsiteurl',
+      },
+      {
+        name: 'statuscode',
+      },
+      {
+        name: 'websiteurl',
+      },
+      {
+        name: 'donotpostalmail',
+      },
+      {
+        name: 'address1_city',
+      },
+      {
+        name: 'address2_fax',
+      },
+      {
+        name: 'aging90_base',
+      },
+      {
+        name: 'opendeals_date',
+      },
+      {
+        name: 'traversedpath',
+      },
+      {
+        name: 'shippingmethodcode',
+      },
+      {
+        name: 'address1_line2',
+      },
+      {
+        name: 'openrevenue_base',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'preferredsystemuseridyominame',
+      },
+      {
+        name: 'address2_line3',
+      },
+      {
+        name: 'address1_postalcode',
+      },
+      {
+        name: 'address2_latitude',
+      },
+      {
+        name: 'ibizprivate',
+      },
+      {
+        name: 'territorycode',
+      },
+      {
+        name: 'teamsfollowed',
+      },
+      {
+        name: 'yominame',
+      },
+      {
+        name: 'address1_latitude',
+      },
+      {
+        name: 'telephone3',
+      },
+      {
+        name: 'ownerid',
+      },
+      {
+        name: 'address2_country',
+      },
+      {
+        name: 'masteraccountidyominame',
+      },
+      {
+        name: 'industrycode',
+      },
+      {
+        name: 'lastonholdtime',
+      },
+      {
+        name: 'address2_addressid',
+      },
+      {
+        name: 'onholdtime',
+      },
+      {
+        name: 'accountclassificationcode',
+      },
+      {
+        name: 'address1_country',
+      },
+      {
+        name: 'address1_addresstypecode',
+      },
+      {
+        name: 'statecode',
+      },
+      {
+        name: 'address2_addresstypecode',
+      },
+      {
+        name: 'accountcategorycode',
+      },
+      {
+        name: 'emailaddress2',
+      },
+      {
+        name: 'address2_shippingmethodcode',
+      },
+      {
+        name: 'importsequencenumber',
+      },
+      {
+        name: 'primarysatoriid',
+      },
+      {
+        name: 'customersizecode',
+      },
+      {
+        name: 'opendeals',
+      },
+      {
+        name: 'donotsendmm',
+      },
+      {
+        name: 'processid',
+      },
+      {
+        name: 'paymenttermscode',
+      },
+      {
+        name: 'sic',
+      },
+      {
+        name: 'address2_primarycontactname',
+      },
+      {
+        name: 'address1_utcoffset',
+      },
+      {
+        name: 'owneridyominame',
+      },
+      {
+        name: 'lastusedincampaign',
+      },
+      {
+        name: 'aging60_base',
+      },
+      {
+        name: 'donotfax',
+      },
+      {
+        name: 'updateman',
+      },
+      {
+        name: 'openrevenue_state',
+      },
+      {
+        name: 'opendeals_state',
+      },
+      {
+        name: 'versionnumber',
+      },
+      {
+        name: 'address1_longitude',
+      },
+      {
+        name: 'aging90',
+      },
+      {
+        name: 'entityimage_url',
+      },
+      {
+        name: 'creditlimit',
+      },
+      {
+        name: 'preferredsystemuserid',
+      },
+      {
+        name: 'revenue',
+      },
+      {
+        name: 'address1_county',
+      },
+      {
+        name: 'address1_line3',
+      },
+      {
+        name: 'stageid',
+      },
+      {
+        name: 'donotemail',
+      },
+      {
+        name: 'address2_postalcode',
+      },
+      {
+        name: 'preferredappointmenttimecode',
+      },
+      {
+        name: 'address2_upszone',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'address2_county',
+      },
+      {
+        name: 'owneridtype',
+      },
+      {
+        name: 'address2_composite',
+      },
+      {
+        name: 'address2_name',
+      },
+      {
+        name: 'address2_line1',
+      },
+      {
+        name: 'marketcap_base',
+      },
+      {
+        name: 'emailaddress3',
+      },
+      {
+        name: 'telephone2',
+      },
+      {
+        name: 'createman',
+      },
+      {
+        name: 'address1_postofficebox',
+      },
+      {
+        name: 'creditonhold',
+      },
+      {
+        name: 'address1_addressid',
+      },
+      {
+        name: 'address2_postofficebox',
+      },
+      {
+        name: 'slaname',
+      },
+      {
+        name: 'originatingleadid',
+      },
+      {
+        name: 'transactioncurrencyid',
+      },
+      {
+        name: 'defaultpricelevelid',
+      },
+      {
+        name: 'parentaccountid',
+      },
+      {
+        name: 'preferredequipmentid',
+      },
+      {
+        name: 'territoryid',
+      },
+      {
+        name: 'primarycontactid',
+      },
+      {
+        name: 'slaid',
+      },
+      {
+        name: 'preferredserviceid',
+      },
+      {
+        name: 'originatingleadname',
+      },
+      {
+        name: 'defaultpricelevelname',
+      },
+      {
+        name: 'territoryname',
+      },
+      {
+        name: 'parentaccountname',
+      },
+      {
+        name: 'preferredequipmentname',
+      },
+      {
+        name: 'preferredservicename',
+      },
+      {
+        name: 'primarycontactname',
+      },
+      {
+        name: 'transactioncurrencyname',
+      },
+      {
+        name: 'childaccountcount',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_CRM/src/widgets/account/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * Infotabviewpanel5 部件服务对象
+ *
+ * @export
+ * @class Infotabviewpanel5Service
+ */
+export default class Infotabviewpanel5Service extends ControlService {
+}
\ No newline at end of file

app_CRM/src/widgets/account/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel.html

+<div class='tabviewpanel' v-if='isActivied'>
+        <incident-by-parent-key 
+        class='viewcontainer2' 
+        :viewdata="viewdata" 
+        :viewparam="viewparam"
+        @viewload="viewDatasChange($event)" 
+        :viewDefaultUsage="false"
+        :viewUsage="7"
+        :expActive="expActive"
+    />
+</div>
\ No newline at end of file

app_CRM/src/widgets/account/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel.vue

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

app_CRM/src/widgets/contact/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel-base.tsx

@@ -50,6 +50,7 @@ export class InfotabexppanelTabexppanelBase extends TabExpPanelControlBase {
         tabviewpanel4:  false ,
         tabviewpanel2:  false ,
         tabviewpanel3:  false ,
+        tabviewpanel5:  false ,
     }
 
     /**

app_CRM/src/widgets/contact/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.html

@@ -120,5 +120,29 @@
     @closeview="closeView($event)">
 </view_tabviewpanel3>
         </tab-pane>
+        <tab-pane :index="4" name='tabviewpanel5' tab='infotabexppanel' class=''  
+            :label="(h) =>{
+                return h('div', [
+                    h('span', '服务案例'),
+                    h('Badge', {
+                        props: {
+                            count: undefined,
+                            type: 'primary'
+                        }
+                    })
+                ])
+            }" >
+            <view_tabviewpanel5 
+    :viewState="viewState"  
+    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+    :context="JSON.parse(JSON.stringify(context))" 
+    v-if="isInit.tabviewpanel5"
+    name="tabviewpanel5"  
+    ref='tabviewpanel5'
+    :expActive="activatedTabViewPanel === 'tabviewpanel5'"
+    @viewpanelDatasChange = "tabViewPanelDatasChange"
+    @closeview="closeView($event)">
+</view_tabviewpanel5>
+        </tab-pane>
     </tabs>
 </div>
\ No newline at end of file

app_CRM/src/widgets/contact/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.vue

@@ -7,6 +7,7 @@ import view_tabviewpanel from '@widgets/contact/infotabviewpanel-tabviewpanel/in
 import view_tabviewpanel4 from '@widgets/contact/infotabviewpanel4-tabviewpanel/infotabviewpanel4-tabviewpanel.vue';
 import view_tabviewpanel2 from '@widgets/contact/infotabviewpanel2-tabviewpanel/infotabviewpanel2-tabviewpanel.vue';
 import view_tabviewpanel3 from '@widgets/contact/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel.vue';
+import view_tabviewpanel5 from '@widgets/contact/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel.vue';
  
 
 /**
@@ -22,6 +23,7 @@ import view_tabviewpanel3 from '@widgets/contact/infotabviewpanel3-tabviewpanel/
         view_tabviewpanel4, 
         view_tabviewpanel2, 
         view_tabviewpanel3, 
+        view_tabviewpanel5, 
          
     }
 })

app_CRM/src/widgets/contact/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, MainControlBase } from '@/studio-core';
+import ContactService from '@/service/contact/contact-service';
+import Infotabviewpanel5Service from './infotabviewpanel5-tabviewpanel-service';
+
+
+/**
+ * tabviewpanel5部件基类
+ *
+ * @export
+ * @class MainControlBase
+ * @extends {Infotabviewpanel5TabviewpanelBase}
+ */
+export class Infotabviewpanel5TabviewpanelBase extends MainControlBase {
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {Infotabviewpanel5Service}
+     * @memberof Infotabviewpanel5TabviewpanelBase
+     */
+    public service: Infotabviewpanel5Service = new Infotabviewpanel5Service({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ContactService}
+     * @memberof Infotabviewpanel5TabviewpanelBase
+     */
+    public appEntityService: ContactService = new ContactService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof Infotabviewpanel5TabviewpanelBase
+     */
+    protected appDeName: string = 'contact';
+
+    /**
+     * 导航模式下项是否激活
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel5
+     */
+    @Prop()
+    public expActive!: any;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof Infotabviewpanel5
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof Infotabviewpanel5
+     */
+    public getData(): any {
+        return null;
+    }
+
+    /**
+     * 是否被激活
+     *
+     * @type {boolean}
+     * @memberof Infotabviewpanel5
+     */
+    public isActivied: boolean = true;
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel5
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel5
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 传入上下文
+     *
+     * @type {string}
+     * @memberof TabExpViewtabviewpanel
+     */
+    public viewdata: string = JSON.stringify(this.context);
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string = JSON.stringify(this.viewparams);
+
+    /**
+     * 视图面板过滤项
+     *
+     * @type {string}
+     * @memberof Infotabviewpanel5
+     */
+    public navfilter: string = "";
+             
+    /**
+     * vue 生命周期
+     *
+     * @returns
+     * @memberof Infotabviewpanel5
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof Infotabviewpanel5
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                this.$forceUpdate();
+                this.initNavParam();
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     * @memberof Infotabviewpanel5
+     */
+    public initNavParam(){
+        if(!Object.is(this.navfilter,"")){
+            Object.assign(this.viewparams,{[this.navfilter]:this.context['majorentity']})
+        }
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata =JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+    /**
+     * 视图数据变化
+     *
+     * @memberof  Infotabviewpanel5
+     */
+    public viewDatasChange($event:any){
+        this.$emit('viewpanelDatasChange',$event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof Infotabviewpanel5
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof Infotabviewpanel5
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+}
\ No newline at end of file

app_CRM/src/widgets/contact/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel-model.ts

+/**
+ * Infotabviewpanel5 部件模型
+ *
+ * @export
+ * @class Infotabviewpanel5Model
+ */
+export default class Infotabviewpanel5Model {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof Infotabviewpanel5Model
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'address1_freighttermscode',
+      },
+      {
+        name: 'address3_city',
+      },
+      {
+        name: 'department',
+      },
+      {
+        name: 'parentcustomeridtype',
+      },
+      {
+        name: 'address1_stateorprovince',
+      },
+      {
+        name: 'aging90_base',
+      },
+      {
+        name: 'accountidyominame',
+      },
+      {
+        name: 'donotbulkpostalmail',
+      },
+      {
+        name: 'managername',
+      },
+      {
+        name: 'donotpostalmail',
+      },
+      {
+        name: 'spousesname',
+      },
+      {
+        name: 'familystatuscode',
+      },
+      {
+        name: 'owneridtype',
+      },
+      {
+        name: 'address3_composite',
+      },
+      {
+        name: 'address3_shippingmethodcode',
+      },
+      {
+        name: 'lastname',
+      },
+      {
+        name: 'lastonholdtime',
+      },
+      {
+        name: 'educationcode',
+      },
+      {
+        name: 'address2_line1',
+      },
+      {
+        name: 'birthdate',
+      },
+      {
+        name: 'owneridyominame',
+      },
+      {
+        name: 'haschildrencode',
+      },
+      {
+        name: 'company',
+      },
+      {
+        name: 'address2_fax',
+      },
+      {
+        name: 'assistantphone',
+      },
+      {
+        name: 'callback',
+      },
+      {
+        name: 'paymenttermscode',
+      },
+      {
+        name: 'address2_telephone1',
+      },
+      {
+        name: 'marketingonly',
+      },
+      {
+        name: 'address2_utcoffset',
+      },
+      {
+        name: 'address2_shippingmethodcode',
+      },
+      {
+        name: 'traversedpath',
+      },
+      {
+        name: 'employeeid',
+      },
+      {
+        name: 'creditlimit_base',
+      },
+      {
+        name: 'followemail',
+      },
+      {
+        name: 'address3_postalcode',
+      },
+      {
+        name: 'merged',
+      },
+      {
+        name: 'jobtitle',
+      },
+      {
+        name: 'address1_telephone1',
+      },
+      {
+        name: 'customersizecode',
+      },
+      {
+        name: 'address3_addresstypecode',
+      },
+      {
+        name: 'pager',
+      },
+      {
+        name: 'assistantname',
+      },
+      {
+        name: 'address1_composite',
+      },
+      {
+        name: 'address1_line1',
+      },
+      {
+        name: 'yomimiddlename',
+      },
+      {
+        name: 'address1_telephone3',
+      },
+      {
+        name: 'telephone2',
+      },
+      {
+        name: 'address2_addressid',
+      },
+      {
+        name: 'parentcontactidyominame',
+      },
+      {
+        name: 'leadsourcecode',
+      },
+      {
+        name: 'statecode',
+      },
+      {
+        name: 'address2_freighttermscode',
+      },
+      {
+        name: 'emailaddress1',
+      },
+      {
+        name: 'entityimage_timestamp',
+      },
+      {
+        name: 'address3_line1',
+      },
+      {
+        name: 'salutation',
+      },
+      {
+        name: 'address1_line3',
+      },
+      {
+        name: 'address3_primarycontactname',
+      },
+      {
+        name: 'ibizprivate',
+      },
+      {
+        name: 'donotfax',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'preferredsystemuseridyominame',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'address3_stateorprovince',
+      },
+      {
+        name: 'address3_line3',
+      },
+      {
+        name: 'creditlimit',
+      },
+      {
+        name: 'timezoneruleversionnumber',
+      },
+      {
+        name: 'parentcustomerid',
+      },
+      {
+        name: 'childrensnames',
+      },
+      {
+        name: 'address1_addresstypecode',
+      },
+      {
+        name: 'accountrolecode',
+      },
+      {
+        name: 'donotphone',
+      },
+      {
+        name: 'managerphone',
+      },
+      {
+        name: 'creditonhold',
+      },
+      {
+        name: 'updateman',
+      },
+      {
+        name: 'address2_postalcode',
+      },
+      {
+        name: 'address1_line2',
+      },
+      {
+        name: 'nickname',
+      },
+      {
+        name: 'versionnumber',
+      },
+      {
+        name: 'yomifullname',
+      },
+      {
+        name: 'entityimage',
+      },
+      {
+        name: 'shippingmethodcode',
+      },
+      {
+        name: 'customertypecode',
+      },
+      {
+        name: 'address2_county',
+      },
+      {
+        name: 'aging90',
+      },
+      {
+        name: 'address2_stateorprovince',
+      },
+      {
+        name: 'address3_utcoffset',
+      },
+      {
+        name: 'fullname',
+      },
+      {
+        name: 'participatesinworkflow',
+      },
+      {
+        name: 'websiteurl',
+      },
+      {
+        name: 'description',
+      },
+      {
+        name: 'address3_telephone1',
+      },
+      {
+        name: 'address2_upszone',
+      },
+      {
+        name: 'address3_county',
+      },
+      {
+        name: 'entityimage_url',
+      },
+      {
+        name: 'address3_upszone',
+      },
+      {
+        name: 'address1_name',
+      },
+      {
+        name: 'mastercontactidyominame',
+      },
+      {
+        name: 'autocreate',
+      },
+      {
+        name: 'backofficecustomer',
+      },
+      {
+        name: 'address2_longitude',
+      },
+      {
+        name: 'address1_fax',
+      },
+      {
+        name: 'exchangerate',
+      },
+      {
+        name: 'address1_city',
+      },
+      {
+        name: 'entityimageid',
+      },
+      {
+        name: 'address1_telephone2',
+      },
+      {
+        name: 'address2_composite',
+      },
+      {
+        name: 'importsequencenumber',
+      },
+      {
+        name: 'gendercode',
+      },
+      {
+        name: 'annualincome',
+      },
+      {
+        name: 'subscriptionid',
+      },
+      {
+        name: 'territorycode',
+      },
+      {
+        name: 'firstname',
+      },
+      {
+        name: 'overriddencreatedon',
+      },
+      {
+        name: 'address3_country',
+      },
+      {
+        name: 'yomilastname',
+      },
+      {
+        name: 'donotbulkemail',
+      },
+      {
+        name: 'address3_telephone2',
+      },
+      {
+        name: 'ownerid',
+      },
+      {
+        name: 'externaluseridentifier',
+      },
+      {
+        name: 'teamsfollowed',
+      },
+      {
+        name: 'donotemail',
+      },
+      {
+        name: 'anniversary',
+      },
+      {
+        name: 'preferredappointmentdaycode',
+      },
+      {
+        name: 'middlename',
+      },
+      {
+        name: 'emailaddress3',
+      },
+      {
+        name: 'address2_telephone2',
+      },
+      {
+        name: 'fax',
+      },
+      {
+        name: 'mobilephone',
+      },
+      {
+        name: 'home2',
+      },
+      {
+        name: 'createman',
+      },
+      {
+        name: 'onholdtime',
+      },
+      {
+        name: 'preferredappointmenttimecode',
+      },
+      {
+        name: 'statuscode',
+      },
+      {
+        name: 'governmentid',
+      },
+      {
+        name: 'address3_telephone3',
+      },
+      {
+        name: 'business2',
+      },
+      {
+        name: 'preferredsystemuserid',
+      },
+      {
+        name: 'address1_upszone',
+      },
+      {
+        name: 'aging60',
+      },
+      {
+        name: 'yomifirstname',
+      },
+      {
+        name: 'address3_postofficebox',
+      },
+      {
+        name: 'address2_city',
+      },
+      {
+        name: 'processid',
+      },
+      {
+        name: 'annualincome_base',
+      },
+      {
+        name: 'address3_addressid',
+      },
+      {
+        name: 'parentcustomeridyominame',
+      },
+      {
+        name: 'contact',
+        prop: 'contactid',
+      },
+      {
+        name: 'aging60_base',
+      },
+      {
+        name: 'address3_latitude',
+      },
+      {
+        name: 'telephone3',
+      },
+      {
+        name: 'address1_primarycontactname',
+      },
+      {
+        name: 'address3_fax',
+      },
+      {
+        name: 'preferredcontactmethodcode',
+      },
+      {
+        name: 'address1_utcoffset',
+      },
+      {
+        name: 'donotsendmm',
+      },
+      {
+        name: 'address2_telephone3',
+      },
+      {
+        name: 'address2_country',
+      },
+      {
+        name: 'aging30',
+      },
+      {
+        name: 'address2_postofficebox',
+      },
+      {
+        name: 'telephone1',
+      },
+      {
+        name: 'address3_longitude',
+      },
+      {
+        name: 'lastusedincampaign',
+      },
+      {
+        name: 'ftpsiteurl',
+      },
+      {
+        name: 'aging30_base',
+      },
+      {
+        name: 'address2_name',
+      },
+      {
+        name: 'suffix',
+      },
+      {
+        name: 'address1_county',
+      },
+      {
+        name: 'address2_addresstypecode',
+      },
+      {
+        name: 'address1_longitude',
+      },
+      {
+        name: 'address3_line2',
+      },
+      {
+        name: 'address1_addressid',
+      },
+      {
+        name: 'address2_line3',
+      },
+      {
+        name: 'address2_latitude',
+      },
+      {
+        name: 'address2_line2',
+      },
+      {
+        name: 'address1_shippingmethodcode',
+      },
+      {
+        name: 'address3_freighttermscode',
+      },
+      {
+        name: 'address1_postofficebox',
+      },
+      {
+        name: 'utcconversiontimezonecode',
+      },
+      {
+        name: 'address3_name',
+      },
+      {
+        name: 'address1_latitude',
+      },
+      {
+        name: 'numberofchildren',
+      },
+      {
+        name: 'address2_primarycontactname',
+      },
+      {
+        name: 'address1_postalcode',
+      },
+      {
+        name: 'stageid',
+      },
+      {
+        name: 'address1_country',
+      },
+      {
+        name: 'emailaddress2',
+      },
+      {
+        name: 'slaname',
+      },
+      {
+        name: 'defaultpricelevelid',
+      },
+      {
+        name: 'preferredequipmentid',
+      },
+      {
+        name: 'transactioncurrencyid',
+      },
+      {
+        name: 'slaid',
+      },
+      {
+        name: 'originatingleadid',
+      },
+      {
+        name: 'preferredserviceid',
+      },
+      {
+        name: 'defaultpricelevelname',
+      },
+      {
+        name: 'originatingleadname',
+      },
+      {
+        name: 'transactioncurrencyname',
+      },
+      {
+        name: 'preferredservicename',
+      },
+      {
+        name: 'preferredequipmentname',
+      },
+      {
+        name: 'customerid',
+      },
+      {
+        name: 'cusomername',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_CRM/src/widgets/contact/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * Infotabviewpanel5 部件服务对象
+ *
+ * @export
+ * @class Infotabviewpanel5Service
+ */
+export default class Infotabviewpanel5Service extends ControlService {
+}
\ No newline at end of file

app_CRM/src/widgets/contact/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel.html

+<div class='tabviewpanel' v-if='isActivied'>
+        <incident-by-parent-key 
+        class='viewcontainer2' 
+        :viewdata="viewdata" 
+        :viewparam="viewparam"
+        @viewload="viewDatasChange($event)" 
+        :viewDefaultUsage="false"
+        :viewUsage="7"
+        :expActive="expActive"
+    />
+</div>
\ No newline at end of file

app_CRM/src/widgets/contact/infotabviewpanel5-tabviewpanel/infotabviewpanel5-tabviewpanel.vue

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

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/mapper/IncidentMapper.java

@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
 
 public interface IncidentMapper extends BaseMapper<Incident>{
 
+    Page<Incident> searchByParentKey(IPage page, @Param("srf") IncidentSearchContext context, @Param("ew") Wrapper<Incident> wrapper) ;
     Page<Incident> searchDefault(IPage page, @Param("srf") IncidentSearchContext context, @Param("ew") Wrapper<Incident> wrapper) ;
     @Override
     Incident selectById(Serializable id);

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/IIncidentService.java

@@ -36,6 +36,7 @@ public interface IIncidentService extends IService<Incident>{
     boolean checkKey(Incident et) ;
     boolean save(Incident et) ;
     void saveBatch(List<Incident> list) ;
+    Page<Incident> searchByParentKey(IncidentSearchContext context) ;
     Page<Incident> searchDefault(IncidentSearchContext context) ;
     List<Incident> selectByPrimarycontactid(String contactid) ;
     void removeByPrimarycontactid(String contactid) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/impl/IncidentServiceImpl.java

@@ -327,6 +327,15 @@ public class IncidentServiceImpl extends ServiceImpl<IncidentMapper, Incident> i
     }
 
 
+    /**
+     * 查询集合 ByParentKey
+     */
+    @Override
+    public Page<Incident> searchByParentKey(IncidentSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Incident> pages=baseMapper.searchByParentKey(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Incident>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
     /**
      * 查询集合 DEFAULT
      */

businesscentral-core/src/main/resources/mapper/service/incident/IncidentMapper.xml

@@ -158,6 +158,15 @@
          where  transactioncurrencyid=#{transactioncurrencyid}
      </select>
 
+    <!--数据集合[ByParentKey]-->
+	 <select id="searchByParentKey"  parameterType="cn.ibizlab.businesscentral.core.service.filter.IncidentSearchContext"  resultMap="IncidentResultMap">
+         select t1.* from (
+                <include refid="ByParentKey" />
+         )t1
+         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
+         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+     </select>
+
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.businesscentral.core.service.filter.IncidentSearchContext"  resultMap="IncidentResultMap">
          select t1.* from (
@@ -167,6 +176,12 @@
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
      </select>
 
+    <!--数据查询[ByParentKey]-->
+    <sql id="ByParentKey" databaseId="mysql">
+		<![CDATA[ SELECT t1.`ACCOUNTIDYOMINAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTIDYOMINAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERIDYOMINAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERIDYOMINAME`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTIDYOMINAME`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTIDYOMINAME`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
+					 WHERE 	( t1.`CUSTOMERID` =  #{srf.datacontext.srfparentkey} )
+			]]>
+    </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
 		<![CDATA[ SELECT t1.`ACCOUNTIDYOMINAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTIDYOMINAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERIDYOMINAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERIDYOMINAME`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTIDYOMINAME`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTIDYOMINAME`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -135,7 +135,7 @@
     "dename":"Incident",
     "delogicname":"案例",
     "sysmoudle":{"id":"SERVICE","name":"Service"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "dedataset":[{"id":"ByParentKey" , "name":"ByParentKey"},{"id":"Default" , "name":"DEFAULT"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/rest/IncidentResource.java

@@ -139,6 +139,27 @@ public class IncidentResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Incident-searchByParentKey-all') and hasPermission(#context,'iBizBusinessCentral-Incident-Get')")
+	@ApiOperation(value = "获取ByParentKey", tags = {"案例" } ,notes = "获取ByParentKey")
+    @RequestMapping(method= RequestMethod.GET , value="/incidents/fetchbyparentkey")
+	public ResponseEntity<List<IncidentDTO>> fetchByParentKey(IncidentSearchContext context) {
+        Page<Incident> domains = incidentService.searchByParentKey(context) ;
+        List<IncidentDTO> list = incidentMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Incident-searchByParentKey-all') and hasPermission(#context,'iBizBusinessCentral-Incident-Get')")
+	@ApiOperation(value = "查询ByParentKey", tags = {"案例" } ,notes = "查询ByParentKey")
+    @RequestMapping(method= RequestMethod.POST , value="/incidents/searchbyparentkey")
+	public ResponseEntity<Page<IncidentDTO>> searchByParentKey(@RequestBody IncidentSearchContext context) {
+        Page<Incident> domains = incidentService.searchByParentKey(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(incidentMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
     @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Incident-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Incident-Get')")
 	@ApiOperation(value = "获取DEFAULT", tags = {"案例" } ,notes = "获取DEFAULT")
     @RequestMapping(method= RequestMethod.GET , value="/incidents/fetchdefault")