xignzi006 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -1720,6 +1720,43 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Lead__PurchaseProcess",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "0",
+                "label": "个人",
+                "text": "个人",
+                "data":"",
+                "codename":"Item_0",
+                "value": "0",
+                
+                "disabled": false
+            }
+            , {
+                "id": "1",
+                "label": "委员会",
+                "text": "委员会",
+                "data":"",
+                "codename":"Item_1",
+                "value": "1",
+                
+                "disabled": false
+            }
+            , {
+                "id": "2",
+                "label": "未知",
+                "text": "未知",
+                "data":"",
+                "codename":"Item_2",
+                "value": "2",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Invoice__ShippingMethodCode",
         "emptytext": "未定义",

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

@@ -2009,6 +2009,16 @@
         "viewtag": "dfc0051ae4813115e03f3d095f8cd7d3",
         "memo": ""
     },
+    "leadqualification": {
+        "title": "授予资格",
+        "caption": "授予资格",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "Sales",
+        "viewname": "LeadQualification",
+        "viewfilename": "lead-qualification",
+        "viewtag": "e0705f7fd9afd10e3f38b1ff03edba8b",
+        "memo": ""
+    },
     "invoicegridview": {
         "title": "发票信息",
         "caption": "发票",

app_CRM/src/interface/entity/lead.ts

@@ -1215,7 +1215,7 @@ export interface Lead {
     campaignname?: any;
 
     /**
-     * 潜在顾客的上司
+     * 识别联系人
      *
      * @returns {*}
      * @memberof Lead
@@ -1223,7 +1223,7 @@ export interface Lead {
     parentcontactname?: any;
 
     /**
-     * 潜在顾客的上级单位
+     * 识别客户
      *
      * @returns {*}
      * @memberof Lead

app_CRM/src/locale/lanres/codelist/codelist_en_US.ts

@@ -240,6 +240,12 @@ export default {
         "1": "首选客户",
         "empty": ""
     },
+    Lead__PurchaseProcess: {
+        "0": "个人",
+        "1": "委员会",
+        "2": "未知",
+        "empty": ""
+    },
     Invoice__ShippingMethodCode: {
         "2": "DHL",
         "3": "FedEx",

app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -240,6 +240,12 @@ export default {
         "1": "首选客户",
         "empty": "",
     },
+    Lead__PurchaseProcess: {
+        "0": "个人",
+        "1": "委员会",
+        "2": "未知",
+        "empty": "",
+    },
     Invoice__ShippingMethodCode: {
         "2": "DHL",
         "3": "FedEx",

app_CRM/src/locale/lanres/entities/lead/lead_en_US.ts

@@ -152,8 +152,8 @@ export default {
     originatingcasename: "原始案例",
     qualifyingopportunityname: "授予商机资格",
     campaignname: "源市场活动",
-    parentcontactname: "潜在顾客的上司",
-    parentaccountname: "潜在顾客的上级单位",
+    parentcontactname: "识别联系人",
+    parentaccountname: "识别客户",
     relatedobjectname: "相关市场活动响应",
     transactioncurrencyname: "货币",
   },
@@ -206,6 +206,10 @@ export default {
 			caption: "潜在顾客",
       		title: "潜在顾客编辑视图",
 		},
+		qualification: {
+			caption: "授予资格",
+      		title: "授予资格",
+		},
 	},
 	quickcreate_form: {
 		details: {
@@ -273,6 +277,32 @@ export default {
 		uiactions: {
 		},
 	},
+	qualification_form: {
+		details: {
+			group1: "潜在顾客基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "潜在顾客", 
+			srfmajortext: "姓名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			parentcontactname: "识别联系人", 
+			parentaccountname: "识别客户", 
+			purchasetimeframe: "购买时间范围", 
+			budgetamount: "预算金额", 
+			purchaseprocess: "采购程序", 
+			decisionmaker: "决策者?", 
+			description: "说明", 
+			parentcontactid: "潜在顾客的上司", 
+			parentaccountid: "潜在顾客的上级单位", 
+			leadid: "潜在顾客", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "lead基本信息", 

app_CRM/src/locale/lanres/entities/lead/lead_zh_CN.ts

@@ -151,8 +151,8 @@ export default {
     originatingcasename: "原始案例",
     qualifyingopportunityname: "授予商机资格",
     campaignname: "源市场活动",
-    parentcontactname: "潜在顾客的上司",
-    parentaccountname: "潜在顾客的上级单位",
+    parentcontactname: "识别联系人",
+    parentaccountname: "识别客户",
     relatedobjectname: "相关市场活动响应",
     transactioncurrencyname: "货币",
   },
@@ -205,6 +205,10 @@ export default {
 			caption: "潜在顾客",
       		title: "潜在顾客编辑视图",
 		},
+		qualification: {
+			caption: "授予资格",
+      		title: "授予资格",
+		},
 	},
 	quickcreate_form: {
 		details: {
@@ -272,6 +276,32 @@ export default {
 		uiactions: {
 		},
 	},
+	qualification_form: {
+		details: {
+			group1: "潜在顾客基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "潜在顾客", 
+			srfmajortext: "姓名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			parentcontactname: "识别联系人", 
+			parentaccountname: "识别客户", 
+			purchasetimeframe: "购买时间范围", 
+			budgetamount: "预算金额", 
+			purchaseprocess: "采购程序", 
+			decisionmaker: "决策者?", 
+			description: "说明", 
+			parentcontactid: "潜在顾客的上司", 
+			parentaccountid: "潜在顾客的上级单位", 
+			leadid: "潜在顾客", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "lead基本信息", 

app_CRM/src/mock/codelist/codelist.ts

@@ -1728,6 +1728,43 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "Lead__PurchaseProcess",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "0",
+                label: "个人",
+                text: "个人",
+                "data":"",
+                "codename":"Item_0",
+                value: "0",
+                
+                disabled: false,
+            },
+            {
+                id: "1",
+                label: "委员会",
+                text: "委员会",
+                "data":"",
+                "codename":"Item_1",
+                value: "1",
+                
+                disabled: false,
+            },
+            {
+                id: "2",
+                label: "未知",
+                text: "未知",
+                "data":"",
+                "codename":"Item_2",
+                value: "2",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Invoice__ShippingMethodCode",
         emptytext: "未定义",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -1615,6 +1615,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SalesOrderGridView",
             "viewtag": "dfc0051ae4813115e03f3d095f8cd7d3"
         },
+        "leadqualification": {
+            "title": "授予资格",
+            "caption": "授予资格",
+            "viewtype": "DEOPTVIEW",
+            "viewmodule": "Sales",
+            "viewname": "LeadQualification",
+            "viewtag": "e0705f7fd9afd10e3f38b1ff03edba8b"
+        },
         "invoicegridview": {
             "title": "发票信息",
             "caption": "发票",

app_CRM/src/pages/sales/lead-qualification/lead-qualification-base.tsx

+import { Subject } from 'rxjs';
+import { OptionViewBase } from '@/studio-core';
+import LeadService from '@/service/lead/lead-service';
+import OptionViewEngine from '@engine/view/option-view-engine';
+
+/**
+ * 授予资格视图基类
+ *
+ * @export
+ * @class LeadQualificationBase
+ * @extends {OptionViewBase}
+ */
+export class LeadQualificationBase extends OptionViewBase {
+
+    /**
+     * 实体服务对象
+     *
+     * @type {LeadService}
+     * @memberof LeadQualificationBase
+     */
+    protected appEntityService: LeadService = new LeadService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof LeadQualificationBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof LeadQualificationBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.lead.views.qualification.caption',
+        srfTitle: 'entities.lead.views.qualification.title',
+        srfSubTitle: 'entities.lead.views.qualification.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof LeadQualificationBase
+     */
+    protected containerModel: any = {
+        view_form: { name: 'form', type: 'FORM' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = 'e0705f7fd9afd10e3f38b1ff03edba8b';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof LeadQualificationBase
+     */
+    public engine: OptionViewEngine = new OptionViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof LeadQualificationBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'lead',
+            majorPSDEField: 'fullname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof LeadQualificationBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof LeadQualificationBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof LeadQualificationBase
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/pages/sales/lead-qualification/lead-qualification.html

+<studio-view-style2 viewName="leadqualification" viewTitle="授予资格" class='deoptview lead-qualification'>
+    <view_form 
+                    :viewState="viewState"  
+                    :viewparams="viewparams" 
+                    :context="context" 
+                    :autosave="false" 
+                    :viewtag="viewtag"
+                    :showBusyIndicator="true"
+                    updateAction="Qualification"
+                    removeAction="Remove"
+                    loaddraftAction="GetDraft"
+                    loadAction="Get"
+                    createAction="Create"
+                    WFSubmitAction=""
+                    WFStartAction=""
+                    style='' 
+                    name="form"  
+                    ref='form' 
+                    @save="form_save($event)"  
+                    @remove="form_remove($event)"  
+                    @load="form_load($event)"  
+                    @closeview="closeView($event)">
+                </view_form>
+    <template slot="footer">
+        <div class="option-view-footer-actions">
+            <i-button type='primary' @click="onClickOk.apply(_self, arguments)">{{ containerModel.view_okbtn.text }}</i-button>
+            &nbsp;&nbsp;
+            <i-button @click="onClickCancel.apply(_self, arguments)">{{ containerModel.view_cancelbtn.text }}</i-button>
+        </div>
+    </template>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/sales/lead-qualification/lead-qualification.vue

+<template src="./lead-qualification.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { LeadQualificationBase } from './lead-qualification-base';
+import view_form from '@widgets/lead/qualification-form/qualification-form.vue';
+
+/**
+ * 授予资格视图
+ *
+ * @export
+ * @class LeadQualification
+ * @extends {LeadQualificationBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
+            vm.$appService.navHistory.setViewContext(vm.context, to);
+        });
+    }
+})
+@VueLifeCycleProcessing()
+export default class LeadQualification extends LeadQualificationBase { }
+</script>

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

@@ -120,14 +120,15 @@ export const PageComponents = {
         Vue.component('service-appointment-edit-view', () => import('@pages/service/service-appointment-edit-view/service-appointment-edit-view.vue'));
         Vue.component('contact-grid-view', () => import('@pages/base/contact-grid-view/contact-grid-view.vue'));
         Vue.component('product-substitute-edit-view', () => import('@pages/product/product-substitute-edit-view/product-substitute-edit-view.vue'));
-        Vue.component('activity-pointer-grid-view', () => import('@pages/base/activity-pointer-grid-view/activity-pointer-grid-view.vue'));
         Vue.component('campaign-activity-by-parent-key', () => import('@pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue'));
+        Vue.component('activity-pointer-grid-view', () => import('@pages/base/activity-pointer-grid-view/activity-pointer-grid-view.vue'));
         Vue.component('account-pickup-view', () => import('@pages/base/account-pickup-view/account-pickup-view.vue'));
         Vue.component('uom-pickup-grid-view', () => import('@pages/base/uom-pickup-grid-view/uom-pickup-grid-view.vue'));
         Vue.component('price-level-pickup-grid-view', () => import('@pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue'));
         Vue.component('quote-opp-qua-grid-view', () => import('@pages/sales/quote-opp-qua-grid-view/quote-opp-qua-grid-view.vue'));
         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('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'));
         Vue.component('lead-dashboard-view', () => import('@pages/sales/lead-dashboard-view/lead-dashboard-view.vue'));

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

@@ -3260,32 +3260,32 @@ const router = new Router({
                     component: () => import('@pages/product/product-substitute-edit-view/product-substitute-edit-view.vue'),
                 },
                 {
-                    path: 'activitypointers/:activitypointer?/gridview/:gridview?',
+                    path: 'campaignactivities/:campaignactivity?/byparentkey/:byparentkey?',
                     meta: {
-                        caption: 'entities.activitypointer.views.gridview.title',
+                        caption: 'entities.campaignactivity.views.byparentkey.title',
                         info:'',
                         parameters: [
                             { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'activitypointers', parameterName: 'activitypointer' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'campaignactivities', parameterName: 'campaignactivity' },
+                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/activity-pointer-grid-view/activity-pointer-grid-view.vue'),
+                    component: () => import('@pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue'),
                 },
                 {
-                    path: 'campaignactivities/:campaignactivity?/byparentkey/:byparentkey?',
+                    path: 'activitypointers/:activitypointer?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.campaignactivity.views.byparentkey.title',
+                        caption: 'entities.activitypointer.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'campaignactivities', parameterName: 'campaignactivity' },
-                            { pathName: 'byparentkey', parameterName: 'byparentkey' },
+                            { pathName: 'activitypointers', parameterName: 'activitypointer' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue'),
+                    component: () => import('@pages/base/activity-pointer-grid-view/activity-pointer-grid-view.vue'),
                 },
                 {
                     path: 'accounts/:account?/pickupview/:pickupview?',
@@ -3434,6 +3434,66 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/contact-by-account/contact-by-account.vue'),
                 },
+                {
+                    path: 'accounts/:account?/contacts/:contact?/leads/:lead?/qualification/:qualification?',
+                    meta: {
+                        caption: 'entities.lead.views.qualification.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'contacts', parameterName: 'contact' },
+                            { pathName: 'leads', parameterName: 'lead' },
+                            { pathName: 'qualification', parameterName: 'qualification' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/lead-qualification/lead-qualification.vue'),
+                },
+                {
+                    path: 'contacts/:contact?/leads/:lead?/qualification/:qualification?',
+                    meta: {
+                        caption: 'entities.lead.views.qualification.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'contacts', parameterName: 'contact' },
+                            { pathName: 'leads', parameterName: 'lead' },
+                            { pathName: 'qualification', parameterName: 'qualification' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/lead-qualification/lead-qualification.vue'),
+                },
+                {
+                    path: 'campaigns/:campaign?/leads/:lead?/qualification/:qualification?',
+                    meta: {
+                        caption: 'entities.lead.views.qualification.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'campaigns', parameterName: 'campaign' },
+                            { pathName: 'leads', parameterName: 'lead' },
+                            { pathName: 'qualification', parameterName: 'qualification' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/lead-qualification/lead-qualification.vue'),
+                },
+                {
+                    path: 'leads/:lead?/qualification/:qualification?',
+                    meta: {
+                        caption: 'entities.lead.views.qualification.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'leads', parameterName: 'lead' },
+                            { pathName: 'qualification', parameterName: 'qualification' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/lead-qualification/lead-qualification.vue'),
+                },
                 {
                     path: 'salesliteratures/:salesliterature?/competitorsalesliteratures/:competitorsalesliterature?/sallitcompgridview/:sallitcompgridview?',
                     meta: {

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

@@ -77,11 +77,11 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item: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;
@@ -91,12 +91,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
-        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) => {
+        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);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -106,7 +106,7 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.campaigncampaigns = campaigncampaignsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -117,8 +117,8 @@ 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+'_leads',JSON.stringify(res.data.leads));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         return res;
     }
 
@@ -148,11 +148,11 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item: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;
@@ -162,12 +162,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
-        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) => {
+        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);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -177,12 +177,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.campaigncampaigns = campaigncampaignsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             return res;
     }
 
@@ -211,8 +211,8 @@ 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+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             return res;
     }
 
@@ -229,8 +229,8 @@ export default class CampaignServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         return res;
     }
 
@@ -273,11 +273,11 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.leads = leadsData;
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item: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;
@@ -287,12 +287,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
-        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) => {
+        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);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -302,12 +302,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.campaigncampaigns = campaigncampaignsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             return res;
     }
 

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

@@ -66,21 +66,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 leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -111,21 +96,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-            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+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            return res;
-        }
-        let masterData:any = {};
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -141,6 +111,21 @@ 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);
@@ -171,6 +156,21 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -180,9 +180,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+'_leads',JSON.stringify(res.data.leads));
         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;
     }
 
@@ -198,21 +198,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 leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -243,14 +228,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            return res;
-        }
-        let masterData:any = {};
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -266,6 +243,14 @@ 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);
@@ -296,11 +281,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/contacts/${context.contact}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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;
     }
 
@@ -332,15 +332,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+'_leads',JSON.stringify(res.data.leads));
             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 res:any = await Http.getInstance().get(`/contacts/${context.contact}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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;
     }
 
@@ -357,16 +357,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+'_leads',JSON.stringify(res.data.leads));
             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 res:any = await  Http.getInstance().get(`/contacts/getdraft`,isloading);
         res.data.contact = data.contact;
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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;
     }
 
@@ -382,21 +382,6 @@ export default class ContactServiceBase extends EntityService {
     public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -427,11 +412,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/active`,data,isloading);
@@ -449,21 +449,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 leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -494,11 +479,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
             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+'_leads',JSON.stringify(res.data.leads));
             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;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/addlist`,data,isloading);
@@ -516,21 +516,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 leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -561,11 +546,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
             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+'_leads',JSON.stringify(res.data.leads));
             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;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/checkkey`,data,isloading);
@@ -583,21 +583,6 @@ export default class ContactServiceBase extends EntityService {
     public async Inactive(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
-        let leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -628,11 +613,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/inactive`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/inactive`,data,isloading);
@@ -650,21 +650,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 leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -695,14 +680,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-            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+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            return res;
-        }
-        let masterData:any = {};
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -718,6 +695,14 @@ 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);
@@ -748,11 +733,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/contacts/${context.contact}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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;
     }
 
@@ -768,21 +768,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 leadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
-            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -813,11 +798,26 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
             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+'_leads',JSON.stringify(res.data.leads));
             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;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/setprimary`,data,isloading);

app_CRM/src/service/ibiz-list/ibiz-list-service-base.ts

@@ -77,6 +77,21 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        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 listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -107,21 +122,6 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        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;
@@ -132,9 +132,9 @@ export default class IBizListServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibizlists`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -164,6 +164,21 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        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 listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -194,27 +209,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        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(`/ibizlists/${context.ibizlist}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -243,9 +243,9 @@ export default class IBizListServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibizlists/${context.ibizlist}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -262,9 +262,9 @@ export default class IBizListServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/ibizlists/getdraft`,isloading);
         res.data.ibizlist = data.ibizlist;
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -307,6 +307,21 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        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 listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -337,27 +352,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        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(`/ibizlists/${context.ibizlist}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 

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

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

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

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

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

@@ -471,6 +471,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'e0705f7fd9afd10e3f38b1ff03edba8b',
                 'bae77557d2f7a7852b634dc5d5a93435',
                 'b5ff54b0672efd3222a44d81f4e7362e',
             ],
@@ -1749,6 +1750,17 @@ export const viewstate: any = {
                 'e9c822edbc51531e713b561101e783a6',
             ],
         },
+        {
+            viewtag: 'e0705f7fd9afd10e3f38b1ff03edba8b',
+            viewmodule: 'Sales',
+            viewname: 'LeadQualification',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'b6b6215e439e78cdf6959b6f45bd7927',
+                '29bfcd628ab25e297248ff0524d12908',
+            ],
+        },
         {
             viewtag: 'e0aef8c0d1f1ae28f628a0541b118961',
             viewmodule: 'Finance',

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

@@ -91,6 +91,7 @@ export default class LeadUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'info_company',srfappde:'leads'});
         this.allViewMap.set(':',{viewname:'dashboardview',srfappde:'leads'});
         this.allViewMap.set(':',{viewname:'info_detail',srfappde:'leads'});
+        this.allViewMap.set(':',{viewname:'qualification',srfappde:'leads'});
     }
 
     /**
@@ -374,7 +375,8 @@ export default class LeadUIServiceBase extends UIService {
      * @param {*} [srfParentDeName] 父实体名称
      * @returns {Promise<any>}
      */
-    public async Lead_Qualification(args: any[],context:any = {}, params:any = {}, $event?: any, xData?: any,actionContext?: any,srfParentDeName?:string){
+    public async Lead_Qualification(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
         let data: any = {};
         let parentContext:any = {};
         let parentViewParam:any = {};
@@ -396,34 +398,37 @@ export default class LeadUIServiceBase extends UIService {
         let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
         Object.assign(data,parentObj);
         Object.assign(context,parentObj);
-        // 直接调实体服务需要转换的数据
-        if(context && context.srfsessionid){
-          context.srfsessionkey = context.srfsessionid;
-            delete context.srfsessionid;
+        let deResParameters: any[] = [];
+        if(context.campaign && true){
+            deResParameters = [
+            { pathName: 'campaigns', parameterName: 'campaign' },
+            ]
         }
-        const backend = () => {
-            const curService:LeadService =  new LeadService();
-            curService.Qualification(context,data, true).then((response: any) => {
-                if (!response || response.status !== 200) {
-                    actionContext.$Notice.error({ title: '错误', desc: response.message });
-                    return;
-                }
-                actionContext.$Notice.success({ title: '成功', desc: '授予资格成功！' });
-
-                const _this: any = actionContext;
-                return response;
-            }).catch((response: any) => {
-                if (!response || !response.status || !response.data) {
-                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
-                    return;
-                }
-                if (response.status === 401) {
-                    return;
-                }
-                return response;
-            });
-        };
-        backend();
+        const parameters: any[] = [
+            { pathName: 'leads', parameterName: 'lead' },
+        ];
+            const openPopOver = (view: any, data: any) => {
+                let container: Subject<any> = actionContext.$apppopover.openPop($event, view, context,data);
+                container.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    const _this: any = actionContext;
+                    if(window.opener){
+                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
+                        window.close();
+                    }
+                    return result.datas;
+                });
+            }
+            const view: any = {
+                viewname: 'lead-qualification', 
+                height: 0, 
+                width: 450,  
+                title: actionContext.$t('entities.lead.views.qualification.title'),
+                placement: 'POPOVER',
+            };
+            openPopOver(view, data);
     }
 
     /**

app_CRM/src/widgets/lead/qualification-form/qualification-form-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, EditFormControlBase } from '@/studio-core';
+import LeadService from '@/service/lead/lead-service';
+import QualificationService from './qualification-form-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+
+
+/**
+ * form部件基类
+ *
+ * @export
+ * @class EditFormControlBase
+ * @extends {QualificationEditFormBase}
+ */
+export class QualificationEditFormBase extends EditFormControlBase {
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {QualificationService}
+     * @memberof QualificationEditFormBase
+     */
+    public service: QualificationService = new QualificationService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {LeadService}
+     * @memberof QualificationEditFormBase
+     */
+    public appEntityService: LeadService = new LeadService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof QualificationEditFormBase
+     */
+    protected appDeName: string = 'lead';
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof QualificationEditFormBase
+     */
+    public data: any = {
+        srfupdatedate: null,
+        srforikey: null,
+        srfkey: null,
+        srfmajortext: null,
+        srftempmode: null,
+        srfuf: null,
+        srfdeid: null,
+        srfsourcekey: null,
+        parentcontactname: null,
+        parentaccountname: null,
+        purchasetimeframe: null,
+        budgetamount: null,
+        purchaseprocess: null,
+        decisionmaker: null,
+        description: null,
+        parentcontactid: null,
+        parentaccountid: null,
+        leadid: null,
+        lead:null,
+    };
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof QualificationEditFormBase
+     */
+    public rules: any = {
+    }
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof QualificationEditFormBase
+     */
+    public detailsModel: any = {
+        group1: new FormGroupPanelModel({ caption: '潜在顾客基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.lead.qualification_form', extractMode: 'ITEM', details: [] } }),
+
+        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this }),
+
+        srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 0 }),
+
+        srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        srfkey: new FormItemModel({ caption: '潜在顾客', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
+
+        srfmajortext: new FormItemModel({ caption: '姓名', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        parentcontactname: new FormItemModel({ caption: '识别联系人', detailType: 'FORMITEM', name: 'parentcontactname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        parentaccountname: new FormItemModel({ caption: '识别客户', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        purchasetimeframe: new FormItemModel({ caption: '购买时间范围', detailType: 'FORMITEM', name: 'purchasetimeframe', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        budgetamount: new FormItemModel({ caption: '预算金额', detailType: 'FORMITEM', name: 'budgetamount', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        purchaseprocess: new FormItemModel({ caption: '采购程序', detailType: 'FORMITEM', name: 'purchaseprocess', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        decisionmaker: new FormItemModel({ caption: '决策者?', detailType: 'FORMITEM', name: 'decisionmaker', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        parentcontactid: new FormItemModel({ caption: '潜在顾客的上司', detailType: 'FORMITEM', name: 'parentcontactid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        parentaccountid: new FormItemModel({ caption: '潜在顾客的上级单位', detailType: 'FORMITEM', name: 'parentaccountid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+
+        leadid: new FormItemModel({ caption: '潜在顾客', detailType: 'FORMITEM', name: 'leadid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
+
+    };
+}
\ No newline at end of file

app_CRM/src/widgets/lead/qualification-form/qualification-form-model.ts

+/**
+ * Qualification 部件模型
+ *
+ * @export
+ * @class QualificationModel
+ */
+export default class QualificationModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof QualificationModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfupdatedate',
+        prop: 'updatedate',
+        dataType: 'DATETIME',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'leadid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'fullname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'parentcontactname',
+        prop: 'parentcontactname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'parentaccountname',
+        prop: 'parentaccountname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'purchasetimeframe',
+        prop: 'purchasetimeframe',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'budgetamount',
+        prop: 'budgetamount',
+        dataType: 'BIGDECIMAL',
+      },
+      {
+        name: 'purchaseprocess',
+        prop: 'purchaseprocess',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'decisionmaker',
+        prop: 'decisionmaker',
+        dataType: 'YESNO',
+      },
+      {
+        name: 'description',
+        prop: 'description',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'parentcontactid',
+        prop: 'parentcontactid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'parentaccountid',
+        prop: 'parentaccountid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'leadid',
+        prop: 'leadid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'lead',
+        prop: 'leadid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_CRM/src/widgets/lead/qualification-form/qualification-form-service.ts

+import { Http,Util,Errorlog } from '@/utils';
+import ControlService from '@/widgets/control-service';
+import LeadService from '@/service/lead/lead-service';
+import QualificationModel from './qualification-form-model';
+import ContactService from '@/service/contact/contact-service';
+import AccountService from '@/service/account/account-service';
+
+
+/**
+ * Qualification 部件服务对象
+ *
+ * @export
+ * @class QualificationService
+ */
+export default class QualificationService extends ControlService {
+
+    /**
+     * 潜在顾客服务对象
+     *
+     * @type {LeadService}
+     * @memberof QualificationService
+     */
+    public appEntityService: LeadService = new LeadService({ $store: this.getStore() });
+
+    /**
+     * 设置从数据模式
+     *
+     * @type {boolean}
+     * @memberof QualificationService
+     */
+    public setTempMode(){
+        this.isTempMode = false;
+    }
+
+    /**
+     * Creates an instance of QualificationService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof QualificationService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.model = new QualificationModel();
+    }
+
+    /**
+     * 联系人服务对象
+     *
+     * @type {ContactService}
+     * @memberof QualificationService
+     */
+    public contactService: ContactService = new ContactService();
+
+    /**
+     * 客户服务对象
+     *
+     * @type {AccountService}
+     * @memberof QualificationService
+     */
+    public accountService: AccountService = new AccountService();
+
+    /**
+     * 处理数据
+     *
+     * @private
+     * @param {Promise<any>} promise
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
+        return new Promise((resolve, reject) => {
+            promise.then((response: any) => {
+                if (response && response.status === 200) {
+                    const data = response.data;
+                    data.forEach((item:any,index:number) =>{
+                        item[deName] = item[deKeyField];
+                        data[index] = item;
+                    });
+                    resolve(data);
+                } else {
+                    reject([])
+                }
+            }).catch((response: any) => {
+                reject([])
+            });
+        });
+    }
+
+    /**
+     * 获取跨实体数据集合
+     *
+     * @param {string} serviceName 服务名称
+     * @param {string} interfaceName 接口名称
+     * @param {*} data
+     * @param {boolean} [isloading]
+     * @returns {Promise<any[]>}
+     * @memberof  QualificationService
+     */
+    @Errorlog
+    public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
+        }
+        if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
+        }
+
+        return Promise.reject([])
+    }
+
+    /**
+     * 启动工作流
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @param {*} [localdata]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public wfstart(action: string,context: any = {},data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
+        data = this.handleWFData(data);
+        context = this.handleRequestData(action,context,data).context;
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](context,data, isloading,localdata);
+            } else {
+                result = this.appEntityService.WFStart(context,data, isloading,localdata);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 提交工作流
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @param {*} [localdata]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
+        data = this.handleWFData(data,true);
+        context = this.handleRequestData(action,context,data,true).context;
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](context,data, isloading,localdata);
+            } else {
+                result = this.appEntityService.WFSubmit(context,data, isloading,localdata);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+
+    /**
+     * 添加数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Create(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public delete(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Remove(Context,Data, isloading);
+            }
+            result.then((response) => {
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Update(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 查询数据
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public get(action: string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.Get(Context,Data, isloading);
+            }
+            result.then((response) => {
+                this.handleResponse(action, response);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+    /**
+     * 加载草稿
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        //仿真主键数据
+        const PrimaryKey = Util.createUUID();
+        Data.leadid = PrimaryKey;
+        Data.lead = PrimaryKey;
+        return new Promise((resolve: any, reject: any) => {
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                result = this.appEntityService.GetDraft(Context,Data, isloading);
+            }
+            result.then((response) => {
+                response.data.leadid = PrimaryKey;
+                this.handleResponse(action, response, true);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        });
+    }
+
+     /**
+     * 前台逻辑
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof QualificationService
+     */
+    @Errorlog
+    public frontLogic(action:string,context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        const {data:Data,context:Context} = this.handleRequestData(action,context,data);
+        return new Promise((resolve: any, reject: any)=>{
+            let result: Promise<any>;
+            const _appEntityService: any = this.appEntityService;
+            if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
+                result = _appEntityService[action](Context,Data, isloading);
+            } else {
+                return Promise.reject({ status: 500, data: { title: '失败', message: '系统异常' } });
+            }
+            result.then((response) => {
+                this.handleResponse(action, response,true);
+                resolve(response);
+            }).catch(response => {
+                reject(response);
+            });
+        })
+    }
+
+    /**
+     * 处理请求数据
+     * 
+     * @param action 行为 
+     * @param data 数据
+     * @memberof QualificationService
+     */
+    public handleRequestData(action: string,context:any, data: any = {},isMerge:boolean = false){
+        let mode: any = this.getMode();
+        if (!mode && mode.getDataItems instanceof Function) {
+            return data;
+        }
+        let formItemItems: any[] = mode.getDataItems();
+        let requestData:any = {};
+        if(isMerge && (data && data.viewparams)){
+            Object.assign(requestData,data.viewparams);
+        }
+        formItemItems.forEach((item:any) =>{
+            if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
+                if(item && item.prop){
+                    requestData[item.prop] = context[item.name];
+                }
+            }else{
+                if(item && item.prop){
+                    requestData[item.prop] = data[item.name];
+                }
+            }
+        });
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        if(tempContext && tempContext.srfsessionid){
+            tempContext.srfsessionkey = tempContext.srfsessionid;
+            delete tempContext.srfsessionid;
+        }
+        return {context:tempContext,data:requestData};
+    }
+
+}
\ No newline at end of file

app_CRM/src/widgets/lead/qualification-form/qualification-form.html

+<i-form :model="this.data" class='app-form' ref='form'  id='lead_qualification' style="">
+    <input style="display:none;" />
+    <row >
+            
+<i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.lead.qualification_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <row>
+        <i-col v-show="detailsModel.parentcontactname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='parentcontactname' :itemRules="this.rules.parentcontactname" class='' :caption="$t('entities.lead.qualification_form.details.parentcontactname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentcontactname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.parentcontactname.disabled"
+  name='parentcontactname'
+  deMajorField='fullname'
+  deKeyField='contact'
+  :service="service"
+  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
+  valueitem='parentcontactid' 
+  :value="data.parentcontactname" 
+  editortype="" 
+  :pickupView="{ viewname: 'contact-pickup-view', title: $t('entities.contact.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'contacts', parameterName: 'contact' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.lead.qualification_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.parentaccountname.disabled"
+  name='parentaccountname'
+  deMajorField='accountname'
+  deKeyField='account'
+  :service="service"
+  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
+  valueitem='parentaccountid' 
+  :value="data.parentaccountname" 
+  editortype="" 
+  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.purchasetimeframe.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='purchasetimeframe' :itemRules="this.rules.purchasetimeframe" class='' :caption="$t('entities.lead.qualification_form.details.purchasetimeframe')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.purchasetimeframe.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+    v-model="data.purchasetimeframe" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.purchasetimeframe.disabled"  
+    tag='Lead__PurchaseTimeFrame' 
+    codelistType='STATIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.budgetamount.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='budgetamount' :itemRules="this.rules.budgetamount" class='' :caption="$t('entities.lead.qualification_form.details.budgetamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.budgetamount.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.budgetamount"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.budgetamount.disabled" type='number'  style=""></input-box>
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.purchaseprocess.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='purchaseprocess' :itemRules="this.rules.purchaseprocess" class='' :caption="$t('entities.lead.qualification_form.details.purchaseprocess')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.purchaseprocess.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+    v-model="data.purchaseprocess" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.purchaseprocess.disabled"  
+    tag='Lead__PurchaseProcess' 
+    codelistType='STATIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.decisionmaker.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='decisionmaker' :itemRules="this.rules.decisionmaker" class='' :caption="$t('entities.lead.qualification_form.details.decisionmaker')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.decisionmaker.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+  v-model="data.decisionmaker" 
+  :data="data" 
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.decisionmaker.disabled" 
+  style="width:100px;width: 100px;" 
+  tag='YesNo' 
+  codelistType='STATIC'
+  placeholder='请选择...'>
+ </dropdown-list>
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.description.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.lead.qualification_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box v-model="data.description"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.description.disabled" type='text'  style=""></input-box>
+</app-form-item>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+
+
+    </row>
+</i-form>
\ No newline at end of file

app_CRM/src/widgets/lead/qualification-form/qualification-form.vue

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

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/domain/Lead.java

@@ -1175,14 +1175,14 @@ public class Lead extends EntityMP implements Serializable {
     @JsonProperty("campaignname")
     private String campaignname;
     /**
-     * 潜在顾客的上司
+     * 识别联系人
      */
     @TableField(value = "parentcontactname")
     @JSONField(name = "parentcontactname")
     @JsonProperty("parentcontactname")
     private String parentcontactname;
     /**
-     * 潜在顾客的上级单位
+     * 识别客户
      */
     @TableField(value = "parentaccountname")
     @JSONField(name = "parentaccountname")
@@ -2498,7 +2498,7 @@ public class Lead extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [潜在顾客的上司]
+     * 设置 [识别联系人]
      */
     public void setParentcontactname(String parentcontactname){
         this.parentcontactname = parentcontactname ;
@@ -2506,7 +2506,7 @@ public class Lead extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [潜在顾客的上级单位]
+     * 设置 [识别客户]
      */
     public void setParentaccountname(String parentaccountname){
         this.parentaccountname = parentaccountname ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/sales/filter/LeadSearchContext.java

@@ -258,28 +258,28 @@ public class LeadSearchContext extends QueryWrapperContext<Lead> {
             this.getSearchCond().like("campaignname", n_campaignname_like);
         }
     }
-	private String n_parentcontactname_eq;//[潜在顾客的上司]
+	private String n_parentcontactname_eq;//[识别联系人]
 	public void setN_parentcontactname_eq(String n_parentcontactname_eq) {
         this.n_parentcontactname_eq = n_parentcontactname_eq;
         if(!ObjectUtils.isEmpty(this.n_parentcontactname_eq)){
             this.getSearchCond().eq("parentcontactname", n_parentcontactname_eq);
         }
     }
-	private String n_parentcontactname_like;//[潜在顾客的上司]
+	private String n_parentcontactname_like;//[识别联系人]
 	public void setN_parentcontactname_like(String n_parentcontactname_like) {
         this.n_parentcontactname_like = n_parentcontactname_like;
         if(!ObjectUtils.isEmpty(this.n_parentcontactname_like)){
             this.getSearchCond().like("parentcontactname", n_parentcontactname_like);
         }
     }
-	private String n_parentaccountname_eq;//[潜在顾客的上级单位]
+	private String n_parentaccountname_eq;//[识别客户]
 	public void setN_parentaccountname_eq(String n_parentaccountname_eq) {
         this.n_parentaccountname_eq = n_parentaccountname_eq;
         if(!ObjectUtils.isEmpty(this.n_parentaccountname_eq)){
             this.getSearchCond().eq("parentaccountname", n_parentaccountname_eq);
         }
     }
-	private String n_parentaccountname_like;//[潜在顾客的上级单位]
+	private String n_parentaccountname_like;//[识别客户]
 	public void setN_parentaccountname_like(String n_parentaccountname_like) {
         this.n_parentaccountname_like = n_parentaccountname_like;
         if(!ObjectUtils.isEmpty(this.n_parentaccountname_like)){

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

@@ -6589,7 +6589,7 @@
 
 
     <!--输出实体[LEAD]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-128-79">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-139-79">
         <createTable tableName="LEAD">
                 <column name="ADDRESS1_FAX" remarks="" type="VARCHAR(50)">
                 </column>
@@ -11528,28 +11528,28 @@
     </changeSet>
         <!--输出实体[METRIC]外键关系 -->
         <!--输出实体[LEAD]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-322">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-322">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="LEAD" constraintName="DER1N_LEAD__ACCOUNT__PARENTACC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-323">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-323">
        <addForeignKeyConstraint baseColumnNames="RELATEDOBJECTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGNRESPONSE__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACTIVITYID" referencedTableName="CAMPAIGNRESPONSE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-324">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-324">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGN__CAMPAIGN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-325">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-325">
        <addForeignKeyConstraint baseColumnNames="PARENTCONTACTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CONTACT__PARENTCON" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-326">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-326">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGCASEID" baseTableName="LEAD" constraintName="DER1N_LEAD__INCIDENT__ORIGINAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-327">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-327">
        <addForeignKeyConstraint baseColumnNames="QUALIFYINGOPPORTUNITYID" baseTableName="LEAD" constraintName="DER1N_LEAD__OPPORTUNITY__QUALI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-328">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-328">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="LEAD" constraintName="DER1N_LEAD__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-128-329">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-139-329">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="LEAD" constraintName="DER1N_LEAD__TRANSACTIONCURRENC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[TERRITORY]外键关系 -->