chitanda 发布系统代码

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

@@ -209,6 +209,16 @@
         "viewtag": "08e0772f0c42c435525ed40425ae4661",
         "memo": "系统自动添加"
     },
+    "incidenteffectivegridview": {
+        "title": "服务案例信息",
+        "caption": "案例",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentEffectiveGridView",
+        "viewfilename": "incident-effective-grid-view",
+        "viewtag": "091b2e4e1948bc0270ea92ef414b5107",
+        "memo": "系统自动添加"
+    },
     "ibizlistedit_datapanelview": {
         "title": "头部信息编辑",
         "caption": "市场营销列表",
@@ -779,6 +789,16 @@
         "viewtag": "3124753ba4abff3aaf49355a5197c4ab",
         "memo": "系统自动添加"
     },
+    "incidentresolvedgridview": {
+        "title": "服务案例信息",
+        "caption": "案例",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentResolvedGridView",
+        "viewfilename": "incident-resolved-grid-view",
+        "viewtag": "318b64495dd22999b5157cc1e514c284",
+        "memo": "系统自动添加"
+    },
     "accountinfo_all": {
         "title": "客户编辑视图",
         "caption": "客户",
@@ -1189,6 +1209,16 @@
         "viewtag": "521acee07c15c72e914d3ca538cb26fc",
         "memo": ""
     },
+    "incidentedit_datapanelview": {
+        "title": "头部信息编辑",
+        "caption": "案例",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentEdit_DataPanelView",
+        "viewfilename": "incident-edit-data-panel-view",
+        "viewtag": "521ffd6250d5eaa84e1823060941306a",
+        "memo": ""
+    },
     "incidentquickcreateview": {
         "title": "快速新建",
         "caption": "案例",
@@ -1539,6 +1569,16 @@
         "viewtag": "7217511947b8833ba5683e54c06b0271",
         "memo": "系统自动添加"
     },
+    "incidentstatetabview": {
+        "title": "案例状态分页视图",
+        "caption": "案例",
+        "viewtype": "DETABEXPVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentStateTabView",
+        "viewfilename": "incident-state-tab-view",
+        "viewtag": "72a6c4ef002175090488d6f819020395",
+        "memo": ""
+    },
     "accountinfo_introduction": {
         "title": "客户编辑视图",
         "caption": "客户",
@@ -2099,6 +2139,16 @@
         "viewtag": "9bf80730e83a74615919a0f0907505d4",
         "memo": ""
     },
+    "incidentcancelgridview": {
+        "title": "服务案例信息",
+        "caption": "案例",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentCancelGridView",
+        "viewfilename": "incident-cancel-grid-view",
+        "viewtag": "9df0a05841198bd4f991837d703979b8",
+        "memo": "系统自动添加"
+    },
     "productstopgridview": {
         "title": "产品信息",
         "caption": "产品",

app_CRM/src/components/app-mpicker/app-mpicker.vue

@@ -342,11 +342,11 @@ export default class AppMpicker extends Vue {
                 let selects: Array<any> = [];
                 if (result.datas && Array.isArray(result.datas)) {
                     result.datas.forEach((select: any) => {
-                        selects.push({ [this.deKeyField]: select[this.deKeyField], [this.deMajorField]: select[this.deMajorField] });
-                        let index = this.items.findIndex((item) => Object.is(item[this.deKeyField], select[this.deKeyField]));
-                        if (index < 0) {
                         const params = { [this.deMajorField]: select[this.deMajorField], [this.deKeyField]: select[this.deKeyField] }
                         this.fillExtraValue(params, select);
+                        selects.push(params);
+                        let index = this.items.findIndex((item) => Object.is(item[this.deKeyField], select[this.deKeyField]));
+                        if (index < 0) {
                             this.items.push(params);
                         }
                     });
@@ -408,14 +408,11 @@ export default class AppMpicker extends Vue {
      */
     public fillExtraValue(params: any, item: any): void {
         if (isExist(this.extraFillParams)) {
-            for (const key in this.extraFillParams) {
-                if (this.extraFillParams.hasOwnProperty(key)) {
-                    const self = this.extraFillParams[key];
+            this.extraFillParams.forEach((self: any) => {
                 if (isExist(item[self.key])) {
                     Object.assign(params, { [self.value]: item[self.key]});
                 }
-                }
-            }
+            });
         }
     }
 

app_CRM/src/locale/lanres/entities/incident/incident_en_US.ts

@@ -103,6 +103,10 @@ export default {
 			caption: "案例",
       		title: "案例编辑视图",
 		},
+		effectivegridview: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		edit_chlidincident: {
 			caption: "案例",
       		title: "子案例信息",
@@ -111,10 +115,18 @@ export default {
 			caption: "案例",
       		title: "服务案例信息",
 		},
+		resolvedgridview: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		gridview: {
 			caption: "案例",
       		title: "服务案例信息",
 		},
+		edit_datapanelview: {
+			caption: "案例",
+      		title: "头部信息编辑",
+		},
 		quickcreateview: {
 			caption: "案例",
       		title: "快速新建",
@@ -123,6 +135,10 @@ export default {
 			caption: "案例",
       		title: "快速新建",
 		},
+		statetabview: {
+			caption: "案例",
+      		title: "案例状态分页视图",
+		},
 		pickupgridview: {
 			caption: "案例",
       		title: "案例选择表格视图",
@@ -131,6 +147,10 @@ export default {
 			caption: "案例",
       		title: "案例数据选择视图",
 		},
+		cancelgridview: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		childincidentgridview: {
 			caption: "案例",
       		title: "子案例信息",
@@ -237,6 +257,51 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_datapanel_form: {
+		details: {
+			group1: "案例基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "案例", 
+			srfmajortext: "案例标题", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			prioritycode: "优先级", 
+			escalatedon: "呈报日期", 
+			statecode: "状态", 
+			ownername: "负责人", 
+			incidentid: "案例", 
+		},
+		uiactions: {
+		},
+	},
+	datepanel_form: {
+		details: {
+			button1: "头信息编辑", 
+			grouppanel1: "分组面板", 
+			group1: "案例基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "案例", 
+			srfmajortext: "案例标题", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			prioritycode: "优先级", 
+			escalatedon: "呈报日期", 
+			statecode: "状态", 
+			ownername: "负责人", 
+			incidentid: "案例", 
+		},
+		uiactions: {
+        incident_openedit_datapanelview: "头信息编辑",
+		},
+	},
 	main_form: {
 		details: {
 			group1: "incident基本信息", 
@@ -321,6 +386,36 @@ export default {
 			tip: "关闭",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		tbitem17_resolve: {
+			caption: "解决案例",
+			tip: "解决案例",
+		},
+		tbitem17_cancel_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem17_cancel: {
+			caption: "取消案例",
+			tip: "取消案例",
+		},
+		tbitem17_active_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem17_active: {
+			caption: "重新激活",
+			tip: "重新激活",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	byparentkeytoolbar_toolbar: {
 		tbitem1_quickcreatebyparent: {
 			caption: "新建",
@@ -401,6 +496,114 @@ export default {
 			tip: "Copy {0}",
 		},
 	},
+	effectivegridviewtoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_resolve: {
+			caption: "解决案例",
+			tip: "解决案例",
+		},
+		tbitem14_cancel_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem14_cancel: {
+			caption: "取消案例",
+			tip: "取消案例",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	resolvedgridviewtoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_active: {
+			caption: "重新激活",
+			tip: "重新激活",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
@@ -443,4 +646,54 @@ export default {
 			tip: "Filter",
 		},
 	},
+	cancelgridviewtoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_active: {
+			caption: "重新激活",
+			tip: "重新激活",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/incident/incident_zh_CN.ts

@@ -102,6 +102,10 @@ export default {
 			caption: "案例",
       		title: "案例编辑视图",
 		},
+		effectivegridview: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		edit_chlidincident: {
 			caption: "案例",
       		title: "子案例信息",
@@ -110,10 +114,18 @@ export default {
 			caption: "案例",
       		title: "服务案例信息",
 		},
+		resolvedgridview: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		gridview: {
 			caption: "案例",
       		title: "服务案例信息",
 		},
+		edit_datapanelview: {
+			caption: "案例",
+      		title: "头部信息编辑",
+		},
 		quickcreateview: {
 			caption: "案例",
       		title: "快速新建",
@@ -122,6 +134,10 @@ export default {
 			caption: "案例",
       		title: "快速新建",
 		},
+		statetabview: {
+			caption: "案例",
+      		title: "案例状态分页视图",
+		},
 		pickupgridview: {
 			caption: "案例",
       		title: "案例选择表格视图",
@@ -130,6 +146,10 @@ export default {
 			caption: "案例",
       		title: "案例数据选择视图",
 		},
+		cancelgridview: {
+			caption: "案例",
+      		title: "服务案例信息",
+		},
 		childincidentgridview: {
 			caption: "案例",
       		title: "子案例信息",
@@ -236,6 +256,51 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_datapanel_form: {
+		details: {
+			group1: "案例基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "案例", 
+			srfmajortext: "案例标题", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			prioritycode: "优先级", 
+			escalatedon: "呈报日期", 
+			statecode: "状态", 
+			ownername: "负责人", 
+			incidentid: "案例", 
+		},
+		uiactions: {
+		},
+	},
+	datepanel_form: {
+		details: {
+			button1: "头信息编辑", 
+			grouppanel1: "分组面板", 
+			group1: "案例基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "案例", 
+			srfmajortext: "案例标题", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			prioritycode: "优先级", 
+			escalatedon: "呈报日期", 
+			statecode: "状态", 
+			ownername: "负责人", 
+			incidentid: "案例", 
+		},
+		uiactions: {
+			incident_openedit_datapanelview: "头信息编辑",
+		},
+	},
 	main_form: {
 		details: {
 			group1: "incident基本信息", 
@@ -320,6 +385,36 @@ export default {
 			tip: "关闭",
 		},
 	},
+	infoviewtoolbar_toolbar: {
+		tbitem17_resolve: {
+			caption: "解决案例",
+			tip: "解决案例",
+		},
+		tbitem17_cancel_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem17_cancel: {
+			caption: "取消案例",
+			tip: "取消案例",
+		},
+		tbitem17_active_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem17_active: {
+			caption: "重新激活",
+			tip: "重新激活",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "关闭",
+			tip: "关闭",
+		},
+	},
 	byparentkeytoolbar_toolbar: {
 		tbitem1_quickcreatebyparent: {
 			caption: "新建",
@@ -400,6 +495,114 @@ export default {
 			tip: "拷贝",
 		},
 	},
+	effectivegridviewtoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_resolve: {
+			caption: "解决案例",
+			tip: "解决案例",
+		},
+		tbitem14_cancel_sep: {
+			caption: "",
+			tip: "",
+		},
+		tbitem14_cancel: {
+			caption: "取消案例",
+			tip: "取消案例",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	resolvedgridviewtoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_active: {
+			caption: "重新激活",
+			tip: "重新激活",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 	gridviewtoolbar_toolbar: {
 		tbitem1_quickcreate: {
 			caption: "新建",
@@ -442,4 +645,54 @@ export default {
 			tip: "过滤",
 		},
 	},
+	cancelgridviewtoolbar_toolbar: {
+		tbitem1_quickcreate: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14_active: {
+			caption: "重新激活",
+			tip: "重新激活",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -175,6 +175,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountByParentKey",
             "viewtag": "08e0772f0c42c435525ed40425ae4661"
         },
+        "incidenteffectivegridview": {
+            "title": "服务案例信息",
+            "caption": "案例",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentEffectiveGridView",
+            "viewtag": "091b2e4e1948bc0270ea92ef414b5107"
+        },
         "ibizlistedit_datapanelview": {
             "title": "头部信息编辑",
             "caption": "市场营销列表",
@@ -631,6 +639,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ListContactGridView",
             "viewtag": "3124753ba4abff3aaf49355a5197c4ab"
         },
+        "incidentresolvedgridview": {
+            "title": "服务案例信息",
+            "caption": "案例",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentResolvedGridView",
+            "viewtag": "318b64495dd22999b5157cc1e514c284"
+        },
         "accountinfo_all": {
             "title": "客户编辑视图",
             "caption": "客户",
@@ -959,6 +975,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "GoalInfoView",
             "viewtag": "521acee07c15c72e914d3ca538cb26fc"
         },
+        "incidentedit_datapanelview": {
+            "title": "头部信息编辑",
+            "caption": "案例",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentEdit_DataPanelView",
+            "viewtag": "521ffd6250d5eaa84e1823060941306a"
+        },
         "incidentquickcreateview": {
             "title": "快速新建",
             "caption": "案例",
@@ -1239,6 +1263,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountInnerPickupGridView",
             "viewtag": "7217511947b8833ba5683e54c06b0271"
         },
+        "incidentstatetabview": {
+            "title": "案例状态分页视图",
+            "caption": "案例",
+            "viewtype": "DETABEXPVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentStateTabView",
+            "viewtag": "72a6c4ef002175090488d6f819020395"
+        },
         "accountinfo_introduction": {
             "title": "客户编辑视图",
             "caption": "客户",
@@ -1687,6 +1719,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "CompetitorSummary",
             "viewtag": "9bf80730e83a74615919a0f0907505d4"
         },
+        "incidentcancelgridview": {
+            "title": "服务案例信息",
+            "caption": "案例",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentCancelGridView",
+            "viewtag": "9df0a05841198bd4f991837d703979b8"
+        },
         "productstopgridview": {
             "title": "产品信息",
             "caption": "产品",

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

 export const PageComponents = {
     install(Vue: any, opt: any) {
                 Vue.component('ibiz-list-stop-grid-view', () => import('@pages/marketing/ibiz-list-stop-grid-view/ibiz-list-stop-grid-view.vue'));
-        Vue.component('goal-child-goal-grid-view', () => import('@pages/sales/goal-child-goal-grid-view/goal-child-goal-grid-view.vue'));
         Vue.component('quote-effective-grid-view', () => import('@pages/sales/quote-effective-grid-view/quote-effective-grid-view.vue'));
+        Vue.component('goal-child-goal-grid-view', () => import('@pages/sales/goal-child-goal-grid-view/goal-child-goal-grid-view.vue'));
         Vue.component('invoice-info-invoice-view', () => import('@pages/finance/invoice-info-invoice-view/invoice-info-invoice-view.vue'));
         Vue.component('competitor-option-view', () => import('@pages/sales/competitor-option-view/competitor-option-view.vue'));
         Vue.component('ibiz-list-edit-data-panel-view', () => import('@pages/marketing/ibiz-list-edit-data-panel-view/ibiz-list-edit-data-panel-view.vue'));
@@ -126,6 +126,7 @@ export const PageComponents = {
         Vue.component('account-quick-create', () => import('@pages/base/account-quick-create/account-quick-create.vue'));
         Vue.component('incident-edit-chlid-incident', () => import('@pages/service/incident-edit-chlid-incident/incident-edit-chlid-incident.vue'));
         Vue.component('product-price-level-pro-prilv-grid-view', () => import('@pages/product/product-price-level-pro-prilv-grid-view/product-price-level-pro-prilv-grid-view.vue'));
+        Vue.component('incident-state-tab-view', () => import('@pages/service/incident-state-tab-view/incident-state-tab-view.vue'));
         Vue.component('list-account-by-list', () => import('@pages/marketing/list-account-by-list/list-account-by-list.vue'));
         Vue.component('product-info-pro-info', () => import('@pages/product/product-info-pro-info/product-info-pro-info.vue'));
         Vue.component('campaign-response-by-parent-key', () => import('@pages/marketing/campaign-response-by-parent-key/campaign-response-by-parent-key.vue'));
@@ -194,6 +195,7 @@ export const PageComponents = {
         Vue.component('account-by-parent-key', () => import('@pages/base/account-by-parent-key/account-by-parent-key.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('incident-resolved-grid-view', () => import('@pages/service/incident-resolved-grid-view/incident-resolved-grid-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'));
@@ -206,6 +208,7 @@ export const PageComponents = {
         Vue.component('contact-edit-view', () => import('@pages/base/contact-edit-view/contact-edit-view.vue'));
         Vue.component('appointment-edit-view', () => import('@pages/base/appointment-edit-view/appointment-edit-view.vue'));
         Vue.component('list-account-edit-view', () => import('@pages/marketing/list-account-edit-view/list-account-edit-view.vue'));
+        Vue.component('incident-edit-data-panel-view', () => import('@pages/service/incident-edit-data-panel-view/incident-edit-data-panel-view.vue'));
         Vue.component('entitlement-pickup-grid-view', () => import('@pages/service/entitlement-pickup-grid-view/entitlement-pickup-grid-view.vue'));
         Vue.component('contact-grid-view', () => import('@pages/base/contact-grid-view/contact-grid-view.vue'));
         Vue.component('incident-customer-mpickup-view', () => import('@pages/service/incident-customer-mpickup-view/incident-customer-mpickup-view.vue'));
@@ -226,12 +229,13 @@ export const PageComponents = {
         Vue.component('sales-order-by-parent-key', () => import('@pages/sales/sales-order-by-parent-key/sales-order-by-parent-key.vue'));
         Vue.component('product-pickup-grid-view', () => import('@pages/product/product-pickup-grid-view/product-pickup-grid-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('goal-summary-view', () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'));
         Vue.component('account-info', () => import('@pages/base/account-info/account-info.vue'));
+        Vue.component('goal-summary-view', () => import('@pages/sales/goal-summary-view/goal-summary-view.vue'));
         Vue.component('connection-role-grid-view', () => import('@pages/runtime/connection-role-grid-view/connection-role-grid-view.vue'));
         Vue.component('incident-pickup-view', () => import('@pages/service/incident-pickup-view/incident-pickup-view.vue'));
         Vue.component('contact-edit-data-panel-view', () => import('@pages/base/contact-edit-data-panel-view/contact-edit-data-panel-view.vue'));
         Vue.component('account-info-all', () => import('@pages/base/account-info-all/account-info-all.vue'));
+        Vue.component('incident-cancel-grid-view', () => import('@pages/service/incident-cancel-grid-view/incident-cancel-grid-view.vue'));
         Vue.component('contact-stop-grid-view', () => import('@pages/base/contact-stop-grid-view/contact-stop-grid-view.vue'));
         Vue.component('competitor-sales-literature-sal-lit-comp-edit-view', () => import('@pages/sales/competitor-sales-literature-sal-lit-comp-edit-view/competitor-sales-literature-sal-lit-comp-edit-view.vue'));
         Vue.component('activity-pointer-by-parent-key', () => import('@pages/base/activity-pointer-by-parent-key/activity-pointer-by-parent-key.vue'));
@@ -249,6 +253,7 @@ export const PageComponents = {
         Vue.component('campaign-stop-grid-view', () => import('@pages/marketing/campaign-stop-grid-view/campaign-stop-grid-view.vue'));
         Vue.component('product-effective-grid-view', () => import('@pages/product/product-effective-grid-view/product-effective-grid-view.vue'));
         Vue.component('account-stop-grid-view', () => import('@pages/base/account-stop-grid-view/account-stop-grid-view.vue'));
+        Vue.component('incident-effective-grid-view', () => import('@pages/service/incident-effective-grid-view/incident-effective-grid-view.vue'));
         Vue.component('connection-role-pickup-grid-view', () => import('@pages/runtime/connection-role-pickup-grid-view/connection-role-pickup-grid-view.vue'));
         Vue.component('account-inner-pickup-view', () => import('@pages/base/account-inner-pickup-view/account-inner-pickup-view.vue'));
         Vue.component('contact-edit-market', () => import('@pages/base/contact-edit-market/contact-edit-market.vue'));

app_CRM/src/pages/service/incident-cancel-grid-view/incident-cancel-grid-view.html

+<studio-view-style2 viewName="incidentcancelgridview" viewTitle="服务案例信息" class='degridview incident-cancel-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="FetchCancel"
+        :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/service/incident-cancel-grid-view/incident-cancel-grid-view.vue

+<template src="./incident-cancel-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IncidentCancelGridViewBase } from './incident-cancel-grid-view-base';
+import view_grid from '@widgets/incident/main-grid/main-grid.vue';
+import view_searchform from '@widgets/incident/default-searchform/default-searchform.vue';
+
+/**
+ * 服务案例信息视图
+ *
+ * @export
+ * @class IncidentCancelGridView
+ * @extends {IncidentCancelGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class IncidentCancelGridView extends IncidentCancelGridViewBase { }
+</script>

app_CRM/src/pages/service/incident-edit-data-panel-view/incident-edit-data-panel-view-base.tsx

+import { Subject } from 'rxjs';
+import { EditViewBase } from '@/studio-core';
+import IncidentService from '@/service/incident/incident-service';
+import IncidentAuthService from '@/authservice/incident/incident-auth-service';
+import EditViewEngine from '@engine/view/edit-view-engine';
+import IncidentUIService from '@/uiservice/incident/incident-ui-service';
+
+/**
+ * 头部信息编辑视图基类
+ *
+ * @export
+ * @class IncidentEdit_DataPanelViewBase
+ * @extends {EditViewBase}
+ */
+export class IncidentEdit_DataPanelViewBase extends EditViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    protected appDeName: string = 'incident';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    protected appDeKey: string = 'incidentid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    protected appDeMajor: string = 'title';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentService}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    protected appEntityService: IncidentService = new IncidentService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type IncidentUIService
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    public appUIService: IncidentUIService = new IncidentUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.incident.views.edit_datapanelview.caption',
+        srfTitle: 'entities.incident.views.edit_datapanelview.title',
+        srfSubTitle: 'entities.incident.views.edit_datapanelview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    protected containerModel: any = {
+        view_form: { name: 'form', type: 'FORM' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '521ffd6250d5eaa84e1823060941306a';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    public engine: EditViewEngine = new EditViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            form: this.$refs.form,
+            p2k: '0',
+            keyPSDEField: 'incident',
+            majorPSDEField: 'title',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * form 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    public form_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'save', $event);
+    }
+
+    /**
+     * form 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentEdit_DataPanelViewBase
+     */
+    public form_remove($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('form', 'remove', $event);
+    }
+
+    /**
+     * form 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentEdit_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/service/incident-edit-data-panel-view/incident-edit-data-panel-view.html

+<studio-view-style2 viewName="incidentedit_datapanelview" viewTitle="头部信息编辑" class='deeditview incident-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/service/incident-edit-data-panel-view/incident-edit-data-panel-view.vue

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

app_CRM/src/pages/service/incident-effective-grid-view/incident-effective-grid-view.html

+<studio-view-style2 viewName="incidenteffectivegridview" viewTitle="服务案例信息" class='degridview incident-effective-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="FetchEffective"
+        :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/service/incident-effective-grid-view/incident-effective-grid-view.vue

+<template src="./incident-effective-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IncidentEffectiveGridViewBase } from './incident-effective-grid-view-base';
+import view_grid from '@widgets/incident/main-grid/main-grid.vue';
+import view_searchform from '@widgets/incident/default-searchform/default-searchform.vue';
+
+/**
+ * 服务案例信息视图
+ *
+ * @export
+ * @class IncidentEffectiveGridView
+ * @extends {IncidentEffectiveGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class IncidentEffectiveGridView extends IncidentEffectiveGridViewBase { }
+</script>

app_CRM/src/pages/service/incident-grid-view/incident-grid-view.html

 <studio-view-style2 viewName="incidentgridview" viewTitle="服务案例信息" class='degridview incident-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/service/incident-info-view/incident-info-view-base.tsx

@@ -3,6 +3,7 @@ import { TabExpViewBase } from '@/studio-core';
 import IncidentService from '@/service/incident/incident-service';
 import IncidentAuthService from '@/authservice/incident/incident-auth-service';
 import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
+import DataPanelEngine from '@engine/ctrl/data-panel-engine';
 import IncidentUIService from '@/uiservice/incident/incident-ui-service';
 
 /**
@@ -88,9 +89,32 @@ export class IncidentInfoViewBase extends TabExpViewBase {
      * @memberof IncidentInfoViewBase
      */
     protected containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_datapanel: { name: 'datapanel', type: 'FORM' },
         view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
     };
 
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof IncidentInfoView
+     */
+    public toolBarModels: any = {
+        tbitem17_resolve: { name: 'tbitem17_resolve', caption: '解决案例', 'isShowCaption': true, 'isShowIcon': true, tooltip: '解决案例', iconcls: 'fa fa-coffee', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Resolve', target: 'SINGLEKEY', class: '' } },
+
+        tbitem17_cancel_sep: {  name: 'tbitem17_cancel_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem17_cancel: { name: 'tbitem17_cancel', caption: '取消案例', 'isShowCaption': true, 'isShowIcon': true, tooltip: '取消案例', iconcls: 'fa fa-close', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Cancel', target: 'SINGLEKEY', class: '' } },
+
+        tbitem17_active_sep: {  name: 'tbitem17_active_sep', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem17_active: { name: 'tbitem17_active', caption: '重新激活', 'isShowCaption': true, 'isShowIcon': true, tooltip: '重新激活', iconcls: 'fa fa-play-circle-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Active', target: 'SINGLEKEY', class: '' } },
+
+        tbitem2: {  name: 'tbitem2', 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,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+
+    };
+
+
 
 	/**
      * 视图唯一标识
@@ -111,6 +135,15 @@ export class IncidentInfoViewBase extends TabExpViewBase {
      */
     public engine: TabExpViewEngine = new TabExpViewEngine();
 
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof IncidentInfoViewBase
+     */
+    public datapanel: DataPanelEngine = new DataPanelEngine();
+
     /**
      * 引擎初始化
      *
@@ -124,6 +157,164 @@ export class IncidentInfoViewBase extends TabExpViewBase {
             majorPSDEField: 'title',
             isLoadDefault: true,
         });
+        this.datapanel.init({
+            view: this,
+            datapanel: this.$refs.datapanel,
+            keyPSDEField: 'incident',
+            majorPSDEField: 'title',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentInfoViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'tbitem17_resolve')) {
+            this.toolbar_tbitem17_resolve_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem17_cancel')) {
+            this.toolbar_tbitem17_cancel_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem17_active')) {
+            this.toolbar_tbitem17_active_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem12')) {
+            this.toolbar_tbitem12_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem17_resolve_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];
+        }
+        // 界面行为
+        const curUIService:IncidentUIService  = new IncidentUIService();
+        curUIService.Incident_Resolve(datas,contextJO, paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem17_cancel_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];
+        }
+        // 界面行为
+        const curUIService:IncidentUIService  = new IncidentUIService();
+        curUIService.Incident_Cancel(datas,contextJO, paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem17_active_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];
+        }
+        // 界面行为
+        const curUIService:IncidentUIService  = new IncidentUIService();
+        curUIService.Incident_Active(datas,contextJO, paramJO,  $event, xData,this,"Incident");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @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,"Incident");
+    }
+
+    /**
+     * 关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IncidentInfoViewBase
+     */
+    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/service/incident-info-view/incident-info-view.html

@@ -2,6 +2,29 @@
     <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 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/service/incident-info-view/incident-info-view.vue

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

app_CRM/src/pages/service/incident-resolved-grid-view/incident-resolved-grid-view.html

+<studio-view-style2 viewName="incidentresolvedgridview" viewTitle="服务案例信息" class='degridview incident-resolved-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="FetchResolved"
+        :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/service/incident-resolved-grid-view/incident-resolved-grid-view.vue

+<template src="./incident-resolved-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IncidentResolvedGridViewBase } from './incident-resolved-grid-view-base';
+import view_grid from '@widgets/incident/main-grid/main-grid.vue';
+import view_searchform from '@widgets/incident/default-searchform/default-searchform.vue';
+
+/**
+ * 服务案例信息视图
+ *
+ * @export
+ * @class IncidentResolvedGridView
+ * @extends {IncidentResolvedGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class IncidentResolvedGridView extends IncidentResolvedGridViewBase { }
+</script>

app_CRM/src/pages/service/incident-state-tab-view/incident-state-tab-view-base.tsx

+import { Subject } from 'rxjs';
+import { TabExpViewBase } from '@/studio-core';
+import IncidentService from '@/service/incident/incident-service';
+import IncidentAuthService from '@/authservice/incident/incident-auth-service';
+import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
+import IncidentUIService from '@/uiservice/incident/incident-ui-service';
+
+/**
+ * 案例状态分页视图视图基类
+ *
+ * @export
+ * @class IncidentStateTabViewBase
+ * @extends {TabExpViewBase}
+ */
+export class IncidentStateTabViewBase extends TabExpViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentStateTabViewBase
+     */
+    protected appDeName: string = 'incident';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentStateTabViewBase
+     */
+    protected appDeKey: string = 'incidentid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentStateTabViewBase
+     */
+    protected appDeMajor: string = 'title';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentService}
+     * @memberof IncidentStateTabViewBase
+     */
+    protected appEntityService: IncidentService = new IncidentService;
+
+    /**
+     * 实体权限服务对象
+     *
+     * @type IncidentUIService
+     * @memberof IncidentStateTabViewBase
+     */
+    public appUIService: IncidentUIService = new IncidentUIService(this.$store);
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof IncidentStateTabViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentStateTabViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.incident.views.statetabview.caption',
+        srfTitle: 'entities.incident.views.statetabview.title',
+        srfSubTitle: 'entities.incident.views.statetabview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentStateTabViewBase
+     */
+    protected containerModel: any = {
+        view_tabexppanel: { name: 'tabexppanel', type: 'TABEXPPANEL' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '72a6c4ef002175090488d6f819020395';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof IncidentStateTabViewBase
+     */
+    public engine: TabExpViewEngine = new TabExpViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof IncidentStateTabViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            keyPSDEField: 'incident',
+            majorPSDEField: 'title',
+            isLoadDefault: true,
+        });
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/pages/service/incident-state-tab-view/incident-state-tab-view.html

+<studio-view-style2 viewName="incidentstatetabview" viewTitle="案例状态分页视图" class='detabexpview incident-state-tab-view'>
+    <view_tabexppanel 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        name="tabexppanel"  
+        ref='tabexppanel' 
+        @closeview="closeView($event)">
+    </view_tabexppanel>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/service/incident-state-tab-view/incident-state-tab-view.vue

+<template src="./incident-state-tab-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IncidentStateTabViewBase } from './incident-state-tab-view-base';
+import view_tabexppanel from '@widgets/incident/state-tab-viewtabexppanel-tabexppanel/state-tab-viewtabexppanel-tabexppanel.vue';
+
+/**
+ * 案例状态分页视图视图
+ *
+ * @export
+ * @class IncidentStateTabView
+ * @extends {IncidentStateTabViewBase}
+ */
+@Component({
+    components: {
+        view_tabexppanel, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class IncidentStateTabView extends IncidentStateTabViewBase { }
+</script>

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

@@ -178,6 +178,17 @@ export const viewstate: any = {
                 '6e18ac74e5685439110f9b4e534ee005',
             ],
         },
+        {
+            viewtag: '091b2e4e1948bc0270ea92ef414b5107',
+            viewmodule: 'Service',
+            viewname: 'IncidentEffectiveGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '540213698dac06ea2ef3193da7fe9b11',
+                'f440f1d3b950a89e6cb72cadea120b74',
+            ],
+        },
         {
             viewtag: '0ab0bd0aaadd588905a82de62c80ff07',
             viewmodule: 'Marketing',
@@ -687,6 +698,17 @@ export const viewstate: any = {
                 'c7d0ca0f6fa1b27bbd1b5c422d1a108d',
             ],
         },
+        {
+            viewtag: '318b64495dd22999b5157cc1e514c284',
+            viewmodule: 'Service',
+            viewname: 'IncidentResolvedGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '540213698dac06ea2ef3193da7fe9b11',
+                'f440f1d3b950a89e6cb72cadea120b74',
+            ],
+        },
         {
             viewtag: '31f2ad06ced735d250dfa5f309b5aea4',
             viewmodule: 'Base',
@@ -1092,6 +1114,15 @@ export const viewstate: any = {
                 '674522952049a4e85508a1f9f3642d80',
             ],
         },
+        {
+            viewtag: '521ffd6250d5eaa84e1823060941306a',
+            viewmodule: 'Service',
+            viewname: 'IncidentEdit_DataPanelView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '540213698dac06ea2ef3193da7fe9b11',
             viewmodule: 'Service',
@@ -1416,6 +1447,19 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '72a6c4ef002175090488d6f819020395',
+            viewmodule: 'Service',
+            viewname: 'IncidentStateTabView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '9df0a05841198bd4f991837d703979b8',
+                '318b64495dd22999b5157cc1e514c284',
+                '091b2e4e1948bc0270ea92ef414b5107',
+                '3a665de6a3970b95fde436c0fea4b1df',
+            ],
+        },
         {
             viewtag: '73cfeee47b3d8226faade73f93a2097c',
             viewmodule: 'Runtime',
@@ -1661,6 +1705,7 @@ export const viewstate: any = {
                 'ef8908af79e7631a6292209fa498a899',
                 'bd2a4adb1377cac6ebbbc883699f28d9',
                 '25bf5f8c2ebd1ce2be6d06717ed08a96',
+                '72a6c4ef002175090488d6f819020395',
                 '3202f3f503424c7a2c549b2c5186dc36',
                 'd6dde8e6dd703de9b544d3e5d9f07579',
                 'efe82dc0a6991dd88da8c33cee6bf451',
@@ -1675,7 +1720,6 @@ export const viewstate: any = {
                 '3cac572b3a6905293a0e22e3f3fa3c04',
                 '7FCD2E75-E34A-493C-922E-8AE47BCE08CA',
                 'd1c35f3c52010e1428d7dc1a6bc82f63',
-                '3a665de6a3970b95fde436c0fea4b1df',
                 '00367e275947880480763049e5c495be',
             ],
         },
@@ -1949,6 +1993,17 @@ export const viewstate: any = {
                 'a5213905238dbc5d8e1a505029105cc9',
             ],
         },
+        {
+            viewtag: '9df0a05841198bd4f991837d703979b8',
+            viewmodule: 'Service',
+            viewname: 'IncidentCancelGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '540213698dac06ea2ef3193da7fe9b11',
+                'f440f1d3b950a89e6cb72cadea120b74',
+            ],
+        },
         {
             viewtag: '9ee07f1bb550f9c8c723cced7999d62f',
             viewmodule: 'Product',
@@ -2827,6 +2882,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 'b41c9efc080f3313f71ab30676ec7d9d',
+                '521ffd6250d5eaa84e1823060941306a',
                 'f6298e67a8fe2302b75813ca7f3ba94c',
             ],
         },

app_CRM/src/studio-core/view/PickupViewBase.tsx

@@ -59,6 +59,7 @@ export class PickupViewBase extends ViewBase {
      * @memberof PickupViewBase
      */
     public onClickCancel(): void {
+        this.$emit('viewdataschange', null);
         this.$emit('close', null);
     }
 }
\ No newline at end of file

app_CRM/src/studio-core/widgets/EditFormControlBase.tsx

@@ -324,6 +324,7 @@ export class EditFormControlBase extends FormControlBase {
             Object.assign(arg, data);
             Object.assign(arg, this.context);
             if (ifStateNext && this.drCount > 0) {
+                this.drcounter = this.drCount;
                 this.drsaveopt = opt;
                 this.formState.next({ type: 'beforesave', data: arg });//先通知关系界面保存
                 this.saveState = resolve;

app_CRM/src/widgets/app/central-appmenu/central-appmenu-base.tsx

@@ -80,7 +80,7 @@ export class CentralBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'incidents', parameterName: 'incident' },
-            { pathName: 'gridview', parameterName: 'gridview' },
+            { pathName: 'statetabview', parameterName: 'statetabview' },
         ];
         const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
         if(Object.is(this.$route.fullPath,path)){

app_CRM/src/widgets/incident/edit-data-panel-form/edit-data-panel-form.vue

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