lab_gzf 发布系统代码

app_CRM/src/locale/lanres/entities/quote/quote_en_US.ts

@@ -209,9 +209,6 @@ export default {
 			shippingmethodcode: "送货方式", 
 			shipto_postalcode: "送货地的邮政编码", 
 			willcall: "送货地址", 
-			transactioncurrencyid: "货币", 
-			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 			quoteid: "报价单", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/quote/quote_zh_CN.ts

@@ -208,9 +208,6 @@ export default {
 			shippingmethodcode: "送货方式", 
 			shipto_postalcode: "送货地的邮政编码", 
 			willcall: "送货地址", 
-			transactioncurrencyid: "货币", 
-			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 			quoteid: "报价单", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/sales-literature/sales-literature_en_US.ts

@@ -77,7 +77,6 @@ export default {
 			subjectname: "主题", 
 			literaturetypecode: "类型", 
 			description: "说明", 
-			subjectid: "主题", 
 			salesliteratureid: "销售宣传资料", 
 		},
 		uiactions: {

app_CRM/src/locale/lanres/entities/sales-literature/sales-literature_zh_CN.ts

@@ -76,7 +76,6 @@ export default {
 			subjectname: "主题", 
 			literaturetypecode: "类型", 
 			description: "说明", 
-			subjectid: "主题", 
 			salesliteratureid: "销售宣传资料", 
 		},
 		uiactions: {

app_CRM/src/pages/finance/invoice-detail-invoice-pro-grid-view/invoice-detail-invoice-pro-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class InvoiceDetailInvoiceProGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'invoicedetails', parameterName: 'invoicedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'invoice-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.invoicedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class InvoiceDetailInvoiceProGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'invoicedetails', parameterName: 'invoicedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'invoice-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.invoicedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/product/product-association-grid-view/product-association-grid-view-base.tsx

@@ -440,16 +440,27 @@ export class ProductAssociationGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productassociations', parameterName: 'productassociation' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'product-association-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productassociation.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -479,14 +490,27 @@ export class ProductAssociationGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productassociations', parameterName: 'productassociation' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'product-association-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productassociation.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/product/product-price-level-pro-prilv-grid-view/product-price-level-pro-prilv-grid-view-base.tsx

@@ -440,16 +440,27 @@ export class ProductPriceLevelProPrilvGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productpricelevels', parameterName: 'productpricelevel' },
-            { pathName: 'proprilveditview', parameterName: 'proprilveditview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'product-price-level-pro-prilv-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productpricelevel.views.proprilveditview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -479,14 +490,27 @@ export class ProductPriceLevelProPrilvGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productpricelevels', parameterName: 'productpricelevel' },
-            { pathName: 'proprilveditview', parameterName: 'proprilveditview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'product-price-level-pro-prilv-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productpricelevel.views.proprilveditview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/product/product-substitute-grid-view/product-substitute-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class ProductSubstituteGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productsubstitutes', parameterName: 'productsubstitute' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'product-substitute-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productsubstitute.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class ProductSubstituteGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'productsubstitutes', parameterName: 'productsubstitute' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'product-substitute-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.productsubstitute.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/quote-detail-quo-detail-grid-view/quote-detail-quo-detail-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class QuoteDetailQuoDetailGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'quotedetails', parameterName: 'quotedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'quote-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.quotedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class QuoteDetailQuoDetailGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'quotedetails', parameterName: 'quotedetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'quote-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.quotedetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class SalesLiteratureItemGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesliteratureitems', parameterName: 'salesliteratureitem' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'sales-literature-item-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesliteratureitem.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class SalesLiteratureItemGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesliteratureitems', parameterName: 'salesliteratureitem' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'sales-literature-item-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesliteratureitem.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view.html

 <studio-view-style2 viewName="salesliteratureitemgridview" viewTitle="销售附件表格视图" class='degridview sales-literature-item-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/sales/sales-order-detail-soproduct-grid-view/sales-order-detail-soproduct-grid-view-base.tsx

@@ -441,16 +441,27 @@ export class SalesOrderDetailSOProductGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesorderdetails', parameterName: 'salesorderdetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'sales-order-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesorderdetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 
@@ -480,14 +491,27 @@ export class SalesOrderDetailSOProductGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'salesorderdetails', parameterName: 'salesorderdetail' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openPopupModal = (view: any, data: any) => {
+            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'sales-order-detail-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.salesorderdetail.views.editview.title'),
+        };
+        openPopupModal(view, data);
     }
 
 

app_CRM/src/pages/sales/sales-order-summary-view/sales-order-summary-view.html

 <studio-view-style2 viewName="salesordersummaryview" viewTitle="订单数据看板视图" class='deportalview sales-order-summary-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <view_dashboard 
                     :viewState="viewState"  
                     :viewparams="viewparams" 

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

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

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

@@ -66,36 +66,36 @@ 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) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -120,42 +120,42 @@ export default class ContactServiceBase extends EntityService {
             }
             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+'_leads',JSON.stringify(res.data.leads));
             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);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -180,8 +180,8 @@ 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+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
@@ -198,36 +198,36 @@ 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) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -245,42 +245,42 @@ 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+'_leads',JSON.stringify(res.data.leads));
             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);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -298,8 +298,8 @@ export default class ContactServiceBase extends EntityService {
         masterData.listcontacts = listcontactsData;
         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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
@@ -332,14 +332,14 @@ 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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
@@ -357,15 +357,15 @@ 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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
@@ -382,36 +382,36 @@ 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) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -429,8 +429,8 @@ 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}/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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
@@ -449,36 +449,36 @@ 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) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -496,42 +496,42 @@ 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+'_leads',JSON.stringify(res.data.leads));
             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);
-            if(leadsData && leadsData.length && leadsData.length > 0){
-                leadsData.forEach((item:any) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -549,8 +549,8 @@ export default class ContactServiceBase extends EntityService {
         masterData.listcontacts = listcontactsData;
         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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
@@ -567,36 +567,36 @@ 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) => {
+        let opportunitiesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunities'),'undefined')){
+            opportunitiesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunities') as any);
+            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
+                opportunitiesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.leadid = null;
+                            item.opportunityid = 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);
-            if(opportunitiesData && opportunitiesData.length && opportunitiesData.length > 0){
-                opportunitiesData.forEach((item:any) => {
+        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.opportunityid = null;
+                            item.leadid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunities = opportunitiesData;
+        masterData.leads = leadsData;
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -614,8 +614,8 @@ 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}/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+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }

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

@@ -69,21 +69,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && true){
             let masterData:any = {};
-        let 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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -99,21 +99,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -123,28 +123,28 @@ export default class OpportunityServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -160,21 +160,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -184,27 +184,27 @@ 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+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -220,21 +220,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -244,9 +244,9 @@ export default class OpportunityServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         return res;
     }
 
@@ -262,21 +262,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let 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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -292,45 +292,45 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -346,44 +346,44 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -399,26 +399,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
     }
 
@@ -453,22 +453,22 @@ export default class OpportunityServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
     }
 
@@ -485,24 +485,24 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
         return res;
     }
 
@@ -518,21 +518,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let 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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -548,45 +548,45 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -602,26 +602,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/checkkey`,data,isloading);
@@ -639,21 +639,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Lose(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let 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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -669,45 +669,45 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -723,26 +723,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/lose`,data,isloading);
@@ -760,21 +760,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let 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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -790,45 +790,45 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -844,44 +844,44 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -897,26 +897,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
     }
 
@@ -932,21 +932,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Win(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
-        let 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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -962,45 +962,45 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             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 opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.opportunityproductid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunitycompetitors = opportunitycompetitorsData;
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1016,26 +1016,26 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.quotes = quotesData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item: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.opportunityproductid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.opportunityproducts = opportunityproductsData;
+        masterData.opportunitycompetitors = opportunitycompetitorsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/win`,data,isloading);

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

@@ -77,36 +77,36 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productassociations = productassociationsData;
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        let productpricelevelsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
+            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
+            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
+                productpricelevelsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productpricelevelid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productpricelevelid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productpricelevels = productpricelevelsData;
+        masterData.productsubstitutes = productsubstitutesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -117,8 +117,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+'_productassociations',JSON.stringify(res.data.productassociations));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         return res;
     }
 
@@ -148,41 +148,41 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productassociations = productassociationsData;
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        let productpricelevelsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
+            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
+            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
+                productpricelevelsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productpricelevelid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productpricelevelid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productpricelevels = productpricelevelsData;
+        masterData.productsubstitutes = productsubstitutesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/products/${context.product}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             return res;
     }
 
@@ -211,8 +211,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+'_productassociations',JSON.stringify(res.data.productassociations));
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             return res;
     }
 
@@ -229,8 +229,8 @@ export default class ProductServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/products/getdraft`,isloading);
         res.data.product = data.product;
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
         return res;
     }
 
@@ -273,41 +273,41 @@ export default class ProductServiceBase extends EntityService {
             }
         }
         masterData.productassociations = productassociationsData;
-        let productsubstitutesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes'),'undefined')){
-            productsubstitutesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsubstitutes') as any);
-            if(productsubstitutesData && productsubstitutesData.length && productsubstitutesData.length > 0){
-                productsubstitutesData.forEach((item:any) => {
+        let productpricelevelsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels'),'undefined')){
+            productpricelevelsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productpricelevels') as any);
+            if(productpricelevelsData && productpricelevelsData.length && productpricelevelsData.length > 0){
+                productpricelevelsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productsubstituteid = null;
+                            item.productpricelevelid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        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) => {
+        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) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.productpricelevelid = null;
+                            item.productsubstituteid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.productpricelevels = productpricelevelsData;
+        masterData.productsubstitutes = productsubstitutesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/products/${context.product}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_productassociations',JSON.stringify(res.data.productassociations));
-            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             this.tempStorage.setItem(context.srfsessionkey+'_productpricelevels',JSON.stringify(res.data.productpricelevels));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsubstitutes',JSON.stringify(res.data.productsubstitutes));
             return res;
     }
 

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

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

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

@@ -543,9 +543,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '8b806fb12589b2fc17d1bb90f4b5422e',
-                'da3f8c1f20f440f3df54d6c13a8de586',
-                '6debde861c6e6f91eeb442cb869e9737',
             ],
         },
         {
@@ -1244,7 +1241,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'e52af970c14fd89546ac8ccaecab460c',
                 '1bc1e98908024887f7476018b9e314d1',
             ],
         },

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

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-envelope-o',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '商机'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/invoice/board-dashboard/board-dashboard.html

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_CRM/src/widgets/invoice/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/invoice/view-inv-info-portlet/view-inv-info-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_InvInfoPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/invoice/view-inv-info-portlet/view-inv-info-portlet.html

-<div class='portlet view-inv-info ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-inv-info ' :style="{}">
         <p class='portlet-title'>
             <span>
             

app_CRM/src/widgets/product/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '捆绑销售产品'),
                     h('Badge', {
                         props: {
@@ -49,6 +61,12 @@
         <tab-pane :index="2" name='tabviewpanel3' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-money',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '价目表项'),
                     h('Badge', {
                         props: {
@@ -72,6 +90,12 @@
         <tab-pane :index="3" name='tabviewpanel4' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cubes',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品关系'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/quote/abstract-info-dashboard/abstract-info-dashboard.html

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-base.tsx

@@ -74,9 +74,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
         shippingmethodcode: null,
         shipto_postalcode: null,
         willcall: null,
-        transactioncurrencyid: null,
-        opportunityid: null,
-        pricelevelid: null,
         quoteid: null,
         quote:null,
     };
@@ -88,22 +85,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
      * @memberof AbstractInfoEditFormBase
      */
     public rules: any = {
-        quotenumber: [
-            { required: true, type: 'string', message: '报价单 ID 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '报价单 ID 值不能为空', trigger: 'blur' },
-        ],
-        quotename: [
-            { required: true, type: 'string', message: '报价名称 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '报价名称 值不能为空', trigger: 'blur' },
-        ],
-        customerid: [
-            { required: true, type: 'string', message: '潜在客户 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '潜在客户 值不能为空', trigger: 'blur' },
-        ],
-        statecode: [
-            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'change' },
-            { required: true, type: 'number', message: '状态 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**
@@ -173,12 +154,6 @@ export class AbstractInfoEditFormBase extends EditFormControlBase {
 
         willcall: new FormItemModel({ caption: '送货地址', detailType: 'FORMITEM', name: 'willcall', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        transactioncurrencyid: new FormItemModel({ caption: '货币', detailType: 'FORMITEM', name: 'transactioncurrencyid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        opportunityid: new FormItemModel({ caption: '商机', detailType: 'FORMITEM', name: 'opportunityid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
-        pricelevelid: new FormItemModel({ caption: '价目表', detailType: 'FORMITEM', name: 'pricelevelid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
         quoteid: new FormItemModel({ caption: '报价单', detailType: 'FORMITEM', name: 'quoteid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
 
     };

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-model.ts

@@ -148,21 +148,6 @@ export default class AbstractInfoModel {
         prop: 'willcall',
         dataType: 'YESNO',
       },
-      {
-        name: 'transactioncurrencyid',
-        prop: 'transactioncurrencyid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'opportunityid',
-        prop: 'opportunityid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'pricelevelid',
-        prop: 'pricelevelid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'quoteid',
         prop: 'quoteid',

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form-service.ts

@@ -2,9 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import QuoteService from '@/service/quote/quote-service';
 import AbstractInfoModel from './abstract-info-form-model';
-import TransactionCurrencyService from '@/service/transaction-currency/transaction-currency-service';
-import OpportunityService from '@/service/opportunity/opportunity-service';
-import PriceLevelService from '@/service/price-level/price-level-service';
 
 
 /**
@@ -44,30 +41,6 @@ export default class AbstractInfoService extends ControlService {
         this.model = new AbstractInfoModel();
     }
 
-    /**
-     * 货币服务对象
-     *
-     * @type {TransactionCurrencyService}
-     * @memberof AbstractInfoService
-     */
-    public transactioncurrencyService: TransactionCurrencyService = new TransactionCurrencyService();
-
-    /**
-     * 商机服务对象
-     *
-     * @type {OpportunityService}
-     * @memberof AbstractInfoService
-     */
-    public opportunityService: OpportunityService = new OpportunityService();
-
-    /**
-     * 价目表服务对象
-     *
-     * @type {PriceLevelService}
-     * @memberof AbstractInfoService
-     */
-    public pricelevelService: PriceLevelService = new PriceLevelService();
-
     /**
      * 处理数据
      *
@@ -107,15 +80,6 @@ export default class AbstractInfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'TransactionCurrencyService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.transactioncurrencyService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'transactioncurrencyid', 'transactioncurrency');
-        }
-        if (Object.is(serviceName, 'OpportunityService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.opportunityService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'opportunityid', 'opportunity');
-        }
-        if (Object.is(serviceName, 'PriceLevelService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.pricelevelService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'pricelevelid', 'pricelevel');
-        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/quote/abstract-info-form/abstract-info-form.html

-<i-form :model="this.data" class='app-form' ref='form'  id='quote_abstractinfo' style="">
+<i-form :model="this.data" class='app-form info-form-mode' ref='form'  id='quote_abstractinfo' style="">
     <input style="display:none;" />
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.quote.abstractinfo_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.quote.abstractinfo_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.quotenumber.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='quotenumber' :itemRules="this.rules.quotenumber" class='' :caption="$t('entities.quote.abstractinfo_form.details.quotenumber')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.quotenumber.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.quotenumber"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.quotenumber.disabled" type='text'  style=""></input-box>
+    
+<app-span name='quotenumber' :value="data.quotenumber" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.quotename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='quotename' :itemRules="this.rules.quotename" class='' :caption="$t('entities.quote.abstractinfo_form.details.quotename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.quotename.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.quotename"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.quotename.disabled" type='text'  style=""></input-box>
+    
+<app-span name='quotename' :value="data.quotename" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </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.quote.abstractinfo_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>
-
+<app-span name='transactioncurrencyname' :value="data.transactioncurrencyname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.opportunityname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='opportunityname' :itemRules="this.rules.opportunityname" class='' :caption="$t('entities.quote.abstractinfo_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: 'contacts', parameterName: 'contact' }, ], parameters: [{ pathName: 'opportunities', parameterName: 'opportunity' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+<app-span name='opportunityname' :value="data.opportunityname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.customerid.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='customerid' :itemRules="this.rules.customerid" class='' :caption="$t('entities.quote.abstractinfo_form.details.customerid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customerid.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.customerid"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.customerid.disabled" type='text'  style=""></input-box>
+    
+<app-span name='customerid' :value="data.customerid" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </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.quote.abstractinfo_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>
-
+<app-span name='pricelevelname' :value="data.pricelevelname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.statecode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='statecode' :itemRules="this.rules.statecode" class='' :caption="$t('entities.quote.abstractinfo_form.details.statecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.statecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.statecode" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.statecode.disabled"  
-    tag='Quote__StateCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='statecode' :value="data.statecode" tag='Quote__StateCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.description.visible" :style="{}"  :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.quote.abstractinfo_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.description"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.description.disabled" type='text'  style=""></input-box>
+    
+<app-span name='description' :value="data.description" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -134,47 +67,26 @@
 
 </i-col>
 <i-col v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.quote.abstractinfo_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.quote.abstractinfo_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.paymenttermscode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='paymenttermscode' :itemRules="this.rules.paymenttermscode" class='' :caption="$t('entities.quote.abstractinfo_form.details.paymenttermscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.paymenttermscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.paymenttermscode" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.paymenttermscode.disabled"  
-    tag='Quote__PaymentTermsCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='paymenttermscode' :value="data.paymenttermscode" tag='Quote__PaymentTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.freighttermscode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='freighttermscode' :itemRules="this.rules.freighttermscode" class='' :caption="$t('entities.quote.abstractinfo_form.details.freighttermscode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.freighttermscode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.freighttermscode" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.freighttermscode.disabled"  
-    tag='Quote__FreightTermsCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='freighttermscode' :value="data.freighttermscode" tag='Quote__FreightTermsCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.billto_postalcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='billto_postalcode' :itemRules="this.rules.billto_postalcode" class='' :caption="$t('entities.quote.abstractinfo_form.details.billto_postalcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.billto_postalcode.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.billto_postalcode"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.billto_postalcode.disabled" type='text'  style=""></input-box>
+    
+<app-span name='billto_postalcode' :value="data.billto_postalcode" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -186,68 +98,50 @@
 </i-col>
 <i-col v-show="detailsModel.billto_country.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='billto_country' :itemRules="this.rules.billto_country" class='' :caption="$t('entities.quote.abstractinfo_form.details.billto_country')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.billto_country.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.billto_country"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.billto_country.disabled" type='text'  style=""></input-box>
+    
+<app-span name='billto_country' :value="data.billto_country" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.billto_stateorprovince.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='billto_stateorprovince' :itemRules="this.rules.billto_stateorprovince" class='' :caption="$t('entities.quote.abstractinfo_form.details.billto_stateorprovince')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.billto_stateorprovince.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.billto_stateorprovince"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.billto_stateorprovince.disabled" type='text'  style=""></input-box>
+    
+<app-span name='billto_stateorprovince' :value="data.billto_stateorprovince" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.billto_city.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='billto_city' :itemRules="this.rules.billto_city" class='' :caption="$t('entities.quote.abstractinfo_form.details.billto_city')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.billto_city.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.billto_city"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.billto_city.disabled" type='text'  style=""></input-box>
+    
+<app-span name='billto_city' :value="data.billto_city" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.billto_line1.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='billto_line1' :itemRules="this.rules.billto_line1" class='' :caption="$t('entities.quote.abstractinfo_form.details.billto_line1')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.billto_line1.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.billto_line1"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.billto_line1.disabled" type='text'  style=""></input-box>
+    
+<app-span name='billto_line1' :value="data.billto_line1" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.shippingmethodcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='shippingmethodcode' :itemRules="this.rules.shippingmethodcode" class='' :caption="$t('entities.quote.abstractinfo_form.details.shippingmethodcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shippingmethodcode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.shippingmethodcode" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.shippingmethodcode.disabled"  
-    tag='Quote__ShippingMethodCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='Quote__ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.shipto_postalcode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='shipto_postalcode' :itemRules="this.rules.shipto_postalcode" class='' :caption="$t('entities.quote.abstractinfo_form.details.shipto_postalcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shipto_postalcode.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.shipto_postalcode"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.shipto_postalcode.disabled" type='text'  style=""></input-box>
+    
+<app-span name='shipto_postalcode' :value="data.shipto_postalcode" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.willcall.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='willcall' :itemRules="this.rules.willcall" class='' :caption="$t('entities.quote.abstractinfo_form.details.willcall')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.willcall.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-  v-model="data.willcall" 
-  :data="data" 
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.willcall.disabled" 
-  style="width:100px;width: 100px;" 
-  tag='YesNo' 
-  codelistType='STATIC'
-  placeholder='请选择...'>
- </dropdown-list>
+<app-span name='willcall' :value="data.willcall" tag='YesNo' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>

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

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infotabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '报价单明细'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/quote/view-quo-abs-portlet/view-quo-abs-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_QuoAbsPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/quote/view-quo-abs-portlet/view-quo-abs-portlet.html

-<div class='portlet view-quo-abs ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-quo-abs ' :style="{}">
         <div class="portlet-without-title">
         <quote-info-abstract :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></quote-info-abstract>
         </div>

app_CRM/src/widgets/sales-literature/info-form/info-form-base.tsx

@@ -68,7 +68,6 @@ export class InfoEditFormBase extends EditFormControlBase {
         subjectname: null,
         literaturetypecode: null,
         description: null,
-        subjectid: null,
         salesliteratureid: null,
         salesliterature:null,
     };
@@ -80,10 +79,6 @@ export class InfoEditFormBase extends EditFormControlBase {
      * @memberof InfoEditFormBase
      */
     public rules: any = {
-        salesliteraturename: [
-            { required: true, type: 'string', message: '标题 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '标题 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**
@@ -125,8 +120,6 @@ export class InfoEditFormBase extends EditFormControlBase {
 
         description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        subjectid: new FormItemModel({ caption: '主题', detailType: 'FORMITEM', name: 'subjectid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
         salesliteratureid: new FormItemModel({ caption: '销售宣传资料', detailType: 'FORMITEM', name: 'salesliteratureid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
 
     };

app_CRM/src/widgets/sales-literature/info-form/info-form-model.ts

@@ -75,11 +75,6 @@ export default class InfoModel {
         prop: 'description',
         dataType: 'TEXT',
       },
-      {
-        name: 'subjectid',
-        prop: 'subjectid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'salesliteratureid',
         prop: 'salesliteratureid',

app_CRM/src/widgets/sales-literature/info-form/info-form-service.ts

@@ -2,7 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import SalesLiteratureService from '@/service/sales-literature/sales-literature-service';
 import InfoModel from './info-form-model';
-import SubjectService from '@/service/subject/subject-service';
 
 
 /**
@@ -42,14 +41,6 @@ export default class InfoService extends ControlService {
         this.model = new InfoModel();
     }
 
-    /**
-     * 主题服务对象
-     *
-     * @type {SubjectService}
-     * @memberof InfoService
-     */
-    public subjectService: SubjectService = new SubjectService();
-
     /**
      * 处理数据
      *
@@ -89,9 +80,6 @@ export default class InfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'SubjectService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.subjectService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'subjectid', 'subject');
-        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/sales-literature/info-form/info-form.html

-<i-form :model="this.data" class='app-form' ref='form'  id='salesliterature_info' style="">
+<i-form :model="this.data" class='app-form info-form-mode' ref='form'  id='salesliterature_info' style="">
     <input style="display:none;" />
     <row >
             
 <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.salesliterature.info_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.salesliterature.info_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.salesliteraturename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='salesliteraturename' :itemRules="this.rules.salesliteraturename" class='' :caption="$t('entities.salesliterature.info_form.details.salesliteraturename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.salesliteraturename.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.salesliteraturename"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.salesliteraturename.disabled" type='text'  style=""></input-box>
+    
+<app-span name='salesliteraturename' :value="data.salesliteraturename" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <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.salesliterature.info_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>
-
+<app-span name='subjectname' :value="data.subjectname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.literaturetypecode.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='literaturetypecode' :itemRules="this.rules.literaturetypecode" class='' :caption="$t('entities.salesliterature.info_form.details.literaturetypecode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.literaturetypecode.error" :isEmptyCaption="false" labelPos="LEFT">
     
- <dropdown-list 
-    v-model="data.literaturetypecode" 
-    :data="data" 
-    :context="context"
-    :viewparams="viewparams"
-    :localContext ='{ }' 
-    :localParam ='{ }' 
-    :disabled="detailsModel.literaturetypecode.disabled"  
-    tag='Salesliterature__LiteratureTypeCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='literaturetypecode' :value="data.literaturetypecode" tag='Salesliterature__LiteratureTypeCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.description.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.salesliterature.info_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.description"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.description.disabled" type='text'  style=""></input-box>
+    
+<app-span name='description' :value="data.description" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -68,7 +39,7 @@
 
 </i-col>
 <i-col v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.salesliterature.info_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.salesliterature.info_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.druipart1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-druipart

app_CRM/src/widgets/sales-literature/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品'),
                     h('Badge', {
                         props: {
@@ -49,6 +61,12 @@
         <tab-pane :index="2" name='tabviewpanel3' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-user-secret',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '竞争对手'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/sales-literature/sal-lit-info-dashboard/sal-lit-info-dashboard.html

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_CRM/src/widgets/sales-literature/view-sal-lit-info-portlet/view-sal-lit-info-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_SalLitInfoPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/sales-literature/view-sal-lit-info-portlet/view-sal-lit-info-portlet.html

-<div class='portlet view-sal-lit-info ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-sal-lit-info ' :style="{}">
         <div class="portlet-without-title">
         <sales-literature-info-sal-lit-view :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></sales-literature-info-sal-lit-view>
         </div>

app_CRM/src/widgets/sales-order/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -3,6 +3,12 @@
         <tab-pane :index="0" name='tabviewpanel' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-info-circle',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '概览'),
                     h('Badge', {
                         props: {
@@ -26,6 +32,12 @@
         <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
+                    h('i',{
+                        class:'fa fa-cube',
+                        style:{
+                            'margin-right' : '2px'
+                        }
+                    }),
                     h('span', '产品'),
                     h('Badge', {
                         props: {

app_CRM/src/widgets/sales-order/soinfo-dashboard/soinfo-dashboard.html

@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_CRM/src/widgets/sales-order/view-soinfo-portlet/view-soinfo-portlet-base.tsx

@@ -100,7 +100,7 @@ export class View_SOInfoPortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_CRM/src/widgets/sales-order/view-soinfo-portlet/view-soinfo-portlet.html

-<div class='portlet view-soinfo ' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
+<div class='portlet view-soinfo ' :style="{}">
         <div class="portlet-without-title">
         <sales-order-info-soview :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></sales-order-info-soview>
         </div>

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[PRODUCTASSOCIATION]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-productassociation-19-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-productassociation-20-1">
         <createTable tableName="PRODUCTASSOCIATION">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -474,7 +474,7 @@
 
 
     <!--输出实体[QUOTEDETAIL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-quotedetail-16-8">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-quotedetail-18-8">
         <createTable tableName="QUOTEDETAIL">
                 <column name="OWNERIDTYPE" remarks="" type="VARCHAR(100)">
                 </column>
@@ -1298,7 +1298,7 @@
 
 
     <!--输出实体[SALESLITERATUREITEM]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-salesliteratureitem-11-18">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-salesliteratureitem-13-18">
         <createTable tableName="SALESLITERATUREITEM">
                 <column name="AUTHORNAME" remarks="" type="VARCHAR(500)">
                 </column>
@@ -1356,7 +1356,7 @@
 
 
     <!--输出实体[PRODUCTPRICELEVEL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-productpricelevel-25-19">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-productpricelevel-26-19">
         <createTable tableName="PRODUCTPRICELEVEL">
                 <column name="IMPORTSEQUENCENUMBER" remarks="" type="INT">
                 </column>
@@ -2438,7 +2438,7 @@
 
 
     <!--输出实体[INVOICE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-invoice-40-33">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-invoice-41-33">
         <createTable tableName="INVOICE">
                 <column name="BILLTO_LINE1" remarks="" type="VARCHAR(250)">
                 </column>
@@ -2890,7 +2890,7 @@
 
 
     <!--输出实体[INVOICEDETAIL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-invoicedetail-16-40">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-invoicedetail-18-40">
         <createTable tableName="INVOICEDETAIL">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -3752,7 +3752,7 @@
 
 
     <!--输出实体[QUOTE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-43-47">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-45-47">
         <createTable tableName="QUOTE">
                 <column name="BILLTO_COUNTRY" remarks="" type="VARCHAR(80)">
                 </column>
@@ -6363,7 +6363,7 @@
 
 
     <!--输出实体[SALESLITERATURE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-salesliterature-31-73">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-salesliterature-33-73">
         <createTable tableName="SALESLITERATURE">
                 <column name="IMPORTSEQUENCENUMBER" remarks="" type="INT">
                 </column>
@@ -7585,7 +7585,7 @@
 
 
     <!--输出实体[SALESORDERDETAIL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-salesorderdetail-20-80">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-salesorderdetail-21-80">
         <createTable tableName="SALESORDERDETAIL">
                 <column name="SHIPTO_NAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -8133,7 +8133,7 @@
 
 
     <!--输出实体[COMPETITOR]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-40-90">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-41-90">
         <createTable tableName="COMPETITOR">
                 <column name="ENTITYIMAGE" remarks="" type="VARCHAR(100)">
                 </column>
@@ -8303,7 +8303,7 @@
 
 
     <!--输出实体[PRODUCT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-product-72-91">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-product-74-91">
         <createTable tableName="PRODUCT">
                 <column name="VENDORID" remarks="" type="VARCHAR(100)">
                 </column>
@@ -8582,7 +8582,7 @@
 
 
     <!--输出实体[SALESORDER]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-salesorder-48-96">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-salesorder-50-96">
         <createTable tableName="SALESORDER">
                 <column name="ENTITYIMAGE" remarks="" type="VARCHAR(100)">
                 </column>
@@ -9048,7 +9048,7 @@
 
 
     <!--输出实体[PRODUCTSUBSTITUTE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-productsubstitute-19-100">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-productsubstitute-20-100">
         <createTable tableName="PRODUCTSUBSTITUTE">
                 <column name="PRODUCTSUBSTITUTENAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -10460,7 +10460,7 @@
 
 
     <!--输出实体[OPPORTUNITY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunity-123-124">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunity-124-124">
         <createTable tableName="OPPORTUNITY">
                 <column name="DECISIONMAKER" remarks="" type="INT">
                 </column>
@@ -10800,13 +10800,13 @@
     </changeSet>
 
         <!--输出实体[PRODUCTASSOCIATION]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productassociation-19-128">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productassociation-20-128">
        <addForeignKeyConstraint baseColumnNames="ASSOCIATEDPRODUCT" baseTableName="PRODUCTASSOCIATION" constraintName="DER1N_PRODUCTASSOCIATION__PROD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productassociation-19-130">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productassociation-20-130">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRODUCTASSOCIATION" constraintName="DER1N_PRODUCTASSOCIATION__TRAN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productassociation-19-131">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productassociation-20-131">
        <addForeignKeyConstraint baseColumnNames="UOMID" baseTableName="PRODUCTASSOCIATION" constraintName="DER1N_PRODUCTASSOCIATION__UOM_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[GOALROLLUPQUERY]外键关系 -->
@@ -10831,19 +10831,19 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="SEMIANNUALFISCALCALENDAR" constraintName="DER1N_SEMIANNUALFISCALCALENDAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[QUOTEDETAIL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-16-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-18-137">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="QUOTEDETAIL" constraintName="DER1N_QUOTEDETAIL__PRODUCT__PR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-16-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-18-138">
        <addForeignKeyConstraint baseColumnNames="PARENTBUNDLEIDREF" baseTableName="QUOTEDETAIL" constraintName="DER1N_QUOTEDETAIL__QUOTEDETAIL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="QUOTEDETAILID" referencedTableName="QUOTEDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-16-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-18-139">
        <addForeignKeyConstraint baseColumnNames="QUOTEID" baseTableName="QUOTEDETAIL" constraintName="DER1N_QUOTEDETAIL__QUOTE__QUOT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="QUOTEID" referencedTableName="QUOTE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-16-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-18-140">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="QUOTEDETAIL" constraintName="DER1N_QUOTEDETAIL__TRANSACTION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-16-141">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quotedetail-18-141">
        <addForeignKeyConstraint baseColumnNames="UOMID" baseTableName="QUOTEDETAIL" constraintName="DER1N_QUOTEDETAIL__UOM__UOMID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[QUARTERLYFISCALCALENDAR]外键关系 -->
@@ -10898,26 +10898,26 @@
     </changeSet>
         <!--输出实体[UOMSCHEDULE]外键关系 -->
         <!--输出实体[SALESLITERATUREITEM]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliteratureitem-11-156">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliteratureitem-13-156">
        <addForeignKeyConstraint baseColumnNames="SALESLITERATUREID" baseTableName="SALESLITERATUREITEM" constraintName="DER1N_SALESLITERATUREITEM__SAL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SALESLITERATUREID" referencedTableName="SALESLITERATURE" validate="true"/>
     </changeSet>
         <!--输出实体[PRODUCTPRICELEVEL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-25-157">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-26-157">
        <addForeignKeyConstraint baseColumnNames="DISCOUNTTYPEID" baseTableName="PRODUCTPRICELEVEL" constraintName="DER1N_PRODUCTPRICELEVEL__DISCO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DISCOUNTTYPEID" referencedTableName="DISCOUNTTYPE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-25-158">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-26-158">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="PRODUCTPRICELEVEL" constraintName="DER1N_PRODUCTPRICELEVEL__PRICE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-25-159">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-26-159">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="PRODUCTPRICELEVEL" constraintName="DER1N_PRODUCTPRICELEVEL__PRODU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-25-160">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-26-160">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRODUCTPRICELEVEL" constraintName="DER1N_PRODUCTPRICELEVEL__TRANS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-25-161">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-26-161">
        <addForeignKeyConstraint baseColumnNames="UOMSCHEDULEID" baseTableName="PRODUCTPRICELEVEL" constraintName="DER1N_PRODUCTPRICELEVEL__UOMSC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMSCHEDULEID" referencedTableName="UOMSCHEDULE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-25-162">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productpricelevel-26-162">
        <addForeignKeyConstraint baseColumnNames="UOMID" baseTableName="PRODUCTPRICELEVEL" constraintName="DER1N_PRODUCTPRICELEVEL__UOM__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[APPOINTMENT]外键关系 -->
@@ -11009,19 +11009,19 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="SLAKPIINSTANCE" constraintName="DER1N_SLAKPIINSTANCE__TRANSACT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[INVOICE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-192">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-41-192">
        <addForeignKeyConstraint baseColumnNames="OPPORTUNITYID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__OPPORTUNITY__OP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-193">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-41-193">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__PRICELEVEL__PRI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-194">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-41-194">
        <addForeignKeyConstraint baseColumnNames="SALESORDERID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__SALESORDER__SAL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SALESORDERID" referencedTableName="SALESORDER" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-195">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-41-195">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-196">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-41-196">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[TASK]外键关系 -->
@@ -11055,22 +11055,22 @@
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="T_INVENTORY" constraintName="DER1N_INVENTORY_PRODUCT_PRODUC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
         <!--输出实体[INVOICEDETAIL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-16-205">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-18-205">
        <addForeignKeyConstraint baseColumnNames="PARENTBUNDLEIDREF" baseTableName="INVOICEDETAIL" constraintName="DER1N_INVOICEDETAIL__INVOICEDE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INVOICEDETAILID" referencedTableName="INVOICEDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-16-206">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-18-206">
        <addForeignKeyConstraint baseColumnNames="INVOICEID" baseTableName="INVOICEDETAIL" constraintName="DER1N_INVOICEDETAIL__INVOICE__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INVOICEID" referencedTableName="INVOICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-16-207">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-18-207">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="INVOICEDETAIL" constraintName="DER1N_INVOICEDETAIL__PRODUCT__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-16-208">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-18-208">
        <addForeignKeyConstraint baseColumnNames="SALESORDERDETAILID" baseTableName="INVOICEDETAIL" constraintName="DER1N_INVOICEDETAIL__SALESORDE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SALESORDERDETAILID" referencedTableName="SALESORDERDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-16-209">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-18-209">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INVOICEDETAIL" constraintName="DER1N_INVOICEDETAIL__TRANSACTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-16-210">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoicedetail-18-210">
        <addForeignKeyConstraint baseColumnNames="UOMID" baseTableName="INVOICEDETAIL" constraintName="DER1N_INVOICEDETAIL__UOM__UOMI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[BOOKABLERES]外键关系 -->
@@ -11134,19 +11134,19 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRICELEVEL" constraintName="DER1N_PRICELEVEL__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[QUOTE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-230">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-45-230">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__CAMPAIGN__CAMPAIG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-231">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-45-231">
        <addForeignKeyConstraint baseColumnNames="OPPORTUNITYID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__OPPORTUNITY__OPPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-232">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-45-232">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__PRICELEVEL__PRICE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-233">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-45-233">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-234">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-45-234">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="QUOTE" constraintName="DER1N_QUOTE__TRANSACTIONCURREN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[BULKDELETEOPERATION]外键关系 -->
@@ -11361,10 +11361,10 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="RATINGVALUE" constraintName="DER1N_RATINGVALUE__TRANSACTION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[SALESLITERATURE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliterature-31-311">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliterature-33-311">
        <addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="SALESLITERATURE" constraintName="DER1N_SALESLITERATURE__SUBJECT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliterature-31-312">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliterature-33-312">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="SALESLITERATURE" constraintName="DER1N_SALESLITERATURE__TRANSAC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[METRIC]外键关系 -->
@@ -11416,19 +11416,19 @@
        <addForeignKeyConstraint baseColumnNames="RESOURCE" baseTableName="BOOKABLERESCHARACTERISTIC" constraintName="DER1N_BOOKABLERESCHARACTERISTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BOOKABLERESID" referencedTableName="BOOKABLERES" validate="true"/>
     </changeSet>
         <!--输出实体[SALESORDERDETAIL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-20-330">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-21-330">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="SALESORDERDETAIL" constraintName="DER1N_SALESORDERDETAIL__PRODUC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-20-331">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-21-331">
        <addForeignKeyConstraint baseColumnNames="QUOTEDETAILID" baseTableName="SALESORDERDETAIL" constraintName="DER1N_SALESORDERDETAIL__QUOTED" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="QUOTEDETAILID" referencedTableName="QUOTEDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-20-332">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-21-332">
        <addForeignKeyConstraint baseColumnNames="PARENTBUNDLEIDREF" baseTableName="SALESORDERDETAIL" constraintName="DER1N_SALESORDERDETAIL__SALESO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SALESORDERDETAILID" referencedTableName="SALESORDERDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-20-334">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-21-334">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="SALESORDERDETAIL" constraintName="DER1N_SALESORDERDETAIL__TRANSA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-20-335">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorderdetail-21-335">
        <addForeignKeyConstraint baseColumnNames="UOMID" baseTableName="SALESORDERDETAIL" constraintName="DER1N_SALESORDERDETAIL__UOM__U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[BOOKABLERESBOOKINGHEADER]外键关系 -->
@@ -11483,26 +11483,26 @@
         <!--输出实体[CAMPAIGNLIST]外键关系 -->
         <!--输出实体[LISTCONTACT]外键关系 -->
         <!--输出实体[COMPETITOR]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-40-350">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-41-350">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="COMPETITOR" constraintName="DER1N_COMPETITOR__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[PRODUCT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-351">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-74-351">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__PRICELEVEL__PRI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-352">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-74-352">
        <addForeignKeyConstraint baseColumnNames="PARENTPRODUCTID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__PRODUCT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-353">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-74-353">
        <addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__SUBJECT__SUBJEC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-354">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-74-354">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-355">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-74-355">
        <addForeignKeyConstraint baseColumnNames="DEFAULTUOMSCHEDULEID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__UOMSCHEDULE__DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMSCHEDULEID" referencedTableName="UOMSCHEDULE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-356">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-74-356">
        <addForeignKeyConstraint baseColumnNames="DEFAULTUOMID" baseTableName="PRODUCT" constraintName="DER1N_PRODUCT__UOM__DEFAULTUOM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="UOMID" referencedTableName="UOM" validate="true"/>
     </changeSet>
         <!--输出实体[CHARACTERISTIC]外键关系 -->
@@ -11522,22 +11522,22 @@
        <addForeignKeyConstraint baseColumnNames="RESOURCECATEGORY" baseTableName="BOOKABLERESCATEGORYASSN" constraintName="DER1N_BOOKABLERESCATEGORYASSN_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BOOKABLERESCATEGORYID" referencedTableName="BOOKABLERESCATEGORY" validate="true"/>
     </changeSet>
         <!--输出实体[SALESORDER]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-364">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-50-364">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__CAMPAIGN__CA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-365">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-50-365">
        <addForeignKeyConstraint baseColumnNames="OPPORTUNITYID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__OPPORTUNITY_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-366">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-50-366">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__PRICELEVEL__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-367">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-50-367">
        <addForeignKeyConstraint baseColumnNames="QUOTEID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__QUOTE__QUOTE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="QUOTEID" referencedTableName="QUOTE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-368">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-50-368">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-369">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-50-369">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="SALESORDER" constraintName="DER1N_SALESORDER__TRANSACTIONC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[LEADADDRESS]外键关系 -->
@@ -11559,10 +11559,10 @@
     </changeSet>
         <!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->
         <!--输出实体[PRODUCTSUBSTITUTE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productsubstitute-19-375">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productsubstitute-20-375">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="PRODUCTSUBSTITUTE" constraintName="DER1N_PRODUCTSUBSTITUTE__PRODU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-productsubstitute-19-377">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productsubstitute-20-377">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRODUCTSUBSTITUTE" constraintName="DER1N_PRODUCTSUBSTITUTE__TRANS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYPOINTER]外键关系 -->
@@ -11694,25 +11694,25 @@
         <!--输出实体[RELATIONSHIPS]外键关系 -->
         <!--输出实体[CONNECTIONROLE]外键关系 -->
         <!--输出实体[OPPORTUNITY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-123-414">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-414">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__ACCOUNT__PA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-123-415">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-415">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__CAMPAIGN__C" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-123-416">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-416">
        <addForeignKeyConstraint baseColumnNames="PARENTCONTACTID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__CONTACT__PA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-123-417">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-417">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__LEAD__ORIGI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-123-418">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-418">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__PRICELEVEL_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-123-419">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-419">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-123-420">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-124-420">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__TRANSACTION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[OPPORTUNITYCOMPETITOR]外键关系 -->