xignzi006 发布系统代码

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

@@ -749,13 +749,13 @@
         "viewtag": "3b3a9dc75518028c6577a3634f853bdc",
         "memo": ""
     },
-    "leadcompetitoredit_compleadview": {
+    "leadcompetitoredit_competitorview": {
         "title": "竞争对手潜在顾客信息",
         "caption": "潜在客户对手",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "Sales",
-        "viewname": "LeadCompetitorEdit_CompLeadView",
-        "viewfilename": "lead-competitor-edit-comp-lead-view",
+        "viewname": "LeadCompetitorEdit_CompetitorView",
+        "viewfilename": "lead-competitor-edit-competitor-view",
         "viewtag": "3bcf50e94ca826894b625ce946d9d8c8",
         "memo": ""
     },
@@ -869,6 +869,16 @@
         "viewtag": "41e012bf9b91b39e4a30072986b7c11e",
         "memo": ""
     },
+    "leadcompetitorleadgridview": {
+        "title": "潜在客户",
+        "caption": "潜在客户对手",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Sales",
+        "viewname": "LeadCompetitorLeadGridView",
+        "viewfilename": "lead-competitor-lead-grid-view",
+        "viewtag": "425cf0567a781d8c08ef69a2cf6df4ad",
+        "memo": "系统自动添加"
+    },
     "goalinfo_goalview": {
         "title": "目标信息视图",
         "caption": "目标",
@@ -1389,13 +1399,13 @@
         "viewtag": "73cfeee47b3d8226faade73f93a2097c",
         "memo": "系统自动添加"
     },
-    "leadcompetitorcompleadgridview": {
-        "title": "竞争对手潜在顾客信息",
+    "leadcompetitorcompetitorgridview": {
+        "title": "竞争对手",
         "caption": "潜在客户对手",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "Sales",
-        "viewname": "LeadCompetitorCompLeadGridView",
-        "viewfilename": "lead-competitor-comp-lead-grid-view",
+        "viewname": "LeadCompetitorCompetitorGridView",
+        "viewfilename": "lead-competitor-competitor-grid-view",
         "viewtag": "74d764142f94fb7dafabc018c953002c",
         "memo": ""
     },
@@ -2519,16 +2529,6 @@
         "viewtag": "d43a25ac94ca7cb20db961aae174ca53",
         "memo": "系统自动添加"
     },
-    "leadcompetitorgridview": {
-        "title": "潜在客户对手表格视图",
-        "caption": "潜在客户对手",
-        "viewtype": "DEGRIDVIEW",
-        "viewmodule": "Sales",
-        "viewname": "LeadCompetitorGridView",
-        "viewfilename": "lead-competitor-grid-view",
-        "viewtag": "d5bc3dd94496dbc1549773a1647ca64d",
-        "memo": "系统自动添加"
-    },
     "campaigninfo": {
         "title": "市场活动信息",
         "caption": "市场活动",

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

@@ -206,12 +206,10 @@ export default {
 		uiactions: {
 		},
 	},
-	main_form: {
+	edit_datapanel_form: {
 		details: {
-			group1: "invoice基本信息", 
+			group1: "发票基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "发票", 
@@ -220,18 +218,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			invoicename: "发票名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			totalamount: "总金额", 
+			statecode: "状态", 
+			ownername: "负责人", 
 			invoiceid: "发票", 
 		},
 		uiactions: {
 		},
 	},
-	edit_datapanel_form: {
+	datapanel_form: {
 		details: {
+			button1: "头信息编辑", 
+			grouppanel1: "分组面板", 
 			group1: "发票基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -248,6 +246,31 @@ export default {
 			invoiceid: "发票", 
 		},
 		uiactions: {
+        invoice_openedit_datapanelview: "头信息编辑",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "invoice基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "发票", 
+			srfmajortext: "发票名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			invoicename: "发票名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			invoiceid: "发票", 
+		},
+		uiactions: {
 		},
 	},
 	main_grid: {

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

@@ -205,12 +205,10 @@ export default {
 		uiactions: {
 		},
 	},
-	main_form: {
+	edit_datapanel_form: {
 		details: {
-			group1: "invoice基本信息", 
+			group1: "发票基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "发票", 
@@ -219,18 +217,18 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			invoicename: "发票名称", 
-			createman: "建立人", 
-			createdate: "建立时间", 
-			updateman: "更新人", 
-			updatedate: "更新时间", 
+			totalamount: "总金额", 
+			statecode: "状态", 
+			ownername: "负责人", 
 			invoiceid: "发票", 
 		},
 		uiactions: {
 		},
 	},
-	edit_datapanel_form: {
+	datapanel_form: {
 		details: {
+			button1: "头信息编辑", 
+			grouppanel1: "分组面板", 
 			group1: "发票基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -246,6 +244,31 @@ export default {
 			ownername: "负责人", 
 			invoiceid: "发票", 
 		},
+		uiactions: {
+			invoice_openedit_datapanelview: "头信息编辑",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "invoice基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "发票", 
+			srfmajortext: "发票名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			invoicename: "发票名称", 
+			createman: "建立人", 
+			createdate: "建立时间", 
+			updateman: "更新人", 
+			updatedate: "更新时间", 
+			invoiceid: "发票", 
+		},
 		uiactions: {
 		},
 	},

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

@@ -14,21 +14,21 @@ export default {
     entity2name: "对手",
   },
 	views: {
-		edit_compleadview: {
+		edit_competitorview: {
 			caption: "潜在客户对手",
       		title: "竞争对手潜在顾客信息",
 		},
-		compleadgridview: {
+		leadgridview: {
 			caption: "潜在客户对手",
-      		title: "竞争对手潜在顾客信息",
+      		title: "潜在客户",
 		},
-		editview: {
+		competitorgridview: {
 			caption: "潜在客户对手",
-      		title: "潜在客户对手编辑视图",
+      		title: "竞争对手",
 		},
-		gridview: {
+		editview: {
 			caption: "潜在客户对手",
-      		title: "潜在客户对手表格视图",
+      		title: "潜在客户对手编辑视图",
 		},
 	},
 	edit_complead_form: {
@@ -43,10 +43,9 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			entity2name: "对手", 
 			entity2id: "竞争对手", 
-			entityname: "潜在客户", 
 			relationshipsid: "关系标识", 
-			entityid: "潜在顾客", 
 		},
 		uiactions: {
 		},
@@ -85,19 +84,19 @@ export default {
 		uiactions: {
 		},
 	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
+	competitorgridviewtoolbar_toolbar: {
+		deuiaction1: {
 			caption: "New",
 			tip: "New",
 		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem4: {
 			caption: "Edit",
 			tip: "Edit {0}",
 		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
 		tbitem7: {
 			caption: "-",
 			tip: "",
@@ -123,9 +122,9 @@ export default {
 			tip: "Filter",
 		},
 	},
-	edit_compleadviewtoolbar_toolbar: {
+	edit_competitorviewtoolbar_toolbar: {
 	},
-	compleadgridviewtoolbar_toolbar: {
+	leadgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "New",
 			tip: "New",

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

@@ -13,21 +13,21 @@ export default {
     entity2name: "对手",
   },
 	views: {
-		edit_compleadview: {
+		edit_competitorview: {
 			caption: "潜在客户对手",
       		title: "竞争对手潜在顾客信息",
 		},
-		compleadgridview: {
+		leadgridview: {
 			caption: "潜在客户对手",
-      		title: "竞争对手潜在顾客信息",
+      		title: "潜在客户",
 		},
-		editview: {
+		competitorgridview: {
 			caption: "潜在客户对手",
-      		title: "潜在客户对手编辑视图",
+      		title: "竞争对手",
 		},
-		gridview: {
+		editview: {
 			caption: "潜在客户对手",
-      		title: "潜在客户对手表格视图",
+      		title: "潜在客户对手编辑视图",
 		},
 	},
 	edit_complead_form: {
@@ -42,10 +42,9 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
+			entity2name: "对手", 
 			entity2id: "竞争对手", 
-			entityname: "潜在客户", 
 			relationshipsid: "关系标识", 
-			entityid: "潜在顾客", 
 		},
 		uiactions: {
 		},
@@ -84,19 +83,19 @@ export default {
 		uiactions: {
 		},
 	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
+	competitorgridviewtoolbar_toolbar: {
+		deuiaction1: {
 			caption: "新建",
 			tip: "新建",
 		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem4: {
 			caption: "编辑",
 			tip: "编辑",
 		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
 		tbitem7: {
 			caption: "-",
 			tip: "",
@@ -122,9 +121,9 @@ export default {
 			tip: "过滤",
 		},
 	},
-	edit_compleadviewtoolbar_toolbar: {
+	edit_competitorviewtoolbar_toolbar: {
 	},
-	compleadgridviewtoolbar_toolbar: {
+	leadgridviewtoolbar_toolbar: {
 		deuiaction1: {
 			caption: "新建",
 			tip: "新建",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -607,12 +607,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "CompetitorInfo_Abstract",
             "viewtag": "3b3a9dc75518028c6577a3634f853bdc"
         },
-        "leadcompetitoredit_compleadview": {
+        "leadcompetitoredit_competitorview": {
             "title": "竞争对手潜在顾客信息",
             "caption": "潜在客户对手",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "Sales",
-            "viewname": "LeadCompetitorEdit_CompLeadView",
+            "viewname": "LeadCompetitorEdit_CompetitorView",
             "viewtag": "3bcf50e94ca826894b625ce946d9d8c8"
         },
         "productpricelevelproprilvgridview": {
@@ -703,6 +703,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ProductInfo_ProInfo",
             "viewtag": "41e012bf9b91b39e4a30072986b7c11e"
         },
+        "leadcompetitorleadgridview": {
+            "title": "潜在客户",
+            "caption": "潜在客户对手",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Sales",
+            "viewname": "LeadCompetitorLeadGridView",
+            "viewtag": "425cf0567a781d8c08ef69a2cf6df4ad"
+        },
         "goalinfo_goalview": {
             "title": "目标信息视图",
             "caption": "目标",
@@ -1119,12 +1127,12 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ConnectionRoleEditView",
             "viewtag": "73cfeee47b3d8226faade73f93a2097c"
         },
-        "leadcompetitorcompleadgridview": {
-            "title": "竞争对手潜在顾客信息",
+        "leadcompetitorcompetitorgridview": {
+            "title": "竞争对手",
             "caption": "潜在客户对手",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "Sales",
-            "viewname": "LeadCompetitorCompLeadGridView",
+            "viewname": "LeadCompetitorCompetitorGridView",
             "viewtag": "74d764142f94fb7dafabc018c953002c"
         },
         "contacteditaddress": {
@@ -2023,14 +2031,6 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "OpportunityLostGridView",
             "viewtag": "d43a25ac94ca7cb20db961aae174ca53"
         },
-        "leadcompetitorgridview": {
-            "title": "潜在客户对手表格视图",
-            "caption": "潜在客户对手",
-            "viewtype": "DEGRIDVIEW",
-            "viewmodule": "Sales",
-            "viewname": "LeadCompetitorGridView",
-            "viewtag": "d5bc3dd94496dbc1549773a1647ca64d"
-        },
         "campaigninfo": {
             "title": "市场活动信息",
             "caption": "市场活动",

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

@@ -44,7 +44,7 @@ export const PageComponents = {
         Vue.component('campaign-grid-view', () => import('@pages/marketing/campaign-grid-view/campaign-grid-view.vue'));
         Vue.component('knowledge-article-summary-view', () => import('@pages/base/knowledge-article-summary-view/knowledge-article-summary-view.vue'));
         Vue.component('list-lead-by-list', () => import('@pages/marketing/list-lead-by-list/list-lead-by-list.vue'));
-        Vue.component('lead-competitor-comp-lead-grid-view', () => import('@pages/sales/lead-competitor-comp-lead-grid-view/lead-competitor-comp-lead-grid-view.vue'));
+        Vue.component('lead-competitor-competitor-grid-view', () => import('@pages/sales/lead-competitor-competitor-grid-view/lead-competitor-competitor-grid-view.vue'));
         Vue.component('campaign-activity-edit-view', () => import('@pages/marketing/campaign-activity-edit-view/campaign-activity-edit-view.vue'));
         Vue.component('contact-quick-create', () => import('@pages/base/contact-quick-create/contact-quick-create.vue'));
         Vue.component('quote-by-parent-key', () => import('@pages/sales/quote-by-parent-key/quote-by-parent-key.vue'));
@@ -92,7 +92,6 @@ export const PageComponents = {
         Vue.component('contact-by-account', () => import('@pages/base/contact-by-account/contact-by-account.vue'));
         Vue.component('multi-pick-data-ac', () => import('@pages/base/multi-pick-data-ac/multi-pick-data-ac.vue'));
         Vue.component('ibiz-list-summary', () => import('@pages/marketing/ibiz-list-summary/ibiz-list-summary.vue'));
-        Vue.component('lead-competitor-grid-view', () => import('@pages/sales/lead-competitor-grid-view/lead-competitor-grid-view.vue'));
         Vue.component('campaign-quick-create-view', () => import('@pages/marketing/campaign-quick-create-view/campaign-quick-create-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('sales-order-cancel-grid-view', () => import('@pages/sales/sales-order-cancel-grid-view/sales-order-cancel-grid-view.vue'));
@@ -153,6 +152,7 @@ export const PageComponents = {
         Vue.component('opportunity-lost-grid-view', () => import('@pages/sales/opportunity-lost-grid-view/opportunity-lost-grid-view.vue'));
         Vue.component('product-association-edit-view', () => import('@pages/product/product-association-edit-view/product-association-edit-view.vue'));
         Vue.component('sales-order-grid-view', () => import('@pages/sales/sales-order-grid-view/sales-order-grid-view.vue'));
+        Vue.component('lead-competitor-lead-grid-view', () => import('@pages/sales/lead-competitor-lead-grid-view/lead-competitor-lead-grid-view.vue'));
         Vue.component('metric-pickup-view', () => import('@pages/base/metric-pickup-view/metric-pickup-view.vue'));
         Vue.component('lead-status-tab-view', () => import('@pages/sales/lead-status-tab-view/lead-status-tab-view.vue'));
         Vue.component('sales-order-quick-create-view', () => import('@pages/sales/sales-order-quick-create-view/sales-order-quick-create-view.vue'));
@@ -175,7 +175,6 @@ export const PageComponents = {
         Vue.component('incident-customer-pickup-grid-view', () => import('@pages/service/incident-customer-pickup-grid-view/incident-customer-pickup-grid-view.vue'));
         Vue.component('campaign-response-edit-view', () => import('@pages/marketing/campaign-response-edit-view/campaign-response-edit-view.vue'));
         Vue.component('campaign-info', () => import('@pages/marketing/campaign-info/campaign-info.vue'));
-        Vue.component('lead-competitor-edit-view', () => import('@pages/sales/lead-competitor-edit-view/lead-competitor-edit-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('connection-by-parent-key', () => import('@pages/runtime/connection-by-parent-key/connection-by-parent-key.vue'));
@@ -193,6 +192,7 @@ export const PageComponents = {
         Vue.component('campaign-activity-by-parent-key', () => import('@pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue'));
         Vue.component('price-level-pickup-grid-view', () => import('@pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue'));
         Vue.component('quote-opp-qua-grid-view', () => import('@pages/sales/quote-opp-qua-grid-view/quote-opp-qua-grid-view.vue'));
+        Vue.component('invoice-edit-data-panel-view', () => import('@pages/finance/invoice-edit-data-panel-view/invoice-edit-data-panel-view.vue'));
         Vue.component('account-tree-grid-ex-view', () => import('@pages/base/account-tree-grid-ex-view/account-tree-grid-ex-view.vue'));
         Vue.component('incident-by-parent-key', () => import('@pages/service/incident-by-parent-key/incident-by-parent-key.vue'));
         Vue.component('lead-qualification', () => import('@pages/sales/lead-qualification/lead-qualification.vue'));
@@ -215,7 +215,7 @@ export const PageComponents = {
         Vue.component('activity-pointer-by-parent-key', () => import('@pages/base/activity-pointer-by-parent-key/activity-pointer-by-parent-key.vue'));
         Vue.component('entitlement-pickup-view', () => import('@pages/service/entitlement-pickup-view/entitlement-pickup-view.vue'));
         Vue.component('uom-pickup-view', () => import('@pages/base/uom-pickup-view/uom-pickup-view.vue'));
-        Vue.component('lead-competitor-edit-comp-lead-view', () => import('@pages/sales/lead-competitor-edit-comp-lead-view/lead-competitor-edit-comp-lead-view.vue'));
+        Vue.component('lead-competitor-edit-competitor-view', () => import('@pages/sales/lead-competitor-edit-competitor-view/lead-competitor-edit-competitor-view.vue'));
         Vue.component('list-account-inner', () => import('@pages/marketing/list-account-inner/list-account-inner.vue'));
         Vue.component('contact-summary-view', () => import('@pages/base/contact-summary-view/contact-summary-view.vue'));
         Vue.component('task-edit-view', () => import('@pages/base/task-edit-view/task-edit-view.vue'));

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

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

app_CRM/src/pages/finance/invoice-edit-data-panel-view/invoice-edit-data-panel-view.html

+<studio-view-style2 viewName="invoiceedit_datapanelview" viewTitle="头部信息编辑" class='deeditview invoice-edit-data-panel-view'>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="true" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/finance/invoice-edit-data-panel-view/invoice-edit-data-panel-view.vue

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

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

@@ -2,6 +2,7 @@ import { Subject } from 'rxjs';
 import { TabExpViewBase } from '@/studio-core';
 import InvoiceService from '@/service/invoice/invoice-service';
 import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
+import DataPanelEngine from '@engine/ctrl/data-panel-engine';
 import InvoiceUIService from '@/uiservice/invoice/invoice-ui-service';
 
 /**
@@ -80,6 +81,7 @@ export class InvoiceInfoViewBase extends TabExpViewBase {
      */
     protected containerModel: any = {
         view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_datapanel: { name: 'datapanel', type: 'FORM' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
@@ -124,6 +126,15 @@ export class InvoiceInfoViewBase extends TabExpViewBase {
      */
     public engine: TabExpViewEngine = new TabExpViewEngine();
 
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof InvoiceInfoViewBase
+     */
+    public datapanel: DataPanelEngine = new DataPanelEngine();
+
     /**
      * 引擎初始化
      *
@@ -137,6 +148,13 @@ export class InvoiceInfoViewBase extends TabExpViewBase {
             majorPSDEField: 'invoicename',
             isLoadDefault: true,
         });
+        this.datapanel.init({
+            view: this,
+            datapanel: this.$refs.datapanel,
+            keyPSDEField: 'invoice',
+            majorPSDEField: 'invoicename',
+            isLoadDefault: true,
+        });
     }
 
     /**

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

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

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

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

app_CRM/src/pages/sales/competitor-grid-view/competitor-grid-view.html

 <studio-view-style2 viewName="competitorgridview" viewTitle="竞争对手信息" class='degridview competitor-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_CRM/src/pages/sales/lead-competitor-competitor-grid-view/lead-competitor-competitor-grid-view.html

+<studio-view-style2 viewName="leadcompetitorcompetitorgridview" viewTitle="竞争对手" class='degridview lead-competitor-competitor-grid-view'>
+    <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>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/sales/lead-competitor-competitor-grid-view/lead-competitor-competitor-grid-view.vue

+<template src="./lead-competitor-competitor-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { LeadCompetitorCompetitorGridViewBase } from './lead-competitor-competitor-grid-view-base';
+import view_grid from '@widgets/lead-competitor/main-grid/main-grid.vue';
+import view_searchform from '@widgets/lead-competitor/default-searchform/default-searchform.vue';
+
+/**
+ * 竞争对手视图
+ *
+ * @export
+ * @class LeadCompetitorCompetitorGridView
+ * @extends {LeadCompetitorCompetitorGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class LeadCompetitorCompetitorGridView extends LeadCompetitorCompetitorGridViewBase { }
+</script>

app_CRM/src/pages/sales/lead-competitor-edit-competitor-view/lead-competitor-edit-competitor-view-base.tsx

+import { Subject } from 'rxjs';
+import { EditViewBase } from '@/studio-core';
+import LeadCompetitorService from '@/service/lead-competitor/lead-competitor-service';
+import EditViewEngine from '@engine/view/edit-view-engine';
+
+/**
+ * 竞争对手潜在顾客信息视图基类
+ *
+ * @export
+ * @class LeadCompetitorEdit_CompetitorViewBase
+ * @extends {EditViewBase}
+ */
+export class LeadCompetitorEdit_CompetitorViewBase extends EditViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    protected appDeName: string = 'leadcompetitor';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    protected appDeKey: string = 'relationshipsid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    protected appDeMajor: string = 'relationshipsname';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {LeadCompetitorService}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    protected appEntityService: LeadCompetitorService = new LeadCompetitorService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.leadcompetitor.views.edit_competitorview.caption',
+        srfTitle: 'entities.leadcompetitor.views.edit_competitorview.title',
+        srfSubTitle: 'entities.leadcompetitor.views.edit_competitorview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_form: { name: 'form', type: 'FORM' },
+    };
+
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof LeadCompetitorEdit_CompetitorView
+     */
+    public toolBarModels: any = {
+    };
+
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '3bcf50e94ca826894b625ce946d9d8c8';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    public engine: EditViewEngine = new EditViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'leadcompetitor',
+            majorPSDEField: 'relationshipsname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof LeadCompetitorEdit_CompetitorViewBase
+     */
+    public form_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/pages/sales/lead-competitor-edit-competitor-view/lead-competitor-edit-competitor-view.html

+<studio-view-style2 viewName="leadcompetitoredit_competitorview" viewTitle="竞争对手潜在顾客信息" class='deeditview lead-competitor-edit-competitor-view'>
+    <template slot="toolbar">
+                <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
+    <view_form 
+                :viewState="viewState"  
+                :viewparams="viewparams" 
+                :context="context" 
+                :autosave="false" 
+                :viewtag="viewtag"
+                :showBusyIndicator="true"
+                updateAction="Update"
+                removeAction="Remove"
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
+                WFSubmitAction=""
+                WFStartAction=""
+                style='' 
+                name="form"  
+                ref='form' 
+                @save="form_save($event)"  
+                @remove="form_remove($event)"  
+                @load="form_load($event)"  
+                @closeview="closeView($event)">
+            </view_form>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/sales/lead-competitor-edit-competitor-view/lead-competitor-edit-competitor-view.vue

+<template src="./lead-competitor-edit-competitor-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { LeadCompetitorEdit_CompetitorViewBase } from './lead-competitor-edit-competitor-view-base';
+import view_form from '@widgets/lead-competitor/edit-comp-lead-form/edit-comp-lead-form.vue';
+
+/**
+ * 竞争对手潜在顾客信息视图
+ *
+ * @export
+ * @class LeadCompetitorEdit_CompetitorView
+ * @extends {LeadCompetitorEdit_CompetitorViewBase}
+ */
+@Component({
+    components: {
+        view_form, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class LeadCompetitorEdit_CompetitorView extends LeadCompetitorEdit_CompetitorViewBase { }
+</script>

app_CRM/src/pages/sales/lead-competitor-lead-grid-view/lead-competitor-lead-grid-view.html

+<studio-view-style2 viewName="leadcompetitorleadgridview" viewTitle="潜在客户" class='degridview lead-competitor-lead-grid-view'>
+    <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>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave.apply(_self, arguments)"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata.bind(_self)"
+        :opendata="opendata.bind(_self)"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/sales/lead-competitor-lead-grid-view/lead-competitor-lead-grid-view.vue

+<template src="./lead-competitor-lead-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { LeadCompetitorLeadGridViewBase } from './lead-competitor-lead-grid-view-base';
+import view_grid from '@widgets/lead-competitor/main-grid/main-grid.vue';
+import view_searchform from '@widgets/lead-competitor/default-searchform/default-searchform.vue';
+
+/**
+ * 潜在客户视图
+ *
+ * @export
+ * @class LeadCompetitorLeadGridView
+ * @extends {LeadCompetitorLeadGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class LeadCompetitorLeadGridView extends LeadCompetitorLeadGridViewBase { }
+</script>

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

@@ -657,9 +657,9 @@ export const viewstate: any = {
             refviews: [
                 '50fa6dc3108b1959155c8092331dd8a7',
                 'e0705f7fd9afd10e3f38b1ff03edba8b',
+                '74d764142f94fb7dafabc018c953002c',
                 '2e9c7792c3a728896ca8902634f71983',
                 'bae77557d2f7a7852b634dc5d5a93435',
-                'd5bc3dd94496dbc1549773a1647ca64d',
                 'b5ff54b0672efd3222a44d81f4e7362e',
                 '44f1244c0a9e78981a151dc7f247e867',
                 'fcdb236b65d78c4a8ae64e74f9483a63',
@@ -699,11 +699,11 @@ export const viewstate: any = {
         {
             viewtag: '3bcf50e94ca826894b625ce946d9d8c8',
             viewmodule: 'Sales',
-            viewname: 'LeadCompetitorEdit_CompLeadView',
+            viewname: 'LeadCompetitorEdit_CompetitorView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '1bc48b15dbe69c5f30dafe489f58aacb',
+                'b153b539b40b2ff7a9d81b6c0329cf25',
             ],
         },
         {
@@ -756,6 +756,15 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '3dce5b12278b797f02c77e6dad5f6b17',
+            viewmodule: 'Finance',
+            viewname: 'InvoiceEdit_DataPanelView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '3de13dd6914e2465d23dab68ccea5cae',
             viewmodule: 'Sales',
@@ -792,6 +801,16 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '425cf0567a781d8c08ef69a2cf6df4ad',
+            viewmodule: 'Sales',
+            viewname: 'LeadCompetitorLeadGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '3bcf50e94ca826894b625ce946d9d8c8',
+            ],
+        },
         {
             viewtag: '42dfdbed522e32b0efd03a9402ae29f8',
             viewmodule: 'Sales',
@@ -1275,11 +1294,11 @@ export const viewstate: any = {
         {
             viewtag: '74d764142f94fb7dafabc018c953002c',
             viewmodule: 'Sales',
-            viewname: 'LeadCompetitorCompLeadGridView',
+            viewname: 'LeadCompetitorCompetitorGridView',
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'd43728f22dd85502c1f3c27e93878162',
+                '3bcf50e94ca826894b625ce946d9d8c8',
             ],
         },
         {
@@ -1965,6 +1984,7 @@ export const viewstate: any = {
             refviews: [
                 '2bb0e34c7ae753e03404e4d96b17e90c',
                 '77ef5d53fe0cadbe03c9d2f9d25c804b',
+                '3dce5b12278b797f02c77e6dad5f6b17',
             ],
         },
         {
@@ -1985,7 +2005,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'f83783341c365d6eb1d7385c9d1ddb95',
-                '74d764142f94fb7dafabc018c953002c',
+                '425cf0567a781d8c08ef69a2cf6df4ad',
                 '6f2e9be27a6026ea1b35f6b54101cd21',
                 'ac5ea5e435a4102d39f1f4a569368b25',
                 '9bf80730e83a74615919a0f0907505d4',
@@ -2323,15 +2343,6 @@ export const viewstate: any = {
                 '94d961edd298073d53ca3239c092fac4',
             ],
         },
-        {
-            viewtag: 'd43728f22dd85502c1f3c27e93878162',
-            viewmodule: 'Sales',
-            viewname: 'LeadCompetitorEditView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-            ],
-        },
         {
             viewtag: 'd43a25ac94ca7cb20db961aae174ca53',
             viewmodule: 'Sales',
@@ -2343,16 +2354,6 @@ export const viewstate: any = {
                 'a243cd62accb02ceba4fb128703128f0',
             ],
         },
-        {
-            viewtag: 'd5bc3dd94496dbc1549773a1647ca64d',
-            viewmodule: 'Sales',
-            viewname: 'LeadCompetitorGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                '3bcf50e94ca826894b625ce946d9d8c8',
-            ],
-        },
         {
             viewtag: 'd8b664607bd727900320b23da3fafaf2',
             viewmodule: 'Marketing',

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

@@ -240,6 +240,74 @@ export default class InvoiceUIServiceBase extends UIService {
             openDrawer(view, data);
     }
 
+    /**
+     * 头信息编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName] 父实体名称
+     * @returns {Promise<any>}
+     */
+    public async Invoice_OpenEdit_DataPanelView(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    
+        let data: any = {};
+        let parentContext:any = {};
+        let parentViewParam:any = {};
+        const _this: any = actionContext;
+        const _args: any[] = Util.deepCopy(args);
+        const actionTarget: string | null = 'SINGLEKEY';
+        Object.assign(context, { invoice: '%invoice%' });
+        Object.assign(params, { invoiceid: '%invoice%' });
+        Object.assign(params, { invoicename: '%invoicename%' });
+        if(_this.context){
+            parentContext = _this.context;
+        }
+        if(_this.viewparams){
+            parentViewParam = _this.viewparams;
+        }
+        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
+        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
+        context = Object.assign({},actionContext.context,context);
+        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
+        Object.assign(data,parentObj);
+        Object.assign(context,parentObj);
+        let deResParameters: any[] = [];
+        if(context.salesorder && true){
+            deResParameters = [
+            { pathName: 'salesorders', parameterName: 'salesorder' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'invoices', parameterName: 'invoice' },
+        ];
+            const openPopOver = (view: any, data: any) => {
+                let container: Subject<any> = actionContext.$apppopover.openPop($event, view, context,data);
+                container.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    const _this: any = actionContext;
+                    if(window.opener){
+                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
+                        window.close();
+                    }
+                    return result.datas;
+                });
+            }
+            const view: any = {
+                viewname: 'invoice-edit-data-panel-view', 
+                height: 300, 
+                width: 300,  
+                title: actionContext.$t('entities.invoice.views.edit_datapanelview.title'),
+                placement: 'POPOVER',
+            };
+            openPopOver(view, data);
+    }
+
     /**
      * 打开主信息界面
      *

app_CRM/src/uiservice/lead-competitor/lead-competitor-ui-service-base.ts

@@ -79,10 +79,10 @@ export default class LeadCompetitorUIServiceBase extends UIService {
      * @memberof  LeadCompetitorUIServiceBase
      */  
     public initViewMap(){
-        this.allViewMap.set(':',{viewname:'edit_compleadview',srfappde:'leadcompetitors'});
-        this.allViewMap.set(':',{viewname:'compleadgridview',srfappde:'leadcompetitors'});
+        this.allViewMap.set(':',{viewname:'edit_competitorview',srfappde:'leadcompetitors'});
+        this.allViewMap.set(':',{viewname:'leadgridview',srfappde:'leadcompetitors'});
+        this.allViewMap.set(':',{viewname:'competitorgridview',srfappde:'leadcompetitors'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'leadcompetitors'});
-        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'leadcompetitors'});
     }
 
     /**

app_CRM/src/widgets/competitor/infotabviewpanel4-tabviewpanel/infotabviewpanel4-tabviewpanel.html

 <div class='tabviewpanel' v-if='isActivied'>
-        <lead-competitor-comp-lead-grid-view 
+        <lead-competitor-lead-grid-view 
         class='viewcontainer2' 
         :viewdata="viewdata" 
         :viewparam="viewparam"

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

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