xignzi006 发布系统代码

app_CRM/public/assets/json/data-dictionary.json

@@ -4684,6 +4684,33 @@
             }
         ]
     }, 
+    {
+        "srfkey": "ContentType",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "CONTENT",
+                "label": "内容",
+                "text": "内容",
+                "data":"",
+                "codename":"Content",
+                "value": "CONTENT",
+                
+                "disabled": false
+            }
+            , {
+                "id": "LINK",
+                "label": "链接",
+                "text": "链接",
+                "data":"",
+                "codename":"Link",
+                "value": "LINK",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Invoice__PaymentTermsCode",
         "emptytext": "未定义",

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

@@ -749,6 +749,16 @@
         "viewtag": "45fdc8ee4d1401d2d625e80177395ddc",
         "memo": ""
     },
+    "accounttreegridexview": {
+        "title": "客户树表格视图",
+        "caption": "客户",
+        "viewtype": "DETREEGRIDEXVIEW",
+        "viewmodule": "Base",
+        "viewname": "AccountTreeGridExView",
+        "viewfilename": "account-tree-grid-ex-view",
+        "viewtag": "4643000e02b7f39e4302c8e529ba096d",
+        "memo": ""
+    },
     "leadquickcreate": {
         "title": "快速新建",
         "caption": "快速新建",
@@ -1999,6 +2009,16 @@
         "viewtag": "c607e5bc2c07ab2aca084e275ce677b7",
         "memo": "系统自动添加"
     },
+    "websitecontenteditview": {
+        "title": "站点内容",
+        "caption": "站点内容",
+        "viewtype": "DEEDITVIEW",
+        "viewmodule": "WebSite",
+        "viewname": "WebSiteContentEditView",
+        "viewfilename": "web-site-content-edit-view",
+        "viewtag": "c711b39278eb48dac3c6f0195a69c109",
+        "memo": "系统自动添加"
+    },
     "opportunityinfo_product": {
         "title": "商机编辑视图",
         "caption": "商机",
@@ -2209,6 +2229,16 @@
         "viewtag": "e52af970c14fd89546ac8ccaecab460c",
         "memo": "系统自动添加"
     },
+    "websitecontentgridview": {
+        "title": "站点内容",
+        "caption": "站点内容",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "WebSite",
+        "viewname": "WebSiteContentGridView",
+        "viewfilename": "web-site-content-grid-view",
+        "viewtag": "e570e236f765ac29c3b0a54418996f01",
+        "memo": "系统自动添加"
+    },
     "salesorderinfo_soview": {
         "title": "订单编辑视图",
         "caption": "订单",

app_CRM/src/interface/entity/web-site-content.ts

+/**
+ * 站点内容
+ *
+ * @export
+ * @interface WebSiteContent
+ */
+export interface WebSiteContent {
+
+    /**
+     * 内容标识
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    websitecontentid?: any;
+
+    /**
+     * 建立人
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    createman?: any;
+
+    /**
+     * 内容名称
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    websitecontentname?: any;
+
+    /**
+     * 建立时间
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    createdate?: any;
+
+    /**
+     * 更新时间
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    updatedate?: any;
+
+    /**
+     * 更新人
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    updateman?: any;
+
+    /**
+     * 网站标识
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    websiteid?: any;
+
+    /**
+     * 频道标识
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    websitechannelid?: any;
+
+    /**
+     * 频道
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    websitechannelname?: any;
+
+    /**
+     * 站点
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    websitename?: any;
+
+    /**
+     * 内容类型
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    contenttype?: any;
+
+    /**
+     * 业务标识
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    contentcode?: any;
+
+    /**
+     * 作者
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    author?: any;
+
+    /**
+     * 内容
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    content?: any;
+
+    /**
+     * 子标题
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    subtitle?: any;
+
+    /**
+     * 标题
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    title?: any;
+
+    /**
+     * 内容链接
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    link?: any;
+
+    /**
+     * 是否启用
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    validflag?: any;
+
+    /**
+     * 序号
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    sn?: any;
+
+    /**
+     * 备注
+     *
+     * @returns {*}
+     * @memberof WebSiteContent
+     */
+    memo?: any;
+}
\ No newline at end of file

app_CRM/src/locale/lang/en-US.ts

@@ -8,6 +8,7 @@ import email_en_US from '@locale/lanres/entities/email/email_en_US';
 import serviceappointment_en_US from '@locale/lanres/entities/service-appointment/service-appointment_en_US';
 import uom_en_US from '@locale/lanres/entities/uom/uom_en_US';
 import transactioncurrency_en_US from '@locale/lanres/entities/transaction-currency/transaction-currency_en_US';
+import websitecontent_en_US from '@locale/lanres/entities/web-site-content/web-site-content_en_US';
 import metric_en_US from '@locale/lanres/entities/metric/metric_en_US';
 import opportunity_en_US from '@locale/lanres/entities/opportunity/opportunity_en_US';
 import goal_en_US from '@locale/lanres/entities/goal/goal_en_US';
@@ -168,6 +169,7 @@ export default {
         serviceappointment: serviceappointment_en_US,
         uom: uom_en_US,
         transactioncurrency: transactioncurrency_en_US,
+        websitecontent: websitecontent_en_US,
         metric: metric_en_US,
         opportunity: opportunity_en_US,
         goal: goal_en_US,

app_CRM/src/locale/lang/zh-CN.ts

@@ -8,6 +8,7 @@ import email_zh_CN from '@locale/lanres/entities/email/email_zh_CN';
 import serviceappointment_zh_CN from '@locale/lanres/entities/service-appointment/service-appointment_zh_CN';
 import uom_zh_CN from '@locale/lanres/entities/uom/uom_zh_CN';
 import transactioncurrency_zh_CN from '@locale/lanres/entities/transaction-currency/transaction-currency_zh_CN';
+import websitecontent_zh_CN from '@locale/lanres/entities/web-site-content/web-site-content_zh_CN';
 import metric_zh_CN from '@locale/lanres/entities/metric/metric_zh_CN';
 import opportunity_zh_CN from '@locale/lanres/entities/opportunity/opportunity_zh_CN';
 import goal_zh_CN from '@locale/lanres/entities/goal/goal_zh_CN';
@@ -168,6 +169,7 @@ export default {
         serviceappointment: serviceappointment_zh_CN,
         uom: uom_zh_CN,
         transactioncurrency: transactioncurrency_zh_CN,
+        websitecontent: websitecontent_zh_CN,
         metric: metric_zh_CN,
         opportunity: opportunity_zh_CN,
         goal: goal_zh_CN,

app_CRM/src/locale/lanres/codelist/codelist_en_US.ts

@@ -610,6 +610,11 @@ export default {
         "1": "高",
         "empty": ""
     },
+    ContentType: {
+        "CONTENT": "内容",
+        "LINK": "链接",
+        "empty": ""
+    },
     Invoice__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",

app_CRM/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -610,6 +610,11 @@ export default {
         "1": "高",
         "empty": "",
     },
+    ContentType: {
+        "CONTENT": "内容",
+        "LINK": "链接",
+        "empty": "",
+    },
     Invoice__PaymentTermsCode: {
         "2": "2/10 N30",
         "1": "N30",

app_CRM/src/locale/lanres/entities/account/account_en_US.ts

@@ -198,6 +198,10 @@ export default {
 			caption: "客户",
       		title: "客户编辑视图",
 		},
+		treegridexview: {
+			caption: "客户",
+      		title: "客户树表格视图",
+		},
 		gridview: {
 			caption: "客户信息",
       		title: "客户表格视图",
@@ -761,7 +765,29 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	treegridexviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+	},
+	usablegridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -798,12 +824,20 @@ export default {
 			caption: "-",
 			tip: "",
 		},
+		tbitem14_inactive: {
+			caption: "停用",
+			tip: "停用",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
 	},
-	usablegridviewtoolbar_toolbar: {
+	stopgridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -840,9 +874,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_inactive: {
-			caption: "停用",
-			tip: "停用",
+		tbitem14_active: {
+			caption: "激活",
+			tip: "激活",
 		},
 		tbitem15: {
 			caption: "-",
@@ -853,7 +887,7 @@ export default {
 			tip: "Filter",
 		},
 	},
-	stopgridviewtoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -890,14 +924,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_active: {
-			caption: "激活",
-			tip: "激活",
-		},
-		tbitem15: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",

app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -197,6 +197,10 @@ export default {
 			caption: "客户",
       		title: "客户编辑视图",
 		},
+		treegridexview: {
+			caption: "客户",
+      		title: "客户树表格视图",
+		},
 		gridview: {
 			caption: "客户信息",
       		title: "客户表格视图",
@@ -760,7 +764,29 @@ export default {
 			tip: "关闭",
 		},
 	},
-	gridviewtoolbar_toolbar: {
+	treegridexviewtoolbar_toolbar: {
+		deuiaction1: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+	},
+	usablegridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -797,12 +823,20 @@ export default {
 			caption: "-",
 			tip: "",
 		},
+		tbitem14_inactive: {
+			caption: "停用",
+			tip: "停用",
+		},
+		tbitem15: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",
 		},
 	},
-	usablegridviewtoolbar_toolbar: {
+	stopgridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -839,9 +873,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_inactive: {
-			caption: "停用",
-			tip: "停用",
+		tbitem14_active: {
+			caption: "激活",
+			tip: "激活",
 		},
 		tbitem15: {
 			caption: "-",
@@ -852,7 +886,7 @@ export default {
 			tip: "过滤",
 		},
 	},
-	stopgridviewtoolbar_toolbar: {
+	gridviewtoolbar_toolbar: {
 		tbitem1_openquickcreateview: {
 			caption: "新建",
 			tip: "新建",
@@ -889,14 +923,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem14_active: {
-			caption: "激活",
-			tip: "激活",
-		},
-		tbitem15: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",

app_CRM/src/locale/lanres/entities/web-site-content/web-site-content_en_US.ts

+
+export default {
+  fields: {
+    websitecontentid: "内容标识",
+    createman: "建立人",
+    websitecontentname: "内容名称",
+    createdate: "建立时间",
+    updatedate: "更新时间",
+    updateman: "更新人",
+    websiteid: "网站标识",
+    websitechannelid: "频道标识",
+    websitechannelname: "频道",
+    websitename: "站点",
+    contenttype: "内容类型",
+    contentcode: "业务标识",
+    author: "作者",
+    content: "内容",
+    subtitle: "子标题",
+    title: "标题",
+    link: "内容链接",
+    validflag: "是否启用",
+    sn: "序号",
+    memo: "备注",
+  },
+	views: {
+		editview: {
+			caption: "站点内容",
+      		title: "站点内容",
+		},
+		gridview: {
+			caption: "站点内容",
+      		title: "站点内容",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "内容基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "内容标识", 
+			srfmajortext: "内容名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			websitecontentid: "内容标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			websitename: "站点",
+			websitechannelname: "频道",
+			sn: "序号",
+			contenttype: "内容类型",
+			title: "标题",
+			contentcode: "业务标识",
+			author: "作者",
+			validflag: "是否启用",
+			memo: "备注",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "New",
+			tip: "New",
+		},
+		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: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem4: {
+			caption: "Save And New",
+			tip: "Save And New",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "Remove And Close",
+			tip: "Remove And Close Window",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "New",
+			tip: "New",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+	},
+};
\ No newline at end of file

app_CRM/src/locale/lanres/entities/web-site-content/web-site-content_zh_CN.ts

+export default {
+  fields: {
+    websitecontentid: "内容标识",
+    createman: "建立人",
+    websitecontentname: "内容名称",
+    createdate: "建立时间",
+    updatedate: "更新时间",
+    updateman: "更新人",
+    websiteid: "网站标识",
+    websitechannelid: "频道标识",
+    websitechannelname: "频道",
+    websitename: "站点",
+    contenttype: "内容类型",
+    contentcode: "业务标识",
+    author: "作者",
+    content: "内容",
+    subtitle: "子标题",
+    title: "标题",
+    link: "内容链接",
+    validflag: "是否启用",
+    sn: "序号",
+    memo: "备注",
+  },
+	views: {
+		editview: {
+			caption: "站点内容",
+      		title: "站点内容",
+		},
+		gridview: {
+			caption: "站点内容",
+      		title: "站点内容",
+		},
+	},
+	main_form: {
+		details: {
+			group1: "内容基本信息", 
+			formpage1: "基本信息", 
+			group2: "操作信息", 
+			formpage2: "其它", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "内容标识", 
+			srfmajortext: "内容名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			websitecontentid: "内容标识", 
+		},
+		uiactions: {
+		},
+	},
+	main_grid: {
+		columns: {
+			websitename: "站点",
+			websitechannelname: "频道",
+			sn: "序号",
+			contenttype: "内容类型",
+			title: "标题",
+			contentcode: "业务标识",
+			author: "作者",
+			validflag: "是否启用",
+			memo: "备注",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+		},
+		uiactions: {
+		},
+	},
+	gridviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem4: {
+			caption: "编辑",
+			tip: "编辑",
+		},
+		tbitem6: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "删除",
+			tip: "删除",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "导出",
+			tip: "导出",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "过滤",
+			tip: "过滤",
+		},
+	},
+	editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem4: {
+			caption: "保存并新建",
+			tip: "保存并新建",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem7: {
+			caption: "删除并关闭",
+			tip: "删除并关闭",
+		},
+		tbitem8: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem13: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem14: {
+			caption: "拷贝",
+			tip: "拷贝",
+		},
+	},
+};
\ No newline at end of file

app_CRM/src/mock/codelist/codelist.ts

@@ -4692,6 +4692,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "ContentType",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "CONTENT",
+                label: "内容",
+                text: "内容",
+                "data":"",
+                "codename":"Content",
+                value: "CONTENT",
+                
+                disabled: false,
+            },
+            {
+                id: "LINK",
+                label: "链接",
+                text: "链接",
+                "data":"",
+                "codename":"Link",
+                value: "LINK",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Invoice__PaymentTermsCode",
         emptytext: "未定义",

app_CRM/src/mock/entity/web-site-contents/web-site-contents.ts

+import qs from 'qs';
+import { MockAdapter } from '@/mock/mock-adapter';
+const mock = MockAdapter.getInstance();
+
+// 模拟数据
+const mockDatas: Array<any> = [
+];
+
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibizbusinesscentral-app-crm\/websitecontents\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibizbusinesscentral-app-crm\/websitecontents\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
+// createBatch
+mock.onPost(new RegExp(/^\/websitecontents\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: createBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+// updateBatch
+mock.onPut(new RegExp(/^\/websitecontents\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: updateBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+// removeBatch
+mock.onDelete(new RegExp(/^\/websitecontents\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: removeBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+
+// Select
+mock.onGet(new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: Select");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['websitecontentid'];
+    const matchArray:any = new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.websitecontentid, tempValue.websitecontentid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+        
+// Create
+mock.onPost(new RegExp(/^\/websitecontents\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: Create");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['websitecontentid'];
+    const matchArray:any = new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas[0]);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas[0]];
+});
+        
+// Update
+mock.onPut(new RegExp(/^\/websitecontents\/?([a-zA-Z0-9\-\;]{0,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: Update");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['websitecontentid'];
+    const matchArray:any = new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.websitecontentid, tempValue.websitecontentid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['websitecontentid'] == tempValue['websitecontentid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+
+// GetDraft
+mock.onGet(new RegExp(/^\/websitecontents\/getdraft$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: GetDraft");
+    console.table({url:config.url, method: config.method, data:config.data});
+    // GetDraft
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table({});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, {}];
+});
+        
+// CheckKey
+mock.onPost(new RegExp(/^\/websitecontents\/?([a-zA-Z0-9\-\;]{0,35})\/checkkey$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: CheckKey");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['websitecontentid'];
+    const matchArray:any = new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})\/checkkey$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.websitecontentid, tempValue.websitecontentid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['websitecontentid'] == tempValue['websitecontentid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+        
+// Save
+mock.onPost(new RegExp(/^\/websitecontents\/?([a-zA-Z0-9\-\;]{0,35})\/save$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: Save");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['websitecontentid'];
+    const matchArray:any = new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})\/save$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    //let items = mockDatas ? mockDatas : [];
+    //let _items = items.find((item: any) => Object.is(item.websitecontentid, tempValue.websitecontentid));
+      let data = JSON.parse(config.data);
+    mockDatas.forEach((item)=>{
+        if(item['websitecontentid'] == tempValue['websitecontentid'] ){
+            for(let value in data){
+              if(item.hasOwnProperty(value)){
+                  item[value] = data[value];
+              }
+            }
+        }
+    })
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(data);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, data];
+});
+    
+// FetchDefault
+mock.onGet(new RegExp(/^\/websitecontents\/fetchdefault$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: FetchDefault");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchDefault
+mock.onGet(new RegExp(/^\/websitecontents\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: FetchDefault");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+
+
+// Remove
+mock.onDelete(new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: Remove");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['websitecontentid'];
+    const matchArray:any = new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.websitecontentid, tempValue.websitecontentid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items?_items:{});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items?_items:{}];
+});
+
+// Get
+mock.onGet(new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})$/)).reply((config: any) => {
+    console.groupCollapsed("实体:websitecontent 方法: Get");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['websitecontentid'];
+    const matchArray:any = new RegExp(/^\/websitecontents\/([a-zA-Z0-9\-\;]{1,35})$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.websitecontentid, tempValue.websitecontentid));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items?_items:{});
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items?_items:{}];
+});

app_CRM/src/mock/index.ts

@@ -17,6 +17,7 @@ import './entity/emails/emails';
 import './entity/service-appointments/service-appointments';
 import './entity/uoms/uoms';
 import './entity/transaction-currencys/transaction-currencys';
+import './entity/web-site-contents/web-site-contents';
 import './entity/metrics/metrics';
 import './entity/opportunitys/opportunitys';
 import './entity/goals/goals';

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -607,6 +607,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ActivityPointerGridView",
             "viewtag": "45fdc8ee4d1401d2d625e80177395ddc"
         },
+        "accounttreegridexview": {
+            "title": "客户树表格视图",
+            "caption": "客户",
+            "viewtype": "DETREEGRIDEXVIEW",
+            "viewmodule": "Base",
+            "viewname": "AccountTreeGridExView",
+            "viewtag": "4643000e02b7f39e4302c8e529ba096d"
+        },
         "leadquickcreate": {
             "title": "快速新建",
             "caption": "快速新建",
@@ -1607,6 +1615,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountInfo_Distribution",
             "viewtag": "c607e5bc2c07ab2aca084e275ce677b7"
         },
+        "websitecontenteditview": {
+            "title": "站点内容",
+            "caption": "站点内容",
+            "viewtype": "DEEDITVIEW",
+            "viewmodule": "WebSite",
+            "viewname": "WebSiteContentEditView",
+            "viewtag": "c711b39278eb48dac3c6f0195a69c109"
+        },
         "opportunityinfo_product": {
             "title": "商机编辑视图",
             "caption": "商机",
@@ -1775,6 +1791,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SubjectPickupView",
             "viewtag": "e52af970c14fd89546ac8ccaecab460c"
         },
+        "websitecontentgridview": {
+            "title": "站点内容",
+            "caption": "站点内容",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "WebSite",
+            "viewname": "WebSiteContentGridView",
+            "viewtag": "e570e236f765ac29c3b0a54418996f01"
+        },
         "salesorderinfo_soview": {
             "title": "订单编辑视图",
             "caption": "订单",

app_CRM/src/pages/base/account-tree-grid-ex-view/account-tree-grid-ex-view-base.tsx

@@ -60,7 +60,6 @@ export class AccountTreeGridExViewBase extends TreeGridExViewBase {
      * @memberof AccountTreeGridExViewBase
      */
     protected containerModel: any = {
-        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
         view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_treegridex: { name: 'treegridex', type: 'TREEGRIDEX' },
     };
@@ -72,6 +71,14 @@ export class AccountTreeGridExViewBase extends TreeGridExViewBase {
      * @memberof AccountTreeGridExView
      */
     public toolBarModels: any = {
+        deuiaction1: { name: 'deuiaction1', caption: '新建','isShowCaption':true,'isShowIcon':true, tooltip: '新建', iconcls: 'fa fa-file-text-o', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' }, class: '' },
+
+        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem4: { name: 'tbitem4', caption: '编辑','isShowCaption':true,'isShowIcon':true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' }, class: '' },
+
+        tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem8: { name: 'tbitem8', caption: '删除','isShowCaption':true,'isShowIcon':true, tooltip: '删除', iconcls: 'fa fa-remove', icon: '', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' }, class: '' },
+
     };
 
 
@@ -83,7 +90,7 @@ export class AccountTreeGridExViewBase extends TreeGridExViewBase {
      * @type {string}
      * @memberof ViewBase
      */
-	protected viewtag: string = '8199e26c05058f9a505c39d85fcf1d46';
+	protected viewtag: string = '4643000e02b7f39e4302c8e529ba096d';
 
 
     /**
@@ -95,5 +102,319 @@ export class AccountTreeGridExViewBase extends TreeGridExViewBase {
     public engineInit(): void {
     }
 
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof AccountTreeGridExViewBase
+     */
+    public toolbar_click($event: any, $event2?: any): void {
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem19')) {
+            this.toolbar_tbitem19_click(null, '', $event2);
+        }
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.treegridex;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.New(datas, contextJO,paramJO,  $event, xData,this,"Account");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem4_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 = {};
+        xData = this.$refs.treegridex;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"Account");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem8_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 = {};
+        xData = this.$refs.treegridex;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Remove(datas, contextJO,paramJO,  $event, xData,this,"Account");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem13_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 = {};
+        xData = this.$refs.treegridex;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"Account");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem11_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 = {};
+        xData = this.$refs.treegridex;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Print(datas, contextJO,paramJO,  $event, xData,this,"Account");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem19_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 = {};
+        xData = this.$refs.treegridex;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"Account");
+    }
+
+    /**
+     * 新建
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof AccountTreeGridExViewBase
+     */
+    public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+         const _this: any = this;
+        if (_this.newdata && _this.newdata instanceof Function) {
+            const data: any = {};
+            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof AccountTreeGridExViewBase
+     */
+    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        if (args.length === 0) {
+            return;
+        }
+        const _this: any = this;
+        if (_this.opendata && _this.opendata instanceof Function) {
+            const data: any = { };
+            if (args.length > 0) {
+                Object.assign(data, { account: args[0].account })
+            }
+            _this.opendata([{ ...data }], params, $event, xData);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof AccountTreeGridExViewBase
+     */
+    public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (!xData || !(xData.remove instanceof Function)) {
+            return ;
+        }
+        xData.remove(args);
+    }
+
+    /**
+     * 导出
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof AccountTreeGridExViewBase
+     */
+    public ExportExcel(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (!xData || !(xData.exportExcel instanceof Function) || !$event) {
+            return ;
+        }
+        xData.exportExcel($event.exportparms);
+    }
+    /**
+     * 打印
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof AccountTreeGridExViewBase
+     */
+    public Print(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        let _this:any = this;
+        if (!xData || !(xData.print instanceof Function) || !$event) {
+            return ;
+        }
+        xData.print();
+    }
+    /**
+     * 过滤
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof AccountTreeGridExViewBase
+     */
+    public ToggleFilter(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (_this.hasOwnProperty('isExpandSearchForm')) {
+            _this.isExpandSearchForm = !_this.isExpandSearchForm;
+        }
+    }
 
 }
\ No newline at end of file

app_CRM/src/pages/base/account-tree-grid-ex-view/account-tree-grid-ex-view.html

 <studio-view-style2 viewName="accounttreegridexview" viewTitle="客户树表格视图" class='detreegridexview account-tree-grid-ex-view'>
+    <template slot='title'>
+    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
+    </template>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>
-    <template slot="searchForm">
-                <view_searchform 
-            :viewState="viewState"  
-            :viewparams="viewparams" 
-            :context="context" 
-            :showBusyIndicator="true"
-            v-show="isExpandSearchForm"
-            loaddraftAction="FilterGetDraft"
-            loadAction="FilterGet"
-        
-            name="searchform"  
-            ref='searchform' 
-            @closeview="closeView($event)">
-        </view_searchform>
-    </template>
     <view_treegridex 
         :viewState="viewState"  
         :viewparams="viewparams" 

app_CRM/src/pages/base/account-tree-grid-ex-view/account-tree-grid-ex-view.vue

@@ -3,8 +3,7 @@
 import { Component } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '@/studio-core';
 import { AccountTreeGridExViewBase } from './account-tree-grid-ex-view-base';
-import view_searchform from '@widgets/account/default-searchform/default-searchform.vue';
-import view_treegridex from '@widgets/account/gradation-treegridex/gradation-treegridex.vue';
+import view_treegridex from '@widgets/app/channel-content-treegridex/channel-content-treegridex.vue';
 
 /**
  * 客户树表格视图视图
@@ -15,7 +14,6 @@ import view_treegridex from '@widgets/account/gradation-treegridex/gradation-tre
  */
 @Component({
     components: {
-        view_searchform, 
         view_treegridex, 
     }
 })

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

@@ -36,7 +36,6 @@ export const PageComponents = {
         Vue.component('metric-pickup-grid-view', () => import('@pages/base/metric-pickup-grid-view/metric-pickup-grid-view.vue'));
         Vue.component('email-edit-view', () => import('@pages/base/email-edit-view/email-edit-view.vue'));
         Vue.component('goal-grid-view', () => import('@pages/sales/goal-grid-view/goal-grid-view.vue'));
-        Vue.component('account-grid-view', () => import('@pages/base/account-grid-view/account-grid-view.vue'));
         Vue.component('invoice-grid-view', () => import('@pages/finance/invoice-grid-view/invoice-grid-view.vue'));
         Vue.component('sales-literature-quick-create-view', () => import('@pages/sales/sales-literature-quick-create-view/sales-literature-quick-create-view.vue'));
         Vue.component('subject-pickup-grid-view', () => import('@pages/base/subject-pickup-grid-view/subject-pickup-grid-view.vue'));
@@ -129,6 +128,7 @@ export const PageComponents = {
         Vue.component('uom-pickup-grid-view', () => import('@pages/base/uom-pickup-grid-view/uom-pickup-grid-view.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('account-tree-grid-ex-view', () => import('@pages/base/account-tree-grid-ex-view/account-tree-grid-ex-view.vue'));
         Vue.component('invoice-info-view', () => import('@pages/finance/invoice-info-view/invoice-info-view.vue'));
         Vue.component('contact-by-account', () => import('@pages/base/contact-by-account/contact-by-account.vue'));
         Vue.component('lead-qualification', () => import('@pages/sales/lead-qualification/lead-qualification.vue'));

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

@@ -953,20 +953,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/goal-grid-view/goal-grid-view.vue'),
                 },
-                {
-                    path: 'accounts/:account?/gridview/:gridview?',
-                    meta: {
-                        caption: 'entities.account.views.gridview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/account-grid-view/account-grid-view.vue'),
-                },
                 {
                     path: 'invoices/:invoice?/gridview/:gridview?',
                     meta: {
@@ -3509,6 +3495,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/quote-opp-qua-grid-view/quote-opp-qua-grid-view.vue'),
                 },
+                {
+                    path: 'accounts/:account?/treegridexview/:treegridexview?',
+                    meta: {
+                        caption: 'entities.account.views.treegridexview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'treegridexview', parameterName: 'treegridexview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/account-tree-grid-ex-view/account-tree-grid-ex-view.vue'),
+                },
                 {
                     path: 'invoices/:invoice?/infoview/:infoview?',
                     meta: {

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

@@ -62,11 +62,11 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item:any) => {
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -76,12 +76,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        masterData.campaignlists = campaignlistsData;
+        let campaigncampaignsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
+            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -91,7 +91,7 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.campaigncampaigns = campaigncampaignsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -116,8 +116,8 @@ export default class CampaignServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/campaigns`,data,isloading);
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
@@ -133,11 +133,11 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item:any) => {
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -147,12 +147,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        masterData.campaignlists = campaignlistsData;
+        let campaigncampaignsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
+            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -162,7 +162,7 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.campaigncampaigns = campaigncampaignsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -180,8 +180,8 @@ export default class CampaignServiceBase extends EntityService {
         masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/campaigns/${context.campaign}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
@@ -210,8 +210,8 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/campaigns/${context.campaign}`,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }
@@ -228,8 +228,8 @@ export default class CampaignServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/campaigns/getdraft`,isloading);
         res.data.campaign = data.campaign;
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         return res;
     }
@@ -258,11 +258,11 @@ export default class CampaignServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
-        let campaigncampaignsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
-            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
-            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
-                campaigncampaignsData.forEach((item:any) => {
+        let campaignlistsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
+            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
+            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
+                campaignlistsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -272,12 +272,12 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaigncampaigns = campaigncampaignsData;
-        let campaignlistsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists'),'undefined')){
-            campaignlistsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaignlists') as any);
-            if(campaignlistsData && campaignlistsData.length && campaignlistsData.length > 0){
-                campaignlistsData.forEach((item:any) => {
+        masterData.campaignlists = campaignlistsData;
+        let campaigncampaignsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns'),'undefined')){
+            campaigncampaignsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_campaigncampaigns') as any);
+            if(campaigncampaignsData && campaigncampaignsData.length && campaigncampaignsData.length > 0){
+                campaigncampaignsData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -287,7 +287,7 @@ export default class CampaignServiceBase extends EntityService {
                 });
             }
         }
-        masterData.campaignlists = campaignlistsData;
+        masterData.campaigncampaigns = campaigncampaignsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -305,8 +305,8 @@ export default class CampaignServiceBase extends EntityService {
         masterData.leads = leadsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/campaigns/${context.campaign}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_campaignlists',JSON.stringify(res.data.campaignlists));
+            this.tempStorage.setItem(context.srfsessionkey+'_campaigncampaigns',JSON.stringify(res.data.campaigncampaigns));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             return res;
     }

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

@@ -68,6 +68,21 @@ export default class ContactServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && true){
             let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -98,6 +113,21 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            return res;
+        }
+        let masterData:any = {};
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -113,21 +143,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            return res;
-        }
-        let masterData:any = {};
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -158,21 +173,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -182,9 +182,9 @@ export default class ContactServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/contacts`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -200,6 +200,21 @@ export default class ContactServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -230,6 +245,14 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            return res;
+        }
+        let masterData:any = {};
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -245,14 +268,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            return res;
-        }
-        let masterData:any = {};
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -283,26 +298,11 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/contacts/${context.contact}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -334,15 +334,15 @@ export default class ContactServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -359,16 +359,16 @@ export default class ContactServiceBase extends EntityService {
         if(context.account && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/getdraft`,isloading);
             res.data.contact = data.contact;
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/contacts/getdraft`,isloading);
         res.data.contact = data.contact;
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
         return res;
     }
 
@@ -399,6 +399,21 @@ export default class ContactServiceBase extends EntityService {
     public async AddList(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -429,26 +444,11 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/addlist`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/addlist`,data,isloading);
@@ -466,6 +466,21 @@ export default class ContactServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -496,26 +511,11 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/checkkey`,data,isloading);
@@ -548,6 +548,21 @@ export default class ContactServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -578,6 +593,14 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
+            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
+            return res;
+        }
+        let masterData:any = {};
         let listcontactsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
             listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
@@ -593,14 +616,6 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.listcontacts = listcontactsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
-            return res;
-        }
-        let masterData:any = {};
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -631,26 +646,11 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/contacts/${context.contact}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
     }
 
@@ -666,6 +666,21 @@ export default class ContactServiceBase extends EntityService {
     public async SetPrimary(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact){
             let masterData:any = {};
+        let listcontactsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
+            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
+            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
+                listcontactsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.relationshipsid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.listcontacts = listcontactsData;
         let leadsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_leads'),'undefined')){
             leadsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_leads') as any);
@@ -696,26 +711,11 @@ export default class ContactServiceBase extends EntityService {
             }
         }
         masterData.opportunities = opportunitiesData;
-        let listcontactsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts'),'undefined')){
-            listcontactsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_listcontacts') as any);
-            if(listcontactsData && listcontactsData.length && listcontactsData.length > 0){
-                listcontactsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.relationshipsid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.listcontacts = listcontactsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/setprimary`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             this.tempStorage.setItem(context.srfsessionkey+'_leads',JSON.stringify(res.data.leads));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunities',JSON.stringify(res.data.opportunities));
-            this.tempStorage.setItem(context.srfsessionkey+'_listcontacts',JSON.stringify(res.data.listcontacts));
             return res;
         }
             return Http.getInstance().post(`/contacts/${context.contact}/setprimary`,data,isloading);

app_CRM/src/service/entity-service-register.ts

@@ -49,6 +49,7 @@ export class EntityServiceRegister {
         this.allEntityService.set('serviceappointment', () => import('@/service/service-appointment/service-appointment-service'));
         this.allEntityService.set('uom', () => import('@/service/uom/uom-service'));
         this.allEntityService.set('transactioncurrency', () => import('@/service/transaction-currency/transaction-currency-service'));
+        this.allEntityService.set('websitecontent', () => import('@/service/web-site-content/web-site-content-service'));
         this.allEntityService.set('metric', () => import('@/service/metric/metric-service'));
         this.allEntityService.set('opportunity', () => import('@/service/opportunity/opportunity-service'));
         this.allEntityService.set('goal', () => import('@/service/goal/goal-service'));

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

@@ -69,6 +69,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && true){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -99,21 +114,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             if(!data.srffrontuf || data.srffrontuf !== "1"){
                 data[this.APPDEKEY] = null;
@@ -123,13 +123,28 @@ export default class OpportunityServiceBase extends EntityService {
             }
             let tempContext:any = JSON.parse(JSON.stringify(context));
             let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && true){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -160,6 +175,21 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            if(!data.srffrontuf || data.srffrontuf !== "1"){
+                data[this.APPDEKEY] = null;
+            }
+            if(data.srffrontuf){
+                delete data.srffrontuf;
+            }
+            let tempContext:any = JSON.parse(JSON.stringify(context));
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -175,21 +205,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            if(!data.srffrontuf || data.srffrontuf !== "1"){
-                data[this.APPDEKEY] = null;
-            }
-            if(data.srffrontuf){
-                delete data.srffrontuf;
-            }
-            let tempContext:any = JSON.parse(JSON.stringify(context));
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities`,data,isloading);
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -220,21 +235,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -244,9 +244,9 @@ export default class OpportunityServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/opportunities`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
 
@@ -262,6 +262,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -292,6 +307,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -307,15 +331,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -346,6 +361,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -361,14 +384,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().put(`/contacts/${context.contact}/opportunities/${context.opportunity}`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -399,26 +414,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/opportunities/${context.opportunity}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 
@@ -453,22 +453,22 @@ export default class OpportunityServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && context.opportunity){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/${context.opportunity}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             let res:any = await Http.getInstance().get(`/opportunities/${context.opportunity}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 
@@ -485,24 +485,24 @@ export default class OpportunityServiceBase extends EntityService {
         if(context.account && context.contact && true){
             let res:any = await Http.getInstance().get(`/accounts/${context.account}/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         if(context.contact && true){
             let res:any = await Http.getInstance().get(`/contacts/${context.contact}/opportunities/getdraft`,isloading);
             res.data.opportunity = data.opportunity;
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
         let res:any = await  Http.getInstance().get(`/opportunities/getdraft`,isloading);
         res.data.opportunity = data.opportunity;
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
         return res;
     }
 
@@ -518,6 +518,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -548,6 +563,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -563,15 +587,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -602,26 +617,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/active`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/active`,data,isloading);
@@ -639,6 +639,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -669,6 +684,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -684,15 +708,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -723,26 +738,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/checkkey`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/checkkey`,data,isloading);
@@ -760,6 +760,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Lose(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -790,6 +805,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -805,15 +829,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -844,26 +859,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/lose`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/lose`,data,isloading);
@@ -881,6 +881,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -911,6 +926,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -926,15 +950,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -965,6 +980,14 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -980,14 +1003,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/save`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1018,26 +1033,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/opportunities/${context.opportunity}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
     }
 
@@ -1053,6 +1053,21 @@ export default class OpportunityServiceBase extends EntityService {
     public async Win(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         if(context.account && context.contact && context.opportunity){
             let masterData:any = {};
+        let opportunityproductsData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
+            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
+            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
+                opportunityproductsData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.opportunityproductid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.opportunityproducts = opportunityproductsData;
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1083,6 +1098,15 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
+            Object.assign(data,masterData);
+            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
+            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
+            return res;
+        }
+        if(context.contact && context.opportunity){
+            let masterData:any = {};
         let opportunityproductsData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
             opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
@@ -1098,15 +1122,6 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunityproducts = opportunityproductsData;
-            Object.assign(data,masterData);
-            let res:any = await Http.getInstance().post(`/accounts/${context.account}/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
-            this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
-            return res;
-        }
-        if(context.contact && context.opportunity){
-            let masterData:any = {};
         let quotesData:any = [];
         if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_quotes'),'undefined')){
             quotesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_quotes') as any);
@@ -1137,26 +1152,11 @@ export default class OpportunityServiceBase extends EntityService {
             }
         }
         masterData.opportunitycompetitors = opportunitycompetitorsData;
-        let opportunityproductsData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts'),'undefined')){
-            opportunityproductsData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_opportunityproducts') as any);
-            if(opportunityproductsData && opportunityproductsData.length && opportunityproductsData.length > 0){
-                opportunityproductsData.forEach((item:any) => {
-                    if(item.srffrontuf){
-                        if(Object.is(item.srffrontuf,"0")){
-                            item.opportunityproductid = null;
-                        }
-                        delete item.srffrontuf;
-                    }
-                });
-            }
-        }
-        masterData.opportunityproducts = opportunityproductsData;
             Object.assign(data,masterData);
             let res:any = await Http.getInstance().post(`/contacts/${context.contact}/opportunities/${context.opportunity}/win`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             this.tempStorage.setItem(context.srfsessionkey+'_quotes',JSON.stringify(res.data.quotes));
             this.tempStorage.setItem(context.srfsessionkey+'_opportunitycompetitors',JSON.stringify(res.data.opportunitycompetitors));
-            this.tempStorage.setItem(context.srfsessionkey+'_opportunityproducts',JSON.stringify(res.data.opportunityproducts));
             return res;
         }
             return Http.getInstance().post(`/opportunities/${context.opportunity}/win`,data,isloading);

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

@@ -77,11 +77,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -91,12 +91,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
+        masterData.productsalesliteratures = productsalesliteraturesData;
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -106,7 +106,7 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -117,8 +117,8 @@ export default class SalesLiteratureServiceBase extends EntityService {
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/salesliteratures`,data,isloading);
         this.tempStorage.setItem(tempContext.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
-        this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
         this.tempStorage.setItem(tempContext.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
         return res;
     }
 
@@ -148,11 +148,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -162,12 +162,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
+        masterData.productsalesliteratures = productsalesliteraturesData;
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -177,12 +177,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/salesliteratures/${context.salesliterature}`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             return res;
     }
 
@@ -211,8 +211,8 @@ export default class SalesLiteratureServiceBase extends EntityService {
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/salesliteratures/${context.salesliterature}`,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             return res;
     }
 
@@ -229,8 +229,8 @@ export default class SalesLiteratureServiceBase extends EntityService {
         let res:any = await  Http.getInstance().get(`/salesliteratures/getdraft`,isloading);
         res.data.salesliterature = data.salesliterature;
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
         return res;
     }
 
@@ -273,11 +273,11 @@ export default class SalesLiteratureServiceBase extends EntityService {
             }
         }
         masterData.salesliteratureitems = salesliteratureitemsData;
-        let competitorsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
-            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
-            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
-                competitorsalesliteraturesData.forEach((item:any) => {
+        let productsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
+            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
+            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
+                productsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -287,12 +287,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
-        let productsalesliteraturesData:any = [];
-        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures'),'undefined')){
-            productsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_productsalesliteratures') as any);
-            if(productsalesliteraturesData && productsalesliteraturesData.length && productsalesliteraturesData.length > 0){
-                productsalesliteraturesData.forEach((item:any) => {
+        masterData.productsalesliteratures = productsalesliteraturesData;
+        let competitorsalesliteraturesData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures'),'undefined')){
+            competitorsalesliteraturesData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_competitorsalesliteratures') as any);
+            if(competitorsalesliteraturesData && competitorsalesliteraturesData.length && competitorsalesliteraturesData.length > 0){
+                competitorsalesliteraturesData.forEach((item:any) => {
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.relationshipsid = null;
@@ -302,12 +302,12 @@ export default class SalesLiteratureServiceBase extends EntityService {
                 });
             }
         }
-        masterData.productsalesliteratures = productsalesliteraturesData;
+        masterData.competitorsalesliteratures = competitorsalesliteraturesData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/salesliteratures/${context.salesliterature}/save`,data,isloading);
             this.tempStorage.setItem(context.srfsessionkey+'_salesliteratureitems',JSON.stringify(res.data.salesliteratureitems));
-            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             this.tempStorage.setItem(context.srfsessionkey+'_productsalesliteratures',JSON.stringify(res.data.productsalesliteratures));
+            this.tempStorage.setItem(context.srfsessionkey+'_competitorsalesliteratures',JSON.stringify(res.data.competitorsalesliteratures));
             return res;
     }
 

app_CRM/src/service/web-site-content/web-site-content-service-base.ts

+import { Http,Util } from '@/utils';
+import EntityService from '../entity-service';
+
+
+
+/**
+ * 站点内容服务对象基类
+ *
+ * @export
+ * @class WebSiteContentServiceBase
+ * @extends {EntityServie}
+ */
+export default class WebSiteContentServiceBase extends EntityService {
+
+    /**
+     * Creates an instance of  WebSiteContentServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  WebSiteContentServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 初始化基础数据
+     *
+     * @memberof WebSiteContentServiceBase
+     */
+    public initBasicData(){
+        this.APPLYDEKEY ='websitecontent';
+        this.APPDEKEY = 'websitecontentid';
+        this.APPDENAME = 'websitecontents';
+        this.APPDETEXT = 'websitecontentname';
+        this.APPNAME = 'crm';
+        this.SYSTEMNAME = 'ibizbusinesscentral';
+    }
+
+// 实体接口
+
+    /**
+     * Select接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            return Http.getInstance().get(`/websitecontents/${context.websitecontent}/select`,isloading);
+    }
+
+    /**
+     * Create接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+        if(!data.srffrontuf || data.srffrontuf !== "1"){
+            data[this.APPDEKEY] = null;
+        }
+        if(data.srffrontuf){
+            delete data.srffrontuf;
+        }
+        let tempContext:any = JSON.parse(JSON.stringify(context));
+        let res:any = await Http.getInstance().post(`/websitecontents`,data,isloading);
+        return res;
+    }
+
+    /**
+     * Update接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().put(`/websitecontents/${context.websitecontent}`,data,isloading);
+            return res;
+    }
+
+    /**
+     * Remove接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            return Http.getInstance().delete(`/websitecontents/${context.websitecontent}`,isloading);
+    }
+
+    /**
+     * Get接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            let res:any = await Http.getInstance().get(`/websitecontents/${context.websitecontent}`,isloading);
+            return res;
+    }
+
+    /**
+     * GetDraft接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let res:any = await  Http.getInstance().get(`/websitecontents/getdraft`,isloading);
+        res.data.websitecontent = data.websitecontent;
+        return res;
+    }
+
+    /**
+     * CheckKey接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+            return Http.getInstance().post(`/websitecontents/${context.websitecontent}/checkkey`,data,isloading);
+    }
+
+    /**
+     * Save接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let masterData:any = {};
+        Object.assign(data,masterData);
+            let res:any = await  Http.getInstance().post(`/websitecontents/${context.websitecontent}/save`,data,isloading);
+            return res;
+    }
+
+    /**
+     * FetchDefault接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WebSiteContentServiceBase
+     */
+    public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/websitecontents/fetchdefault`,tempData,isloading);
+    }
+}
\ No newline at end of file

app_CRM/src/service/web-site-content/web-site-content-service.ts

+import { Http,Util } from '@/utils';
+import WebSiteContentServiceBase from './web-site-content-service-base';
+
+
+/**
+ * 站点内容服务对象
+ *
+ * @export
+ * @class WebSiteContentService
+ * @extends {WebSiteContentServiceBase}
+ */
+export default class WebSiteContentService extends WebSiteContentServiceBase {
+
+    /**
+     * Creates an instance of  WebSiteContentService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  WebSiteContentService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

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

@@ -343,9 +343,9 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '5c7e90ccfaeb49b5bd84ae6c17b479e3',
                 '6d920bddee09ffdf2e18a0701ab9e9e7',
                 '9433b49c4e43a15dfc8bbd91bdd4c27f',
+                '4643000e02b7f39e4302c8e529ba096d',
             ],
         },
         {
@@ -685,6 +685,16 @@ export const viewstate: any = {
                 '893e62d6fbdc4580de7e3e802aec9108',
             ],
         },
+        {
+            viewtag: '4643000e02b7f39e4302c8e529ba096d',
+            viewmodule: 'Base',
+            viewname: 'AccountTreeGridExView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '6e18ac74e5685439110f9b4e534ee005',
+            ],
+        },
         {
             viewtag: '4745ca10fe4421ea043cb9ace1840224',
             viewmodule: 'Sales',
@@ -819,18 +829,6 @@ export const viewstate: any = {
             refviews: [
             ],
         },
-        {
-            viewtag: '5c7e90ccfaeb49b5bd84ae6c17b479e3',
-            viewmodule: 'Base',
-            viewname: 'AccountGridView',
-            viewaction: '',
-            viewdatachange: false,
-            refviews: [
-                'a69ba7dd2f8bdac8a3c733dcc79c0ee5',
-                '2e9c7792c3a728896ca8902634f71983',
-                '6e18ac74e5685439110f9b4e534ee005',
-            ],
-        },
         {
             viewtag: '5de2a290b5d079445ad825f6d6418dd6',
             viewmodule: 'Sales',

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

@@ -87,6 +87,7 @@ export default class AccountUIServiceBase extends UIService {
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'info',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'info_all',srfappde:'accounts'});
+        this.allViewMap.set(':',{viewname:'treegridexview',srfappde:'accounts'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'edit_accountinfo',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'gradation',srfappde:'accounts'});

app_CRM/src/uiservice/ui-service-register.ts

@@ -49,6 +49,7 @@ export class UIServiceRegister {
         this.allUIService.set('serviceappointment', () => import('@/uiservice/service-appointment/service-appointment-ui-service'));
         this.allUIService.set('uom', () => import('@/uiservice/uom/uom-ui-service'));
         this.allUIService.set('transactioncurrency', () => import('@/uiservice/transaction-currency/transaction-currency-ui-service'));
+        this.allUIService.set('websitecontent', () => import('@/uiservice/web-site-content/web-site-content-ui-service'));
         this.allUIService.set('metric', () => import('@/uiservice/metric/metric-ui-service'));
         this.allUIService.set('opportunity', () => import('@/uiservice/opportunity/opportunity-ui-service'));
         this.allUIService.set('goal', () => import('@/uiservice/goal/goal-ui-service'));

app_CRM/src/uiservice/web-site-content/web-site-content-ui-service-base.ts

+import { Environment } from '@/environments/environment';
+import { UIActionTool,Util } from '@/utils';
+import UIService from '../ui-service';
+import { Subject } from 'rxjs';
+import WebSiteContentService from '@/service/web-site-content/web-site-content-service';
+
+/**
+ * 站点内容UI服务对象基类
+ *
+ * @export
+ * @class WebSiteContentUIServiceBase
+ */
+export default class WebSiteContentUIServiceBase extends UIService {
+
+    /**
+     * 是否支持工作流
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */
+    public isEnableWorkflow:boolean = false;
+
+    /**
+     * 当前UI服务对应的数据服务对象
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */
+    public dataService:WebSiteContentService = new WebSiteContentService();
+
+    /**
+     * 所有关联视图
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */ 
+    public allViewMap: Map<string, Object> = new Map();
+
+    /**
+     * 状态值
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */ 
+    public stateValue: number = 0;
+
+    /**
+     * 状态属性
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */ 
+    public stateField: string = "";
+
+    /**
+     * 主状态属性集合
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */  
+    public mainStateFields:Array<any> = [];
+
+    /**
+     * 主状态集合Map
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */  
+    public allDeMainStateMap:Map<string,string> = new Map();
+
+    /**
+     * Creates an instance of  WebSiteContentUIServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  WebSiteContentUIServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+        this.initViewMap();
+        this.initDeMainStateMap();
+    }
+
+    /**
+     * 初始化视图Map
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */  
+    public initViewMap(){
+        this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'websitecontents'});
+        this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'websitecontents'});
+    }
+
+    /**
+     * 初始化主状态集合
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+     */  
+    public initDeMainStateMap(){
+    }
+
+
+    /**
+     * 获取指定数据的重定向页面
+     * 
+     * @param srfkey 数据主键
+     * @param isEnableWorkflow  重定向视图是否需要处理流程中的数据
+     * @memberof  WebSiteContentUIServiceBase
+     */
+    public async getRDAppView(srfkey:string,isEnableWorkflow:boolean){
+        this.isEnableWorkflow = isEnableWorkflow;
+        // 进行数据查询
+        let result:any = await this.dataService.Get({websitecontent:srfkey});
+        const curData:any = result.data;
+        //判断当前数据模式,默认为true，todo
+        const iRealDEModel:boolean = true;
+
+        let bDataInWF:boolean = false;
+		let bWFMode:any = false;
+		// 计算数据模式
+		if (this.isEnableWorkflow) {
+			bDataInWF = await this.dataService.testDataInWF({stateValue:this.stateValue,stateField:this.stateField},curData);
+			if (bDataInWF) {
+				bDataInWF = true;
+				bWFMode = await this.dataService.testUserExistWorklist(null,curData);
+			}
+        }
+        let strPDTViewParam:string = await this.getDESDDEViewPDTParam(curData, bDataInWF, bWFMode);
+        //若不是当前数据模式，处理strPDTViewParam，todo
+
+        //查找视图
+
+        //返回视图
+        return this.allViewMap.get(strPDTViewParam);
+    }
+
+    /**
+	 * 获取实际的数据类型
+     * 
+     * @memberof  WebSiteContentUIServiceBase
+	 */
+	public getRealDEType(entity:any){
+
+    }
+
+    /**
+     * 获取实体单数据实体视图预定义参数
+     * 
+     * @param curData 当前数据
+     * @param bDataInWF 是否有数据在工作流中
+     * @param bWFMode   是否工作流模式
+     * @memberof  WebSiteContentUIServiceBase
+     */
+    public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
+        let strPDTParam:string = '';
+		if (bDataInWF) {
+			// 判断数据是否在流程中
+        }
+        //多表单，todo
+        const isEnableMultiForm:boolean = false;
+        const multiFormDEField:string|null =null;
+
+        if (isEnableMultiForm && multiFormDEField) {
+			const objFormValue:string = curData[multiFormDEField];
+			if(!Environment.isAppMode){
+				return 'MOBEDITVIEW'+objFormValue;
+			}
+			return 'EDITVIEW'+objFormValue;
+        }
+		if(!Environment.isAppMode){
+            if(this.getDEMainStateTag(curData)){
+                return `MOBEDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+            }
+			return 'MOBEDITVIEW:';
+        }
+        if(this.getDEMainStateTag(curData)){
+            return `EDITVIEW:MSTAG:${ await this.getDEMainStateTag(curData)}`;
+        }
+		return 'EDITVIEW:';
+    }
+
+    /**
+     * 获取数据对象的主状态标识
+     * 
+     * @param curData 当前数据
+     * @memberof  WebSiteContentUIServiceBase
+     */  
+    public async getDEMainStateTag(curData:any){
+        if(this.mainStateFields.length === 0) return null;
+
+        this.mainStateFields.forEach((singleMainField:any) =>{
+            if(!(singleMainField in curData)){
+                console.error(`当前数据对象不包含属性singleMainField，可能会发生错误`);
+            }
+        })
+
+        let strTag:String = "";
+        for (let i = 0; i <= 1; i++) {
+            let strTag:string = (curData[this.mainStateFields[0]])?(i == 0) ? curData[this.mainStateFields[0]] : "":"";
+            if (this.mainStateFields.length >= 2) {
+                for (let j = 0; j <= 1; j++) {
+                    let strTag2:string = (curData[this.mainStateFields[1]])?`${strTag}__${(j == 0) ? curData[this.mainStateFields[1]] : ""}`:strTag;
+                    if (this.mainStateFields.length >= 3) {
+                        for (let k = 0; k <= 1; k++) {
+                            let strTag3:string = (curData[this.mainStateFields[2]])?`${strTag2}__${(k == 0) ? curData[this.mainStateFields[2]] : ""}`:strTag2;
+                            // 判断是否存在
+                            return this.allDeMainStateMap.get(strTag3);
+                        }
+                    }else{
+                        return this.allDeMainStateMap.get(strTag2);
+                    }
+                }
+            }else{
+                return this.allDeMainStateMap.get(strTag);
+            }
+        }
+        return null;
+    }
+
+}
\ No newline at end of file

app_CRM/src/uiservice/web-site-content/web-site-content-ui-service.ts

+import WebSiteContentUIServiceBase from './web-site-content-ui-service-base';
+
+/**
+ * 站点内容UI服务对象
+ *
+ * @export
+ * @class WebSiteContentUIService
+ */
+export default class WebSiteContentUIService extends WebSiteContentUIServiceBase {
+
+    /**
+     * Creates an instance of  WebSiteContentUIService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  WebSiteContentUIService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_CRM/src/widgets/account/status-tab-viewtabviewpanel-tabviewpanel/status-tab-viewtabviewpanel-tabviewpanel.html

 <div class='tabviewpanel' v-if='isActivied'>
-        <account-grid-view 
+        <account-tree-grid-ex-view 
         class='viewcontainer2' 
         :viewdata="viewdata" 
         :viewparam="viewparam"

app_CRM/src/widgets/app/channel-content-treegridex/channel-content-treegridex-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, MainControlBase } from '@/studio-core';
+import ChannelContentService from './channel-content-treegridex-service';
+
+
+/**
+ * treegridex部件基类
+ *
+ * @export
+ * @class MainControlBase
+ * @extends {ChannelContentTreegridexBase}
+ */
+export class ChannelContentTreegridexBase extends MainControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof ChannelContentTreegridexBase
+     */
+    protected controlType: string = 'TREEGRIDEX';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {ChannelContentService}
+     * @memberof ChannelContentTreegridexBase
+     */
+    public service: ChannelContentService = new ChannelContentService({ $store: this.$store });
+
+    /**
+     * 显示处理提示
+     *
+     * @type {boolean}
+     * @memberof ChannelContent
+     */
+    @Prop({ default: true }) public showBusyIndicator?: boolean;
+
+    /**
+     * 部件行为--load
+     *
+     * @type {string}
+     * @memberof ChannelContent
+     */
+    @Prop() public loadAction!: string;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof ChannelContent
+     */
+    @Prop({ default: true }) public isSingleSelect!: boolean;
+
+    /**
+     * 部件样式名
+     *
+     * @public
+     * @type {any[]}
+     * @memberof ChannelContent
+     */
+    public controlClass: string = "treegridex";
+
+    /**
+     * 数据集合
+     *
+     * @public
+     * @type {any[]}
+     * @memberof ChannelContent
+     */
+    public items: any[] = [];
+
+    /**
+     * 默认展开节点集合
+     *
+     * @memberof ChannelContent
+     */
+    public defExpands: any = [];
+
+    /**
+     * 行节点下标
+     *
+     * @memberof ChannelContent
+     */
+    public itemNum: any = {};
+
+    /**
+     * 计数下标
+     *
+     * @memberof ChannelContent
+     */
+    public num: number = 0;
+
+    /**
+     * 获取列属性值
+     *
+     * @public
+     * @memberof ChannelContent
+     */
+    public getColumnValue(task: any, field: string) {
+        if(Object.is(task.id.split(';')[0], 'ChildChannel')) {
+            return task[field];
+        }
+        if(Object.is(task.id.split(';')[0], 'RootChannel')) {
+            return task[field];
+        }
+        if(Object.is(task.id.split(';')[0], 'WEBSITE')) {
+            return task[field];
+        }
+        if(Object.is(task.id.split(';')[0], 'ROOT')) {
+            return task[field];
+        }
+    }
+
+    /**
+     * 获取代码项
+     *
+     * @public
+     * @memberof ChannelContent
+     */
+    public getCodeListItem(codelist: any, val: any) {
+        for(let i = 0; i < codelist.items.length; i++) {
+            if(Object.is(codelist.items[i].value, val)) {
+                return codelist.items[i].text;
+            }
+        }
+        return codelist.emptytext;
+    }
+
+    /**
+     * 搜索获取日程事件
+     *
+     * @param {*} $event 日期信息
+     * @memberof ChannelContent
+     */
+    public load(task: any = {}, resolve?: any) {
+        const params: any = {
+            srfnodeid: task && task.id ? task.id : "#",
+            srfnodefilter: ''
+        };
+        let tempViewParams:any = JSON.parse(JSON.stringify(this.viewparams));
+        let curNode:any = {}; 
+        this.$util.deepObjectMerge(curNode, task);
+        let tempContext:any = this.computecurNodeContext(curNode);
+        if(curNode && curNode.srfparentdename) {
+            Object.assign(tempContext,{ srfparentdename: curNode.srfparentdename });
+            Object.assign(tempViewParams,{ srfparentdename: curNode.srfparentdename });
+        }
+        if(curNode && curNode.srfparentkey) {
+            Object.assign(tempContext,{ srfparentkey: curNode.srfparentkey });
+            Object.assign(tempViewParams,{ srfparentkey: curNode.srfparentkey });
+        }
+        Object.assign(params,{viewparams:tempViewParams});
+        this.service.getNodes(tempContext,params).then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: "错误", desc: response.info });
+                return;
+            }
+            response.data.forEach((item: any) => {
+                this.itemNum[item.id] = this.num++;
+                if(!item.collapsed) {
+                    this.defExpands.push(item);
+                }
+            })
+            if(resolve && resolve instanceof Function) {
+                resolve(response.data);
+            } else {
+                this.items = [...response.data];
+            }
+            this.$nextTick(() => {
+                this.expandDefNode();
+            })
+            this.$emit("load", this.items);
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            this.$Notice.error({ title: "错误", desc: response.info });
+        });
+    }
+
+    /**
+     * 加载节点
+     *
+     * @memberof TreeTable
+     */
+    public loadTreeNode(tree: any, treeNode: any, resolve: any) {
+        this.load(tree, resolve);
+    }
+
+    /**
+     * 计算当前节点的上下文
+     *
+     * @param {*} curNode 当前节点
+     * @memberof ChannelContent
+     */
+    public computecurNodeContext(curNode:any){
+        let tempContext:any = {};
+        if(curNode && curNode.data && curNode.data.srfappctx){
+            tempContext = JSON.parse(JSON.stringify(curNode.data.srfappctx));
+        }else{
+            tempContext = JSON.parse(JSON.stringify(this.context));
+        }
+        return tempContext;
+    }
+
+    /**
+     * 节点展开
+     *
+     * @param {*} item 当前节点
+     * @memberof ChannelContent
+     */
+    public itemExpand(item: any) {
+
+    }
+
+    /**
+     * 刷新
+     *
+     * @memberof ChannelContent
+     */
+    public refresh() {
+        this.load();
+    }
+
+
+
+    /**
+     * 选中的数据
+     *
+     * @returns {any[]}
+     * @memberof ChannelContent
+     */
+    public selections: any[] = [];
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof ChannelContent
+     */
+    public getDatas(): any[] {
+        return this.selections;
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof ChannelContent
+     */
+    public getData(): any {
+        return null;
+    }
+             
+    /**
+     * vue 生命周期
+     *
+     * @returns
+     * @memberof ChannelContent
+     */
+    public created() {
+        this.load();
+    }
+
+    /**
+     * 设置行Class
+     *
+     * @returns
+     * @memberof ChannelContent
+     */
+    public setRowClass({row, rowIndex}: {row: any, rowIndex: number}) {
+        return 'treegrid' + this.itemNum[row.id];
+    }
+
+    /**
+     * 展开默认节点
+     *
+     * @returns
+     * @memberof ChannelContent
+     */
+    public expandDefNode() {
+        if(this.defExpands.length > 0) {
+            let item: any = this.defExpands[0];
+            this.defExpands.splice(0, 1);
+            let trs: any = this.$el.getElementsByClassName('treegrid' + this.itemNum[item.id]);
+            if(trs) {
+                let icons: any = trs[0].getElementsByClassName('el-table__expand-icon');
+                icons[0].click();
+            }
+        }
+    }
+
+    /**
+     * 选中变化
+     *
+     * @returns
+     * @memberof ChannelContent
+     */
+    public select($event: any) {
+        if (!$event) {
+            return;
+        }
+        this.selections = [JSON.parse(JSON.stringify($event))];
+        this.$emit('selectionchange', this.selections);
+    }
+
+}
\ No newline at end of file

app_CRM/src/widgets/app/channel-content-treegridex/channel-content-treegridex-model.ts

+/**
+ * ChannelContent 部件模型
+ *
+ * @export
+ * @class ChannelContentModel
+ */
+export default class ChannelContentModel {
+
+	/**
+	 * 日历项类型
+	 *
+	 * @returns {any[]}
+	 * @memberof ChannelContentTreegridexMode
+	 */
+	public itemType: string = "";
+
+	/**
+	 * 获取数据项集合
+	 *
+	 * @returns {any[]}
+	 * @memberof ChannelContentTreegridexMode
+	 */
+	public getDataItems(): any[] {
+     let dataItems: any = [
+          // 前端新增修改标识，新增为"0",修改为"1"或未设值
+          {
+            name: 'srffrontuf',
+            prop: 'srffrontuf',
+            dataType: 'TEXT',
+          },
+          {
+            name: 'style',
+          },
+          {
+            name: 'textColor',
+          },
+          {
+            name: 'itemType',
+          },
+          {
+            name: 'parentId'
+          },
+          {
+            name: 'query',
+            prop: 'query',
+          },
+      ];
+      switch(this.itemType){
+          case "ChildChannel":
+              dataItems = [...dataItems,
+              ];
+              break;
+          case "RootChannel":
+              dataItems = [...dataItems,
+              ];
+              break;
+          case "WEBSITE":
+              dataItems = [...dataItems,
+              ];
+              break;
+      }
+      return dataItems;
+	}
+
+}
\ No newline at end of file

app_CRM/src/widgets/app/channel-content-treegridex/channel-content-treegridex-service.ts

+!!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${appde.getCodeName()?lower_case}  [in template "TEMPLCODE_zh_CN" at line 299, column 55]
+----
\ No newline at end of file

app_CRM/src/widgets/app/channel-content-treegridex/channel-content-treegridex.html

+<el-table ref="treegridex" 
+    :data="items" 
+    row-key="id" 
+    border  
+    lazy
+    height="100%"  
+    :row-class-name="setRowClass" 
+    :load="loadTreeNode.bind(_self)"
+    :tree-props="{ children: 'children', hasChildren: 'leaf' }"
+    :select-on-indeterminate="isSingleSelect"
+    @current-change="select.apply(_self, arguments)"
+    >
+</el-table>
\ No newline at end of file

app_CRM/src/widgets/app/channel-content-treegridex/channel-content-treegridex.vue

+<template src="./channel-content-treegridex.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { ChannelContentTreegridexBase } from './channel-content-treegridex-base';
+ 
+
+/**
+ * treegridex部件
+ *
+ * @export
+ * @class ChannelContentTreegridex
+ * @extends {ChannelContentTreegridexBase}
+ */
+@Component({
+    components: {
+         
+    }
+})
+@VueLifeCycleProcessing()
+export default class ChannelContentTreegridex extends ChannelContentTreegridexBase { }
+</script>

businesscentral-app/businesscentral-app-crm/src/main/resources/application-crm-prod.yml

@@ -47,6 +47,10 @@ zuul:
       path: /transactioncurrencies/**
       serviceId: ibizbusinesscentral-centralapi
       stripPrefix: false
+    websitecontent:
+      path: /websitecontents/**
+      serviceId: ibizbusinesscentral-centralapi
+      stripPrefix: false
     metric:
       path: /metrics/**
       serviceId: ibizbusinesscentral-centralapi

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-464-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-477-1">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -10913,7 +10913,7 @@
 
 
     <!--输出实体[WEBSITECONTENT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-websitecontent-37-130">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-websitecontent-39-130">
         <createTable tableName="WEBSITECONTENT">
                 <column name="WEBSITECONTENTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WEBSITECONTENT_WEBSITECONTE"/>
@@ -10978,31 +10978,31 @@
     </changeSet>
 
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-132">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-132">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-133">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-133">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-134">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-134">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-135">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-135">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-136">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-136">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-137">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-138">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-139">
        <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-464-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-477-140">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->
@@ -11911,10 +11911,10 @@
        <addForeignKeyConstraint baseColumnNames="WEBSITEID" baseTableName="WEBSITECHANNEL" constraintName="DER1N_WEBSITECHANNEL_WEBSITE_W" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITEID" referencedTableName="WEBSITE" validate="true"/>
     </changeSet>
         <!--输出实体[WEBSITECONTENT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-37-429">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-39-429">
        <addForeignKeyConstraint baseColumnNames="WEBSITECHANNELID" baseTableName="WEBSITECONTENT" constraintName="DER1N_WEBSITECONTENT_WEBSITECH" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITECHANNELID" referencedTableName="WEBSITECHANNEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-37-430">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-39-430">
        <addForeignKeyConstraint baseColumnNames="WEBSITEID" baseTableName="WEBSITECONTENT" constraintName="DER1N_WEBSITECONTENT_WEBSITE_W" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITEID" referencedTableName="WEBSITE" validate="true"/>
     </changeSet>
         <!--输出实体[WEBSITERESOURCE]外键关系 -->

businesscentral-core/src/main/resources/permission/systemResource.json

@@ -84,6 +84,14 @@
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
     ,    {
+    "dename":"WebSiteContent",
+    "delogicname":"站点内容",
+    "sysmoudle":{"id":"WEBSITE","name":"WebSite"},
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
+    "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
+     }
+    ,    {
     "dename":"Metric",
     "delogicname":"目标度量",
     "sysmoudle":{"id":"BASE","name":"Base"},
@@ -436,14 +444,6 @@
     "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
      }
     ,    {
-    "dename":"WebSiteContent",
-    "delogicname":"站点内容",
-    "sysmoudle":{"id":"WEBSITE","name":"WebSite"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
-    "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
-    "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
-     }
-    ,    {
     "dename":"WebSiteChannel",
     "delogicname":"站点频道",
     "sysmoudle":{"id":"WEBSITE","name":"WebSite"},