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/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/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',