lab_gzf 发布系统代码

app_CRM/src/app-register.ts

@@ -45,7 +45,7 @@ import AppCheckbox from './components/app-checkbox/app-checkbox.vue'
 import AppColumnRender from './components/app-column-render/app-column-render.vue'
 import AppPickerSelectView from './components/app-picker-select-view/app-picker-select-view.vue'
 import AppSiderMenus from './components/app-sider-menus/app-sider-menus.vue'
-import AppSpan from './components/app-span/app-span.vue'
+import AppSpan from './components/app-span/app-span'
 import AppAddressSelection from './components/app-address-selection/app-address-selection.vue'
 import DropdownListMpicker  from './components/dropdown-list-mpicker/dropdown-list-mpicker.vue'
 import AppRate from './components/app-rate/app-rate.vue'

app_CRM/src/components/app-form-group/app-form-group.tsx

@@ -281,7 +281,7 @@ export default class AppFormGroup extends Vue {
         return <card bordered={false} dis-hover={true} class={this.classes}>
             <p slot='title'>
                 <span class="arrow-forward">
-                {this.titleBarCloseMode !== 0 ? <icon type={this.collapseContant ? 'ivu-icon ivu-icon-ios-arrow-back' : 'ivu-icon ivu-icon-ios-arrow-down'} on-click={() => this.clickCollapse()}></icon> : null}
+                    {this.titleBarCloseMode !== 0 ? <icon type={this.collapseContant ? 'ivu-icon ivu-icon-ios-arrow-forward' : 'ivu-icon ivu-icon-ios-arrow-down'} on-click={() => this.clickCollapse()}></icon> : null}
                 </span>
                 <span class={this.titleClass}>{this.caption}</span>
             </p>

app_CRM/src/components/app-span/app-span.tsx

+import { Vue, Component, Prop, Watch, Model } from 'vue-property-decorator';
+
+@Component({})
+export default class AppSpan extends Vue {
+
+    /**
+     * 当前值
+     * 
+     * @type {*}
+     * @memberof AppSpan
+     */
+    @Prop() public value?: any;
+
+    /**
+     * 当前表单项名称
+     * 
+     * @type {*}
+     * @memberof AppSpan
+     */
+    @Prop() public name?: any;
+
+    /**
+     * 代码表标识
+     *
+     * @type {string}
+     * @memberof AppSpan
+     */
+    @Prop() public tag?: string;
+
+    /**
+     * 代码表类型
+     *
+     * @type {string}
+     * @memberof AppSpan
+     */
+    @Prop() public codelistType?: string;
+
+    /**
+     * 获取或模式
+     * @type {boolean}
+     * @memberof AppSpan
+     */
+    @Prop({ default: "STR" }) public renderMode?: string;
+
+    /**
+     * 文本分隔符
+     * @type {boolean}
+     * @memberof AppSpan
+     */
+    @Prop({ default: '、' }) public textSeparator?: string;
+
+    /**
+     * 值分隔符
+     * @type {boolean}
+     * @memberof AppSpan
+     */
+    @Prop({ default: ',' }) public valueSeparator?: string;
+
+    /**
+     * 传入表单数据
+     *
+     * @type {*}
+     * @memberof AppSpan
+     */
+    @Prop() public data?: any;
+
+    /**
+     * 局部上下文导航参数
+     * 
+     * @type {any}
+     * @memberof AppSpan
+     */
+    @Prop() public localContext!: any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
+     * @memberof AppSpan
+     */
+    @Prop() public localParam!: any;
+
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppSpan
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppSpan
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 监控表单属性 data 值
+     *
+     * @memberof AppSpan
+     */
+    @Watch('value')
+    onDataChange(newVal: any, oldVal: any) {
+        if (newVal !== oldVal) {
+            this.load();
+        }
+    }
+
+    /**
+     * 显示值
+     * @type {*}
+     * @memberof AppSpan
+     */
+    public text: any = '';
+
+    /**
+     * 编辑器类型
+     *
+     * @type {string}
+     * @memberof AppSpan
+     */
+    @Prop() public editorType?: string;
+
+    /**
+     * vue  生命周期
+     *
+     * @memberof AppSpan
+     */
+    public created() {
+        this.load();
+    }
+
+    /**
+     * 处理数据
+     * 
+     * @memberof AppSpan
+     */
+    public load() {
+        if (this.tag) {
+            return;  //代码表走codelist组件
+        } else if (this.editorType === "ADDRESSPICKUP") {
+            JSON.parse(this.value).forEach((item: any, index: number) => {
+                this.text += index === 0 ? item.srfmajortext : "," + item.srfmajortext;
+            });
+        } else {
+            this.text = this.value;
+        }
+    }
+
+    /**
+     * 绘制内容
+     *
+     * @returns {*}
+     * @memberof AppSpan
+     */
+    public render(): any {
+        console.log(this.value, (!isExist(this.value) || isEmpty(this.value)));
+        if (!isExist(this.value) || isEmpty(this.value)) {
+            return <span class="app-span">---</span>;
+        }
+        if (this.tag) {
+            return <codelist tag={this.tag} value={this.value} codelistType={this.codelistType} renderMode={this.renderMode} valueSeparator={this.valueSeparator} textSeparator={this.textSeparator} data={this.data} localContext={this.localContext} localParam={this.localParam} context={this.context} viewparams={this.viewparams}></codelist>
+        } else if (Object.is(this.editorType, 'PICTURE') || Object.is(this.editorType, 'PICTURE_ONE') || Object.is(this.editorType, 'FILEUPLOADER')) {
+            return <app-upload-file-info value={this.value} name={this.name} />;
+        }
+        return <span class="app-span">{this.text}</span>;
+    }
+
+}
\ No newline at end of file

app_CRM/src/locale/lanres/entities/product/product_en_US.ts

@@ -162,6 +162,27 @@ export default {
 		uiactions: {
 		},
 	},
+	datapanel_form: {
+		details: {
+			button1: "头信息编辑", 
+			grouppanel1: "分组面板", 
+			group1: "产品基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "产品", 
+			srfmajortext: "产品名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			statecode: "状态", 
+			productid: "产品", 
+		},
+		uiactions: {
+        product_openedit_datapanelview: "头信息编辑",
+		},
+	},
 	quickcreate_form: {
 		details: {
 			group1: "产品基本信息", 

app_CRM/src/locale/lanres/entities/product/product_zh_CN.ts

@@ -161,6 +161,27 @@ export default {
 		uiactions: {
 		},
 	},
+	datapanel_form: {
+		details: {
+			button1: "头信息编辑", 
+			grouppanel1: "分组面板", 
+			group1: "产品基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "产品", 
+			srfmajortext: "产品名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			statecode: "状态", 
+			productid: "产品", 
+		},
+		uiactions: {
+			product_openedit_datapanelview: "头信息编辑",
+		},
+	},
 	quickcreate_form: {
 		details: {
 			group1: "产品基本信息", 

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

@@ -16,8 +16,8 @@ export const PageComponents = {
         Vue.component('knowledge-article-incident-edit-view', () => import('@pages/service/knowledge-article-incident-edit-view/knowledge-article-incident-edit-view.vue'));
         Vue.component('sales-order-invoice-grid-view', () => import('@pages/sales/sales-order-invoice-grid-view/sales-order-invoice-grid-view.vue'));
         Vue.component('sales-order-edit-data-panel-view', () => import('@pages/sales/sales-order-edit-data-panel-view/sales-order-edit-data-panel-view.vue'));
-        Vue.component('invoice-by-parent-key', () => import('@pages/finance/invoice-by-parent-key/invoice-by-parent-key.vue'));
         Vue.component('goal-info-goal-view', () => import('@pages/sales/goal-info-goal-view/goal-info-goal-view.vue'));
+        Vue.component('invoice-by-parent-key', () => import('@pages/finance/invoice-by-parent-key/invoice-by-parent-key.vue'));
         Vue.component('invoice-paid-grid-view', () => import('@pages/finance/invoice-paid-grid-view/invoice-paid-grid-view.vue'));
         Vue.component('goal-info-view', () => import('@pages/sales/goal-info-view/goal-info-view.vue'));
         Vue.component('opportunity-grid-view', () => import('@pages/sales/opportunity-grid-view/opportunity-grid-view.vue'));
@@ -145,6 +145,7 @@ export const PageComponents = {
         Vue.component('product-grid-view', () => import('@pages/product/product-grid-view/product-grid-view.vue'));
         Vue.component('ibiz-list-info-abstract', () => import('@pages/marketing/ibiz-list-info-abstract/ibiz-list-info-abstract.vue'));
         Vue.component('opportunity-competitor-edit-comp-opp-view', () => import('@pages/sales/opportunity-competitor-edit-comp-opp-view/opportunity-competitor-edit-comp-opp-view.vue'));
+        Vue.component('product-edit-data-panel-view', () => import('@pages/product/product-edit-data-panel-view/product-edit-data-panel-view.vue'));
         Vue.component('lead-pickup-grid-view', () => import('@pages/sales/lead-pickup-grid-view/lead-pickup-grid-view.vue'));
         Vue.component('opportunity-pickup-view', () => import('@pages/sales/opportunity-pickup-view/opportunity-pickup-view.vue'));
         Vue.component('competitor-mpickup-view', () => import('@pages/sales/competitor-mpickup-view/competitor-mpickup-view.vue'));

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

@@ -758,6 +758,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/sales-order-edit-data-panel-view/sales-order-edit-data-panel-view.vue'),
                 },
+                {
+                    path: 'goals/:goal?/info_goalview/:info_goalview?',
+                    meta: {
+                        caption: 'entities.goal.views.info_goalview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'goals', parameterName: 'goal' },
+                            { pathName: 'info_goalview', parameterName: 'info_goalview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sales/goal-info-goal-view/goal-info-goal-view.vue'),
+                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/quotes/:quote?/salesorders/:salesorder?/invoices/:invoice?/byparentkey/:byparentkey?',
                     meta: {
@@ -875,20 +889,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/finance/invoice-by-parent-key/invoice-by-parent-key.vue'),
                 },
-                {
-                    path: 'goals/:goal?/info_goalview/:info_goalview?',
-                    meta: {
-                        caption: 'entities.goal.views.info_goalview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'goals', parameterName: 'goal' },
-                            { pathName: 'info_goalview', parameterName: 'info_goalview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/goal-info-goal-view/goal-info-goal-view.vue'),
-                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/quotes/:quote?/salesorders/:salesorder?/invoices/:invoice?/paidgridview/:paidgridview?',
                     meta: {
@@ -6298,6 +6298,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/opportunity-competitor-edit-comp-opp-view/opportunity-competitor-edit-comp-opp-view.vue'),
                 },
+                {
+                    path: 'products/:product?/edit_datapanelview/:edit_datapanelview?',
+                    meta: {
+                        caption: 'entities.product.views.edit_datapanelview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'products', parameterName: 'product' },
+                            { pathName: 'edit_datapanelview', parameterName: 'edit_datapanelview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/product/product-edit-data-panel-view/product-edit-data-panel-view.vue'),
+                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/leads/:lead?/pickupgridview/:pickupgridview?',
                     meta: {

app_CRM/src/pages/product/product-edit-data-panel-view/product-edit-data-panel-view-base.tsx

+import { Subject } from 'rxjs';
+import { EditViewBase } from '@/studio-core';
+import ProductService from '@/service/product/product-service';
+import EditViewEngine from '@engine/view/edit-view-engine';
+
+/**
+ * 头部信息编辑视图基类
+ *
+ * @export
+ * @class ProductEdit_DataPanelViewBase
+ * @extends {EditViewBase}
+ */
+export class ProductEdit_DataPanelViewBase extends EditViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    protected appDeName: string = 'product';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    protected appDeKey: string = 'productid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    protected appDeMajor: string = 'productname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ProductService}
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    protected appEntityService: ProductService = new ProductService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof ProductEdit_DataPanelViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.product.views.edit_datapanelview.caption',
+        srfTitle: 'entities.product.views.edit_datapanelview.title',
+        srfSubTitle: 'entities.product.views.edit_datapanelview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    protected containerModel: any = {
+        view_form: { name: 'form', type: 'FORM' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '24c98ed0c280a28a4863eeb399b6bc10';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    public engine: EditViewEngine = new EditViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'product',
+            majorPSDEField: 'productname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ProductEdit_DataPanelViewBase
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/pages/product/product-edit-data-panel-view/product-edit-data-panel-view.html

+<studio-view-style2 viewName="productedit_datapanelview" viewTitle="头部信息编辑" class='deeditview product-edit-data-panel-view'>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="true" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                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>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/product/product-edit-data-panel-view/product-edit-data-panel-view.vue

+<template src="./product-edit-data-panel-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { ProductEdit_DataPanelViewBase } from './product-edit-data-panel-view-base';
+import view_form from '@widgets/product/edit-data-panel-form/edit-data-panel-form.vue';
+
+/**
+ * 头部信息编辑视图
+ *
+ * @export
+ * @class ProductEdit_DataPanelView
+ * @extends {ProductEdit_DataPanelViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class ProductEdit_DataPanelView extends ProductEdit_DataPanelViewBase { }
+</script>

app_CRM/src/pages/product/product-info-view/product-info-view-base.tsx

@@ -2,6 +2,7 @@ import { Subject } from 'rxjs';
 import { TabExpViewBase } from '@/studio-core';
 import ProductService from '@/service/product/product-service';
 import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
+import DataPanelEngine from '@engine/ctrl/data-panel-engine';
 
 /**
  * 产品信息视图基类
@@ -78,6 +79,7 @@ export class ProductInfoViewBase extends TabExpViewBase {
      * @memberof ProductInfoViewBase
      */
     protected containerModel: any = {
+        view_datapanel: { name: 'datapanel', type: 'FORM' },
         view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
@@ -114,6 +116,15 @@ export class ProductInfoViewBase extends TabExpViewBase {
      */
     public engine: TabExpViewEngine = new TabExpViewEngine();
 
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof ProductInfoViewBase
+     */
+    public datapanel: DataPanelEngine = new DataPanelEngine();
+
     /**
      * 引擎初始化
      *
@@ -127,6 +138,13 @@ export class ProductInfoViewBase extends TabExpViewBase {
             majorPSDEField: 'productname',
             isLoadDefault: true,
         });
+        this.datapanel.init({
+            view: this,
+            datapanel: this.$refs.datapanel,
+            keyPSDEField: 'product',
+            majorPSDEField: 'productname',
+            isLoadDefault: true,
+        });
     }
 
     /**

app_CRM/src/pages/product/product-info-view/product-info-view.html

@@ -2,6 +2,27 @@
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
+    <template slot="dataPanel">
+                <view_datapanel 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :autosave="false" 
+            :viewtag="viewtag"
+            :showBusyIndicator="true"
+            updateAction="Update"
+            removeAction="Remove"
+            loaddraftAction="GetDraft"
+            loadAction="Get"
+            createAction="Create"
+            WFSubmitAction=""
+            WFStartAction=""
+            style='' 
+            name="datapanel"  
+            ref='datapanel' 
+            @closeview="closeView($event)">
+        </view_datapanel>
+    </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 

app_CRM/src/pages/product/product-info-view/product-info-view.vue

@@ -3,6 +3,7 @@
 import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { ProductInfoViewBase } from './product-info-view-base';
+import view_datapanel from '@widgets/product/data-panel-form/data-panel-form.vue';
 import view_tabexppanel from '@widgets/product/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.vue';
 
 /**
@@ -14,6 +15,7 @@ import view_tabexppanel from '@widgets/product/info-viewtabexppanel-tabexppanel/
  */
 @Component({
     components: {
+        view_datapanel, 
         view_tabexppanel, 
     }
 })

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

@@ -62,21 +62,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         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) => {
+        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.leadid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        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);
@@ -92,21 +92,21 @@ 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) => {
+        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.relationshipsid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -116,9 +116,9 @@ export default class CampaignServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_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));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -133,21 +133,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         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) => {
+        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.leadid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        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);
@@ -163,26 +163,26 @@ 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) => {
+        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.relationshipsid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.leads = leadsData;
         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));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -210,9 +210,9 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -228,9 +228,9 @@ export default class CampaignServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
-            this.tempStorage.setItem(context.srfsessionkey+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -258,21 +258,21 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         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) => {
+        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.leadid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.leads = leadsData;
+        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);
@@ -288,26 +288,26 @@ 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) => {
+        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.relationshipsid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.leads = leadsData;
         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));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 

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

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

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

@@ -62,11 +62,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.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;
@@ -76,7 +76,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
+        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);
@@ -92,11 +92,11 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listaccounts = listaccountsData;
-        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) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -106,12 +106,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -121,7 +121,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -131,10 +131,10 @@ 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+'_listaccounts',JSON.stringify(res.data.listaccounts));
         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+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -149,11 +149,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.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;
@@ -163,7 +163,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
+        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);
@@ -179,11 +179,11 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listaccounts = listaccountsData;
-        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) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -193,12 +193,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -208,13 +208,13 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.listcontacts = listcontactsData;
         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+'_listaccounts',JSON.stringify(res.data.listaccounts));
             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+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -242,10 +242,10 @@ 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+'_listaccounts',JSON.stringify(res.data.listaccounts));
             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+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -261,10 +261,10 @@ export default class IBizListServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         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+'_listaccounts',JSON.stringify(res.data.listaccounts));
             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+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -292,11 +292,11 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.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;
@@ -306,7 +306,7 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listcontacts = listcontactsData;
+        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);
@@ -322,11 +322,11 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listaccounts = listaccountsData;
-        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) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -336,12 +336,12 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -351,13 +351,13 @@ export default class IBizListServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.listcontacts = listcontactsData;
         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+'_listaccounts',JSON.stringify(res.data.listaccounts));
             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+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 

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

@@ -79,11 +79,11 @@ export default class LeadServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && true){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -93,12 +93,12 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -108,7 +108,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -118,17 +118,17 @@ export default class LeadServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.contact && true){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -138,12 +138,12 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -153,7 +153,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -163,17 +163,17 @@ export default class LeadServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.campaign && true){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -183,12 +183,12 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -198,7 +198,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -208,17 +208,17 @@ export default class LeadServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.account && true){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -228,12 +228,12 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -243,7 +243,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -253,16 +253,16 @@ export default class LeadServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
+        let listleadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
+            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
+            if(listleadsData && listleadsData.length && listleadsData.length > 0){
+                listleadsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -272,12 +272,12 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
-        let listleadsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
-            listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item:any) => {
+        masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -287,7 +287,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.listleads = listleadsData;
+        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -297,8 +297,8 @@ export default class LeadServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/leads`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         return res;
     }
 
@@ -314,21 +314,6 @@ export default class LeadServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -344,14 +329,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.contact && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -367,6 +344,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.contact && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -382,14 +367,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/leads/${context.lead}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.campaign && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -405,6 +382,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/leads/${context.lead}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.campaign && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -420,14 +405,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/campaigns/${context.campaign}/leads/${context.lead}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.account && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -443,6 +420,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/campaigns/${context.campaign}/leads/${context.lead}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.account && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -458,13 +443,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/leads/${context.lead}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -480,6 +458,13 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/leads/${context.lead}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -495,10 +480,25 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/leads/${context.lead}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 
@@ -539,31 +539,31 @@ export default class LeadServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.contact && context.lead){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.campaign && context.lead){
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.account && context.lead){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
             let res:any = await Http.getInstance().get(`/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 
@@ -580,35 +580,35 @@ export default class LeadServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/leads/getdraft`,isloading);
             res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/leads/getdraft`,isloading);
             res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.campaign && true){
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}/leads/getdraft`,isloading);
             res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/leads/getdraft`,isloading);
             res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/leads/getdraft`,isloading);
         res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
         return res;
     }
 
@@ -624,21 +624,6 @@ export default class LeadServiceBase extends EntityService {
     public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -654,14 +639,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.contact && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -677,6 +654,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.contact && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -692,14 +677,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.campaign && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -715,6 +692,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.campaign && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -730,14 +715,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.account && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -753,6 +730,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.account && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -768,10 +753,25 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads/${context.lead}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
             return Http.getInstance().post(`/leads/${context.lead}/active`,data,isloading);
@@ -789,21 +789,6 @@ export default class LeadServiceBase extends EntityService {
     public async AddList(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -819,14 +804,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/addlist`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.contact && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -842,6 +819,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/addlist`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.contact && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -857,14 +842,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/addlist`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.campaign && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -880,6 +857,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/addlist`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.campaign && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -895,14 +880,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/addlist`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.account && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -918,6 +895,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/addlist`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.account && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -933,10 +918,25 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads/${context.lead}/addlist`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
             return Http.getInstance().post(`/leads/${context.lead}/addlist`,data,isloading);
@@ -969,21 +969,6 @@ export default class LeadServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -999,14 +984,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.contact && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1022,6 +999,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.contact && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1037,14 +1022,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.campaign && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1060,6 +1037,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.campaign && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1075,14 +1060,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.account && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1098,6 +1075,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.account && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1113,10 +1098,25 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads/${context.lead}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
             return Http.getInstance().post(`/leads/${context.lead}/checkkey`,data,isloading);
@@ -1134,21 +1134,6 @@ export default class LeadServiceBase extends EntityService {
     public async DisQualification(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1164,14 +1149,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/disqualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.contact && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1187,6 +1164,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/disqualification`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.contact && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1202,14 +1187,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/disqualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.campaign && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1225,6 +1202,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/disqualification`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.campaign && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1240,14 +1225,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/disqualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.account && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1263,6 +1240,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/disqualification`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.account && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1278,10 +1263,25 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads/${context.lead}/disqualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
             return Http.getInstance().post(`/leads/${context.lead}/disqualification`,data,isloading);
@@ -1329,21 +1329,6 @@ export default class LeadServiceBase extends EntityService {
     public async Qualification(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1359,14 +1344,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/qualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.contact && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1382,6 +1359,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/qualification`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.contact && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1397,14 +1382,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/qualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.campaign && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1420,6 +1397,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/qualification`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.campaign && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1435,14 +1420,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/qualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.account && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1458,6 +1435,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/qualification`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.account && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1473,10 +1458,25 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads/${context.lead}/qualification`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
         }
             return Http.getInstance().post(`/leads/${context.lead}/qualification`,data,isloading);
@@ -1494,21 +1494,6 @@ export default class LeadServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.lead){
             let masterData:any = {};
-        let leadcompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
-            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
-            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
-                leadcompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leadcompetitors = leadcompetitorsData;
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1524,14 +1509,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.contact && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1547,6 +1524,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/leads/${context.lead}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.contact && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1562,14 +1547,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.campaign && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1585,6 +1562,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/leads/${context.lead}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.campaign && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1600,14 +1585,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        if(context.account && context.lead){
-            let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1623,6 +1600,14 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/campaigns/${context.campaign}/leads/${context.lead}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        if(context.account && context.lead){
+            let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1638,13 +1623,6 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads/${context.lead}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            return res;
-        }
-        let masterData:any = {};
         let leadcompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
             leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
@@ -1660,6 +1638,13 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.leadcompetitors = leadcompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/leads/${context.lead}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            return res;
+        }
+        let masterData:any = {};
         let listleadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listleads'),'undefined')){
             listleadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listleads') as any);
@@ -1675,10 +1660,25 @@ export default class LeadServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
+        let leadcompetitorsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors'),'undefined')){
+            leadcompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leadcompetitors') as any);
+            if(leadcompetitorsData && leadcompetitorsData.length && leadcompetitorsData.length > 0){
+                leadcompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leadcompetitors = leadcompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/leads/${context.lead}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
+            this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
             return res;
     }
 

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

@@ -74,21 +74,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 quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -119,22 +104,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        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);
@@ -150,6 +119,22 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/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+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.contact && true){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -180,22 +165,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.account && 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);
@@ -211,6 +180,22 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.account && 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);
@@ -241,21 +226,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}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -271,6 +241,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -301,6 +286,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -310,9 +310,9 @@ export default class OpportunityServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         return res;
     }
 
@@ -328,21 +328,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 quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -373,15 +358,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -397,6 +373,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -427,15 +412,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.account && 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);
@@ -451,6 +427,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.account && 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);
@@ -481,14 +466,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -504,6 +481,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -534,11 +519,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 
@@ -576,29 +576,29 @@ export default class OpportunityServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 
@@ -615,32 +615,32 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         return res;
     }
 
@@ -656,21 +656,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 quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -701,15 +686,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -725,6 +701,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -755,15 +740,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}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.account && 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);
@@ -779,6 +755,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.account && 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);
@@ -809,11 +794,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/active`,data,isloading);
@@ -831,21 +831,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 quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -876,15 +861,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -900,6 +876,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -930,15 +915,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}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.account && 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);
@@ -954,6 +930,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.account && 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);
@@ -984,11 +969,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/checkkey`,data,isloading);
@@ -1021,21 +1021,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 quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotes = quotesData;
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1066,15 +1051,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1090,6 +1066,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1120,15 +1105,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+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.account && 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);
@@ -1144,6 +1120,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        if(context.account && 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);
@@ -1174,14 +1159,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1197,6 +1174,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            return res;
+        }
+        let masterData:any = {};
         let opportunitycompetitorsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
             opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
@@ -1227,11 +1212,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
+        let quotesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
+            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
+            if(quotesData && quotesData.length && quotesData.length > 0){
+                quotesData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quoteid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotes = quotesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             return res;
     }
 

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

@@ -424,6 +424,15 @@ export const viewstate: any = {
                 '8332d2ba99d5a618d1ab69f45ce689f5',
             ],
         },
+        {
+            viewtag: '24c98ed0c280a28a4863eeb399b6bc10',
+            viewmodule: 'Product',
+            viewname: 'ProductEdit_DataPanelView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '24e222a530526aab94ed4ed22cfedf9a',
             viewmodule: 'Base',
@@ -509,6 +518,7 @@ export const viewstate: any = {
                 '126557fa1bd6d770b471b1c9d211f07c',
                 '3c8bbe79d569f27ef675664d32a91c0d',
                 '7d6cff9fab81efce5b7dbc0ae11d3c15',
+                '24c98ed0c280a28a4863eeb399b6bc10',
                 '90289db866d87ff28979dfdfd2ce583d',
             ],
         },

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

@@ -238,6 +238,69 @@ export default class ProductUIServiceBase extends UIService {
         backend();
     }
 
+    /**
+     * 头信息编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async Product_OpenEdit_DataPanelView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { product: '%product%' });
+        Object.assign(params, { productid: '%product%' });
+        Object.assign(params, { productname: '%productname%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'products', parameterName: 'product' },
+        ];
+            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: 'product-edit-data-panel-view', 
+                height: 300, 
+                width: 300,  
+                title: actionContext.$t('entities.product.views.edit_datapanelview.title'),
+                placement: 'POPOVER',
+            };
+            openPopOver(view, data);
+    }
+
     /**
      * 新建
      *

app_CRM/src/widgets/product/data-panel-form/data-panel-form-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, EditFormControlBase } from '@/studio-core';
+import ProductService from '@/service/product/product-service';
+import DataPanelService from './data-panel-form-service';
+import ProductUIService from '@/uiservice/product/product-ui-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+
+
+/**
+ * datapanel部件基类
+ *
+ * @export
+ * @class EditFormControlBase
+ * @extends {DataPanelEditFormBase}
+ */
+export class DataPanelEditFormBase extends EditFormControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof DataPanelEditFormBase
+     */
+    protected controlType: string = 'FORM';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {DataPanelService}
+     * @memberof DataPanelEditFormBase
+     */
+    public service: DataPanelService = new DataPanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ProductService}
+     * @memberof DataPanelEditFormBase
+     */
+    public appEntityService: ProductService = new ProductService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof DataPanelEditFormBase
+     */
+    protected appDeName: string = 'product';
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public datapanel_button1_click(params: any = {}, tag?: any, $event?: any) {
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this;
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:ProductUIService  = new ProductUIService();
+        curUIService.Product_OpenEdit_DataPanelView(datas,contextJO, paramJO,  $event, xData,this,"Product");
+    }
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof DataPanelEditFormBase
+     */
+    public data: any = {
+        srfupdatedate: null,
+        srforikey: null,
+        srfkey: null,
+        srfmajortext: null,
+        srftempmode: null,
+        srfuf: null,
+        srfdeid: null,
+        srfsourcekey: null,
+        statecode: null,
+        productid: null,
+        product:null,
+    };
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof DataPanelEditFormBase
+     */
+    public rules: any = {
+    }
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof DataPanelEditFormBase
+     */
+    public detailsModel: any = {
+        button1: new FormButtonModel({ caption: '头信息编辑', detailType: 'BUTTON', name: 'button1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiaction: { type: 'DEUIACTION', tag: 'OpenEdit_DataPanelView', actiontarget: 'SINGLEKEY' } }),
+
+        grouppanel1: new FormGroupPanelModel({ caption: '分组面板', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.product.datapanel_form', extractMode: 'ITEM', details: [] } }),
+
+        group1: new FormGroupPanelModel({ caption: '产品基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.product.datapanel_form', extractMode: 'ITEM', details: [] } }),
+
+        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 0 }),
+
+        srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfkey: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfmajortext: new FormItemModel({ caption: '产品名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        statecode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        productid: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'productid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+    };
+
+	/**
+	 * 表单 头信息编辑 事件
+	 *
+	 * @memberof @memberof DataPanelEditFormBase
+	 */
+    public button1_click($event: any): void {
+        this.datapanel_button1_click(null, null, $event);
+
+    }
+}
\ No newline at end of file

app_CRM/src/widgets/product/data-panel-form/data-panel-form-model.ts

+/**
+ * DataPanel 部件模型
+ *
+ * @export
+ * @class DataPanelModel
+ */
+export default class DataPanelModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof DataPanelModel
+  */
+  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: 'productid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'productname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'statecode',
+        prop: 'statecode',
+        dataType: 'NSCODELIST',
+      },
+      {
+        name: 'productid',
+        prop: 'productid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'product',
+        prop: 'productid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_CRM/src/widgets/product/data-panel-form/data-panel-form-service.ts

+import { Http,Util,Errorlog } from '@/utils';
+import ControlService from '@/widgets/control-service';
+import ProductService from '@/service/product/product-service';
+import DataPanelModel from './data-panel-form-model';
+
+
+/**
+ * DataPanel 部件服务对象
+ *
+ * @export
+ * @class DataPanelService
+ */
+export default class DataPanelService extends ControlService {
+
+    /**
+     * 产品服务对象
+     *
+     * @type {ProductService}
+     * @memberof DataPanelService
+     */
+    public appEntityService: ProductService = new ProductService({ $store: this.getStore() });
+
+    /**
+     * 设置从数据模式
+     *
+     * @type {boolean}
+     * @memberof DataPanelService
+     */
+    public setTempMode(){
+        this.isTempMode = false;
+    }
+
+    /**
+     * Creates an instance of DataPanelService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof DataPanelService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.model = new DataPanelModel();
+    }
+
+    /**
+     * 处理数据
+     *
+     * @private
+     * @param {Promise<any>} promise
+     * @returns {Promise<any>}
+     * @memberof DataPanelService
+     */
+    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  DataPanelService
+     */
+    @Errorlog
+    public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+
+        return Promise.reject([])
+    }
+
+    /**
+     * 启动工作流
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @param {*} [localdata]
+     * @returns {Promise<any>}
+     * @memberof DataPanelService
+     */
+    @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 DataPanelService
+     */
+    @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 DataPanelService
+     */
+    @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 DataPanelService
+     */
+    @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 DataPanelService
+     */
+    @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 DataPanelService
+     */
+    @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 DataPanelService
+     */
+    @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.productid = PrimaryKey;
+        Data.product = 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.productid = 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 DataPanelService
+     */
+    @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 DataPanelService
+     */
+    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/product/data-panel-form/data-panel-form.html

+<i-form :model="this.data" class='app-form info-form-mode' ref='datapanel'  id='product_datapanel' style="">
+    <input style="display:none;" />
+    <row >
+            
+<i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :model="detailsModel.group1" layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.product.datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
+    <app-radio-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
+    <div style="height: 100%;display: flex;">
+        <div  v-show="detailsModel.statecode.visible" :style="{}">
+<app-form-item name='statecode' :itemRules="this.rules.statecode" class='datapanel-style' :caption="$t('entities.product.datapanel_form.details.statecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statecode.error" :isEmptyCaption="false" labelPos="BOTTOM">
+    
+<app-span name='statecode' :value="data.statecode" tag='Product__StateCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
+</app-form-item>
+
+</div>
+<div  v-show="detailsModel.grouppanel1.visible" :style="{}">
+<app-form-group :model="detailsModel.grouppanel1" layoutType="FLEX" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.product.datapanel_form.details.grouppanel1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
+    <app-radio-group-data-panel slot="dataInfoPanel" :model="detailsModel.grouppanel1" :data="data" :context="context" :viewparams="viewparams"/>
+    <div style="height: 100%;display: flex;">
+        <div  v-show="detailsModel.button1.visible" :style="{}">
+    <i-button type="primary" @click="button1_click($event)" class="datapanel-style"
+         style="">
+        <i class="fa fa-angle-down" style="margin-right: 2px;"></i>   
+        
+    </i-button>
+
+</div>
+
+    </div>
+</app-form-group>
+
+</div>
+
+    </div>
+</app-form-group>
+
+</i-col>
+
+
+    </row>
+</i-form>
\ No newline at end of file

app_CRM/src/widgets/product/data-panel-form/data-panel-form.less

+.datapanel-style {
+    font-size:20px;font-weight:bold;text-align:left
+}
+.datapanel-style {
+    height: 48px;
+    margin-top: 2px;
+    margin-bottom: 0px!important;
+    margin-right: 5px;
+    padding-right: 5px;
+    border-right: 2px solid var(--app-dividing-line-color-bright) ;
+
+}
+
+.label-bottom {
+    .editor-wrapper {
+        height: 24px!important;
+    }
+    .app-form-item-label {
+        font-size: 12px;
+        font-weight: bold;
+        height: 24px!important;
+        line-height: 24px!important;
+    }
+}

app_CRM/src/widgets/product/data-panel-form/data-panel-form.vue

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

app_CRM/src/widgets/product/edit-data-panel-form/edit-data-panel-form-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, EditFormControlBase } from '@/studio-core';
+import ProductService from '@/service/product/product-service';
+import Edit_DataPanelService from './edit-data-panel-form-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+
+
+/**
+ * form部件基类
+ *
+ * @export
+ * @class EditFormControlBase
+ * @extends {Edit_DataPanelEditFormBase}
+ */
+export class Edit_DataPanelEditFormBase extends EditFormControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof Edit_DataPanelEditFormBase
+     */
+    protected controlType: string = 'FORM';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {Edit_DataPanelService}
+     * @memberof Edit_DataPanelEditFormBase
+     */
+    public service: Edit_DataPanelService = new Edit_DataPanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ProductService}
+     * @memberof Edit_DataPanelEditFormBase
+     */
+    public appEntityService: ProductService = new ProductService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof Edit_DataPanelEditFormBase
+     */
+    protected appDeName: string = 'product';
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof Edit_DataPanelEditFormBase
+     */
+    public data: any = {
+        srfupdatedate: null,
+        srforikey: null,
+        srfkey: null,
+        srfmajortext: null,
+        srftempmode: null,
+        srfuf: null,
+        srfdeid: null,
+        srfsourcekey: null,
+        statecode: null,
+        productid: null,
+        product:null,
+    };
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof Edit_DataPanelEditFormBase
+     */
+    public rules: any = {
+        statecode: [
+            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' },
+            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' },
+        ],
+    }
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof Edit_DataPanelEditFormBase
+     */
+    public detailsModel: any = {
+        group1: new FormGroupPanelModel({ caption: '产品基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.product.edit_datapanel_form', extractMode: 'ITEM', details: [] } }),
+
+        formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
+
+        srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 0 }),
+
+        srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfkey: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'srfkey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfmajortext: new FormItemModel({ caption: '产品名称', detailType: 'FORMITEM', name: 'srfmajortext', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srftempmode: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srftempmode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfuf: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfuf', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        statecode: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'statecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        productid: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'productid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+    };
+}
\ No newline at end of file

app_CRM/src/widgets/product/edit-data-panel-form/edit-data-panel-form-model.ts

+/**
+ * Edit_DataPanel 部件模型
+ *
+ * @export
+ * @class Edit_DataPanelModel
+ */
+export default class Edit_DataPanelModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof Edit_DataPanelModel
+  */
+  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: 'productid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'productname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'statecode',
+        prop: 'statecode',
+        dataType: 'NSCODELIST',
+      },
+      {
+        name: 'productid',
+        prop: 'productid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'product',
+        prop: 'productid',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_CRM/src/widgets/product/edit-data-panel-form/edit-data-panel-form-service.ts

+import { Http,Util,Errorlog } from '@/utils';
+import ControlService from '@/widgets/control-service';
+import ProductService from '@/service/product/product-service';
+import Edit_DataPanelModel from './edit-data-panel-form-model';
+
+
+/**
+ * Edit_DataPanel 部件服务对象
+ *
+ * @export
+ * @class Edit_DataPanelService
+ */
+export default class Edit_DataPanelService extends ControlService {
+
+    /**
+     * 产品服务对象
+     *
+     * @type {ProductService}
+     * @memberof Edit_DataPanelService
+     */
+    public appEntityService: ProductService = new ProductService({ $store: this.getStore() });
+
+    /**
+     * 设置从数据模式
+     *
+     * @type {boolean}
+     * @memberof Edit_DataPanelService
+     */
+    public setTempMode(){
+        this.isTempMode = false;
+    }
+
+    /**
+     * Creates an instance of Edit_DataPanelService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof Edit_DataPanelService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.model = new Edit_DataPanelModel();
+    }
+
+    /**
+     * 处理数据
+     *
+     * @private
+     * @param {Promise<any>} promise
+     * @returns {Promise<any>}
+     * @memberof Edit_DataPanelService
+     */
+    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  Edit_DataPanelService
+     */
+    @Errorlog
+    public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+
+        return Promise.reject([])
+    }
+
+    /**
+     * 启动工作流
+     *
+     * @param {string} action
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @param {*} [localdata]
+     * @returns {Promise<any>}
+     * @memberof Edit_DataPanelService
+     */
+    @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 Edit_DataPanelService
+     */
+    @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 Edit_DataPanelService
+     */
+    @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 Edit_DataPanelService
+     */
+    @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 Edit_DataPanelService
+     */
+    @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 Edit_DataPanelService
+     */
+    @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 Edit_DataPanelService
+     */
+    @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.productid = PrimaryKey;
+        Data.product = 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.productid = 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 Edit_DataPanelService
+     */
+    @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 Edit_DataPanelService
+     */
+    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/product/edit-data-panel-form/edit-data-panel-form.html

+<i-form :model="this.data" class='app-form' ref='form'  id='product_edit_datapanel' style="">
+    <input style="display:none;" />
+    <row >
+            
+<i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.product.edit_datapanel_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-radio-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
+    <row>
+        <i-col v-show="detailsModel.statecode.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='statecode' :itemRules="this.rules.statecode" class='' :caption="$t('entities.product.edit_datapanel_form.details.statecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statecode.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+ <dropdown-list 
+    v-model="data.statecode" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.statecode.disabled"  
+    tag='Product__StateCode' 
+    codelistType='STATIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
+</app-form-item>
+
+</i-col>
+    
+    </row>
+</app-form-group>
+
+</i-col>
+
+
+    </row>
+</i-form>
\ No newline at end of file

app_CRM/src/widgets/product/edit-data-panel-form/edit-data-panel-form.vue

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

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

@@ -2757,7 +2757,7 @@
 
 
     <!--输出实体[CONTACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-349-38">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-350-38">
         <createTable tableName="CONTACT">
                 <column name="ADDRESS1_FREIGHTTERMSCODE" remarks="" type="VARCHAR(30)">
                 </column>
@@ -7974,7 +7974,7 @@
 
 
     <!--输出实体[PRODUCT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-product-138-91">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-product-143-91">
         <createTable tableName="PRODUCT">
                 <column name="VENDORID" remarks="" type="VARCHAR(100)">
                 </column>
@@ -11186,25 +11186,25 @@
        <addForeignKeyConstraint baseColumnNames="BUSINESSUNITID" baseTableName="CONSTRAINTBASEDGROUP" constraintName="DER1N_CONSTRAINTBASEDGROUP__BU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUSINESSUNITID" referencedTableName="BUSINESSUNIT" validate="true"/>
     </changeSet>
         <!--输出实体[CONTACT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-349-199">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-350-199">
        <addForeignKeyConstraint baseColumnNames="CUSTOMERID" baseTableName="CONTACT" constraintName="DER1N_CONTACT_ACCOUNT_CUSTOMER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-349-200">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-350-200">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-349-201">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-350-201">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-349-202">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-350-202">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-349-203">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-350-203">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-349-204">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-350-204">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-349-205">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-350-205">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[CONTRACT]外键关系 -->
@@ -11626,22 +11626,22 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRICELEVEL" constraintName="DER1N_PRICELEVEL__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[PRODUCT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-138-344">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-143-344">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__PRICELEVEL__PRI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-138-345">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-143-345">
        <addForeignKeyConstraint baseColumnNames="PARENTPRODUCTID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__PRODUCT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-138-346">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-143-346">
        <addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__SUBJECT__SUBJEC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-138-347">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-143-347">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-138-348">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-143-348">
        <addForeignKeyConstraint baseColumnNames="DEFAULTUOMSCHEDULEID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__UOMSCHEDULE__DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMSCHEDULEID" referencedTableName="UOMSCHEDULE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-138-349">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-143-349">
        <addForeignKeyConstraint baseColumnNames="DEFAULTUOMID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__UOM__DEFAULTUOM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[PRODUCTASSOCIATION]外键关系 -->