xignzi006 发布系统代码

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

@@ -199,6 +199,16 @@
         "viewtag": "573c48d02ab5eef37c4cf701be87fcb5",
         "memo": "系统自动添加"
     },
+    "contactabstracteditview9_editmode": {
+        "title": "联系人编辑视图",
+        "caption": "联系人",
+        "viewtype": "DEEDITVIEW9",
+        "viewmodule": "Base",
+        "viewname": "ContactAbstractEditView9_EditMode",
+        "viewfilename": "contact-abstract-edit-view9-edit-mode",
+        "viewtag": "5b2c286488252f647dbe00fcf7f57abd",
+        "memo": ""
+    },
     "accountgridview": {
         "title": "account表格视图",
         "caption": "客户",
@@ -379,6 +389,16 @@
         "viewtag": "916febbb65be1c54dd42ccb9914fe973",
         "memo": "系统自动添加"
     },
+    "contactbyaccount": {
+        "title": "联系人",
+        "caption": "联系人",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "Base",
+        "viewname": "ContactByAccount",
+        "viewfilename": "contact-by-account",
+        "viewtag": "9224b0b14d2d99014e051f8035ba5cbf",
+        "memo": "系统自动添加"
+    },
     "contactabstracteditview9": {
         "title": "联系人编辑视图",
         "caption": "联系人",

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

@@ -391,6 +391,7 @@ export default {
 	},
 	majorcontact_form: {
 		details: {
+			druipart1: "", 
 			group1: "客户基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 

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

@@ -390,6 +390,7 @@ export default {
 	},
 	majorcontact_form: {
 		details: {
+			druipart1: '', 
 			group1: '客户基本信息', 
 			formpage1: '基本信息', 
 			srfupdatedate: '更新时间', 

app_BusinessCentral/src/locale/lanres/entities/contact/contact_en_US.ts

@@ -206,6 +206,10 @@ export default {
 		gridview: {
 			caption: "联系人",
       title: 'contact表格视图',
+		},
+		abstracteditview9_editmode: {
+			caption: "联系人",
+      title: '联系人编辑视图',
 		},
 		detailinfoeditview9: {
 			caption: "联系人",
@@ -214,6 +218,10 @@ export default {
 		pickupgridview: {
 			caption: "联系人",
       title: 'contact选择表格视图',
+		},
+		byaccount: {
+			caption: "联系人",
+      title: '联系人',
 		},
 		abstracteditview9: {
 			caption: "联系人",
@@ -327,6 +335,54 @@ export default {
 		uiactions: {
 		},
 	},
+	main3_form: {
+		details: {
+			grouppanel4: "联系人信息", 
+			grouppanel5: "地址", 
+			group1: "个人信息", 
+			grouppanel1: "市场营销", 
+			grouppanel2: "记账", 
+			grouppanel3: "送货", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "联系人", 
+			srfmajortext: "全名", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			fullname: "全名", 
+			parentcustomerid: "公司名称", 
+			emailaddress1: "电子邮件", 
+			telephone1: "商务电话", 
+			mobilephone: "移动电话", 
+			fax: "传真", 
+			address1_country: "国家/地区", 
+			address1_stateorprovince: "省/市/自治区", 
+			address1_city: "市/县", 
+			address1_line1: "街道", 
+			address1_postalcode: "邮政编码", 
+			gendercode: "性别", 
+			familystatuscode: "婚姻状况", 
+			spousesname: "配偶/伴侣姓名", 
+			birthdate: "生日", 
+			anniversary: "纪念日", 
+			originatingleadname: "原始潜在顾客", 
+			lastusedincampaign: "上次参与市场活动的日期", 
+			donotsendmm: "发送市场营销资料", 
+			transactioncurrencyname: "货币", 
+			creditlimit: "信用额度", 
+			creditonhold: "信用冻结", 
+			paymenttermscode: "付款方式", 
+			shippingmethodcode: "送货方式", 
+			originatingleadid: "原始潜在顾客", 
+			transactioncurrencyid: "货币", 
+			contactid: "联系人", 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: "contact基本信息", 
@@ -415,7 +471,63 @@ export default {
 			caption: "编辑",
 			tip: "编辑",
 		},
-		deuiaction4: {
+	},
+	byaccounttoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: "新建",
+			tip: "新建",
+		},
+		tbitem2: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem4: {
+			caption: "Edit",
+			tip: "Edit {0}",
+		},
+		tbitem6: {
+			caption: "Copy",
+			tip: "Copy {0}",
+		},
+		tbitem7: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
+			caption: "Remove",
+			tip: "Remove {0}",
+		},
+		tbitem9: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem13: {
+			caption: "Export",
+			tip: "Export {0} Data To Excel",
+		},
+		tbitem10: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem19: {
+			caption: "Filter",
+			tip: "Filter",
+		},
+	},
+	abstracteditview9_editmodetoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem6: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem12: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_BusinessCentral/src/locale/lanres/entities/contact/contact_zh_CN.ts

@@ -205,6 +205,10 @@ export default {
 		gridview: {
 			caption: '联系人',
       title: 'contact表格视图',
+		},
+		abstracteditview9_editmode: {
+			caption: '联系人',
+      title: '联系人编辑视图',
 		},
 		detailinfoeditview9: {
 			caption: '联系人',
@@ -213,6 +217,10 @@ export default {
 		pickupgridview: {
 			caption: '联系人',
       title: 'contact选择表格视图',
+		},
+		byaccount: {
+			caption: '联系人',
+      title: '联系人',
 		},
 		abstracteditview9: {
 			caption: '联系人',
@@ -326,6 +334,54 @@ export default {
 		uiactions: {
 		},
 	},
+	main3_form: {
+		details: {
+			grouppanel4: '联系人信息', 
+			grouppanel5: '地址', 
+			group1: '个人信息', 
+			grouppanel1: '市场营销', 
+			grouppanel2: '记账', 
+			grouppanel3: '送货', 
+			formpage1: '基本信息', 
+			srfupdatedate: '更新时间', 
+			srforikey: '', 
+			srfkey: '联系人', 
+			srfmajortext: '全名', 
+			srftempmode: '', 
+			srfuf: '', 
+			srfdeid: '', 
+			srfsourcekey: '', 
+			fullname: '全名', 
+			parentcustomerid: '公司名称', 
+			emailaddress1: '电子邮件', 
+			telephone1: '商务电话', 
+			mobilephone: '移动电话', 
+			fax: '传真', 
+			address1_country: '国家/地区', 
+			address1_stateorprovince: '省/市/自治区', 
+			address1_city: '市/县', 
+			address1_line1: '街道', 
+			address1_postalcode: '邮政编码', 
+			gendercode: '性别', 
+			familystatuscode: '婚姻状况', 
+			spousesname: '配偶/伴侣姓名', 
+			birthdate: '生日', 
+			anniversary: '纪念日', 
+			originatingleadname: '原始潜在顾客', 
+			lastusedincampaign: '上次参与市场活动的日期', 
+			donotsendmm: '发送市场营销资料', 
+			transactioncurrencyname: '货币', 
+			creditlimit: '信用额度', 
+			creditonhold: '信用冻结', 
+			paymenttermscode: '付款方式', 
+			shippingmethodcode: '送货方式', 
+			originatingleadid: '原始潜在顾客', 
+			transactioncurrencyid: '货币', 
+			contactid: '联系人', 
+		},
+		uiactions: {
+		},
+	},
 	main_form: {
 		details: {
 			group1: 'contact基本信息', 
@@ -414,7 +470,63 @@ export default {
 			caption: '编辑',
 			tip: '编辑',
 		},
-		deuiaction4: {
+	},
+	byaccounttoolbar_toolbar: {
+		tbitem1_openquickcreateview: {
+			caption: '新建',
+			tip: '新建',
+		},
+		tbitem2: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem4: {
+			caption: '编辑',
+			tip: '编辑',
+		},
+		tbitem6: {
+			caption: '拷贝',
+			tip: '拷贝',
+		},
+		tbitem7: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem8: {
+			caption: '删除',
+			tip: '删除',
+		},
+		tbitem9: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem13: {
+			caption: '导出',
+			tip: '导出',
+		},
+		tbitem10: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem19: {
+			caption: '过滤',
+			tip: '过滤',
+		},
+	},
+	abstracteditview9_editmodetoolbar_toolbar: {
+		tbitem3: {
+			caption: '保存',
+			tip: '保存',
+		},
+		tbitem5: {
+			caption: '保存并关闭',
+			tip: '保存并关闭',
+		},
+		tbitem6: {
+			caption: '-',
+			tip: '',
+		},
+		tbitem12: {
 			caption: '关闭',
 			tip: '关闭',
 		},

app_BusinessCentral/src/mock/viewconfig/viewconfig.ts

@@ -167,6 +167,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ProductEditView",
             "viewtag": "573c48d02ab5eef37c4cf701be87fcb5"
         },
+        "contactabstracteditview9_editmode": {
+            "title": "联系人编辑视图",
+            "caption": "联系人",
+            "viewtype": "DEEDITVIEW9",
+            "viewmodule": "Base",
+            "viewname": "ContactAbstractEditView9_EditMode",
+            "viewtag": "5b2c286488252f647dbe00fcf7f57abd"
+        },
         "accountgridview": {
             "title": "account表格视图",
             "caption": "客户",
@@ -311,6 +319,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountAddress",
             "viewtag": "916febbb65be1c54dd42ccb9914fe973"
         },
+        "contactbyaccount": {
+            "title": "联系人",
+            "caption": "联系人",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "Base",
+            "viewname": "ContactByAccount",
+            "viewtag": "9224b0b14d2d99014e051f8035ba5cbf"
+        },
         "contactabstracteditview9": {
             "title": "联系人编辑视图",
             "caption": "联系人",

app_BusinessCentral/src/pages/base/contact-abstract-edit-view9/contact-abstract-edit-view9-base.vue

@@ -6,10 +6,6 @@
                     <i class='fa fa-edit'></i>
                     <span class='caption'>{{$t('entities.contact.abstracteditview9toolbar_toolbar.deuiaction2.caption')}}</span>
                 </i-button>
-            <i-button :title="$t('entities.contact.abstracteditview9toolbar_toolbar.deuiaction4.tip')" v-show="toolBarModels.deuiaction4.visabled" :disabled="toolBarModels.deuiaction4.disabled" class='' @click="toolbar_click({ tag: 'deuiaction4' }, $event)">
-                    <i class='fa fa-sign-out'></i>
-                    <span class='caption'>{{$t('entities.contact.abstracteditview9toolbar_toolbar.deuiaction4.caption')}}</span>
-                </i-button>
         </div>
     </template>
     <view_form 
@@ -226,8 +222,6 @@ export default class ContactAbstractEditView9Base extends Vue {
     public toolBarModels: any = {
         deuiaction2: { name: 'deuiaction2', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenEditMode', target: 'SINGLEKEY' } },
 
-        deuiaction4: { name: 'deuiaction4', caption: '关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' } },
-
     };
 
 
@@ -474,9 +468,6 @@ export default class ContactAbstractEditView9Base extends Vue {
         if (Object.is($event.tag, 'deuiaction2')) {
             this.toolbar_deuiaction2_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'deuiaction4')) {
-            this.toolbar_deuiaction4_click(null, '', $event2);
-        }
     }
 
 
@@ -545,34 +536,6 @@ export default class ContactAbstractEditView9Base extends Vue {
         this.OpenEditMode(datas, contextJO,paramJO,  $event, xData,this,"Contact");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_deuiaction4_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"Contact");
-    }
-
     /**
      * 编辑
      *
@@ -640,24 +603,6 @@ export default class ContactAbstractEditView9Base extends Vue {
 
     }
 
-    /**
-     * 关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof ContactAbstractEditView9Base
-     */
-    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        this.closeView(args);
-        if(window.parent){
-            window.parent.postMessage([{ ...args }],'*');
-        }
-    }
-
 
     /**
      * 关闭视图

app_BusinessCentral/src/pages/base/contact-by-account/contact-by-account-base.vue

+<template>
+<studio-view viewName="contactbyaccount" viewTitle="联系人" class='degridview contact-by-account'>
+    <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
+    <template slot="toolbar">
+                <div class='toolbar-container'>
+            <i-button :title="$t('entities.contact.byaccounttoolbar_toolbar.tbitem1_openquickcreateview.tip')" v-show="toolBarModels.tbitem1_openquickcreateview.visabled" :disabled="toolBarModels.tbitem1_openquickcreateview.disabled" class='' @click="toolbar_click({ tag: 'tbitem1_openquickcreateview' }, $event)">
+                    <i class='fa fa-file-text-o'></i>
+                    <span class='caption'>{{$t('entities.contact.byaccounttoolbar_toolbar.tbitem1_openquickcreateview.caption')}}</span>
+                </i-button>
+            <span class='seperator'>|</span>    <i-button :title="$t('entities.contact.byaccounttoolbar_toolbar.tbitem4.tip')" v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
+                    <i class='fa fa-edit'></i>
+                    <span class='caption'>{{$t('entities.contact.byaccounttoolbar_toolbar.tbitem4.caption')}}</span>
+                </i-button>
+            <i-button :title="$t('entities.contact.byaccounttoolbar_toolbar.tbitem6.tip')" v-show="toolBarModels.tbitem6.visabled" :disabled="toolBarModels.tbitem6.disabled" class='' @click="toolbar_click({ tag: 'tbitem6' }, $event)">
+                    <i class='fa fa-copy'></i>
+                    <span class='caption'>{{$t('entities.contact.byaccounttoolbar_toolbar.tbitem6.caption')}}</span>
+                </i-button>
+            <span class='seperator'>|</span>    <i-button :title="$t('entities.contact.byaccounttoolbar_toolbar.tbitem8.tip')" v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)">
+                    <i class='fa fa-remove'></i>
+                    <span class='caption'>{{$t('entities.contact.byaccounttoolbar_toolbar.tbitem8.caption')}}</span>
+                </i-button>
+            <span class='seperator'>|</span>    <app-export-excel :item="toolBarModels.tbitem13" :caption="$t('entities.contact.byaccounttoolbar_toolbar.tbitem13.caption')" @exportexcel="toolbar_click({ tag: 'tbitem13' }, $event)"></app-export-excel>
+            <span class='seperator'>|</span>    <i-button :title="$t('entities.contact.byaccounttoolbar_toolbar.tbitem19.tip')" v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' @click="toolbar_click({ tag: 'tbitem19' }, $event)">
+                    <i class='fa fa-filter'></i>
+                    <span class='caption'>{{$t('entities.contact.byaccounttoolbar_toolbar.tbitem19.caption')}}</span>
+                </i-button>
+        </div>
+    </template>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isSingleSelect"
+        :showBusyIndicator="true"
+        :isOpenEdit="false"
+        :gridRowActiveMode="gridRowActiveMode"
+        @save="onSave"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        :newdata="newdata"
+        :opendata="opendata"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @remove="grid_remove($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view>
+</template>
+
+
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
+import { UIActionTool,Util } from '@/utils';
+import { Subject } from 'rxjs';
+import ContactService from '@/service/contact/contact-service';
+
+import GridViewEngine from '@engine/view/grid-view-engine';
+
+
+import ContactUIService from '@/uiservice/contact/contact-ui-service';
+import CodeListService from "@service/app/codelist-service";
+
+
+@Component({
+    components: {
+    },
+})
+export default class ContactByAccountBase extends Vue {
+
+    /**
+     * 实体服务对象
+     *
+     * @type {ContactService}
+     * @memberof ContactByAccountBase
+     */
+    public appEntityService: ContactService = new ContactService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof ContactByAccountBase
+     */    
+    public counterServiceArray:Array<any> = [];
+    
+    /**
+     * 数据变化
+     *
+     * @param {*} val
+     * @returns {*}
+     * @memberof ContactByAccountBase
+     */
+    @Emit() 
+    public viewDatasChange(val: any):any {
+        return val;
+    }
+
+    /**
+     * 传入视图上下文
+     *
+     * @type {string}
+     * @memberof ContactByAccountBase
+     */
+    @Prop() public viewdata!: string;
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof ContactByAccountBase
+     */
+    @Prop() public viewparam!: string;
+
+    /**
+     * 视图默认使用
+     *
+     * @type {boolean}
+     * @memberof ContactByAccountBase
+     */
+    @Prop({ default: true }) public viewDefaultUsage!: boolean;
+
+	/**
+	 * 视图标识
+	 *
+	 * @type {string}
+	 * @memberof ContactByAccountBase
+	 */
+	public viewtag: string = '9224b0b14d2d99014e051f8035ba5cbf';
+
+	/**
+	 * 自定义视图导航上下文集合
+	 *
+	 * @type {*}
+	 * @memberof ContactByAccountBase
+	 */
+    public customViewNavContexts:any ={
+    };
+
+	/**
+	 * 自定义视图导航参数集合
+	 *
+	 * @type {*}
+	 * @memberof ContactByAccountBase
+	 */
+    public customViewParams:any ={
+    };
+
+    /**
+     * 视图模型数据
+     *
+     * @type {*}
+     * @memberof ContactByAccountBase
+     */
+    public model: any = {
+        srfCaption: 'entities.contact.views.byaccount.caption',
+        srfTitle: 'entities.contact.views.byaccount.title',
+        srfSubTitle: 'entities.contact.views.byaccount.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 视图参数变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof ContactByAccountBase
+     */
+    @Watch('viewparam',{immediate: true, deep: true})
+    onParamData(newVal: any, oldVal: any) {
+        if(newVal){
+            for(let key in this.viewparams){
+                delete this.viewparams[key];
+            }
+            Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            
+        } 
+    }
+
+    /**
+     * 处理应用上下文变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof ContactByAccountBase
+     */
+    @Watch('viewdata')
+    onViewData(newVal: any, oldVal: any) {
+        const _this: any = this;
+        if (!Object.is(newVal, oldVal) && _this.engine) {
+            this.$nextTick(()=>{
+              _this.parseViewParam();
+              _this.engine.load();
+              
+            });
+        }
+    }
+
+    /**
+     * 容器模型
+     *
+     * @type {*}
+     * @memberof ContactByAccountBase
+     */
+    public containerModel: any = {
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
+        view_grid: { name: 'grid', type: 'GRID' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+    };
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof ContactByAccountBase
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+    /**
+     * 视图状态订阅对象
+     *
+     * @public
+     * @type {Subject<{action: string, data: any}>}
+     * @memberof ContactByAccountBase
+     */
+    public viewState: Subject<ViewState> = new Subject();
+    /**
+     * 工具栏模型
+     *
+     * @type {*}
+     * @memberof ContactByAccount
+     */
+    public toolBarModels: any = {
+        tbitem1_openquickcreateview: { name: 'tbitem1_openquickcreateview', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'OpenQuickCreateView', target: 'NONE' } },
+
+        tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
+
+        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
+
+        tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
+
+        tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
+
+        tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
+
+    };
+
+
+
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof ContactByAccountBase
+     */
+    public engine: GridViewEngine = new GridViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof ContactByAccountBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            opendata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.opendata(args,fullargs, params, $event, xData);
+            },
+            newdata: (args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) => {
+                this.newdata(args,fullargs, params, $event, xData);
+            },
+            grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
+            keyPSDEField: 'contact',
+            majorPSDEField: 'fullname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof ContactByAccountBase
+     */
+    public context:any = {};
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof ContactByAccountBase
+     */
+    public viewparams:any = {};
+
+    /**
+     * 解析视图参数
+     *
+     * @public
+     * @memberof ContactByAccountBase
+     */
+    public parseViewParam(): void {
+        for(let key in this.context){
+            delete this.context[key];
+        }
+        if (!this.viewDefaultUsage && this.viewdata && !Object.is(this.viewdata, '')) {
+            Object.assign(this.context, JSON.parse(this.viewdata));
+            if(this.context && this.context.srfparentdename){
+                Object.assign(this.viewparams,{srfparentdename:this.context.srfparentdename});
+            }
+            if(this.context && this.context.srfparentkey){
+                Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
+            }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
+            this.handleCustomViewData();
+            return;
+        }
+        const path = (this.$route.matched[this.$route.matched.length - 1]).path;
+        const keys: Array<any> = [];
+        const curReg = this.$pathToRegExp.pathToRegexp(path, keys);
+        const matchArray = curReg.exec(this.$route.path);
+        let tempValue: Object = {};
+        keys.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item.name, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+        this.$viewTool.formatRouteParams(tempValue,this.$route,this.context,this.viewparams);
+        if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+            Object.assign(this.context,this.$store.getters.getAppData().context);
+        }
+        //初始化视图唯一标识
+        Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
+        this.handleCustomViewData();
+    }
+
+    /**
+     * 处理自定义视图数据
+     *
+     * @memberof ContactByAccountBase
+     */
+	public handleCustomViewData(){
+		if(Object.keys(this.customViewNavContexts).length > 0){
+			Object.keys(this.customViewNavContexts).forEach((item:any) =>{
+				let tempContext:any = {};
+				let curNavContext:any = this.customViewNavContexts[item];
+				this.handleCustomDataLogic(curNavContext,tempContext,item);
+				Object.assign(this.context,tempContext);
+			})
+		}
+		if(Object.keys(this.customViewParams).length > 0){
+			Object.keys(this.customViewParams).forEach((item:any) =>{
+				let tempParam:any = {};
+				let curNavParam:any = this.customViewParams[item];
+				this.handleCustomDataLogic(curNavParam,tempParam,item);
+				Object.assign(this.viewparams,tempParam);
+			})
+		}
+	}
+
+    /**
+     * 处理自定义视图数据逻辑
+     *
+     * @memberof ContactByAccountBase
+     */
+	public handleCustomDataLogic(curNavData:any,tempData:any,item:string){
+		// 直接值直接赋值
+		if(curNavData.isRawValue){
+			if(Object.is(curNavData.value,"null") || Object.is(curNavData.value,"")){
+                Object.defineProperty(tempData, item.toLowerCase(), {
+                    value: null,
+                    writable : true,
+                    enumerable : true,
+                    configurable : true
+                });
+            }else{
+                Object.defineProperty(tempData, item.toLowerCase(), {
+                    value: curNavData.value,
+                    writable : true,
+                    enumerable : true,
+                    configurable : true
+                });
+            }
+		}else{
+			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
+			if(this.context[(curNavData.value).toLowerCase()]){
+				Object.defineProperty(tempData, item.toLowerCase(), {
+					value: this.context[(curNavData.value).toLowerCase()],
+					writable : true,
+					enumerable : true,
+					configurable : true
+				});
+			}else{
+				if(this.viewparams[(curNavData.value).toLowerCase()]){
+					Object.defineProperty(tempData, item.toLowerCase(), {
+						value: this.viewparams[(curNavData.value).toLowerCase()],
+						writable : true,
+						enumerable : true,
+						configurable : true
+					});
+				}else{
+					Object.defineProperty(tempData, item.toLowerCase(), {
+						value: null,
+						writable : true,
+						enumerable : true,
+						configurable : true
+					});
+				}
+			}
+		}
+	}
+	
+
+    /**
+     * Vue声明周期
+     *
+     * @memberof ContactByAccountBase
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     * @memberof ContactByAccountBase
+     */    
+    public afterCreated(){
+        const secondtag = this.$util.createUUID();
+        this.$store.commit('viewaction/createdView', { viewtag: this.viewtag, secondtag: secondtag });
+        this.viewtag = secondtag;
+        this.parseViewParam();
+        if(this.formDruipart){
+            this.formDruipart.subscribe((res:any) =>{
+                if(Object.is(res.action,'save')){
+                    this.viewState.next({ tag:'grid', action: 'save', data: this.viewparams });
+                }
+                if(Object.is(res.action,'load')){
+                    const _this: any = this;
+                    _this.engine.load(res.data,true);
+                }
+            });
+        }
+
+    }
+
+    /**
+     * 销毁之前
+     *
+     * @memberof ContactByAccountBase
+     */
+    public beforeDestroy() {
+        this.$store.commit('viewaction/removeView', this.viewtag);
+    }
+
+    /**
+     * Vue声明周期(组件初始化完毕)
+     *
+     * @memberof ContactByAccountBase
+     */
+    public mounted() {
+        this.afterMounted();
+    }
+
+    /**
+     * 执行mounted后的逻辑
+     * 
+     * @memberof ContactByAccountBase
+     */
+    public afterMounted(){
+        const _this: any = this;
+        _this.engineInit();
+        if (_this.loadModel && _this.loadModel instanceof Function) {
+            _this.loadModel();
+        }
+        
+
+    }
+
+
+    /**
+     * toolbar 部件 click 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem1_openquickcreateview')) {
+            this.toolbar_tbitem1_openquickcreateview_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_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);
+        }
+    }
+
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public grid_selectionchange($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+
+    /**
+     * grid 部件 remove 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public grid_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
+    }
+
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public grid_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public searchform_search($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public searchform_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem1_openquickcreateview_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.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        const curUIService:ContactUIService  = new ContactUIService();
+        curUIService.Contact_OpenQuickCreateView(datas,contextJO, paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @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.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem6_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.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Copy(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @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.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Remove(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @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.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @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.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.Print(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @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.grid;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.ToggleFilter(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 打开新建数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof ContactByAccount
+     */
+    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.contact;
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'contacts', parameterName: 'contact' },
+        ];
+        const _this: any = this;
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
+        }
+        const view: any = {
+            viewname: 'contact-option-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.contact.views.optionview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
+    }
+
+
+    /**
+     * 打开编辑数据视图
+     *
+     * @param {any[]} args
+     * @param {*} [params]
+     * @param {*} [fullargs]
+     * @param {*} [$event]
+     * @param {*} [xData]
+     * @memberof ContactByAccount
+     */
+    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
+        const data: any = {};
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(tempContext,args[0]);
+        }
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'tabexpview', parameterName: 'tabexpview' },
+        ];
+        const _this: any = this;
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
+        }
+        openIndexViewTab(data);
+    }
+
+
+    /**
+     * 编辑
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ContactByAccountBase
+     */
+    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, { contact: args[0].contact })
+            }
+            _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 ContactByAccountBase
+     */
+    public Copy(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.newdata && _this.newdata instanceof Function) {
+            const data: any = {};
+            if (args.length > 0) {
+                Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
+            }
+            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
+        } else if (xData && xData.copy instanceof Function) {
+            if (args.length > 0) {
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
+            }
+            xData.copy(args[0].srfkey);
+        } else {
+            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
+        }
+    }
+    /**
+     * 删除
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ContactByAccountBase
+     */
+    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 ContactByAccountBase
+     */
+    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 ContactByAccountBase
+     */
+    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 ContactByAccountBase
+     */
+    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;
+        }
+    }
+
+    /**
+     * 关闭视图
+     *
+     * @param {any[]} args
+     * @memberof ContactByAccountBase
+     */
+    public closeView(args: any[]): void {
+        let _view: any = this;
+        if (_view.viewdata) {
+            _view.$emit('viewdataschange', [args]);
+            _view.$emit('close', [args]);
+        } else if (_view.$tabPageExp) {
+            _view.$tabPageExp.onClose(_view.$route.fullPath);
+        }
+    }
+
+    /**
+     * 销毁视图回调
+     *
+     * @memberof ContactByAccountBase
+     */
+    public destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof ContactByAccountBase
+     */
+    public afterDestroyed(){
+        if(this.viewDefaultUsage){
+            let localStoreLength = Object.keys(localStorage);
+            if(localStoreLength.length > 0){
+                localStoreLength.forEach((item:string) =>{
+                if(item.startsWith(this.context.srfsessionid)){
+                    localStorage.removeItem(item);
+                }
+                })
+            }
+        }
+    }
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof ContactByAccountBase
+     */
+    public isSingleSelect: boolean = false;
+
+
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof ContactByAccountBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
+
+    /**
+    * 界面关系通讯对象
+    *
+    * @type {Subject<ViewState>}
+    * @memberof ContactByAccountBase
+    */
+    @Prop() public formDruipart?: Subject<ViewState>;
+
+    /**
+     * 搜索值
+     *
+     * @type {string}
+     * @memberof ContactByAccountBase
+     */
+    public query: string = '';
+
+    /**
+     * 是否展开搜索表单
+     *
+     * @type {boolean}
+     * @memberof ContactByAccountBase
+     */
+    public isExpandSearchForm: boolean = false;
+
+    /**
+     * 表格行数据默认激活模式
+     * 0 不激活
+     * 1 单击激活
+     * 2 双击激活
+     *
+     * @type {(number | 0 | 1 | 2)}
+     * @memberof ContactByAccountBase
+     */
+    public gridRowActiveMode: number | 0 | 1 | 2 = 2;
+
+    /**
+     * 快速搜索
+     *
+     * @param {*} $event
+     * @memberof ContactByAccountBase
+     */
+    public onSearch($event: any): void {
+        const grid: any = this.$refs.grid;
+        if (grid) {
+            grid.load(this.context, true);
+        }
+    }
+
+    /**
+     * grid 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof ENTITYTEST1Usr2GridViewBase
+     */
+    public onSave($event: any) {
+        this.$emit('drdatasaved', $event);
+    }
+
+    /**
+     * 刷新数据
+     *
+     * @readonly
+     * @type {(number | null)}
+     * @memberof ContactByAccountBase
+     */
+    get refreshdata(): number | null {
+        return this.$store.getters['viewaction/getRefreshData'](this.viewtag);
+    }
+
+    /**
+     * 监控数据变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @returns
+     * @memberof ContactByAccountBase
+     */
+    @Watch('refreshdata')
+    onRefreshData(newVal: any, oldVal: any) {
+        if (newVal === null || newVal === undefined) {
+            return;
+        }
+        if (newVal === 0) {
+            return;
+        }
+        const grid: any = this.$refs.grid;
+        if (grid) {
+            grid.load({});
+        }
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './contact-by-account.less';
+</style>
\ No newline at end of file

app_BusinessCentral/src/pages/base/contact-by-account/contact-by-account.less

+// 避免空文件，后台不让空文件过
+.contact-by-account {
+    --contact-by-account: 0;
+}
+// 视图样式
+        // this is less
+
+

app_BusinessCentral/src/pages/base/contact-by-account/contact-by-account.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import ContactByAccountBase from './contact-by-account-base.vue';
+
+import view_grid from '@widgets/contact/main-grid/main-grid.vue';
+import view_searchform from '@widgets/contact/default-searchform/default-searchform.vue';
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class ContactByAccount extends ContactByAccountBase {
+
+}
+</script>
\ No newline at end of file

app_BusinessCentral/src/pages/base/contact-grid-view/contact-grid-view-base.vue

@@ -920,28 +920,14 @@ export default class ContactGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'contacts', parameterName: 'contact' },
+            { pathName: 'tabexpview', parameterName: 'tabexpview' },
         ];
         const _this: any = this;
-        const openDrawer = (view: any, data: any) => {
-            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
-            container.subscribe((result: any) => {
-                if (!result || !Object.is(result.ret, 'OK')) {
-                    return;
-                }
-                if (!xData || !(xData.refresh instanceof Function)) {
-                    return;
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
         }
-                xData.refresh(result.datas);
-            });
-        }
-        const view: any = {
-            viewname: 'contact-tab-exp-view', 
-            height: 0, 
-            width: 0,  
-            title: this.$t('entities.contact.views.tabexpview.title'),
-            placement: 'DRAWER_TOP',
-        };
-        openDrawer(view, data);
+        openIndexViewTab(data);
     }
 
 

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

@@ -38,6 +38,7 @@ export const PageComponents = {
         Vue.component('account-pickup-view', () => import('@pages/base/account-pickup-view/account-pickup-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('ibiz-list-grid-view', () => import('@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'));
+        Vue.component('contact-by-account', () => import('@pages/base/contact-by-account/contact-by-account.vue'));
         Vue.component('product-grid-view', () => import('@pages/product/product-grid-view/product-grid-view.vue'));
         Vue.component('sales-literature-edit-view', () => import('@pages/sales/sales-literature-edit-view/sales-literature-edit-view.vue'));
         Vue.component('account-pickup-grid-view', () => import('@pages/base/account-pickup-grid-view/account-pickup-grid-view.vue'));

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

@@ -622,6 +622,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue'),
                 },
+                {
+                    path: 'contacts/:contact?/byaccount/:byaccount?',
+                    meta: {
+                        caption: 'entities.contact.views.byaccount.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'contacts', parameterName: 'contact' },
+                            { pathName: 'byaccount', parameterName: 'byaccount' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/contact-by-account/contact-by-account.vue'),
+                },
                 {
                     path: 'products/:product?/gridview/:gridview?',
                     meta: {
@@ -1318,6 +1332,19 @@ const router = new Router({
         },
         component: () => import('@pages/base/account-address/account-address.vue'),
     },
+    {
+        path: '/contacts/:contact?/byaccount/:byaccount?',
+        meta: {
+            caption: 'entities.contact.views.byaccount.title',
+            info:'',
+            parameters: [
+                { pathName: 'contacts', parameterName: 'contact' },
+                { pathName: 'byaccount', parameterName: 'byaccount' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/base/contact-by-account/contact-by-account.vue'),
+    },
     {
         path: '/contacts/:contact?/abstracteditview9/:abstracteditview9?',
         meta: {

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

@@ -106,19 +106,17 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'e38e7b53a449e0f112cb545d2c5d4b85',
                 'aa79d35850f36fbc1a5085353ecd5af5',
-                'fb06f2c1cea1ac2a5a70c20f4a277ae5',
+                'e38e7b53a449e0f112cb545d2c5d4b85',
                 '73bb9f7e653384ca09f8bbbfd580d892',
-                'e404dc93e70d6284d4e1a083017625ed',
-                'a95d7d9111bc13a8b73a11ee1e4ff92a',
-                '916febbb65be1c54dd42ccb9914fe973',
-                'a5213905238dbc5d8e1a505029105cc9',
                 'e4335da0a7c14a65376eecaabb771fd7',
                 'c607e5bc2c07ab2aca084e275ce677b7',
+                'a95d7d9111bc13a8b73a11ee1e4ff92a',
                 '893e62d6fbdc4580de7e3e802aec9108',
-                '688201ee5642d41628dbf4deba002d17',
+                '916febbb65be1c54dd42ccb9914fe973',
                 '1d3b94223a5d3f8ab1d2fe334c8c4afd',
+                '688201ee5642d41628dbf4deba002d17',
+                'a5213905238dbc5d8e1a505029105cc9',
             ],
         },
         {
@@ -137,6 +135,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'fb06f2c1cea1ac2a5a70c20f4a277ae5',
                 'bae77557d2f7a7852b634dc5d5a93435',
                 '2becf7bda3a6d70cbe9a4e254093e84e',
             ],
@@ -375,6 +374,17 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '9224b0b14d2d99014e051f8035ba5cbf',
+            viewmodule: 'Base',
+            viewname: 'ContactByAccount',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'e404dc93e70d6284d4e1a083017625ed',
+                'fcdb236b65d78c4a8ae64e74f9483a63',
+            ],
+        },
         {
             viewtag: '928f354b1e67a8b855b7f19f485299b0',
             viewmodule: 'Base',
@@ -607,6 +617,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '9224b0b14d2d99014e051f8035ba5cbf',
                 'b6b6215e439e78cdf6959b6f45bd7927',
             ],
         },

app_BusinessCentral/src/uiservice/contact/contact-ui-service-base.ts

@@ -80,8 +80,10 @@ export default class ContactUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'contacts'});
+        this.allViewMap.set(':',{viewname:'abstracteditview9_editmode',srfappde:'contacts'});
         this.allViewMap.set(':',{viewname:'detailinfoeditview9',srfappde:'contacts'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'contacts'});
+        this.allViewMap.set(':',{viewname:'byaccount',srfappde:'contacts'});
         this.allViewMap.set(':',{viewname:'abstracteditview9',srfappde:'contacts'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'contacts'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'contacts'});

app_BusinessCentral/src/widgets/account/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel-base.vue

@@ -59,6 +59,29 @@
     @closeview="closeView($event)">
 </view_tabviewpanel2>
         </tab-pane>
+        <tab-pane :index="2" name='tabviewpanel3' tab='infotabexppanel' class=''  
+            :label="(h) =>{
+                return h('div', [
+                    h('span', '联系人'),
+                    h('Badge', {
+                        props: {
+                            count: undefined,
+                            type: 'primary'
+                        }
+                    })
+                ])
+            }" >
+            <view_tabviewpanel3 
+    :viewState="viewState"  
+    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+    :context="JSON.parse(JSON.stringify(context))" 
+    v-if="isInit.tabviewpanel3"
+    name="tabviewpanel3"  
+    ref='tabviewpanel3'
+    @viewpanelDatasChange = "tabViewPanelDatasChange"
+    @closeview="closeView($event)">
+</view_tabviewpanel3>
+        </tab-pane>
     </tabs>
   </div>
 </template>
@@ -195,6 +218,7 @@ export default class InfotabexppanelBase extends Vue implements ControlInterface
     public isInit: any = {
         tabviewpanel:  true ,
         tabviewpanel2:  false ,
+        tabviewpanel3:  false ,
     }
 
     /**

app_BusinessCentral/src/widgets/account/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel.vue

@@ -3,12 +3,14 @@ import { Component } from 'vue-property-decorator';
 import InfotabexppanelBase from './infotabexppanel-tabexppanel-base.vue';
 import view_tabviewpanel from '@widgets/account/infotabviewpanel-tabviewpanel/infotabviewpanel-tabviewpanel.vue';
 import view_tabviewpanel2 from '@widgets/account/infotabviewpanel2-tabviewpanel/infotabviewpanel2-tabviewpanel.vue';
+import view_tabviewpanel3 from '@widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel.vue';
 
  
 @Component({
     components: {
         view_tabviewpanel, 
         view_tabviewpanel2, 
+        view_tabviewpanel3, 
          
     }
 })

app_BusinessCentral/src/widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel-base.vue

+<template>
+  <div class='tabviewpanel' style="height:100%;" v-if = 'isActivied' >
+        <account-major-contact 
+      class='viewcontainer2' 
+      :viewdata="viewdata" 
+      :viewparam="viewparam"
+      @viewload="viewDatasChange($event)" 
+      :viewDefaultUsage="false" >
+    </account-major-contact>
+  </div>
+</template>
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch, Model } from 'vue-property-decorator';
+import { CreateElement } from 'vue';
+import { Subject, Subscription } from 'rxjs';
+import { ControlInterface } from '@/interface/control';
+import { UIActionTool,Util } from '@/utils';
+import AccountService from '@/service/account/account-service';
+import Infotabviewpanel3Service from './infotabviewpanel3-tabviewpanel-service';
+
+
+
+@Component({
+    components: {
+      
+    }
+})
+export default class Infotabviewpanel3Base extends Vue implements ControlInterface {
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof Infotabviewpanel3
+     */
+    @Prop() public name?: string;
+
+    /**
+     * 视图通讯对象
+     *
+     * @type {Subject<ViewState>}
+     * @memberof Infotabviewpanel3
+     */
+    @Prop() public viewState!: Subject<ViewState>;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel3
+     */
+    @Prop() public context: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel3
+     */
+    @Prop() public viewparams: any;
+
+    /**
+     * 视图状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof Infotabviewpanel3
+     */
+    public viewStateEvent: Subscription | undefined;
+
+    /**
+     * 获取部件类型
+     *
+     * @returns {string}
+     * @memberof Infotabviewpanel3
+     */
+    public getControlType(): string {
+        return 'TABVIEWPANEL'
+    }
+
+
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {Infotabviewpanel3Service}
+     * @memberof Infotabviewpanel3
+     */
+    public service: Infotabviewpanel3Service = new Infotabviewpanel3Service({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {AccountService}
+     * @memberof Infotabviewpanel3
+     */
+    public appEntityService: AccountService = new AccountService({ $store: this.$store });
+    
+
+
+    /**
+     * 关闭视图
+     *
+     * @param {any} args
+     * @memberof Infotabviewpanel3
+     */
+    public closeView(args: any): void {
+        let _this: any = this;
+        _this.$emit('closeview', [args]);
+    }
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof Infotabviewpanel3
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+
+
+ /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof Infotabviewpanel3
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof Infotabviewpanel3
+     */
+    public getData(): any {
+        return null;
+    }
+
+    /**
+     * 是否被激活
+     *
+     * @type {boolean}
+     * @memberof Infotabviewpanel3
+     */
+    public isActivied: boolean = true;
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel3
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof Infotabviewpanel3
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 传入上下文
+     *
+     * @type {string}
+     * @memberof TabExpViewtabviewpanel
+     */
+    public viewdata: string = JSON.stringify(this.context);
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string = JSON.stringify(this.viewparams);
+
+    /**
+     * 视图面板过滤项
+     *
+     * @type {string}
+     * @memberof Infotabviewpanel3
+     */
+    public navfilter: string = "";
+             
+    /**
+     * vue 生命周期
+     *
+     * @returns
+     * @memberof Infotabviewpanel3
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof Infotabviewpanel3
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                this.$forceUpdate();
+                this.initNavParam();
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     * @memberof Infotabviewpanel3
+     */
+    public initNavParam(){
+        if(!Object.is(this.navfilter,"")){
+            Object.assign(this.viewparams,{[this.navfilter]:this.context['majorentity']})
+        }
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata =JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+    /**
+     * 视图数据变化
+     *
+     * @memberof  Infotabviewpanel3
+     */
+    public viewDatasChange($event:any){
+        this.$emit('viewpanelDatasChange',$event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof Infotabviewpanel3
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof Infotabviewpanel3
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+
+
+}
+</script>
+
+<style lang='less'>
+@import './infotabviewpanel3-tabviewpanel.less';
+</style>
\ No newline at end of file

app_BusinessCentral/src/widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel-model.ts

+/**
+ * Infotabviewpanel3 部件模型
+ *
+ * @export
+ * @class Infotabviewpanel3Model
+ */
+export default class Infotabviewpanel3Model {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof Infotabviewpanel3Model
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'address1_primarycontactname',
+      },
+      {
+        name: 'openrevenue_date',
+      },
+      {
+        name: 'address2_utcoffset',
+      },
+      {
+        name: 'fax',
+      },
+      {
+        name: 'address1_composite',
+      },
+      {
+        name: 'entityimage',
+      },
+      {
+        name: 'emailaddress1',
+      },
+      {
+        name: 'overriddencreatedon',
+      },
+      {
+        name: 'address1_stateorprovince',
+      },
+      {
+        name: 'openrevenue',
+      },
+      {
+        name: 'address1_upszone',
+      },
+      {
+        name: 'followemail',
+      },
+      {
+        name: 'marketingonly',
+      },
+      {
+        name: 'numberofemployees',
+      },
+      {
+        name: 'telephone1',
+      },
+      {
+        name: 'aging60',
+      },
+      {
+        name: 'sharesoutstanding',
+      },
+      {
+        name: 'address2_freighttermscode',
+      },
+      {
+        name: 'entityimage_timestamp',
+      },
+      {
+        name: 'revenue_base',
+      },
+      {
+        name: 'accountratingcode',
+      },
+      {
+        name: 'donotbulkemail',
+      },
+      {
+        name: 'aging30',
+      },
+      {
+        name: 'donotbulkpostalmail',
+      },
+      {
+        name: 'creditlimit_base',
+      },
+      {
+        name: 'timezoneruleversionnumber',
+      },
+      {
+        name: 'customertypecode',
+      },
+      {
+        name: 'address2_longitude',
+      },
+      {
+        name: 'accountname',
+      },
+      {
+        name: 'participatesinworkflow',
+      },
+      {
+        name: 'preferredcontactmethodcode',
+      },
+      {
+        name: 'preferredappointmentdaycode',
+      },
+      {
+        name: 'marketcap',
+      },
+      {
+        name: 'address2_telephone1',
+      },
+      {
+        name: 'businesstypecode',
+      },
+      {
+        name: 'entityimageid',
+      },
+      {
+        name: 'address2_city',
+      },
+      {
+        name: 'ownershipcode',
+      },
+      {
+        name: 'utcconversiontimezonecode',
+      },
+      {
+        name: 'accountnumber',
+      },
+      {
+        name: 'address1_telephone2',
+      },
+      {
+        name: 'address1_line1',
+      },
+      {
+        name: 'donotphone',
+      },
+      {
+        name: 'address1_telephone3',
+      },
+      {
+        name: 'exchangerate',
+      },
+      {
+        name: 'address2_line2',
+      },
+      {
+        name: 'address2_telephone3',
+      },
+      {
+        name: 'address1_telephone1',
+      },
+      {
+        name: 'address1_fax',
+      },
+      {
+        name: 'address1_freighttermscode',
+      },
+      {
+        name: 'description',
+      },
+      {
+        name: 'merged',
+      },
+      {
+        name: 'address1_shippingmethodcode',
+      },
+      {
+        name: 'address1_name',
+      },
+      {
+        name: 'aging30_base',
+      },
+      {
+        name: 'address2_telephone2',
+      },
+      {
+        name: 'account',
+        prop: 'accountid',
+      },
+      {
+        name: 'primarytwitterid',
+      },
+      {
+        name: 'tickersymbol',
+      },
+      {
+        name: 'stockexchange',
+      },
+      {
+        name: 'address2_stateorprovince',
+      },
+      {
+        name: 'ftpsiteurl',
+      },
+      {
+        name: 'statuscode',
+      },
+      {
+        name: 'websiteurl',
+      },
+      {
+        name: 'donotpostalmail',
+      },
+      {
+        name: 'address1_city',
+      },
+      {
+        name: 'address2_fax',
+      },
+      {
+        name: 'aging90_base',
+      },
+      {
+        name: 'opendeals_date',
+      },
+      {
+        name: 'traversedpath',
+      },
+      {
+        name: 'shippingmethodcode',
+      },
+      {
+        name: 'address1_line2',
+      },
+      {
+        name: 'openrevenue_base',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'preferredsystemuseridyominame',
+      },
+      {
+        name: 'address2_line3',
+      },
+      {
+        name: 'address1_postalcode',
+      },
+      {
+        name: 'address2_latitude',
+      },
+      {
+        name: 'ibizprivate',
+      },
+      {
+        name: 'territorycode',
+      },
+      {
+        name: 'teamsfollowed',
+      },
+      {
+        name: 'yominame',
+      },
+      {
+        name: 'address1_latitude',
+      },
+      {
+        name: 'telephone3',
+      },
+      {
+        name: 'ownerid',
+      },
+      {
+        name: 'address2_country',
+      },
+      {
+        name: 'masteraccountidyominame',
+      },
+      {
+        name: 'industrycode',
+      },
+      {
+        name: 'lastonholdtime',
+      },
+      {
+        name: 'address2_addressid',
+      },
+      {
+        name: 'onholdtime',
+      },
+      {
+        name: 'accountclassificationcode',
+      },
+      {
+        name: 'address1_country',
+      },
+      {
+        name: 'address1_addresstypecode',
+      },
+      {
+        name: 'statecode',
+      },
+      {
+        name: 'address2_addresstypecode',
+      },
+      {
+        name: 'accountcategorycode',
+      },
+      {
+        name: 'emailaddress2',
+      },
+      {
+        name: 'address2_shippingmethodcode',
+      },
+      {
+        name: 'importsequencenumber',
+      },
+      {
+        name: 'primarysatoriid',
+      },
+      {
+        name: 'customersizecode',
+      },
+      {
+        name: 'opendeals',
+      },
+      {
+        name: 'donotsendmm',
+      },
+      {
+        name: 'processid',
+      },
+      {
+        name: 'paymenttermscode',
+      },
+      {
+        name: 'sic',
+      },
+      {
+        name: 'address2_primarycontactname',
+      },
+      {
+        name: 'address1_utcoffset',
+      },
+      {
+        name: 'owneridyominame',
+      },
+      {
+        name: 'lastusedincampaign',
+      },
+      {
+        name: 'aging60_base',
+      },
+      {
+        name: 'donotfax',
+      },
+      {
+        name: 'updateman',
+      },
+      {
+        name: 'openrevenue_state',
+      },
+      {
+        name: 'opendeals_state',
+      },
+      {
+        name: 'versionnumber',
+      },
+      {
+        name: 'address1_longitude',
+      },
+      {
+        name: 'aging90',
+      },
+      {
+        name: 'entityimage_url',
+      },
+      {
+        name: 'creditlimit',
+      },
+      {
+        name: 'preferredsystemuserid',
+      },
+      {
+        name: 'revenue',
+      },
+      {
+        name: 'address1_county',
+      },
+      {
+        name: 'address1_line3',
+      },
+      {
+        name: 'stageid',
+      },
+      {
+        name: 'donotemail',
+      },
+      {
+        name: 'address2_postalcode',
+      },
+      {
+        name: 'preferredappointmenttimecode',
+      },
+      {
+        name: 'address2_upszone',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'address2_county',
+      },
+      {
+        name: 'owneridtype',
+      },
+      {
+        name: 'address2_composite',
+      },
+      {
+        name: 'address2_name',
+      },
+      {
+        name: 'address2_line1',
+      },
+      {
+        name: 'marketcap_base',
+      },
+      {
+        name: 'emailaddress3',
+      },
+      {
+        name: 'telephone2',
+      },
+      {
+        name: 'createman',
+      },
+      {
+        name: 'address1_postofficebox',
+      },
+      {
+        name: 'creditonhold',
+      },
+      {
+        name: 'address1_addressid',
+      },
+      {
+        name: 'address2_postofficebox',
+      },
+      {
+        name: 'slaname',
+      },
+      {
+        name: 'originatingleadid',
+      },
+      {
+        name: 'transactioncurrencyid',
+      },
+      {
+        name: 'defaultpricelevelid',
+      },
+      {
+        name: 'parentaccountid',
+      },
+      {
+        name: 'preferredequipmentid',
+      },
+      {
+        name: 'territoryid',
+      },
+      {
+        name: 'primarycontactid',
+      },
+      {
+        name: 'slaid',
+      },
+      {
+        name: 'preferredserviceid',
+      },
+      {
+        name: 'originatingleadname',
+      },
+      {
+        name: 'defaultpricelevelname',
+      },
+      {
+        name: 'territoryname',
+      },
+      {
+        name: 'parentaccountname',
+      },
+      {
+        name: 'preferredequipmentname',
+      },
+      {
+        name: 'preferredservicename',
+      },
+      {
+        name: 'primarycontactname',
+      },
+      {
+        name: 'transactioncurrencyname',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_BusinessCentral/src/widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * Infotabviewpanel3 部件服务对象
+ *
+ * @export
+ * @class Infotabviewpanel3Service
+ */
+export default class Infotabviewpanel3Service extends ControlService {
+}
\ No newline at end of file

app_BusinessCentral/src/widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel.less

+// this is less

app_BusinessCentral/src/widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import Infotabviewpanel3Base from './infotabviewpanel3-tabviewpanel-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class Infotabviewpanel3 extends Infotabviewpanel3Base {
+
+}
+</script>
\ No newline at end of file

app_BusinessCentral/src/widgets/account/major-contact-form/major-contact-form-base.vue

@@ -38,6 +38,31 @@
     <input-box v-model="data.emailaddress1"  @enter="onEnter($event)"   unit=""  :disabled="detailsModel.emailaddress1.disabled" type='text'  style=""></input-box>
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.druipart1.visible" :style="{}"  :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
+    <app-form-druipart
+    
+    :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
+    paramItem='account' 
+    :parentdata='{"srfparentdename":"ACCOUNT","SRFPARENTTYPE":"CUSTOM"}'
+    :parameters="[
+    ]"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{}'
+    :localParam ='{}'
+    parameterName='account'
+    parentName="Account"  
+    refviewtype='DEGRIDVIEW' 
+    refreshitems='' 
+    :ignorefieldvaluechange="ignorefieldvaluechange"
+    viewname='contact-by-account' 
+    :data="JSON.stringify(this.data)" 
+    @drdatasaved="drdatasaved($event)"
+    style=";overflow: auto;">
+</app-form-druipart>
+
 </i-col>
     
     </row>
@@ -477,6 +502,8 @@ export default class MajorContactBase extends Vue implements ControlInterface {
      * @memberof MajorContact
      */
     public detailsModel: any = {
+        druipart1: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this })
+, 
         group1: new FormGroupPanelModel({ caption: '客户基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, uiActionGroup: { caption: '', langbase: 'entities.account.majorcontact_form', extractMode: 'ITEM', details: [] } })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
@@ -701,6 +728,7 @@ export default class MajorContactBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**
@@ -1224,7 +1252,7 @@ export default class MajorContactBase extends Vue implements ControlInterface {
             Object.assign(arg, data);
             Object.assign(arg, this.context);
             if (ifStateNext) {
-                this.drcounter = 0;
+                this.drcounter = 1;
                 if(this.drcounter !== 0){
                     this.drsaveopt = opt;
                     this.formState.next({ type: 'beforesave', data: arg });//先通知关系界面保存

app_BusinessCentral/src/widgets/account/summary-dashboard/summary-dashboard-base.vue

@@ -100,52 +100,6 @@
                                     </card>
                                     </div>
                                 </i-col>
-                                <i-col :md="{ span: 24, offset: 0 }">
-                                    <div class="portlet-without-title">
-                                      <card class="portlet-card" :bordered="false" dis-hover :padding="0">
-                                      <span>
-                                                      <div class='portlet-container summarydashboard-container4 ' :style="{}">
-                                            <row>
-                                              <i-col :md="{ span: 24, offset: 0 }">
-                                                  <div class="portlet-without-title">
-                                                    <card class="portlet-card" :bordered="false" dis-hover :padding="0">
-                                                    <span>
-                                                                    <view_dashboard_sysportlet6 
-                                                        :viewState="viewState"  
-                                                        :viewparams="viewparams" 
-                                                        :context="context" 
-                                                        :height="300"
-                                                        name="dashboard_sysportlet6"  
-                                                        ref='dashboard_sysportlet6' 
-                                                        @closeview="closeView($event)">
-                                                    </view_dashboard_sysportlet6>
-                                                    </span>
-                                                  </card>
-                                                  </div>
-                                              </i-col>
-                                              <i-col :md="{ span: 24, offset: 0 }">
-                                                  <div class="portlet-without-title">
-                                                    <card class="portlet-card" :bordered="false" dis-hover :padding="0">
-                                                    <span>
-                                                                    <view_dashboard_sysportlet7 
-                                                        :viewState="viewState"  
-                                                        :viewparams="viewparams" 
-                                                        :context="context" 
-                                                        :height="300"
-                                                        name="dashboard_sysportlet7"  
-                                                        ref='dashboard_sysportlet7' 
-                                                        @closeview="closeView($event)">
-                                                    </view_dashboard_sysportlet7>
-                                                    </span>
-                                                  </card>
-                                                  </div>
-                                              </i-col>
-                                            </row>
-                                        </div>
-                                      </span>
-                                    </card>
-                                    </div>
-                                </i-col>
                               </row>
                           </div>
                         </span>

app_BusinessCentral/src/widgets/account/summary-dashboard/summary-dashboard.vue

@@ -2,8 +2,6 @@
 import { Component } from 'vue-property-decorator';
 import SummaryBase from './summary-dashboard-base.vue';
 import view_dashboard_sysportlet8 from '@widgets/activity-pointer/pt-by-parent-key-portlet/pt-by-parent-key-portlet.vue';
-import view_dashboard_sysportlet6 from '@widgets/account/pt-major-contact-portlet/pt-major-contact-portlet.vue';
-import view_dashboard_sysportlet7 from '@widgets/contact/pt-by-account-portlet/pt-by-account-portlet.vue';
 import view_dashboard_sysportlet4 from '@widgets/account/pt-contact-setting-portlet/pt-contact-setting-portlet.vue';
 import view_dashboard_sysportlet5 from '@widgets/account/pt-distribution-portlet/pt-distribution-portlet.vue';
 import view_dashboard_sysportlet2 from '@widgets/account/pt-address-portlet/pt-address-portlet.vue';
@@ -14,8 +12,6 @@ import view_dashboard_sysportlet1 from '@widgets/account/pt-account-info-portlet
 @Component({
     components: {
         view_dashboard_sysportlet8, 
-        view_dashboard_sysportlet6, 
-        view_dashboard_sysportlet7, 
         view_dashboard_sysportlet4, 
         view_dashboard_sysportlet5, 
         view_dashboard_sysportlet2, 

app_BusinessCentral/src/widgets/contact/default-searchform/default-searchform-base.vue

@@ -561,7 +561,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: '错误', desc: 'ContactPickupGridView视图搜索表单loadAction参数未配置' });
+            this.$Notice.error({ title: '错误', desc: 'ContactByAccount视图搜索表单loadAction参数未配置' });
             return;
         }
         const arg: any = { ...opt };
@@ -598,7 +598,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: '错误', desc: 'ContactPickupGridView视图搜索表单loaddraftAction参数未配置' });
+            this.$Notice.error({ title: '错误', desc: 'ContactByAccount视图搜索表单loaddraftAction参数未配置' });
             return;
         }
         const arg: any = { ...opt } ;

app_BusinessCentral/src/widgets/contact/main-grid/main-grid-base.vue

@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('parentcustomerid')">
-                <el-table-column show-overflow-tooltip :prop="'parentcustomerid'" :label="$t('entities.contact.main_grid.columns.parentcustomerid')" :min-width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'parentcustomerid'" :label="$t('entities.contact.main_grid.columns.parentcustomerid')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.contact.main_grid.columns.parentcustomerid')}}
@@ -268,6 +268,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof Main
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof Main
+     */
+    @Prop() public opendata: any;
 
     /**
      * 显示处理提示
@@ -553,7 +567,7 @@ export default class MainBase extends Vue implements ControlInterface {
             label: '公司名称',
             langtag: 'entities.contact.main_grid.columns.parentcustomerid',
             show: true,
-            util: 'STAR'
+            util: 'PX'
         },
         {
             name: 'telephone1',
@@ -649,7 +663,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: '错误', desc: 'ContactPickupGridView视图表格fetchAction参数未配置' });
+            this.$Notice.error({ title: '错误', desc: 'ContactByAccount视图表格fetchAction参数未配置' });
             return;
         }
         if(pageReset){
@@ -726,7 +740,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: '错误', desc: 'ContactPickupGridView视图表格removeAction参数未配置' });
+            this.$Notice.error({ title: '错误', desc: 'ContactByAccount视图表格removeAction参数未配置' });
             return;
         }
         let _datas:any[] = [];
@@ -832,7 +846,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: '错误', desc: 'ContactPickupGridView视图表格fetchAction参数未配置' });
+            this.$Notice.error({ title: '错误', desc: 'ContactByAccount视图表格fetchAction参数未配置' });
             return;
         }
         if(!arg){
@@ -1370,7 +1384,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: '错误', desc: 'ContactPickupGridView视图表格createAction参数未配置' });
+                        this.$Notice.error({ title: '错误', desc: 'ContactByAccount视图表格createAction参数未配置' });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1378,7 +1392,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: '错误', desc: 'ContactPickupGridView视图表格updateAction参数未配置' });
+                        this.$Notice.error({ title: '错误', desc: 'ContactByAccount视图表格updateAction参数未配置' });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.contact){

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

@@ -2610,7 +2610,7 @@
 
 
     <!--输出实体[TASK]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-task-43-34">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-task-47-34">
         <createTable tableName="TASK">
                 <column name="WORKFLOWCREATED" remarks="" type="INT">
                 </column>
@@ -3152,7 +3152,7 @@
 
 
     <!--输出实体[CONTACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-42-42">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-70-42">
         <createTable tableName="CONTACT">
                 <column name="ADDRESS1_FREIGHTTERMSCODE" remarks="" type="VARCHAR(30)">
                 </column>
@@ -4480,7 +4480,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-147-53">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-169-53">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -6392,7 +6392,7 @@
 
 
     <!--输出实体[LEAD]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-19-72">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-lead-22-72">
         <createTable tableName="LEAD">
                 <column name="ADDRESS1_FAX" remarks="" type="VARCHAR(50)">
                 </column>
@@ -8998,7 +8998,7 @@
 
 
     <!--输出实体[ACTIVITYPOINTER]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-activitypointer-54-95">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-activitypointer-55-95">
         <createTable tableName="ACTIVITYPOINTER">
                 <column name="SERIESID" remarks="" type="VARCHAR(60)">
                 </column>
@@ -10346,7 +10346,7 @@
 
 
     <!--输出实体[OPPORTUNITY]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunity-14-114">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-opportunity-16-114">
         <createTable tableName="OPPORTUNITY">
                 <column name="DECISIONMAKER" remarks="" type="INT">
                 </column>
@@ -10908,13 +10908,13 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INVOICE" constraintName="DER1N_INVOICE__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[TASK]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-task-43-186">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-task-47-186">
        <addForeignKeyConstraint baseColumnNames="SERVICEID" baseTableName="TASK" constraintName="DER1N_TASK__SERVICE__SERVICEID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-task-43-187">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-task-47-187">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="TASK" constraintName="DER1N_TASK__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-task-43-188">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-task-47-188">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="TASK" constraintName="DER1N_TASK__TRANSACTIONCURRENC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[UOM]外键关系 -->
@@ -10973,22 +10973,22 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="MONTHLYFISCALCALENDAR" constraintName="DER1N_MONTHLYFISCALCALENDAR__T" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[CONTACT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-42-206">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-70-206">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-42-207">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-70-207">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-42-208">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-70-208">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-42-209">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-70-209">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-42-210">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-70-210">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-42-211">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-70-211">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="CONTACT" constraintName="DER1N_CONTACT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[TEAM]外键关系 -->
@@ -11074,31 +11074,31 @@
        <addForeignKeyConstraint baseColumnNames="METRICID" baseTableName="GOAL" constraintName="DER1N_GOAL__METRIC__METRICID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="METRICID" referencedTableName="METRIC" validate="true"/>
     </changeSet>
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-147-246">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-246">
        <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-147-247">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-247">
        <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-147-248">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-248">
        <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-147-249">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-249">
        <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-147-250">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-250">
        <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-147-251">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-251">
        <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-147-252">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-252">
        <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-147-253">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-253">
        <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-147-254">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-169-254">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[KNOWLEDGEARTICLEVIEWS]外键关系 -->
@@ -11243,28 +11243,28 @@
     </changeSet>
         <!--输出实体[METRIC]外键关系 -->
         <!--输出实体[LEAD]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-300">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-300">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="LEAD" constraintName="DER1N_LEAD__ACCOUNT__PARENTACC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-301">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-301">
        <addForeignKeyConstraint baseColumnNames="RELATEDOBJECTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGNRESPONSE__" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACTIVITYID" referencedTableName="CAMPAIGNRESPONSE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-302">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-302">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="LEAD" constraintName="DER1N_LEAD__CAMPAIGN__CAMPAIGN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-303">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-303">
        <addForeignKeyConstraint baseColumnNames="PARENTCONTACTID" baseTableName="LEAD" constraintName="DER1N_LEAD__CONTACT__PARENTCON" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-304">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-304">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGCASEID" baseTableName="LEAD" constraintName="DER1N_LEAD__INCIDENT__ORIGINAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-305">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-305">
        <addForeignKeyConstraint baseColumnNames="QUALIFYINGOPPORTUNITYID" baseTableName="LEAD" constraintName="DER1N_LEAD__OPPORTUNITY__QUALI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="OPPORTUNITYID" referencedTableName="OPPORTUNITY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-306">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-306">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="LEAD" constraintName="DER1N_LEAD__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-19-307">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-lead-22-307">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="LEAD" constraintName="DER1N_LEAD__TRANSACTIONCURRENC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[TERRITORY]外键关系 -->
@@ -11434,13 +11434,13 @@
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="PRODUCTSUBSTITUTE" constraintName="DER1N_PRODUCTSUBSTITUTE__TRANS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYPOINTER]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-54-363">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-55-363">
        <addForeignKeyConstraint baseColumnNames="SERVICEID" baseTableName="ACTIVITYPOINTER" constraintName="DER1N_ACTIVITYPOINTER__SERVICE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-54-364">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-55-364">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACTIVITYPOINTER" constraintName="DER1N_ACTIVITYPOINTER__SLA__SL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-54-365">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-activitypointer-55-365">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACTIVITYPOINTER" constraintName="DER1N_ACTIVITYPOINTER__TRANSAC" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[BULKDELETEFAILURE]外键关系 -->
@@ -11552,25 +11552,25 @@
         <!--输出实体[BUSINESSUNITNEWSARTICLE]外键关系 -->
         <!--输出实体[CONNECTIONROLE]外键关系 -->
         <!--输出实体[OPPORTUNITY]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-14-397">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-16-397">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__ACCOUNT__PA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-14-398">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-16-398">
        <addForeignKeyConstraint baseColumnNames="CAMPAIGNID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__CAMPAIGN__C" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CAMPAIGNID" referencedTableName="CAMPAIGN" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-14-399">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-16-399">
        <addForeignKeyConstraint baseColumnNames="PARENTCONTACTID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__CONTACT__PA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-14-400">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-16-400">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__LEAD__ORIGI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-14-401">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-16-401">
        <addForeignKeyConstraint baseColumnNames="PRICELEVELID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__PRICELEVEL_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-14-402">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-16-402">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-14-403">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-opportunity-16-403">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="OPPORTUNITY" constraintName="DER1N_OPPORTUNITY__TRANSACTION" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ANNOTATION]外键关系 -->