lab_gzf 发布系统代码

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

@@ -680,7 +680,7 @@
         "memo": ""
     },
     "salesorderinfoview": {
-        "title": "订单分页导航视图",
+        "title": "订单信息",
         "caption": "订单",
         "viewtype": "DETABEXPVIEW",
         "viewmodule": "Sales",
@@ -1610,7 +1610,7 @@
         "memo": "系统自动添加"
     },
     "quoteinfo": {
-        "title": "报价单分页导航视图",
+        "title": "报价单信息",
         "caption": "报价单信息",
         "viewtype": "DETABEXPVIEW",
         "viewmodule": "Sales",

app_CRM/src/locale/lanres/entities/competitor/competitor_en_US.ts

@@ -251,6 +251,36 @@ export default {
 			tip: "Filter",
 		},
 	},
+	infotoolbar_toolbar: {
+		deuiaction4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",

app_CRM/src/locale/lanres/entities/competitor/competitor_zh_CN.ts

@@ -250,6 +250,36 @@ export default {
 			tip: "过滤",
 		},
 	},
+	infotoolbar_toolbar: {
+		deuiaction4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "保存",

app_CRM/src/locale/lanres/entities/invoice/invoice_en_US.ts

@@ -205,10 +205,6 @@ export default {
 			billto_stateorprovince: "省/市/自治区", 
 			billto_city: "市/县", 
 			billto_line1: "街道", 
-			salesorderid: "订单", 
-			transactioncurrencyid: "货币", 
-			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 			invoiceid: "发票", 
 		},
 		uiactions: {
@@ -311,4 +307,34 @@ export default {
 			tip: "Filter",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/invoice/invoice_zh_CN.ts

@@ -204,10 +204,6 @@ export default {
 			billto_stateorprovince: "省/市/自治区", 
 			billto_city: "市/县", 
 			billto_line1: "街道", 
-			salesorderid: "订单", 
-			transactioncurrencyid: "货币", 
-			opportunityid: "商机", 
-			pricelevelid: "价目表", 
 			invoiceid: "发票", 
 		},
 		uiactions: {
@@ -310,4 +306,34 @@ export default {
 			tip: "过滤",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

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

@@ -119,11 +119,7 @@ export default {
 			quantitydecimal: "支持小数", 
 			subjectname: "主题", 
 			description: "说明", 
-			defaultuomid: "默认计价单位", 
 			productid: "产品", 
-			defaultuomscheduleid: "计价单位组", 
-			subjectid: "主题", 
-			pricelevelid: "默认价目表", 
 		},
 		uiactions: {
 		},
@@ -192,6 +188,36 @@ export default {
 	},
 	info_proinfotoolbar_toolbar: {
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",

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

@@ -118,11 +118,7 @@ export default {
 			quantitydecimal: "支持小数", 
 			subjectname: "主题", 
 			description: "说明", 
-			defaultuomid: "默认计价单位", 
 			productid: "产品", 
-			defaultuomscheduleid: "计价单位组", 
-			subjectid: "主题", 
-			pricelevelid: "默认价目表", 
 		},
 		uiactions: {
 		},
@@ -191,6 +187,36 @@ export default {
 	},
 	info_proinfotoolbar_toolbar: {
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "保存",

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

@@ -124,7 +124,7 @@ export default {
 		},
 		info: {
 			caption: "报价单信息",
-      		title: "报价单分页导航视图",
+      		title: "报价单信息",
 		},
 	},
 	main_form: {
@@ -352,4 +352,34 @@ export default {
 			tip: "Filter",
 		},
 	},
+	infotoolbar_toolbar: {
+		deuiaction4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

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

@@ -123,7 +123,7 @@ export default {
 		},
 		info: {
 			caption: "报价单信息",
-      		title: "报价单分页导航视图",
+      		title: "报价单信息",
 		},
 	},
 	main_form: {
@@ -351,4 +351,34 @@ export default {
 			tip: "过滤",
 		},
 	},
+	infotoolbar_toolbar: {
+		deuiaction4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 };
\ No newline at end of file

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

@@ -144,6 +144,36 @@ export default {
 		uiactions: {
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "Save",

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

@@ -143,6 +143,36 @@ export default {
 		uiactions: {
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	editviewtoolbar_toolbar: {
 		tbitem3: {
 			caption: "保存",

app_CRM/src/locale/lanres/entities/sales-order/sales-order_en_US.ts

@@ -111,7 +111,7 @@ export default {
 		},
 		infoview: {
 			caption: "订单",
-      		title: "订单分页导航视图",
+      		title: "订单信息",
 		},
 		summaryview: {
 			caption: "订单",
@@ -284,6 +284,36 @@ export default {
 			tip: "Copy {0}",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/locale/lanres/entities/sales-order/sales-order_zh_CN.ts

@@ -110,7 +110,7 @@ export default {
 		},
 		infoview: {
 			caption: "订单",
-      		title: "订单分页导航视图",
+      		title: "订单信息",
 		},
 		summaryview: {
 			caption: "订单",
@@ -283,6 +283,36 @@ export default {
 			tip: "拷贝",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		deuiaction4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		seperator4: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction1: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
+		deuiaction2: {
+			caption: "刷新",
+			tip: "刷新",
+		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -552,7 +552,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "49e5e89fb51fa9929925b532841b2549"
         },
         "salesorderinfoview": {
-            "title": "订单分页导航视图",
+            "title": "订单信息",
             "caption": "订单",
             "viewtype": "DETABEXPVIEW",
             "viewmodule": "Sales",
@@ -1296,7 +1296,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "bb5324c14c92a03092c9f6eae01eb908"
         },
         "quoteinfo": {
-            "title": "报价单分页导航视图",
+            "title": "报价单信息",
             "caption": "报价单信息",
             "viewtype": "DETABEXPVIEW",
             "viewmodule": "Sales",

app_CRM/src/pages/finance/invoice-info-view/invoice-info-view-base.tsx

@@ -52,9 +52,31 @@ export class InvoiceInfoViewBase extends TabExpViewBase {
      * @memberof InvoiceInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof InvoiceInfoView
+     */
+    public toolBarModels: any = {
+        deuiaction4: { name: 'deuiaction4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator4: {  name: 'seperator4', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', caption: '删除并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator2: {  name: 'seperator2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction2: { name: 'deuiaction2', caption: '刷新','isShowCaption':true,'isShowIcon':true, tooltip: '刷新', iconcls: 'fa fa-refresh', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Refresh', target: 'SINGLEKEY' }, class: '' },
+
+        seperator1: {  name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem12: { name: 'tbitem12', caption: '关闭','isShowCaption':true,'isShowIcon':true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' }, class: '' },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -90,6 +112,232 @@ export class InvoiceInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof InvoiceInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'deuiaction4')) {
+            this.toolbar_deuiaction4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction2')) {
+            this.toolbar_deuiaction2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"Invoice");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"Invoice");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Refresh(datas, contextJO,paramJO,  $event, xData,this,"Invoice");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"Invoice");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof InvoiceInfoViewBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { invoice: args[0].invoice })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof InvoiceInfoViewBase
+     */
+    public RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 刷新
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof InvoiceInfoViewBase
+     */
+    public Refresh(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.refresh && xData.refresh instanceof Function) {
+            xData.refresh(args);
+        } else if (_this.refresh && _this.refresh instanceof Function) {
+            _this.refresh(args);
+        }
+    }
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof InvoiceInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 
     /**

app_CRM/src/pages/finance/invoice-info-view/invoice-info-view.html

@@ -2,6 +2,8 @@
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/finance/invoice-summary-view/invoice-summary-view.html

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

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

 <studio-view-style2 viewName="productinfo_proinfo" viewTitle="产品编辑视图" class='deeditview product-info-pro-info'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_form 

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

@@ -52,9 +52,31 @@ export class ProductInfoViewBase extends TabExpViewBase {
      * @memberof ProductInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof ProductInfoView
+     */
+    public toolBarModels: any = {
+        deuiaction4: { name: 'deuiaction4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator4: {  name: 'seperator4', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', caption: '删除并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator2: {  name: 'seperator2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction2: { name: 'deuiaction2', caption: '刷新','isShowCaption':true,'isShowIcon':true, tooltip: '刷新', iconcls: 'fa fa-refresh', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Refresh', target: 'SINGLEKEY' }, class: '' },
+
+        seperator1: {  name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem12: { name: 'tbitem12', caption: '关闭','isShowCaption':true,'isShowIcon':true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' }, class: '' },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -90,6 +112,232 @@ export class ProductInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ProductInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'deuiaction4')) {
+            this.toolbar_deuiaction4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction2')) {
+            this.toolbar_deuiaction2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"Product");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"Product");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Refresh(datas, contextJO,paramJO,  $event, xData,this,"Product");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"Product");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ProductInfoViewBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { product: args[0].product })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ProductInfoViewBase
+     */
+    public RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 刷新
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ProductInfoViewBase
+     */
+    public Refresh(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.refresh && xData.refresh instanceof Function) {
+            xData.refresh(args);
+        } else if (_this.refresh && _this.refresh instanceof Function) {
+            _this.refresh(args);
+        }
+    }
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ProductInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 
     /**

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

 <studio-view-style2 viewName="productinfoview" viewTitle="产品信息" class='detabexpview product-info-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/product/product-substitute-grid-view/product-substitute-grid-view.html

 <studio-view-style2 viewName="productsubstitutegridview" viewTitle="产品关系表格视图" class='degridview product-substitute-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/product/product-summary-view/product-summary-view.html

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

app_CRM/src/pages/sales/competitor-info/competitor-info-base.tsx

@@ -52,9 +52,31 @@ export class CompetitorInfoBase extends TabExpViewBase {
      * @memberof CompetitorInfoBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof CompetitorInfo
+     */
+    public toolBarModels: any = {
+        deuiaction4: { name: 'deuiaction4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator4: {  name: 'seperator4', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', caption: '删除并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator2: {  name: 'seperator2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction2: { name: 'deuiaction2', caption: '刷新','isShowCaption':true,'isShowIcon':true, tooltip: '刷新', iconcls: 'fa fa-refresh', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Refresh', target: 'SINGLEKEY' }, class: '' },
+
+        seperator1: {  name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem12: { name: 'tbitem12', caption: '关闭','isShowCaption':true,'isShowIcon':true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' }, class: '' },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -90,6 +112,232 @@ export class CompetitorInfoBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof CompetitorInfoBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'deuiaction4')) {
+            this.toolbar_deuiaction4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction2')) {
+            this.toolbar_deuiaction2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"Competitor");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"Competitor");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Refresh(datas, contextJO,paramJO,  $event, xData,this,"Competitor");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"Competitor");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof CompetitorInfoBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { competitor: args[0].competitor })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof CompetitorInfoBase
+     */
+    public RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 刷新
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof CompetitorInfoBase
+     */
+    public Refresh(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.refresh && xData.refresh instanceof Function) {
+            xData.refresh(args);
+        } else if (_this.refresh && _this.refresh instanceof Function) {
+            _this.refresh(args);
+        }
+    }
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof CompetitorInfoBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 
     /**

app_CRM/src/pages/sales/competitor-info/competitor-info.html

@@ -2,6 +2,8 @@
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/sales/quote-info/quote-info-base.tsx

@@ -4,7 +4,7 @@ import QuoteService from '@/service/quote/quote-service';
 import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
 
 /**
- * 报价单分页导航视图视图基类
+ * 报价单信息视图基类
  *
  * @export
  * @class QuoteInfoBase
@@ -52,9 +52,31 @@ export class QuoteInfoBase extends TabExpViewBase {
      * @memberof QuoteInfoBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof QuoteInfo
+     */
+    public toolBarModels: any = {
+        deuiaction4: { name: 'deuiaction4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator4: {  name: 'seperator4', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', caption: '删除并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator2: {  name: 'seperator2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction2: { name: 'deuiaction2', caption: '刷新','isShowCaption':true,'isShowIcon':true, tooltip: '刷新', iconcls: 'fa fa-refresh', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Refresh', target: 'SINGLEKEY' }, class: '' },
+
+        seperator1: {  name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem12: { name: 'tbitem12', caption: '关闭','isShowCaption':true,'isShowIcon':true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' }, class: '' },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -90,6 +112,232 @@ export class QuoteInfoBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof QuoteInfoBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'deuiaction4')) {
+            this.toolbar_deuiaction4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction2')) {
+            this.toolbar_deuiaction2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"Quote");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"Quote");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Refresh(datas, contextJO,paramJO,  $event, xData,this,"Quote");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"Quote");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof QuoteInfoBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { quote: args[0].quote })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof QuoteInfoBase
+     */
+    public RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 刷新
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof QuoteInfoBase
+     */
+    public Refresh(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.refresh && xData.refresh instanceof Function) {
+            xData.refresh(args);
+        } else if (_this.refresh && _this.refresh instanceof Function) {
+            _this.refresh(args);
+        }
+    }
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof QuoteInfoBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 
     /**

app_CRM/src/pages/sales/quote-info/quote-info.html

-<studio-view-style2 viewName="quoteinfo" viewTitle="报价单分页导航视图" class='detabexpview quote-info'>
+<studio-view-style2 viewName="quoteinfo" viewTitle="报价单信息" class='detabexpview quote-info'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/sales/quote-info/quote-info.vue

@@ -6,7 +6,7 @@ import { QuoteInfoBase } from './quote-info-base';
 import view_tabexppanel from '@widgets/quote/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.vue';
 
 /**
- * 报价单分页导航视图视图
+ * 报价单信息视图
  *
  * @export
  * @class QuoteInfo

app_CRM/src/pages/sales/sales-literature-info-view/sales-literature-info-view-base.tsx

@@ -52,9 +52,31 @@ export class SalesLiteratureInfoViewBase extends TabExpViewBase {
      * @memberof SalesLiteratureInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof SalesLiteratureInfoView
+     */
+    public toolBarModels: any = {
+        deuiaction4: { name: 'deuiaction4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator4: {  name: 'seperator4', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', caption: '删除并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator2: {  name: 'seperator2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction2: { name: 'deuiaction2', caption: '刷新','isShowCaption':true,'isShowIcon':true, tooltip: '刷新', iconcls: 'fa fa-refresh', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Refresh', target: 'SINGLEKEY' }, class: '' },
+
+        seperator1: {  name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem12: { name: 'tbitem12', caption: '关闭','isShowCaption':true,'isShowIcon':true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' }, class: '' },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -90,6 +112,232 @@ export class SalesLiteratureInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof SalesLiteratureInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'deuiaction4')) {
+            this.toolbar_deuiaction4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction2')) {
+            this.toolbar_deuiaction2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"SalesLiterature");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SalesLiterature");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Refresh(datas, contextJO,paramJO,  $event, xData,this,"SalesLiterature");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"SalesLiterature");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesLiteratureInfoViewBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { salesliterature: args[0].salesliterature })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesLiteratureInfoViewBase
+     */
+    public RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 刷新
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesLiteratureInfoViewBase
+     */
+    public Refresh(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.refresh && xData.refresh instanceof Function) {
+            xData.refresh(args);
+        } else if (_this.refresh && _this.refresh instanceof Function) {
+            _this.refresh(args);
+        }
+    }
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesLiteratureInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 
     /**

app_CRM/src/pages/sales/sales-literature-info-view/sales-literature-info-view.html

@@ -2,6 +2,8 @@
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/sales/sales-order-info-view/sales-order-info-view-base.tsx

@@ -4,7 +4,7 @@ import SalesOrderService from '@/service/sales-order/sales-order-service';
 import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
 
 /**
- * 订单分页导航视图视图基类
+ * 订单信息视图基类
  *
  * @export
  * @class SalesOrderInfoViewBase
@@ -52,9 +52,31 @@ export class SalesOrderInfoViewBase extends TabExpViewBase {
      * @memberof SalesOrderInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof SalesOrderInfoView
+     */
+    public toolBarModels: any = {
+        deuiaction4: { name: 'deuiaction4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator4: {  name: 'seperator4', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', caption: '删除并关闭','isShowCaption':true,'isShowIcon':true, tooltip: '删除并关闭', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' }, class: '' },
+
+        seperator2: {  name: 'seperator2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction2: { name: 'deuiaction2', caption: '刷新','isShowCaption':true,'isShowIcon':true, tooltip: '刷新', iconcls: 'fa fa-refresh', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Refresh', target: 'SINGLEKEY' }, class: '' },
+
+        seperator1: {  name: 'seperator1', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem12: { name: 'tbitem12', caption: '关闭','isShowCaption':true,'isShowIcon':true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' }, class: '' },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -90,6 +112,232 @@ export class SalesOrderInfoViewBase extends TabExpViewBase {
         });
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof SalesOrderInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'deuiaction4')) {
+            this.toolbar_deuiaction4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'deuiaction2')) {
+            this.toolbar_deuiaction2_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"SalesOrder");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.RemoveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SalesOrder");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Refresh(datas, contextJO,paramJO,  $event, xData,this,"SalesOrder");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        if (_this.getDatas && _this.getDatas instanceof Function) {
+            datas = [..._this.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"SalesOrder");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesOrderInfoViewBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { salesorder: args[0].salesorder })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesOrderInfoViewBase
+     */
+    public RemoveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.removeAndExit instanceof Function) {
+            xData.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.removeAndExit && _this.removeAndExit instanceof Function) {
+            _this.removeAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
+    /**
+     * 刷新
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesOrderInfoViewBase
+     */
+    public Refresh(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.refresh && xData.refresh instanceof Function) {
+            xData.refresh(args);
+        } else if (_this.refresh && _this.refresh instanceof Function) {
+            _this.refresh(args);
+        }
+    }
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof SalesOrderInfoViewBase
+     */
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
+        }
+    }
+
 
 
     /**

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

-<studio-view-style2 viewName="salesorderinfoview" viewTitle="订单分页导航视图" class='detabexpview sales-order-info-view'>
+<studio-view-style2 viewName="salesorderinfoview" viewTitle="订单信息" class='detabexpview sales-order-info-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
     <view_tabexppanel 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/sales/sales-order-info-view/sales-order-info-view.vue

@@ -6,7 +6,7 @@ import { SalesOrderInfoViewBase } from './sales-order-info-view-base';
 import view_tabexppanel from '@widgets/sales-order/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.vue';
 
 /**
- * 订单分页导航视图视图
+ * 订单信息视图
  *
  * @export
  * @class SalesOrderInfoView

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

@@ -79,7 +79,6 @@ export const PageComponents = {
         Vue.component('competitor-grid-view', () => import('@pages/sales/competitor-grid-view/competitor-grid-view.vue'));
         Vue.component('account-summary', () => import('@pages/base/account-summary/account-summary.vue'));
         Vue.component('sales-literature-info-view', () => import('@pages/sales/sales-literature-info-view/sales-literature-info-view.vue'));
-        Vue.component('uom-schedule-pickup-grid-view', () => import('@pages/base/uom-schedule-pickup-grid-view/uom-schedule-pickup-grid-view.vue'));
         Vue.component('opportunity-product-opp-opp-pro-grid-view', () => import('@pages/sales/opportunity-product-opp-opp-pro-grid-view/opportunity-product-opp-opp-pro-grid-view.vue'));
         Vue.component('ibiz-list-quick-create', () => import('@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'));
         Vue.component('product-association-grid-view', () => import('@pages/product/product-association-grid-view/product-association-grid-view.vue'));
@@ -95,7 +94,6 @@ export const PageComponents = {
         Vue.component('activity-pointer-edit-view', () => import('@pages/base/activity-pointer-edit-view/activity-pointer-edit-view.vue'));
         Vue.component('subject-pickup-view', () => import('@pages/base/subject-pickup-view/subject-pickup-view.vue'));
         Vue.component('sales-literature-grid-view', () => import('@pages/sales/sales-literature-grid-view/sales-literature-grid-view.vue'));
-        Vue.component('uom-schedule-pickup-view', () => import('@pages/base/uom-schedule-pickup-view/uom-schedule-pickup-view.vue'));
         Vue.component('product-summary-view', () => import('@pages/product/product-summary-view/product-summary-view.vue'));
         Vue.component('quote-grid-view', () => import('@pages/sales/quote-grid-view/quote-grid-view.vue'));
         Vue.component('sales-literature-info-sal-lit-view', () => import('@pages/sales/sales-literature-info-sal-lit-view/sales-literature-info-sal-lit-view.vue'));
@@ -127,7 +125,6 @@ export const PageComponents = {
         Vue.component('ibiz-list-summary', () => import('@pages/marketing/ibiz-list-summary/ibiz-list-summary.vue'));
         Vue.component('sales-literature-item-grid-view', () => import('@pages/sales/sales-literature-item-grid-view/sales-literature-item-grid-view.vue'));
         Vue.component('lead-dashboard-view', () => import('@pages/sales/lead-dashboard-view/lead-dashboard-view.vue'));
-        Vue.component('sales-order-pickup-grid-view', () => import('@pages/sales/sales-order-pickup-grid-view/sales-order-pickup-grid-view.vue'));
         Vue.component('discount-type-pickup-grid-view', () => import('@pages/sales/discount-type-pickup-grid-view/discount-type-pickup-grid-view.vue'));
         Vue.component('list-account-quick-create-by-list', () => import('@pages/marketing/list-account-quick-create-by-list/list-account-quick-create-by-list.vue'));
         Vue.component('campaign-list-edit-view', () => import('@pages/marketing/campaign-list-edit-view/campaign-list-edit-view.vue'));
@@ -135,7 +132,6 @@ export const PageComponents = {
         Vue.component('account-pickup-grid-view', () => import('@pages/base/account-pickup-grid-view/account-pickup-grid-view.vue'));
         Vue.component('lead-info', () => import('@pages/sales/lead-info/lead-info.vue'));
         Vue.component('product-pickup-grid-view', () => import('@pages/product/product-pickup-grid-view/product-pickup-grid-view.vue'));
-        Vue.component('sales-order-pickup-view', () => import('@pages/sales/sales-order-pickup-view/sales-order-pickup-view.vue'));
         Vue.component('list-lead-quick-create-by-list', () => import('@pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue'));
         Vue.component('account-info', () => import('@pages/base/account-info/account-info.vue'));
         Vue.component('lead-info-detail', () => import('@pages/sales/lead-info-detail/lead-info-detail.vue'));

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

@@ -2219,20 +2219,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/sales-literature-info-view/sales-literature-info-view.vue'),
                 },
-                {
-                    path: 'uomschedules/:uomschedule?/pickupgridview/:pickupgridview?',
-                    meta: {
-                        caption: 'entities.uomschedule.views.pickupgridview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'uomschedules', parameterName: 'uomschedule' },
-                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/uom-schedule-pickup-grid-view/uom-schedule-pickup-grid-view.vue'),
-                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/opportunityproducts/:opportunityproduct?/opp_oppprogridview/:opp_oppprogridview?',
                     meta: {
@@ -2694,20 +2680,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/sales-literature-grid-view/sales-literature-grid-view.vue'),
                 },
-                {
-                    path: 'uomschedules/:uomschedule?/pickupview/:pickupview?',
-                    meta: {
-                        caption: 'entities.uomschedule.views.pickupview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'uomschedules', parameterName: 'uomschedule' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/uom-schedule-pickup-view/uom-schedule-pickup-view.vue'),
-                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/editperson/:editperson?',
                     meta: {
@@ -3800,20 +3772,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/opportunity-con-opp-grid-view/opportunity-con-opp-grid-view.vue'),
                 },
-                {
-                    path: 'salesorders/:salesorder?/pickupgridview/:pickupgridview?',
-                    meta: {
-                        caption: 'entities.salesorder.views.pickupgridview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'salesorders', parameterName: 'salesorder' },
-                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/sales-order-pickup-grid-view/sales-order-pickup-grid-view.vue'),
-                },
                 {
                     path: 'discounttypes/:discounttype?/pickupgridview/:pickupgridview?',
                     meta: {
@@ -4032,20 +3990,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/product/product-pickup-grid-view/product-pickup-grid-view.vue'),
                 },
-                {
-                    path: 'salesorders/:salesorder?/pickupview/:pickupview?',
-                    meta: {
-                        caption: 'entities.salesorder.views.pickupview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'salesorders', parameterName: 'salesorder' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sales/sales-order-pickup-view/sales-order-pickup-view.vue'),
-                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/leads/:lead?/listleads/:listlead?/quickcreatebylist/:quickcreatebylist?',
                     meta: {

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 listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let contactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
+            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
+            if(contactsData && contactsData.length && contactsData.length > 0){
+                contactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.contactid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let contactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
-            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
-            if(contactsData && contactsData.length && contactsData.length > 0){
-                contactsData.forEach((item:any) => {
+        masterData.contacts = contactsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.contactid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.contacts = contactsData;
+        masterData.listaccounts = listaccountsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -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+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         return res;
     }
 
@@ -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 listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let contactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
+            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
+            if(contactsData && contactsData.length && contactsData.length > 0){
+                contactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.contactid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let contactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
-            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
-            if(contactsData && contactsData.length && contactsData.length > 0){
-                contactsData.forEach((item:any) => {
+        masterData.contacts = contactsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.contactid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.contacts = contactsData;
+        masterData.listaccounts = listaccountsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/accounts/${context.account}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             return res;
     }
 
@@ -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+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             return res;
     }
 
@@ -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+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         return res;
     }
 
@@ -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 listaccountsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
-            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
-            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
-                listaccountsData.forEach((item:any) => {
+        let contactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
+            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
+            if(contactsData && contactsData.length && contactsData.length > 0){
+                contactsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
+                            item.contactid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.listaccounts = listaccountsData;
-        let contactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_contacts'),'undefined')){
-            contactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_contacts') as any);
-            if(contactsData && contactsData.length && contactsData.length > 0){
-                contactsData.forEach((item:any) => {
+        masterData.contacts = contactsData;
+        let listaccountsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts'),'undefined')){
+            listaccountsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listaccounts') as any);
+            if(listaccountsData && listaccountsData.length && listaccountsData.length > 0){
+                listaccountsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
-                            item.contactid = null;
+                            item.relationshipsid = null;
                         }
                         delete item.srffrontuf;
                     }
                 });
             }
         }
-        masterData.contacts = contactsData;
+        masterData.listaccounts = listaccountsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/accounts/${context.account}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_contacts',JSON.stringify(res.data.contacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             return res;
     }
 

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

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

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

@@ -62,6 +62,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -107,21 +122,6 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -131,10 +131,10 @@ export default class IBizListServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibizlists`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -149,6 +149,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -194,27 +209,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibizlists/${context.ibizlist}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -242,10 +242,10 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibizlists/${context.ibizlist}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -261,10 +261,10 @@ export default class IBizListServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibizlists/getdraft`,isloading);
         res.data.ibizlist = data.ibizlist;
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -292,6 +292,21 @@ export default class IBizListServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let campaignlistsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
             campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
@@ -337,27 +352,12 @@ export default class IBizListServiceBase extends EntityService {
             }
         }
         masterData.listleads = listleadsData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibizlists/${context.ibizlist}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
             this.tempStorage.setItem(context.srfsessionkey+'_listaccounts',JSON.stringify(res.data.listaccounts));
             this.tempStorage.setItem(context.srfsessionkey+'_listleads',JSON.stringify(res.data.listleads));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 

app_CRM/src/service/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 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && true){
             let masterData:any = {};
-        let 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         let masterData:any = {};
-        let 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;
         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 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;
         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+'_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));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         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 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let masterData:any = {};
-        let 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;
         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 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;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         let masterData:any = {};
-        let 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;
         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 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;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         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 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let masterData:any = {};
-        let 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             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 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let masterData:any = {};
-        let 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             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 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let masterData:any = {};
-        let 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         let masterData:any = {};
-        let 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;
         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 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;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             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 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let masterData:any = {};
-        let 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;
         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 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;
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/win`,data,isloading);

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

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

app_CRM/src/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 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;
@@ -76,7 +76,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -92,11 +92,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        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;
@@ -106,7 +106,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.productsalesliteratures = productsalesliteraturesData;
         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+'_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));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         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 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;
@@ -147,7 +147,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -163,11 +163,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        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;
@@ -177,12 +177,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesliteratures/${context.salesliterature}`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             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+'_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));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
         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 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;
@@ -272,7 +272,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         let salesliteratureitemsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems'),'undefined')){
             salesliteratureitemsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_salesliteratureitems') as any);
@@ -288,11 +288,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        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;
@@ -302,12 +302,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
+        masterData.productsalesliteratures = productsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesliteratures/${context.salesliterature}/save`,data,isloading);
-            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));
+            this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
+            this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
             return res;
     }
 

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

@@ -288,16 +288,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: '241c1fe99d6b6b99ad2888762140837a',
-            viewmodule: 'Base',
-            viewname: 'UomSchedulePickupView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '7decb196037249b909762c9142adfe91',
-            ],
-        },
         {
             viewtag: '24a93674ec4c976c08902a3e95421ca6',
             viewmodule: 'Marketing',
@@ -575,10 +565,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '8b806fb12589b2fc17d1bb90f4b5422e',
-                'e52af970c14fd89546ac8ccaecab460c',
-                '241c1fe99d6b6b99ad2888762140837a',
-                'd3692664b9e2e150526e1ce4b969f15b',
             ],
         },
         {
@@ -1009,15 +995,6 @@ export const viewstate: any = {
                 '41e012bf9b91b39e4a30072986b7c11e',
             ],
         },
-        {
-            viewtag: '7decb196037249b909762c9142adfe91',
-            viewmodule: 'Base',
-            viewname: 'UomSchedulePickupGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: '7FCD2E75-E34A-493C-922E-8AE47BCE08CA',
             viewmodule: 'Ungroup',
@@ -1640,15 +1617,6 @@ export const viewstate: any = {
                 '6c67094479c2f8af7ea1575eee584056',
             ],
         },
-        {
-            viewtag: 'c78a9fa4a75c9a957de0bacd4c0c911c',
-            viewmodule: 'Sales',
-            viewname: 'SalesOrderPickupGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: 'c7d0ca0f6fa1b27bbd1b5c422d1a108d',
             viewmodule: 'Marketing',
@@ -1741,10 +1709,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '8b806fb12589b2fc17d1bb90f4b5422e',
-                'f6f91153f3caa976cf7f552636f7e012',
-                'da3f8c1f20f440f3df54d6c13a8de586',
-                '6debde861c6e6f91eeb442cb869e9737',
             ],
         },
         {
@@ -1833,16 +1797,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: 'f6f91153f3caa976cf7f552636f7e012',
-            viewmodule: 'Sales',
-            viewname: 'SalesOrderPickupView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'c78a9fa4a75c9a957de0bacd4c0c911c',
-            ],
-        },
         {
             viewtag: 'f84a705f33385d5999fcfb69124932d4',
             viewmodule: 'Base',

app_CRM/src/widgets/invoice/info-form/info-form-base.tsx

@@ -77,10 +77,6 @@ export class InfoEditFormBase extends EditFormControlBase {
         billto_stateorprovince: null,
         billto_city: null,
         billto_line1: null,
-        salesorderid: null,
-        transactioncurrencyid: null,
-        opportunityid: null,
-        pricelevelid: null,
         invoiceid: null,
         invoice:null,
     };
@@ -92,26 +88,6 @@ export class InfoEditFormBase extends EditFormControlBase {
      * @memberof InfoEditFormBase
      */
     public rules: any = {
-        invoicenumber: [
-            { required: true, type: 'string', message: '发票编码 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '发票编码 值不能为空', trigger: 'blur' },
-        ],
-        invoicename: [
-            { required: true, type: 'string', message: '发票名称 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '发票名称 值不能为空', trigger: 'blur' },
-        ],
-        transactioncurrencyname: [
-            { required: true, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        pricelevelname: [
-            { 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' },
-        ],
     }
 
     /**
@@ -193,14 +169,6 @@ export class InfoEditFormBase extends EditFormControlBase {
 
         billto_line1: new FormItemModel({ caption: '街道', detailType: 'FORMITEM', name: 'billto_line1', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        salesorderid: new FormItemModel({ caption: '订单', detailType: 'FORMITEM', name: 'salesorderid', 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: 1 }),
-
-        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 }),
-
         invoiceid: new FormItemModel({ caption: '发票', detailType: 'FORMITEM', name: 'invoiceid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
 
     };

app_CRM/src/widgets/invoice/info-form/info-form-model.ts

@@ -165,26 +165,6 @@ export default class InfoModel {
         prop: 'billto_line1',
         dataType: 'TEXT',
       },
-      {
-        name: 'salesorderid',
-        prop: 'salesorderid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'transactioncurrencyid',
-        prop: 'transactioncurrencyid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'opportunityid',
-        prop: 'opportunityid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'pricelevelid',
-        prop: 'pricelevelid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'invoiceid',
         prop: 'invoiceid',

app_CRM/src/widgets/invoice/info-form/info-form-service.ts

@@ -2,10 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import InvoiceService from '@/service/invoice/invoice-service';
 import InfoModel from './info-form-model';
-import TransactionCurrencyService from '@/service/transaction-currency/transaction-currency-service';
-import PriceLevelService from '@/service/price-level/price-level-service';
-import OpportunityService from '@/service/opportunity/opportunity-service';
-import SalesOrderService from '@/service/sales-order/sales-order-service';
 
 
 /**
@@ -45,38 +41,6 @@ export default class InfoService extends ControlService {
         this.model = new InfoModel();
     }
 
-    /**
-     * 货币服务对象
-     *
-     * @type {TransactionCurrencyService}
-     * @memberof InfoService
-     */
-    public transactioncurrencyService: TransactionCurrencyService = new TransactionCurrencyService();
-
-    /**
-     * 价目表服务对象
-     *
-     * @type {PriceLevelService}
-     * @memberof InfoService
-     */
-    public pricelevelService: PriceLevelService = new PriceLevelService();
-
-    /**
-     * 商机服务对象
-     *
-     * @type {OpportunityService}
-     * @memberof InfoService
-     */
-    public opportunityService: OpportunityService = new OpportunityService();
-
-    /**
-     * 订单服务对象
-     *
-     * @type {SalesOrderService}
-     * @memberof InfoService
-     */
-    public salesorderService: SalesOrderService = new SalesOrderService();
-
     /**
      * 处理数据
      *
@@ -116,18 +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, 'TransactionCurrencyService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.transactioncurrencyService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'transactioncurrencyid', 'transactioncurrency');
-        }
-        if (Object.is(serviceName, 'PriceLevelService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.pricelevelService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'pricelevelid', 'pricelevel');
-        }
-        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, 'SalesOrderService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.salesorderService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'salesorderid', 'salesorder');
-        }
 
         return Promise.reject([])
     }

app_CRM/src/widgets/invoice/info-form/info-form.html

-<i-form :model="this.data" class='app-form' ref='form'  id='invoice_info' style="">
+<i-form :model="this.data" class='app-form info-form-mode' ref='form'  id='invoice_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.invoice.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.invoice.info_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.invoicenumber.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='invoicenumber' :itemRules="this.rules.invoicenumber" class='' :caption="$t('entities.invoice.info_form.details.invoicenumber')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.invoicenumber.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.invoicenumber"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.invoicenumber.disabled" type='text'  style=""></input-box>
+    
+<app-span name='invoicenumber' :value="data.invoicenumber" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.invoicename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='invoicename' :itemRules="this.rules.invoicename" class='' :caption="$t('entities.invoice.info_form.details.invoicename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.invoicename.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.invoicename"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.invoicename.disabled" type='text'  style=""></input-box>
+    
+<app-span name='invoicename' :value="data.invoicename" :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.invoice.info_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.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.invoice.info_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>
@@ -77,59 +39,40 @@
 
 </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.invoice.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.invoice.info_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.datedelivered.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='datedelivered' :itemRules="this.rules.datedelivered" class='' :caption="$t('entities.invoice.info_form.details.datedelivered')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.datedelivered.error" :isEmptyCaption="false" labelPos="LEFT">
-    <date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :value="data.datedelivered" :disabled="detailsModel.datedelivered.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.datedelivered = val1 }"></date-picker>
+    
+<app-span name='datedelivered' :value="data.datedelivered" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.duedate.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='duedate' :itemRules="this.rules.duedate" class='' :caption="$t('entities.invoice.info_form.details.duedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.duedate.error" :isEmptyCaption="false" labelPos="LEFT">
-    <date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :value="data.duedate" :disabled="detailsModel.duedate.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.duedate = val1 }"></date-picker>
+    
+<app-span name='duedate' :value="data.duedate" :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.invoice.info_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='Invoice__ShippingMethodCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='shippingmethodcode' :value="data.shippingmethodcode" tag='Invoice__ShippingMethodCode' codelistType='STATIC' :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <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.invoice.info_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='Invoice__PaymentTermsCode' 
-    codelistType='STATIC'
-    placeholder='请选择...' style="">
- </dropdown-list>
+<app-span name='paymenttermscode' :value="data.paymenttermscode" tag='Invoice__PaymentTermsCode' 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.invoice.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>
@@ -139,41 +82,47 @@
 
 </i-col>
 <i-col v-show="detailsModel.grouppanel3.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel3.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.invoice.info_form.details.grouppanel3')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel3.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.invoice.info_form.details.grouppanel3')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.totallineitemamount.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='totallineitemamount' :itemRules="this.rules.totallineitemamount" class='' :caption="$t('entities.invoice.info_form.details.totallineitemamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.totallineitemamount.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.totallineitemamount"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.totallineitemamount.disabled" type='number'  style=""></input-box>
+    
+<app-span name='totallineitemamount' :value="data.totallineitemamount" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.discountpercentage.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='discountpercentage' :itemRules="this.rules.discountpercentage" class='' :caption="$t('entities.invoice.info_form.details.discountpercentage')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.discountpercentage.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.discountpercentage"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.discountpercentage.disabled" type='number'  style=""></input-box>
+    
+<app-span name='discountpercentage' :value="data.discountpercentage" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.discountamount.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='discountamount' :itemRules="this.rules.discountamount" class='' :caption="$t('entities.invoice.info_form.details.discountamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.discountamount.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.discountamount"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.discountamount.disabled" type='number'  style=""></input-box>
+    
+<app-span name='discountamount' :value="data.discountamount" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.totalamountlessfreight.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='totalamountlessfreight' :itemRules="this.rules.totalamountlessfreight" class='' :caption="$t('entities.invoice.info_form.details.totalamountlessfreight')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.totalamountlessfreight.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.totalamountlessfreight"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.totalamountlessfreight.disabled" type='number'  style=""></input-box>
+    
+<app-span name='totalamountlessfreight' :value="data.totalamountlessfreight" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.freightamount.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='freightamount' :itemRules="this.rules.freightamount" class='' :caption="$t('entities.invoice.info_form.details.freightamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.freightamount.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.freightamount"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.freightamount.disabled" type='number'  style=""></input-box>
+    
+<app-span name='freightamount' :value="data.freightamount" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.totalamount.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='totalamount' :itemRules="this.rules.totalamount" class='' :caption="$t('entities.invoice.info_form.details.totalamount')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.totalamount.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.totalamount"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.totalamount.disabled" type='number'  style=""></input-box>
+    
+<app-span name='totalamount' :value="data.totalamount" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -183,65 +132,26 @@
 
 </i-col>
 <i-col v-show="detailsModel.grouppanel2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.invoice.info_form.details.grouppanel2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.invoice.info_form.details.grouppanel2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <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.invoice.info_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.salesordername.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='salesordername' :itemRules="this.rules.salesordername" class='' :caption="$t('entities.invoice.info_form.details.salesordername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.salesordername.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.salesordername.disabled"
-  name='salesordername'
-  deMajorField='salesordername'
-  deKeyField='salesorder'
-  :service="service"
-  :acParams="{ serviceName: 'SalesOrderService', interfaceName: 'FetchDefault'}"
-  valueitem='salesorderid' 
-  :value="data.salesordername" 
-  editortype="" 
-  :pickupView="{ viewname: 'sales-order-pickup-view', title: $t('entities.salesorder.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'salesorders', parameterName: 'salesorder' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+<app-span name='salesordername' :value="data.salesordername" :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.invoice.info_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>
@@ -251,29 +161,33 @@
 
 </i-col>
 <i-col v-show="detailsModel.grouppanel4.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.invoice.info_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
+    <app-form-group layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel4.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.invoice.info_form.details.grouppanel4')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.billto_country.visible" :style="{}"  :md="{ span: 121, 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.invoice.info_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: 121, 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.invoice.info_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: 121, 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.invoice.info_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: 121, 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.invoice.info_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>

app_CRM/src/widgets/product/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel-base.tsx

@@ -47,9 +47,9 @@ export class InfoViewtabexppanelTabexppanelBase extends TabExpPanelControlBase {
      */
     protected isInit: any = {
         tabviewpanel:  true ,
+        tabviewpanel2:  false ,
         tabviewpanel3:  false ,
         tabviewpanel4:  false ,
-        tabviewpanel2:  false ,
     }
 
     /**

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

@@ -23,10 +23,10 @@
     @closeview="closeView($event)">
 </view_tabviewpanel>
         </tab-pane>
-        <tab-pane :index="1" name='tabviewpanel3' tab='infoviewtabexppanel' class=''  
+        <tab-pane :index="1" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
-                    h('span', '价目表项'),
+                    h('span', '捆绑销售产品'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -35,21 +35,21 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel3 
+            <view_tabviewpanel2 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel3"
-    name="tabviewpanel3"  
-    ref='tabviewpanel3'
+    v-if="isInit.tabviewpanel2"
+    name="tabviewpanel2"  
+    ref='tabviewpanel2'
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel3>
+</view_tabviewpanel2>
         </tab-pane>
-        <tab-pane :index="2" name='tabviewpanel4' tab='infoviewtabexppanel' class=''  
+        <tab-pane :index="2" name='tabviewpanel3' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
-                    h('span', '产品关系'),
+                    h('span', '价目表项'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -58,21 +58,21 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel4 
+            <view_tabviewpanel3 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel4"
-    name="tabviewpanel4"  
-    ref='tabviewpanel4'
+    v-if="isInit.tabviewpanel3"
+    name="tabviewpanel3"  
+    ref='tabviewpanel3'
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel4>
+</view_tabviewpanel3>
         </tab-pane>
-        <tab-pane :index="3" name='tabviewpanel2' tab='infoviewtabexppanel' class=''  
+        <tab-pane :index="3" name='tabviewpanel4' tab='infoviewtabexppanel' class=''  
             :label="(h) =>{
                 return h('div', [
-                    h('span', '捆绑销售产品'),
+                    h('span', '产品关系'),
                     h('Badge', {
                         props: {
                             count: undefined,
@@ -81,16 +81,16 @@
                     })
                 ])
             }" >
-            <view_tabviewpanel2 
+            <view_tabviewpanel4 
     :viewState="viewState"  
     :viewparams="JSON.parse(JSON.stringify(viewparams))" 
     :context="JSON.parse(JSON.stringify(context))" 
-    v-if="isInit.tabviewpanel2"
-    name="tabviewpanel2"  
-    ref='tabviewpanel2'
+    v-if="isInit.tabviewpanel4"
+    name="tabviewpanel4"  
+    ref='tabviewpanel4'
     @viewpanelDatasChange = "tabViewPanelDatasChange"
     @closeview="closeView($event)">
-</view_tabviewpanel2>
+</view_tabviewpanel4>
         </tab-pane>
     </tabs>
 </div>
\ No newline at end of file

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

@@ -4,9 +4,9 @@ import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { InfoViewtabexppanelTabexppanelBase } from './info-viewtabexppanel-tabexppanel-base';
 import view_tabviewpanel from '@widgets/product/info-viewtabviewpanel-tabviewpanel/info-viewtabviewpanel-tabviewpanel.vue';
+import view_tabviewpanel2 from '@widgets/product/info-viewtabviewpanel2-tabviewpanel/info-viewtabviewpanel2-tabviewpanel.vue';
 import view_tabviewpanel3 from '@widgets/product/info-viewtabviewpanel3-tabviewpanel/info-viewtabviewpanel3-tabviewpanel.vue';
 import view_tabviewpanel4 from '@widgets/product/info-viewtabviewpanel4-tabviewpanel/info-viewtabviewpanel4-tabviewpanel.vue';
-import view_tabviewpanel2 from '@widgets/product/info-viewtabviewpanel2-tabviewpanel/info-viewtabviewpanel2-tabviewpanel.vue';
  
 
 /**
@@ -19,9 +19,9 @@ import view_tabviewpanel2 from '@widgets/product/info-viewtabviewpanel2-tabviewp
 @Component({
     components: {
         view_tabviewpanel, 
+        view_tabviewpanel2, 
         view_tabviewpanel3, 
         view_tabviewpanel4, 
-        view_tabviewpanel2, 
          
     }
 })

app_CRM/src/widgets/product/pro-info-form/pro-info-form-base.tsx

@@ -65,11 +65,7 @@ export class ProInfoEditFormBase extends EditFormControlBase {
         quantitydecimal: null,
         subjectname: null,
         description: null,
-        defaultuomid: null,
         productid: null,
-        defaultuomscheduleid: null,
-        subjectid: null,
-        pricelevelid: null,
         product:null,
     };
 
@@ -80,18 +76,6 @@ export class ProInfoEditFormBase extends EditFormControlBase {
      * @memberof ProInfoEditFormBase
      */
     public rules: any = {
-        productname: [
-            { required: true, type: 'string', message: '产品名称 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '产品名称 值不能为空', trigger: 'blur' },
-        ],
-        productnumber: [
-            { required: true, type: 'string', message: '产品 ID 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '产品 ID 值不能为空', trigger: 'blur' },
-        ],
-        quantitydecimal: [
-            { required: true, type: 'number', message: '支持小数 值不能为空', trigger: 'change' },
-            { required: true, type: 'number', message: '支持小数 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**
@@ -143,15 +127,7 @@ export class ProInfoEditFormBase extends EditFormControlBase {
 
         description: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'description', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        defaultuomid: new FormItemModel({ caption: '默认计价单位', detailType: 'FORMITEM', name: 'defaultuomid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
-
         productid: new FormItemModel({ caption: '产品', detailType: 'FORMITEM', name: 'productid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }),
 
-        defaultuomscheduleid: new FormItemModel({ caption: '计价单位组', detailType: 'FORMITEM', name: 'defaultuomscheduleid', 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 }),
-
-        pricelevelid: new FormItemModel({ caption: '默认价目表', detailType: 'FORMITEM', name: 'pricelevelid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 2 }),
-
     };
 }
\ No newline at end of file

app_CRM/src/widgets/product/pro-info-form/pro-info-form-model.ts

@@ -105,31 +105,11 @@ export default class ProInfoModel {
         prop: 'description',
         dataType: 'LONGTEXT_1000',
       },
-      {
-        name: 'defaultuomid',
-        prop: 'defaultuomid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'productid',
         prop: 'productid',
         dataType: 'GUID',
       },
-      {
-        name: 'defaultuomscheduleid',
-        prop: 'defaultuomscheduleid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'subjectid',
-        prop: 'subjectid',
-        dataType: 'PICKUP',
-      },
-      {
-        name: 'pricelevelid',
-        prop: 'pricelevelid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'product',
         prop: 'productid',

app_CRM/src/widgets/product/pro-info-form/pro-info-form-service.ts

@@ -2,10 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import ProductService from '@/service/product/product-service';
 import ProInfoModel from './pro-info-form-model';
-import UomScheduleService from '@/service/uom-schedule/uom-schedule-service';
-import UomService from '@/service/uom/uom-service';
-import PriceLevelService from '@/service/price-level/price-level-service';
-import SubjectService from '@/service/subject/subject-service';
 
 
 /**
@@ -45,38 +41,6 @@ export default class ProInfoService extends ControlService {
         this.model = new ProInfoModel();
     }
 
-    /**
-     * 计价单位组服务对象
-     *
-     * @type {UomScheduleService}
-     * @memberof ProInfoService
-     */
-    public uomscheduleService: UomScheduleService = new UomScheduleService();
-
-    /**
-     * 计价单位服务对象
-     *
-     * @type {UomService}
-     * @memberof ProInfoService
-     */
-    public uomService: UomService = new UomService();
-
-    /**
-     * 价目表服务对象
-     *
-     * @type {PriceLevelService}
-     * @memberof ProInfoService
-     */
-    public pricelevelService: PriceLevelService = new PriceLevelService();
-
-    /**
-     * 主题服务对象
-     *
-     * @type {SubjectService}
-     * @memberof ProInfoService
-     */
-    public subjectService: SubjectService = new SubjectService();
-
     /**
      * 处理数据
      *
@@ -116,18 +80,6 @@ export default class ProInfoService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
-        if (Object.is(serviceName, 'UomScheduleService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.uomscheduleService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'uomscheduleid', 'uomschedule');
-        }
-        if (Object.is(serviceName, 'UomService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.uomService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'uomid', 'uom');
-        }
-        if (Object.is(serviceName, 'PriceLevelService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.pricelevelService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'pricelevelid', 'pricelevel');
-        }
-        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/product/pro-info-form/pro-info-form.html

-<i-form :model="this.data" class='app-form' ref='form'  id='product_proinfo' style="">
+<i-form :model="this.data" class='app-form info-form-mode' ref='form'  id='product_proinfo' 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.product.proinfo_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.product.proinfo_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.productname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='productname' :itemRules="this.rules.productname" class='' :caption="$t('entities.product.proinfo_form.details.productname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.productname"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.productname.disabled" type='text'  style=""></input-box>
+    
+<app-span name='productname' :value="data.productname" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.productnumber.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='productnumber' :itemRules="this.rules.productnumber" class='' :caption="$t('entities.product.proinfo_form.details.productnumber')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.productnumber.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.productnumber"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.productnumber.disabled" type='text'  style=""></input-box>
+    
+<app-span name='productnumber' :value="data.productnumber" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.validfromdate.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='validfromdate' :itemRules="this.rules.validfromdate" class='' :caption="$t('entities.product.proinfo_form.details.validfromdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.validfromdate.error" :isEmptyCaption="false" labelPos="LEFT">
-    <date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :value="data.validfromdate" :disabled="detailsModel.validfromdate.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.validfromdate = val1 }"></date-picker>
+    
+<app-span name='validfromdate' :value="data.validfromdate" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.validtodate.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='validtodate' :itemRules="this.rules.validtodate" class='' :caption="$t('entities.product.proinfo_form.details.validtodate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.validtodate.error" :isEmptyCaption="false" labelPos="LEFT">
-    <date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :value="data.validtodate" :disabled="detailsModel.validtodate.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.validtodate = val1 }"></date-picker>
+    
+<app-span name='validtodate' :value="data.validtodate" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
@@ -35,126 +39,47 @@
 
 </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.product.proinfo_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.product.proinfo_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="true" >    
     <row>
         <i-col v-show="detailsModel.defaultuomschedulename.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='defaultuomschedulename' :itemRules="this.rules.defaultuomschedulename" class='' :caption="$t('entities.product.proinfo_form.details.defaultuomschedulename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.defaultuomschedulename.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.defaultuomschedulename.disabled"
-  name='defaultuomschedulename'
-  deMajorField='uomschedulename'
-  deKeyField='uomschedule'
-  :service="service"
-  :acParams="{ serviceName: 'UomScheduleService', interfaceName: 'FetchDefault'}"
-  valueitem='defaultuomscheduleid' 
-  :value="data.defaultuomschedulename" 
-  editortype="" 
-  :pickupView="{ viewname: 'uom-schedule-pickup-view', title: $t('entities.uomschedule.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'uomschedules', parameterName: 'uomschedule' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+<app-span name='defaultuomschedulename' :value="data.defaultuomschedulename" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style=""></app-span>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.defaultuomname.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='defaultuomname' :itemRules="this.rules.defaultuomname" class='' :caption="$t('entities.product.proinfo_form.details.defaultuomname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.defaultuomname.error" :isEmptyCaption="false" labelPos="LEFT">
     
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.defaultuomname.disabled"
-  name='defaultuomname'
-  deMajorField='uomname'
-  deKeyField='uom'
-  :service="service"
-  :acParams="{ serviceName: 'UomService', interfaceName: 'FetchDefault'}"
-  valueitem='defaultuomid' 
-  :value="data.defaultuomname" 
-  editortype="" 
-  :pickupView="{ viewname: 'uom-pickup-view', title: $t('entities.uom.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'uoms', parameterName: 'uom' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange($event)">
-</app-picker>
-
+<app-span name='defaultuomname' :value="data.defaultuomname" :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.product.proinfo_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.quantitydecimal.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 6, offset: 0 }">
     <app-form-item name='quantitydecimal' :itemRules="this.rules.quantitydecimal" class='' :caption="$t('entities.product.proinfo_form.details.quantitydecimal')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.quantitydecimal.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.quantitydecimal"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.quantitydecimal.disabled" type='number'  style=""></input-box>
+    
+<app-span name='quantitydecimal' :value="data.quantitydecimal" :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.product.proinfo_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.description.visible" :style="{}"  :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 24, offset: 0 }">
     <app-form-item name='description' :itemRules="this.rules.description" class='' :caption="$t('entities.product.proinfo_form.details.description')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.description.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box v-model="data.description" :autoSize="{minRows: 10}"  :disabled="detailsModel.description.disabled" type='textarea' style="height:200px;" ></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>

app_CRM/src/widgets/product/view-pro-info-portlet/view-pro-info-portlet.html

 <div class='portlet view-pro-info ' :style="{}">
-        <p class='portlet-title'>
-            <span>
-            
-            产品信息
-            </span>
-        </p>
-        <div class="portlet-with-title">
+        <div class="portlet-without-title">
         <product-info-pro-info :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></product-info-pro-info>
         </div>
 </div>

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,}">
-        <p class='portlet-title'>
-            <span>
-            
-            摘要信息
-            </span>
-        </p>
-        <div class="portlet-with-title">
+        <div class="portlet-without-title">
         <quote-info-abstract :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></quote-info-abstract>
         </div>
 </div>

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,}">
-        <p class='portlet-title'>
-            <span>
-            
-            资料信息
-            </span>
-        </p>
-        <div class="portlet-with-title">
+        <div class="portlet-without-title">
         <sales-literature-info-sal-lit-view :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></sales-literature-info-sal-lit-view>
         </div>
 </div>

app_CRM/src/widgets/sales-order/quick-create-form/quick-create-form-base.tsx

@@ -80,14 +80,6 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
             { required: true, type: 'string', message: '销售订单名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '销售订单名称 值不能为空', trigger: 'blur' },
         ],
-        transactioncurrencyname: [
-            { required: true, type: 'string', message: '货币 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '货币 值不能为空', trigger: 'blur' },
-        ],
-        pricelevelname: [
-            { required: true, type: 'string', message: '价目表 值不能为空', trigger: 'change' },
-            { required: true, type: 'string', message: '价目表 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**

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,}">
-        <p class='portlet-title'>
-            <span>
-            
-            订单信息
-            </span>
-        </p>
-        <div class="portlet-with-title">
+        <div class="portlet-without-title">
         <sales-order-info-soview :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></sales-order-info-soview>
         </div>
 </div>

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

@@ -2438,7 +2438,7 @@
 
 
     <!--输出实体[INVOICE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-invoice-37-33">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-invoice-40-33">
         <createTable tableName="INVOICE">
                 <column name="BILLTO_LINE1" remarks="" type="VARCHAR(250)">
                 </column>
@@ -3752,7 +3752,7 @@
 
 
     <!--输出实体[QUOTE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-40-47">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-quote-43-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-30-73">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-salesliterature-31-73">
         <createTable tableName="SALESLITERATURE">
                 <column name="IMPORTSEQUENCENUMBER" remarks="" type="INT">
                 </column>
@@ -8133,7 +8133,7 @@
 
 
     <!--输出实体[COMPETITOR]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-39-90">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-competitor-40-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-61-91">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-product-72-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-46-96">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-salesorder-48-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-18-100">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-productsubstitute-19-100">
         <createTable tableName="PRODUCTSUBSTITUTE">
                 <column name="PRODUCTSUBSTITUTENAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -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-37-192">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-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-37-193">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-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-37-194">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-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-37-195">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-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-37-196">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-invoice-40-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]外键关系 -->
@@ -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-40-230">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-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-40-231">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-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-40-232">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-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-40-233">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-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-40-234">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-quote-43-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-30-311">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliterature-31-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-30-312">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesliterature-31-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]外键关系 -->
@@ -11483,26 +11483,26 @@
         <!--输出实体[CAMPAIGNLIST]外键关系 -->
         <!--输出实体[LISTCONTACT]外键关系 -->
         <!--输出实体[COMPETITOR]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-39-350">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-competitor-40-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-61-351">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-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-61-352">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-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-61-353">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-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-61-354">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-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-61-355">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-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-61-356">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-product-72-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-46-364">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-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-46-365">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-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-46-366">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-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-46-367">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-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-46-368">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-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-46-369">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-salesorder-48-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-18-375">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productsubstitute-19-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-18-377">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-productsubstitute-19-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]外键关系 -->