chitanda 发布系统代码

app_CRM/src/components/dropdown-list/dropdown-list.vue

@@ -69,6 +69,10 @@ export default class DropDownList extends Vue {
             } else {
                 this.value = this.itemValue.toString();
             }
+            // 代码表集合中不存在改选项，重新准备集合
+            if(this.value && !this.items.find((item: any) => Object.is(this.value, item.value))) {
+                this.readyCodelist();
+            }
         } catch (error) {
             console.log('下拉列表，值转换失败');
         }
@@ -264,6 +268,15 @@ export default class DropDownList extends Vue {
      * @memberof DropDownList
      */
     public created() {
+        this.readyCodelist();
+    }
+    
+    /**
+     * 准备代码表
+     *
+     * @memberof DropDownList
+     */
+    public readyCodelist() {
         if(this.tag && Object.is(this.codelistType,"STATIC")){
           const codelist = this.$store.getters.getCodeList(this.tag);
           if (codelist) {

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

@@ -65,21 +65,6 @@ export default class AccountServiceBase 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) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -125,6 +110,21 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -134,10 +134,10 @@ export default class AccountServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/accounts`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -152,21 +152,6 @@ export default class AccountServiceBase 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) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -212,12 +197,27 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/accounts/${context.account}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -245,10 +245,10 @@ export default class AccountServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/accounts/${context.account}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 
@@ -264,10 +264,10 @@ export default class AccountServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/accounts/getdraft`,isloading);
         res.data.account = data.account;
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
 
@@ -338,21 +338,6 @@ export default class AccountServiceBase 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) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -398,12 +383,27 @@ export default class AccountServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/accounts/${context.account}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
 

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

@@ -64,21 +64,6 @@ 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) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -109,6 +94,21 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -118,9 +118,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+'_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;
     }
 
@@ -135,21 +135,6 @@ 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) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -180,11 +165,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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;
     }
 
@@ -212,9 +212,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+'_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;
     }
 
@@ -230,9 +230,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+'_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;
     }
 
@@ -275,21 +275,6 @@ 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) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.leads = leadsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -320,11 +305,26 @@ export default class CampaignServiceBase extends EntityService {
             }
         }
         masterData.campaigncampaigns = campaigncampaignsData;
+        let leadsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
+            leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
+            if(leadsData && leadsData.length && leadsData.length > 0){
+                leadsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.leadid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let competitorproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorproducts'),'undefined')){
             competitorproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorproducts') as any);
@@ -107,6 +92,21 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -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+'_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));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let competitorproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorproducts'),'undefined')){
             competitorproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorproducts') as any);
@@ -178,11 +163,26 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/competitors/${context.competitor}`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let competitorproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorproducts'),'undefined')){
             competitorproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorproducts') as any);
@@ -303,11 +288,26 @@ export default class CompetitorServiceBase extends EntityService {
             }
         }
         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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/competitors/${context.competitor}/save`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
     }
 

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

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

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

@@ -64,21 +64,6 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -124,6 +109,21 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -133,10 +133,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+'_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));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -151,21 +151,6 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -211,12 +196,27 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibizlists/${context.ibizlist}`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -244,10 +244,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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             return res;
     }
 
@@ -263,10 +263,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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         return res;
     }
 
@@ -309,21 +309,6 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.campaignlists = campaignlistsData;
         let listaccountsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
             listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
@@ -369,12 +354,27 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.campaignlists = campaignlistsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibizlists/${context.ibizlist}/save`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             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 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) => {
+        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;
@@ -93,12 +93,12 @@ 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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -108,7 +108,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             return res;
         }
         if(context.contact && true){
             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);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item: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;
@@ -138,12 +138,12 @@ 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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -153,7 +153,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             return res;
         }
         if(context.campaign && true){
             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);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item: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;
@@ -183,12 +183,12 @@ 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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -198,7 +198,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             return res;
         }
         if(context.account && true){
             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);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item: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;
@@ -228,12 +228,12 @@ 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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -243,7 +243,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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);
-            if(listleadsData && listleadsData.length && listleadsData.length > 0){
-                listleadsData.forEach((item: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;
@@ -272,12 +272,12 @@ 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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -287,7 +287,7 @@ export default class LeadServiceBase extends EntityService {
                 });
             }
         }
-        masterData.leadcompetitors = leadcompetitorsData;
+        masterData.listleads = listleadsData;
         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+'_listleads',JSON.stringify(res.data.listleads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
         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 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;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -344,14 +329,6 @@ 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);
@@ -367,6 +344,14 @@ 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);
@@ -382,14 +367,6 @@ 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);
@@ -405,6 +382,14 @@ 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);
@@ -420,14 +405,6 @@ 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);
@@ -443,6 +420,14 @@ 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);
@@ -458,13 +443,6 @@ 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);
@@ -480,6 +458,13 @@ 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);
@@ -495,10 +480,25 @@ 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) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listleads = listleadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/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));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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+'_listleads',JSON.stringify(res.data.listleads));
             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 res:any = await Http.getInstance().get(`/contacts/${context.contact}/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 res:any = await Http.getInstance().get(`/campaigns/${context.campaign}/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 res:any = await Http.getInstance().get(`/accounts/${context.account}/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 res:any = await Http.getInstance().get(`/leads/${context.lead}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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+'_listleads',JSON.stringify(res.data.listleads));
             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 && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/leads/getdraft`,isloading);
             res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 && true){
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}/leads/getdraft`,isloading);
             res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/leads/getdraft`,isloading);
             res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 res:any = await  Http.getInstance().get(`/leads/getdraft`,isloading);
         res.data.lead = data.lead;
-            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
         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 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;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -654,14 +639,6 @@ 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);
@@ -677,6 +654,14 @@ 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);
@@ -692,14 +677,6 @@ 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);
@@ -715,6 +692,14 @@ 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);
@@ -730,14 +715,6 @@ 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);
@@ -753,6 +730,14 @@ 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);
@@ -768,10 +753,25 @@ 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) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 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;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -819,14 +804,6 @@ 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);
@@ -842,6 +819,14 @@ 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);
@@ -857,14 +842,6 @@ 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);
@@ -880,6 +857,14 @@ 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);
@@ -895,14 +880,6 @@ 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);
@@ -918,6 +895,14 @@ 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);
@@ -933,10 +918,25 @@ 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) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 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;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -999,14 +984,6 @@ 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);
@@ -1022,6 +999,14 @@ 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);
@@ -1037,14 +1022,6 @@ 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);
@@ -1060,6 +1037,14 @@ 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);
@@ -1075,14 +1060,6 @@ 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);
@@ -1098,6 +1075,14 @@ 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);
@@ -1113,10 +1098,25 @@ 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) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 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;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -1164,14 +1149,6 @@ 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);
@@ -1187,6 +1164,14 @@ 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);
@@ -1202,14 +1187,6 @@ 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);
@@ -1225,6 +1202,14 @@ 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);
@@ -1240,14 +1225,6 @@ 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);
@@ -1263,6 +1240,14 @@ 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);
@@ -1278,10 +1263,25 @@ 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) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 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;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -1359,14 +1344,6 @@ 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);
@@ -1382,6 +1359,14 @@ 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);
@@ -1397,14 +1382,6 @@ 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);
@@ -1420,6 +1397,14 @@ 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);
@@ -1435,14 +1420,6 @@ 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);
@@ -1458,6 +1435,14 @@ 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);
@@ -1473,10 +1458,25 @@ 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) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listleads = listleadsData;
             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+'_listleads',JSON.stringify(res.data.listleads));
             this.tempStorage.setItem(context.srfsessionkey+'_leadcompetitors',JSON.stringify(res.data.leadcompetitors));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             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 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;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        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);
@@ -1524,14 +1509,6 @@ 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);
@@ -1547,6 +1524,14 @@ 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);
@@ -1562,14 +1547,6 @@ 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);
@@ -1585,6 +1562,14 @@ 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);
@@ -1600,14 +1585,6 @@ 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);
@@ -1623,6 +1600,14 @@ 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);
@@ -1638,13 +1623,6 @@ 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);
@@ -1660,6 +1638,13 @@ 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);
@@ -1675,10 +1660,25 @@ 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) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listleads = listleadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/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));
+            this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
             return res;
     }
 

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

@@ -74,36 +74,36 @@ export default class OpportunityServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && true){
             let masterData:any = {};
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -128,43 +128,43 @@ export default class OpportunityServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -189,43 +189,43 @@ export default class OpportunityServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -250,42 +250,42 @@ export default class OpportunityServiceBase extends EntityService {
             }
             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+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -310,8 +310,8 @@ export default class OpportunityServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
@@ -328,36 +328,36 @@ export default class OpportunityServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -375,43 +375,43 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -429,43 +429,43 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -483,42 +483,42 @@ 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+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -536,8 +536,8 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
@@ -576,28 +576,28 @@ export default class OpportunityServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
@@ -615,31 +615,31 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             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+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
@@ -656,36 +656,36 @@ export default class OpportunityServiceBase extends EntityService {
     public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -703,43 +703,43 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -757,43 +757,43 @@ 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+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -811,8 +811,8 @@ 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}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
@@ -831,36 +831,36 @@ export default class OpportunityServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -878,43 +878,43 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -932,43 +932,43 @@ 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+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -986,8 +986,8 @@ 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}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
@@ -1021,36 +1021,36 @@ export default class OpportunityServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1068,43 +1068,43 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1122,43 +1122,43 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1176,42 +1176,42 @@ 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+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunitycompetitorsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors'),'undefined')){
-            opportunitycompetitorsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunitycompetitors') as any);
-            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
-                opportunitycompetitorsData.forEach((item:any) => {
+        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.relationshipsid = null;
+                            item.quoteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let quotesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
-            quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
-            if(quotesData && quotesData.length && quotesData.length > 0){
-                quotesData.forEach((item:any) => {
+        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);
+            if(opportunitycompetitorsData && opportunitycompetitorsData.length && opportunitycompetitorsData.length > 0){
+                opportunitycompetitorsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.quoteid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.quotes = quotesData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1229,8 +1229,8 @@ export default class OpportunityServiceBase extends EntityService {
         masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }

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

@@ -65,36 +65,36 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productpricelevelsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
-            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
-            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
-                productpricelevelsData.forEach((item:any) => {
+        let productsubstitutesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
+            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
+            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
+                productsubstitutesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productpricelevelid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productpricelevels = productpricelevelsData;
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        masterData.productsubstitutes = productsubstitutesData;
+        let productpricelevelsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
+            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
+            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
+                productpricelevelsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productpricelevelid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productsubstitutes = productsubstitutesData;
+        masterData.productpricelevels = productpricelevelsData;
         let productassociationsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
             productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
@@ -119,8 +119,8 @@ export default class ProductServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/products`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
@@ -136,36 +136,36 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productpricelevelsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
-            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
-            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
-                productpricelevelsData.forEach((item:any) => {
+        let productsubstitutesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
+            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
+            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
+                productsubstitutesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productpricelevelid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productpricelevels = productpricelevelsData;
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        masterData.productsubstitutes = productsubstitutesData;
+        let productpricelevelsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
+            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
+            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
+                productpricelevelsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productpricelevelid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productsubstitutes = productsubstitutesData;
+        masterData.productpricelevels = productpricelevelsData;
         let productassociationsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
             productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
@@ -183,8 +183,8 @@ export default class ProductServiceBase extends EntityService {
         masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/products/${context.product}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
@@ -213,8 +213,8 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/products/${context.product}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }
@@ -231,8 +231,8 @@ export default class ProductServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/products/getdraft`,isloading);
         res.data.product = data.product;
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
         return res;
     }
@@ -291,36 +291,36 @@ export default class ProductServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let productpricelevelsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
-            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
-            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
-                productpricelevelsData.forEach((item:any) => {
+        let productsubstitutesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
+            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
+            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
+                productsubstitutesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productpricelevelid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productpricelevels = productpricelevelsData;
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        masterData.productsubstitutes = productsubstitutesData;
+        let productpricelevelsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
+            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
+            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
+                productpricelevelsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productpricelevelid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productsubstitutes = productsubstitutesData;
+        masterData.productpricelevels = productpricelevelsData;
         let productassociationsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productassociations'),'undefined')){
             productassociationsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productassociations') as any);
@@ -338,8 +338,8 @@ export default class ProductServiceBase extends EntityService {
         masterData.productassociations = productassociationsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/products/${context.product}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
+            this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
             return res;
     }

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

@@ -78,21 +78,6 @@ export default class QuoteServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && true){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -108,21 +93,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            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/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && true){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -138,6 +108,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            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/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && true){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -153,21 +138,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            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/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && true){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -183,6 +153,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            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/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && true){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -198,21 +183,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            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/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && true){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -228,6 +198,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            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/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && true){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -243,20 +228,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            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(`/opportunities/${context.opportunity}/quotes`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -272,6 +243,20 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            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(`/opportunities/${context.opportunity}/quotes`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -287,6 +272,21 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -296,8 +296,8 @@ export default class QuoteServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/quotes`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
         return res;
     }
 
@@ -313,21 +313,6 @@ export default class QuoteServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -343,14 +328,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -366,6 +343,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -381,14 +366,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -404,6 +381,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -419,14 +404,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -442,6 +419,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -457,13 +442,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -479,6 +457,13 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -494,10 +479,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/quotes/${context.quote}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
     }
 
@@ -538,31 +538,31 @@ export default class QuoteServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.contact && context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.account && context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.opportunity && context.quote){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
     }
 
@@ -579,35 +579,35 @@ export default class QuoteServiceBase extends EntityService {
         if(context.account && context.contact && context.opportunity && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.contact && context.opportunity && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.account && context.opportunity && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         if(context.opportunity && true){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/getdraft`,isloading);
             res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/quotes/getdraft`,isloading);
         res.data.quote = data.quote;
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
         return res;
     }
 
@@ -638,21 +638,6 @@ export default class QuoteServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -668,14 +653,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -691,6 +668,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -706,14 +691,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -729,6 +706,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -744,14 +729,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -767,6 +744,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -782,10 +767,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
             return Http.getInstance().post(`/quotes/${context.quote}/checkkey`,data,isloading);
@@ -818,21 +818,6 @@ export default class QuoteServiceBase extends EntityService {
     public async GenSalesOrder(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -848,14 +833,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -871,6 +848,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -886,14 +871,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -909,6 +886,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -924,14 +909,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -947,6 +924,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -962,10 +947,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/gensalesorder`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
         }
             return Http.getInstance().post(`/quotes/${context.quote}/gensalesorder`,data,isloading);
@@ -983,21 +983,6 @@ export default class QuoteServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote){
             let masterData:any = {};
-        let quotedetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
-            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
-            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
-                quotedetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.quotedetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.quotedetails = quotedetailsData;
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1013,14 +998,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1036,6 +1013,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1051,14 +1036,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1074,6 +1051,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1089,14 +1074,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        if(context.opportunity && context.quote){
-            let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1112,6 +1089,14 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        if(context.opportunity && context.quote){
+            let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1127,13 +1112,6 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
-            return res;
-        }
-        let masterData:any = {};
         let quotedetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
             quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
@@ -1149,6 +1127,13 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.quotedetails = quotedetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
+            return res;
+        }
+        let masterData:any = {};
         let salesordersData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorders'),'undefined')){
             salesordersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorders') as any);
@@ -1164,10 +1149,25 @@ export default class QuoteServiceBase extends EntityService {
             }
         }
         masterData.salesorders = salesordersData;
+        let quotedetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails'),'undefined')){
+            quotedetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotedetails') as any);
+            if(quotedetailsData && quotedetailsData.length && quotedetailsData.length > 0){
+                quotedetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.quotedetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.quotedetails = quotedetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/quotes/${context.quote}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             this.tempStorage.setItem(context.srfsessionkey+'_salesorders',JSON.stringify(res.data.salesorders));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotedetails',JSON.stringify(res.data.quotedetails));
             return res;
     }
 

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

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

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

@@ -80,21 +80,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && true){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -110,21 +95,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            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/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -140,6 +110,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            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/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -155,21 +140,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            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/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -185,6 +155,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            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/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -200,21 +185,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            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/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -230,6 +200,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            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/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -245,21 +230,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            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(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && true){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -275,6 +245,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            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(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && true){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -290,20 +275,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            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(`/quotes/${context.quote}/salesorders`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -319,6 +290,20 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            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(`/quotes/${context.quote}/salesorders`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -334,6 +319,21 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -343,8 +343,8 @@ export default class SalesOrderServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesorders`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
         return res;
     }
 
@@ -360,21 +360,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -390,14 +375,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -413,6 +390,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -428,14 +413,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -451,6 +428,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -466,14 +451,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -489,6 +466,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -504,14 +489,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -527,6 +504,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -542,13 +527,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -564,6 +542,13 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/quotes/${context.quote}/salesorders/${context.salesorder}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -579,10 +564,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesorders/${context.salesorder}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
     }
 
@@ -626,37 +626,37 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.contact && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.account && context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.opportunity && context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.quote && context.salesorder){
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
             let res:any = await Http.getInstance().get(`/salesorders/${context.salesorder}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
     }
 
@@ -673,42 +673,42 @@ export default class SalesOrderServiceBase extends EntityService {
         if(context.account && context.contact && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.contact && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.account && context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.opportunity && context.quote && true){
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         if(context.quote && true){
             let res:any = await Http.getInstance().get(`/quotes/${context.quote}/salesorders/getdraft`,isloading);
             res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/salesorders/getdraft`,isloading);
         res.data.salesorder = data.salesorder;
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
         return res;
     }
 
@@ -739,21 +739,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -769,14 +754,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -792,6 +769,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -807,14 +792,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -830,6 +807,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -845,14 +830,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -868,6 +845,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -883,14 +868,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -906,6 +883,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -921,10 +906,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
             return Http.getInstance().post(`/salesorders/${context.salesorder}/checkkey`,data,isloading);
@@ -957,21 +957,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async GenInvoice(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -987,14 +972,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1010,6 +987,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1025,14 +1010,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1048,6 +1025,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1063,14 +1048,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1086,6 +1063,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1101,14 +1086,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1124,6 +1101,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1139,10 +1124,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/geninvoice`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
         }
             return Http.getInstance().post(`/salesorders/${context.salesorder}/geninvoice`,data,isloading);
@@ -1160,21 +1160,6 @@ export default class SalesOrderServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity && context.quote && context.salesorder){
             let masterData:any = {};
-        let salesorderdetailsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
-            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
-            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
-                salesorderdetailsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.salesorderdetailid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.salesorderdetails = salesorderdetailsData;
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1190,14 +1175,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.contact && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1213,6 +1190,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.contact && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1228,14 +1213,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.account && context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1251,6 +1228,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.account && context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1266,14 +1251,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.opportunity && context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1289,6 +1266,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.opportunity && context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1304,14 +1289,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        if(context.quote && context.salesorder){
-            let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1327,6 +1304,14 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/opportunities/${context.opportunity}/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        if(context.quote && context.salesorder){
+            let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1342,13 +1327,6 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
-            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
-            return res;
-        }
-        let masterData:any = {};
         let salesorderdetailsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
             salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
@@ -1364,6 +1342,13 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.salesorderdetails = salesorderdetailsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/quotes/${context.quote}/salesorders/${context.salesorder}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
+            return res;
+        }
+        let masterData:any = {};
         let invoicesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_invoices'),'undefined')){
             invoicesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_invoices') as any);
@@ -1379,10 +1364,25 @@ export default class SalesOrderServiceBase extends EntityService {
             }
         }
         masterData.invoices = invoicesData;
+        let salesorderdetailsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails'),'undefined')){
+            salesorderdetailsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesorderdetails') as any);
+            if(salesorderdetailsData && salesorderdetailsData.length && salesorderdetailsData.length > 0){
+                salesorderdetailsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.salesorderdetailid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.salesorderdetails = salesorderdetailsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesorders/${context.salesorder}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             this.tempStorage.setItem(context.srfsessionkey+'_invoices',JSON.stringify(res.data.invoices));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesorderdetails',JSON.stringify(res.data.salesorderdetails));
             return res;
     }
 

app_CRM/src/widgets/account/edit-account-info-form/edit-account-info-form.html

@@ -32,28 +32,10 @@
 </i-col>
 <i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.account.edit_accountinfo_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentaccountname.disabled"
-  name='parentaccountname'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='parentaccountid' 
-  :value="data.parentaccountname" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -85,28 +67,10 @@
 </i-col>
 <i-col v-show="detailsModel.defaultpricelevelname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='defaultpricelevelname' :itemRules="this.rules.defaultpricelevelname" class='' :caption="$t('entities.account.edit_accountinfo_form.details.defaultpricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.defaultpricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.defaultpricelevelname.disabled"
-  name='defaultpricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='defaultpricelevelid' 
-  :value="data.defaultpricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/account/main-form/main-form.html

@@ -32,28 +32,10 @@
 </i-col>
 <i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.account.main_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentaccountname.disabled"
-  name='parentaccountname'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='parentaccountid' 
-  :value="data.parentaccountname" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -85,28 +67,10 @@
 </i-col>
 <i-col v-show="detailsModel.defaultpricelevelname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='defaultpricelevelname' :itemRules="this.rules.defaultpricelevelname" class='' :caption="$t('entities.account.main_form.details.defaultpricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.defaultpricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.defaultpricelevelname.disabled"
-  name='defaultpricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='defaultpricelevelid' 
-  :value="data.defaultpricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/account/quick-create-form/quick-create-form.html

@@ -32,28 +32,10 @@
 </i-col>
 <i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.account.quickcreate_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentaccountname.disabled"
-  name='parentaccountname'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='parentaccountid' 
-  :value="data.parentaccountname" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -85,28 +67,10 @@
 </i-col>
 <i-col v-show="detailsModel.defaultpricelevelname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='defaultpricelevelname' :itemRules="this.rules.defaultpricelevelname" class='' :caption="$t('entities.account.quickcreate_form.details.defaultpricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.defaultpricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.defaultpricelevelname.disabled"
-  name='defaultpricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='defaultpricelevelid' 
-  :value="data.defaultpricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/campaign/quick-create-form/quick-create-form.html

@@ -20,28 +20,10 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.campaign.quickcreate_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/competitor-product/edit-comp-pro-form/edit-comp-pro-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entity2name.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='entity2name' :itemRules="this.rules.entity2name" class='' :caption="$t('entities.competitorproduct.edit_comppro_form.details.entity2name')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entity2name.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entity2name.disabled"
-  name='entity2name'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='entity2id' 
-  :value="data.entity2name" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/competitor-sales-literature/sal-lit-comp-form/sal-lit-comp-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entityname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entityname' :itemRules="this.rules.entityname" class='' :caption="$t('entities.competitorsalesliterature.sallitcomp_form.details.entityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entityname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entityname.disabled"
-  name='entityname'
-  deMajorField='competitorname'
-  deKeyField='competitor'
-  :service="service"
-  :acParams="{ serviceName: 'CompetitorService', interfaceName: 'FetchDefault'}"
-  valueitem='entityid' 
-  :value="data.entityname" 
-  editortype="" 
-  :pickupView="{ viewname: 'competitor-pickup-view', title: $t('entities.competitor.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'competitors', parameterName: 'competitor' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/competitor/quick-create-form/quick-create-form.html

@@ -20,28 +20,10 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.competitor.quickcreate_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/connection/main-form/main-form.html

@@ -30,55 +30,19 @@
 </i-col>
 <i-col v-show="detailsModel.record1rolename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='record1rolename' :itemRules="this.rules.record1rolename" class='' :caption="$t('entities.connection.main_form.details.record1rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.record1rolename.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.record1rolename.disabled"
-  name='record1rolename'
-  deMajorField='connectionrolename'
-  deKeyField='connectionrole'
-  :service="service"
-  :acParams="{ serviceName: 'ConnectionRoleService', interfaceName: 'FetchDefault'}"
-  valueitem='record1roleid' 
-  :value="data.record1rolename" 
-  editortype="" 
-  :pickupView="{ viewname: 'connection-role-pickup-view', title: $t('entities.connectionrole.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'connectionroles', parameterName: 'connectionrole' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.record2rolename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='record2rolename' :itemRules="this.rules.record2rolename" class='' :caption="$t('entities.connection.main_form.details.record2rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.record2rolename.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.record2rolename.disabled"
-  name='record2rolename'
-  deMajorField='connectionrolename'
-  deKeyField='connectionrole'
-  :service="service"
-  :acParams="{ serviceName: 'ConnectionRoleService', interfaceName: 'FetchDefault'}"
-  valueitem='record2roleid' 
-  :value="data.record2rolename" 
-  editortype="" 
-  :pickupView="{ viewname: 'connection-role-pickup-view', title: $t('entities.connectionrole.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'connectionroles', parameterName: 'connectionrole' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/contact/book-edit-form/book-edit-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.contact.bookedit_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/contact/edit-abstract-form/edit-abstract-form.html

@@ -20,28 +20,10 @@
 </i-col>
 <i-col v-show="detailsModel.customername.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='customername' :itemRules="this.rules.customername" class='' :caption="$t('entities.contact.edit_abstract_form.details.customername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customername.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.customername.disabled"
-  name='customername'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='customerid' 
-  :value="data.customername" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -192,28 +174,10 @@
     <row>
         <i-col v-show="detailsModel.originatingleadname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='originatingleadname' :itemRules="this.rules.originatingleadname" class='' :caption="$t('entities.contact.edit_abstract_form.details.originatingleadname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.originatingleadname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.originatingleadname.disabled"
-  name='originatingleadname'
-  deMajorField='fullname'
-  deKeyField='lead'
-  :service="service"
-  :acParams="{ serviceName: 'LeadService', interfaceName: 'FetchDefault'}"
-  valueitem='originatingleadid' 
-  :value="data.originatingleadname" 
-  editortype="" 
-  :pickupView="{ viewname: 'lead-pickup-view', title: $t('entities.lead.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'leads', parameterName: 'lead' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -274,28 +238,10 @@
     <row>
         <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.contact.edit_abstract_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/contact/market-edit-form/market-edit-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.originatingleadname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='originatingleadname' :itemRules="this.rules.originatingleadname" class='' :caption="$t('entities.contact.marketedit_form.details.originatingleadname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.originatingleadname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.originatingleadname.disabled"
-  name='originatingleadname'
-  deMajorField='fullname'
-  deKeyField='lead'
-  :service="service"
-  :acParams="{ serviceName: 'LeadService', interfaceName: 'FetchDefault'}"
-  valueitem='originatingleadid' 
-  :value="data.originatingleadname" 
-  editortype="" 
-  :pickupView="{ viewname: 'lead-pickup-view', title: $t('entities.lead.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'leads', parameterName: 'lead' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/contact/quick-create-form/quick-create-form.html

@@ -20,28 +20,10 @@
 </i-col>
 <i-col v-show="detailsModel.customername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='customername' :itemRules="this.rules.customername" class='' :caption="$t('entities.contact.quickcreate_form.details.customername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customername.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.customername.disabled"
-  name='customername'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='customerid' 
-  :value="data.customername" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/goal/edit-child-goal-form/edit-child-goal-form.html

@@ -14,55 +14,19 @@
 </i-col>
 <i-col v-show="detailsModel.parentgoalname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='parentgoalname' :itemRules="this.rules.parentgoalname" class='' :caption="$t('entities.goal.edit_childgoal_form.details.parentgoalname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentgoalname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentgoalname.disabled"
-  name='parentgoalname'
-  deMajorField='title'
-  deKeyField='goal'
-  :service="service"
-  :acParams="{ serviceName: 'GoalService', interfaceName: 'FetchDefault'}"
-  valueitem='parentgoalid' 
-  :value="data.parentgoalname" 
-  editortype="" 
-  :pickupView="{ viewname: 'goal-pickup-view', title: $t('entities.goal.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'goals', parameterName: 'goal' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.metricname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='metricname' :itemRules="this.rules.metricname" class='' :caption="$t('entities.goal.edit_childgoal_form.details.metricname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.metricname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.metricname.disabled"
-  name='metricname'
-  deMajorField='metricname'
-  deKeyField='metric'
-  :service="service"
-  :acParams="{ serviceName: 'MetricService', interfaceName: 'FetchDefault'}"
-  valueitem='metricid' 
-  :value="data.metricname" 
-  editortype="" 
-  :pickupView="{ viewname: 'metric-pickup-view', title: $t('entities.metric.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'metrics', parameterName: 'metric' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/goal/quick-create-form/quick-create-form.html

@@ -14,28 +14,10 @@
 </i-col>
 <i-col v-show="detailsModel.parentgoalname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='parentgoalname' :itemRules="this.rules.parentgoalname" class='' :caption="$t('entities.goal.quickcreate_form.details.parentgoalname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentgoalname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentgoalname.disabled"
-  name='parentgoalname'
-  deMajorField='title'
-  deKeyField='goal'
-  :service="service"
-  :acParams="{ serviceName: 'GoalService', interfaceName: 'FetchDefault'}"
-  valueitem='parentgoalid' 
-  :value="data.parentgoalname" 
-  editortype="" 
-  :pickupView="{ viewname: 'goal-pickup-view', title: $t('entities.goal.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'goals', parameterName: 'goal' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -47,28 +29,10 @@
 </i-col>
 <i-col v-show="detailsModel.metricname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='metricname' :itemRules="this.rules.metricname" class='' :caption="$t('entities.goal.quickcreate_form.details.metricname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.metricname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.metricname.disabled"
-  name='metricname'
-  deMajorField='metricname'
-  deKeyField='metric'
-  :service="service"
-  :acParams="{ serviceName: 'MetricService', interfaceName: 'FetchDefault'}"
-  valueitem='metricid' 
-  :value="data.metricname" 
-  editortype="" 
-  :pickupView="{ viewname: 'metric-pickup-view', title: $t('entities.metric.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'metrics', parameterName: 'metric' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/ibiz-list/abstract-edit-form/abstract-edit-form.html

@@ -52,28 +52,10 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.ibizlist.abstractedit_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/ibiz-list/quick-create-form/quick-create-form.html

@@ -52,28 +52,10 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.ibizlist.quickcreate_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/incident/by-parent-key-form/by-parent-key-form.html

@@ -14,28 +14,10 @@
 </i-col>
 <i-col v-show="detailsModel.subjectname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='subjectname' :itemRules="this.rules.subjectname" class='' :caption="$t('entities.incident.byparentkey_form.details.subjectname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subjectname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.subjectname.disabled"
-  name='subjectname'
-  deMajorField='title'
-  deKeyField='subject'
-  :service="service"
-  :acParams="{ serviceName: 'SubjectService', interfaceName: 'FetchDefault'}"
-  valueitem='subjectid' 
-  :value="data.subjectname" 
-  editortype="" 
-  :pickupView="{ viewname: 'subject-pickup-view', title: $t('entities.subject.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'subjects', parameterName: 'subject' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -61,55 +43,19 @@
 </i-col>
 <i-col v-show="detailsModel.productname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='productname' :itemRules="this.rules.productname" class='' :caption="$t('entities.incident.byparentkey_form.details.productname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.productname.disabled"
-  name='productname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='productid' 
-  :value="data.productname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.entitlementname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entitlementname' :itemRules="this.rules.entitlementname" class='' :caption="$t('entities.incident.byparentkey_form.details.entitlementname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entitlementname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entitlementname.disabled"
-  name='entitlementname'
-  deMajorField='entitlementname'
-  deKeyField='entitlement'
-  :service="service"
-  :acParams="{ serviceName: 'EntitlementService', interfaceName: 'FetchDefault'}"
-  valueitem='entitlementid' 
-  :value="data.entitlementname" 
-  editortype="" 
-  :pickupView="{ viewname: 'entitlement-pickup-view', title: $t('entities.entitlement.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'entitlements', parameterName: 'entitlement' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -121,28 +67,10 @@
 </i-col>
 <i-col v-show="detailsModel.customername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='customername' :itemRules="this.rules.customername" class='' :caption="$t('entities.incident.byparentkey_form.details.customername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customername.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.customername.disabled"
-  name='customername'
-  deMajorField='customername'
-  deKeyField='incidentcustomer'
-  :service="service"
-  :acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
-  valueitem='customerid' 
-  :value="data.customername" 
-  editortype="" 
-  :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], height: 800, placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form.html

@@ -20,28 +20,10 @@
 </i-col>
 <i-col v-show="detailsModel.subjectname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='subjectname' :itemRules="this.rules.subjectname" class='' :caption="$t('entities.incident.edit_childincident_form.details.subjectname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subjectname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.subjectname.disabled"
-  name='subjectname'
-  deMajorField='title'
-  deKeyField='subject'
-  :service="service"
-  :acParams="{ serviceName: 'SubjectService', interfaceName: 'FetchDefault'}"
-  valueitem='subjectid' 
-  :value="data.subjectname" 
-  editortype="" 
-  :pickupView="{ viewname: 'subject-pickup-view', title: $t('entities.subject.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'subjects', parameterName: 'subject' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -67,28 +49,10 @@
 </i-col>
 <i-col v-show="detailsModel.primarycontactname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='primarycontactname' :itemRules="this.rules.primarycontactname" class='' :caption="$t('entities.incident.edit_childincident_form.details.primarycontactname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.primarycontactname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.primarycontactname.disabled"
-  name='primarycontactname'
-  deMajorField='fullname'
-  deKeyField='contact'
-  :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
-  valueitem='primarycontactid' 
-  :value="data.primarycontactname" 
-  editortype="" 
-  :pickupView="{ viewname: 'contact-pickup-view', title: $t('entities.contact.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'contacts', parameterName: 'contact' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -114,55 +78,19 @@
 </i-col>
 <i-col v-show="detailsModel.productname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='productname' :itemRules="this.rules.productname" class='' :caption="$t('entities.incident.edit_childincident_form.details.productname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.productname.disabled"
-  name='productname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='productid' 
-  :value="data.productname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.entitlementname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entitlementname' :itemRules="this.rules.entitlementname" class='' :caption="$t('entities.incident.edit_childincident_form.details.entitlementname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entitlementname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entitlementname.disabled"
-  name='entitlementname'
-  deMajorField='entitlementname'
-  deKeyField='entitlement'
-  :service="service"
-  :acParams="{ serviceName: 'EntitlementService', interfaceName: 'FetchDefault'}"
-  valueitem='entitlementid' 
-  :value="data.entitlementname" 
-  editortype="" 
-  :pickupView="{ viewname: 'entitlement-pickup-view', title: $t('entities.entitlement.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'entitlements', parameterName: 'entitlement' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html

@@ -14,55 +14,19 @@
 </i-col>
 <i-col v-show="detailsModel.subjectname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='subjectname' :itemRules="this.rules.subjectname" class='' :caption="$t('entities.incident.quickcreate_form.details.subjectname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subjectname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.subjectname.disabled"
-  name='subjectname'
-  deMajorField='title'
-  deKeyField='subject'
-  :service="service"
-  :acParams="{ serviceName: 'SubjectService', interfaceName: 'FetchDefault'}"
-  valueitem='subjectid' 
-  :value="data.subjectname" 
-  editortype="" 
-  :pickupView="{ viewname: 'subject-pickup-view', title: $t('entities.subject.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'subjects', parameterName: 'subject' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.customername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='customername' :itemRules="this.rules.customername" class='' :caption="$t('entities.incident.quickcreate_form.details.customername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customername.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.customername.disabled"
-  name='customername'
-  deMajorField='customername'
-  deKeyField='incidentcustomer'
-  :service="service"
-  :acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
-  valueitem='customerid' 
-  :value="data.customername" 
-  editortype="" 
-  :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], height: 800, placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -88,55 +52,19 @@
 </i-col>
 <i-col v-show="detailsModel.productname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='productname' :itemRules="this.rules.productname" class='' :caption="$t('entities.incident.quickcreate_form.details.productname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.productname.disabled"
-  name='productname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='productid' 
-  :value="data.productname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.entitlementname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entitlementname' :itemRules="this.rules.entitlementname" class='' :caption="$t('entities.incident.quickcreate_form.details.entitlementname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entitlementname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entitlementname.disabled"
-  name='entitlementname'
-  deMajorField='entitlementname'
-  deKeyField='entitlement'
-  :service="service"
-  :acParams="{ serviceName: 'EntitlementService', interfaceName: 'FetchDefault'}"
-  valueitem='entitlementid' 
-  :value="data.entitlementname" 
-  editortype="" 
-  :pickupView="{ viewname: 'entitlement-pickup-view', title: $t('entities.entitlement.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'entitlements', parameterName: 'entitlement' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/invoice-detail/main-form/main-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.productname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='productname' :itemRules="this.rules.productname" class='' :caption="$t('entities.invoicedetail.main_form.details.productname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.productname.disabled"
-  name='productname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='productid' 
-  :value="data.productname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -47,28 +29,10 @@
 </i-col>
 <i-col v-show="detailsModel.uomname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='uomname' :itemRules="this.rules.uomname" class='' :caption="$t('entities.invoicedetail.main_form.details.uomname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.uomname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.uomname.disabled"
-  name='uomname'
-  deMajorField='uomname'
-  deKeyField='uom'
-  :service="service"
-  :acParams="{ serviceName: 'UomService', interfaceName: 'FetchDefault'}"
-  valueitem='uomid' 
-  :value="data.uomname" 
-  editortype="" 
-  :pickupView="{ viewname: 'uom-pickup-view', title: $t('entities.uom.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'uoms', parameterName: 'uom' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/invoice/quick-create-form/quick-create-form.html

@@ -20,55 +20,19 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.invoice.quickcreate_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.pricelevelname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='pricelevelname' :itemRules="this.rules.pricelevelname" class='' :caption="$t('entities.invoice.quickcreate_form.details.pricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.pricelevelname.disabled"
-  name='pricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='pricelevelid' 
-  :value="data.pricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/knowledge-article-incident/main-form/main-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.incidentname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='incidentname' :itemRules="this.rules.incidentname" class='' :caption="$t('entities.knowledgearticleincident.main_form.details.incidentname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.incidentname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.incidentname.disabled"
-  name='incidentname'
-  deMajorField='title'
-  deKeyField='incident'
-  :service="service"
-  :acParams="{ serviceName: 'IncidentService', interfaceName: 'FetchDefault'}"
-  valueitem='incidentid' 
-  :value="data.incidentname" 
-  editortype="" 
-  :pickupView="{ viewname: 'incident-pickup-view', title: $t('entities.incident.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidents', parameterName: 'incident' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/knowledge-article/info-knowledge-article-form/info-knowledge-article-form.html

@@ -83,28 +83,10 @@
     <row>
         <i-col v-show="detailsModel.subjectname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='subjectname' :itemRules="this.rules.subjectname" class='' :caption="$t('entities.knowledgearticle.info_knowledgearticle_form.details.subjectname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subjectname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.subjectname.disabled"
-  name='subjectname'
-  deMajorField='title'
-  deKeyField='subject'
-  :service="service"
-  :acParams="{ serviceName: 'SubjectService', interfaceName: 'FetchDefault'}"
-  valueitem='subjectid' 
-  :value="data.subjectname" 
-  editortype="" 
-  :pickupView="{ viewname: 'subject-pickup-view', title: $t('entities.subject.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'subjects', parameterName: 'subject' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/lead-competitor/edit-comp-lead-form/edit-comp-lead-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entity2name.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='entity2name' :itemRules="this.rules.entity2name" class='' :caption="$t('entities.leadcompetitor.edit_complead_form.details.entity2name')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entity2name.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entity2name.disabled"
-  name='entity2name'
-  deMajorField='competitorname'
-  deKeyField='competitor'
-  :service="service"
-  :acParams="{ serviceName: 'CompetitorService', interfaceName: 'FetchDefault'}"
-  valueitem='entity2id' 
-  :value="data.entity2name" 
-  editortype="" 
-  :pickupView="{ viewname: 'competitor-pickup-view', title: $t('entities.competitor.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'competitors', parameterName: 'competitor' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/lead/edit-main-form/edit-main-form.html

@@ -136,28 +136,10 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.lead.edit_main_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -172,28 +154,10 @@
     <row>
         <i-col v-show="detailsModel.campaignname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='campaignname' :itemRules="this.rules.campaignname" class='' :caption="$t('entities.lead.edit_main_form.details.campaignname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.campaignname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.campaignname.disabled"
-  name='campaignname'
-  deMajorField='campaignname'
-  deKeyField='campaign'
-  :service="service"
-  :acParams="{ serviceName: 'CampaignService', interfaceName: 'FetchDefault'}"
-  valueitem='campaignid' 
-  :value="data.campaignname" 
-  editortype="" 
-  :pickupView="{ viewname: 'campaign-pickup-view', title: $t('entities.campaign.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'campaigns', parameterName: 'campaign' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

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

@@ -8,55 +8,19 @@
     <row>
         <i-col v-show="detailsModel.parentcontactname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='parentcontactname' :itemRules="this.rules.parentcontactname" class='' :caption="$t('entities.lead.qualification_form.details.parentcontactname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentcontactname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentcontactname.disabled"
-  name='parentcontactname'
-  deMajorField='fullname'
-  deKeyField='contact'
-  :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
-  valueitem='parentcontactid' 
-  :value="data.parentcontactname" 
-  editortype="" 
-  :pickupView="{ viewname: 'contact-pickup-view', title: $t('entities.contact.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'contacts', parameterName: 'contact' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.lead.qualification_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentaccountname.disabled"
-  name='parentaccountname'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='parentaccountid' 
-  :value="data.parentaccountname" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/list-account/quick-create-by-list-form/quick-create-by-list-form.html

@@ -8,26 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entity2name.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entity2name' :itemRules="this.rules.entity2name" class='' :caption="$t('entities.listaccount.quickcreatebylist_form.details.entity2name')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entity2name.error" :isEmptyCaption="false" labelPos="TOP">
-    
-<app-picker-select-view 
-  :formState="formState" 
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entity2name.disabled" 
-  name='entity2name'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  valueitem='entity2id' 
-  :value="data.entity2name"
-  :pickupView="{ viewname: 'account-inner-pickup-view', title: $t('entities.account.views.innerpickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'innerpickupview', parameterName: 'innerpickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker-select-view>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 177, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/list-lead/quick-create-by-list-form/quick-create-by-list-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entity2name.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entity2name' :itemRules="this.rules.entity2name" class='' :caption="$t('entities.listlead.quickcreatebylist_form.details.entity2name')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entity2name.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entity2name.disabled"
-  name='entity2name'
-  deMajorField='fullname'
-  deKeyField='lead'
-  :service="service"
-  :acParams="{ serviceName: 'LeadService', interfaceName: 'FetchDefault'}"
-  valueitem='entity2id' 
-  :value="data.entity2name" 
-  editortype="" 
-  :pickupView="{ viewname: 'lead-pickup-view', title: $t('entities.lead.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'leads', parameterName: 'lead' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/opportunity-competitor/edit-comp-opp-form/edit-comp-opp-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entityname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='entityname' :itemRules="this.rules.entityname" class='' :caption="$t('entities.opportunitycompetitor.edit_compopp_form.details.entityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entityname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entityname.disabled"
-  name='entityname'
-  deMajorField='opportunityname'
-  deKeyField='opportunity'
-  :service="service"
-  :acParams="{ serviceName: 'OpportunityService', interfaceName: 'FetchDefault'}"
-  valueitem='entityid' 
-  :value="data.entityname" 
-  editortype="" 
-  :pickupView="{ viewname: 'opportunity-pickup-view', title: $t('entities.opportunity.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'opportunities', parameterName: 'opportunity' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/opportunity-competitor/main-form/main-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entity2name.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='entity2name' :itemRules="this.rules.entity2name" class='' :caption="$t('entities.opportunitycompetitor.main_form.details.entity2name')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entity2name.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entity2name.disabled"
-  name='entity2name'
-  deMajorField='competitorname'
-  deKeyField='competitor'
-  :service="service"
-  :acParams="{ serviceName: 'CompetitorService', interfaceName: 'FetchDefault'}"
-  valueitem='entity2id' 
-  :value="data.entity2name" 
-  editortype="" 
-  :pickupView="{ viewname: 'competitor-pickup-view', title: $t('entities.competitor.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'competitors', parameterName: 'competitor' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/opportunity/main-form/main-form.html

@@ -14,55 +14,19 @@
 </i-col>
 <i-col v-show="detailsModel.parentcontactname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='parentcontactname' :itemRules="this.rules.parentcontactname" class='' :caption="$t('entities.opportunity.main_form.details.parentcontactname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentcontactname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentcontactname.disabled"
-  name='parentcontactname'
-  deMajorField='fullname'
-  deKeyField='contact'
-  :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
-  valueitem='parentcontactid' 
-  :value="data.parentcontactname" 
-  editortype="" 
-  :pickupView="{ viewname: 'contact-pickup-view', title: $t('entities.contact.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'contacts', parameterName: 'contact' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.opportunity.main_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentaccountname.disabled"
-  name='parentaccountname'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='parentaccountid' 
-  :value="data.parentaccountname" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -88,28 +52,10 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.opportunity.main_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -174,28 +120,10 @@
     <row>
         <i-col v-show="detailsModel.pricelevelname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='pricelevelname' :itemRules="this.rules.pricelevelname" class='' :caption="$t('entities.opportunity.main_form.details.pricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.pricelevelname.disabled"
-  name='pricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='pricelevelid' 
-  :value="data.pricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/opportunity/quick-create-form/quick-create-form.html

@@ -14,55 +14,19 @@
 </i-col>
 <i-col v-show="detailsModel.parentcontactname.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='parentcontactname' :itemRules="this.rules.parentcontactname" class='' :caption="$t('entities.opportunity.quickcreate_form.details.parentcontactname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentcontactname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentcontactname.disabled"
-  name='parentcontactname'
-  deMajorField='fullname'
-  deKeyField='contact'
-  :service="service"
-  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
-  valueitem='parentcontactid' 
-  :value="data.parentcontactname" 
-  editortype="" 
-  :pickupView="{ viewname: 'contact-pickup-view', title: $t('entities.contact.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'contacts', parameterName: 'contact' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.parentaccountname.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='parentaccountname' :itemRules="this.rules.parentaccountname" class='' :caption="$t('entities.opportunity.quickcreate_form.details.parentaccountname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.parentaccountname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.parentaccountname.disabled"
-  name='parentaccountname'
-  deMajorField='accountname'
-  deKeyField='account'
-  :service="service"
-  :acParams="{ serviceName: 'AccountService', interfaceName: 'FetchDefault'}"
-  valueitem='parentaccountid' 
-  :value="data.parentaccountname" 
-  editortype="" 
-  :pickupView="{ viewname: 'account-pickup-view', title: $t('entities.account.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -88,28 +52,10 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.opportunity.quickcreate_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/product-association/main-form/main-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.associatedproductname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='associatedproductname' :itemRules="this.rules.associatedproductname" class='' :caption="$t('entities.productassociation.main_form.details.associatedproductname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.associatedproductname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.associatedproductname.disabled"
-  name='associatedproductname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='associatedproduct' 
-  :value="data.associatedproductname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -41,28 +23,10 @@
 </i-col>
 <i-col v-show="detailsModel.uomname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='uomname' :itemRules="this.rules.uomname" class='' :caption="$t('entities.productassociation.main_form.details.uomname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.uomname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.uomname.disabled"
-  name='uomname'
-  deMajorField='uomname'
-  deKeyField='uom'
-  :service="service"
-  :acParams="{ serviceName: 'UomService', interfaceName: 'FetchDefault'}"
-  valueitem='uomid' 
-  :value="data.uomname" 
-  editortype="" 
-  :pickupView="{ viewname: 'uom-pickup-view', title: $t('entities.uom.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'uoms', parameterName: 'uom' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/product-price-level/pro-prilv-form/pro-prilv-form.html

@@ -8,136 +8,46 @@
     <row>
         <i-col v-show="detailsModel.productname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='productname' :itemRules="this.rules.productname" class='' :caption="$t('entities.productpricelevel.proprilv_form.details.productname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.productname.disabled"
-  name='productname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='productid' 
-  :value="data.productname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.pricelevelname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='pricelevelname' :itemRules="this.rules.pricelevelname" class='' :caption="$t('entities.productpricelevel.proprilv_form.details.pricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.pricelevelname.disabled"
-  name='pricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='pricelevelid' 
-  :value="data.pricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.uomname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='uomname' :itemRules="this.rules.uomname" class='' :caption="$t('entities.productpricelevel.proprilv_form.details.uomname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.uomname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.uomname.disabled"
-  name='uomname'
-  deMajorField='uomname'
-  deKeyField='uom'
-  :service="service"
-  :acParams="{ serviceName: 'UomService', interfaceName: 'FetchDefault'}"
-  valueitem='uomid' 
-  :value="data.uomname" 
-  editortype="" 
-  :pickupView="{ viewname: 'uom-pickup-view', title: $t('entities.uom.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'uoms', parameterName: 'uom' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.currencyname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='currencyname' :itemRules="this.rules.currencyname" class='' :caption="$t('entities.productpricelevel.proprilv_form.details.currencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.currencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.currencyname.disabled"
-  name='currencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.currencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.discounttypename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='discounttypename' :itemRules="this.rules.discounttypename" class='' :caption="$t('entities.productpricelevel.proprilv_form.details.discounttypename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.discounttypename.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.discounttypename.disabled"
-  name='discounttypename'
-  deMajorField='discounttypename'
-  deKeyField='discounttype'
-  :service="service"
-  :acParams="{ serviceName: 'DiscountTypeService', interfaceName: 'FetchDefault'}"
-  valueitem='discounttypeid' 
-  :value="data.discounttypename" 
-  editortype="" 
-  :pickupView="{ viewname: 'discount-type-pickup-view', title: $t('entities.discounttype.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'discounttypes', parameterName: 'discounttype' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/product-sales-literature/sal-lit-pro-form/sal-lit-pro-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.entityname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entityname' :itemRules="this.rules.entityname" class='' :caption="$t('entities.productsalesliterature.sallitpro_form.details.entityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entityname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entityname.disabled"
-  name='entityname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='entityid' 
-  :value="data.entityname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/product-substitute/main-form/main-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.substitutedproductname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='substitutedproductname' :itemRules="this.rules.substitutedproductname" class='' :caption="$t('entities.productsubstitute.main_form.details.substitutedproductname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.substitutedproductname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.substitutedproductname.disabled"
-  name='substitutedproductname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='substitutedproductid' 
-  :value="data.substitutedproductname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/quote/quick-create-form/quick-create-form.html

@@ -20,55 +20,19 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.quote.quickcreate_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.opportunityname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='opportunityname' :itemRules="this.rules.opportunityname" class='' :caption="$t('entities.quote.quickcreate_form.details.opportunityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.opportunityname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.opportunityname.disabled"
-  name='opportunityname'
-  deMajorField='opportunityname'
-  deKeyField='opportunity'
-  :service="service"
-  :acParams="{ serviceName: 'OpportunityService', interfaceName: 'FetchDefault'}"
-  valueitem='opportunityid' 
-  :value="data.opportunityname" 
-  editortype="" 
-  :pickupView="{ viewname: 'opportunity-pickup-view', title: $t('entities.opportunity.views.pickupview.title'), deResParameters: [{ pathName: 'accounts', parameterName: 'account' }, ], parameters: [{ pathName: 'opportunities', parameterName: 'opportunity' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -80,28 +44,10 @@
 </i-col>
 <i-col v-show="detailsModel.pricelevelname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='pricelevelname' :itemRules="this.rules.pricelevelname" class='' :caption="$t('entities.quote.quickcreate_form.details.pricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.pricelevelname.disabled"
-  name='pricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='pricelevelid' 
-  :value="data.pricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/sales-literature/quick-create-form/quick-create-form.html

@@ -14,28 +14,10 @@
 </i-col>
 <i-col v-show="detailsModel.subjectname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='subjectname' :itemRules="this.rules.subjectname" class='' :caption="$t('entities.salesliterature.quickcreate_form.details.subjectname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.subjectname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.subjectname.disabled"
-  name='subjectname'
-  deMajorField='title'
-  deKeyField='subject'
-  :service="service"
-  :acParams="{ serviceName: 'SubjectService', interfaceName: 'FetchDefault'}"
-  valueitem='subjectid' 
-  :value="data.subjectname" 
-  editortype="" 
-  :pickupView="{ viewname: 'subject-pickup-view', title: $t('entities.subject.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'subjects', parameterName: 'subject' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/sales-order-detail/soproduct-edit-form/soproduct-edit-form.html

@@ -8,28 +8,10 @@
     <row>
         <i-col v-show="detailsModel.productname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='productname' :itemRules="this.rules.productname" class='' :caption="$t('entities.salesorderdetail.soproductedit_form.details.productname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.productname.disabled"
-  name='productname'
-  deMajorField='productname'
-  deKeyField='product'
-  :service="service"
-  :acParams="{ serviceName: 'ProductService', interfaceName: 'FetchDefault'}"
-  valueitem='productid' 
-  :value="data.productname" 
-  editortype="" 
-  :pickupView="{ viewname: 'product-pickup-view', title: $t('entities.product.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'products', parameterName: 'product' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
@@ -47,28 +29,10 @@
 </i-col>
 <i-col v-show="detailsModel.uomname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='uomname' :itemRules="this.rules.uomname" class='' :caption="$t('entities.salesorderdetail.soproductedit_form.details.uomname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.uomname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.uomname.disabled"
-  name='uomname'
-  deMajorField='uomname'
-  deKeyField='uom'
-  :service="service"
-  :acParams="{ serviceName: 'UomService', interfaceName: 'FetchDefault'}"
-  valueitem='uomid' 
-  :value="data.uomname" 
-  editortype="" 
-  :pickupView="{ viewname: 'uom-pickup-view', title: $t('entities.uom.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'uoms', parameterName: 'uom' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/sales-order/quick-create-form/quick-create-form.html

@@ -20,55 +20,19 @@
 </i-col>
 <i-col v-show="detailsModel.transactioncurrencyname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='transactioncurrencyname' :itemRules="this.rules.transactioncurrencyname" class='' :caption="$t('entities.salesorder.quickcreate_form.details.transactioncurrencyname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.transactioncurrencyname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.transactioncurrencyname.disabled"
-  name='transactioncurrencyname'
-  deMajorField='currencyname'
-  deKeyField='transactioncurrency'
-  :service="service"
-  :acParams="{ serviceName: 'TransactionCurrencyService', interfaceName: 'FetchDefault'}"
-  valueitem='transactioncurrencyid' 
-  :value="data.transactioncurrencyname" 
-  editortype="" 
-  :pickupView="{ viewname: 'transaction-currency-pickup-view', title: $t('entities.transactioncurrency.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'transactioncurrencies', parameterName: 'transactioncurrency' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.pricelevelname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='pricelevelname' :itemRules="this.rules.pricelevelname" class='' :caption="$t('entities.salesorder.quickcreate_form.details.pricelevelname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pricelevelname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.pricelevelname.disabled"
-  name='pricelevelname'
-  deMajorField='pricelevelname'
-  deKeyField='pricelevel'
-  :service="service"
-  :acParams="{ serviceName: 'PriceLevelService', interfaceName: 'FetchDefault'}"
-  valueitem='pricelevelid' 
-  :value="data.pricelevelname" 
-  editortype="" 
-  :pickupView="{ viewname: 'price-level-pickup-view', title: $t('entities.pricelevel.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'pricelevels', parameterName: 'pricelevel' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

app_CRM/src/widgets/task/quick-create-form/quick-create-form.html

@@ -20,28 +20,10 @@
 </i-col>
 <i-col v-show="detailsModel.ownername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='ownername' :itemRules="this.rules.ownername" class='' :caption="$t('entities.task.quickcreate_form.details.ownername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.ownername.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.ownername.disabled"
-  name='ownername'
-  deMajorField='pickdataname'
-  deKeyField='multipickdata'
-  :service="service"
-  :acParams="{ serviceName: 'MultiPickDataService', interfaceName: 'FetchAC'}"
-  valueitem='ownerid' 
-  :value="data.ownername" 
-  editortype="" 
-  :pickupView="{ viewname: 'multi-pick-data-ac', title: $t('entities.multipickdata.views.ac.title'), deResParameters: [], parameters: [{ pathName: 'multipickdata', parameterName: 'multipickdata' }, { pathName: 'ac', parameterName: 'ac' } ], width: 1024, placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+    !!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${editor.getEditorParams()}  [in template "TEMPLCODE_zh_CN" at line 175, column 18]
+----
 </app-form-item>
 
 </i-col>

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

@@ -4769,7 +4769,7 @@
 
 
     <!--输出实体[INCIDENT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-94-59">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-96-59">
         <createTable tableName="INCIDENT">
                 <column name="LASTONHOLDTIME" remarks="" type="DATETIME">
                 </column>
@@ -11357,43 +11357,43 @@
        <addForeignKeyConstraint baseColumnNames="RESOURCESPECID" baseTableName="SERVICE" constraintName="DER1N_SERVICE__RESOURCESPEC__R" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="RESOURCESPECID" referencedTableName="RESOURCESPEC" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-260">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__PRIMA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-261">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-261">
        <addForeignKeyConstraint baseColumnNames="RESPONSIBLECONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__RESPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-262">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-262">
        <addForeignKeyConstraint baseColumnNames="CONTRACTDETAILID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACTDETAIL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTDETAILID" referencedTableName="CONTRACTDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-263">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-263">
        <addForeignKeyConstraint baseColumnNames="CONTRACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACT__CONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTID" referencedTableName="CONTRACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-264">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-264">
        <addForeignKeyConstraint baseColumnNames="ENTITLEMENTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__ENTITLEMENT__E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ENTITLEMENTID" referencedTableName="ENTITLEMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-265">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-265">
        <addForeignKeyConstraint baseColumnNames="EXISTINGCASE" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__EXIS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-266">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-266">
        <addForeignKeyConstraint baseColumnNames="MASTERID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__MAST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-267">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-267">
        <addForeignKeyConstraint baseColumnNames="PARENTCASEID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__PARE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-268">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-268">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__PRODUCT__PRODU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-269">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-269">
        <addForeignKeyConstraint baseColumnNames="FIRSTRESPONSEBYKPIID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLAKPIINSTANCE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAKPIINSTANCEID" referencedTableName="SLAKPIINSTANCE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-271">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-271">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-272">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-272">
        <addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SUBJECT__SUBJE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-94-273">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-96-273">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__TRANSACTIONCUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENTCUSTOMER]外键关系 -->