xignzi006 发布系统代码

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

@@ -217,6 +217,33 @@
             }
         ]
     }, 
+    {
+        "srfkey": "IncidentCustomer",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "ACCOUNT",
+                "label": "客户",
+                "text": "客户",
+                "data":{"n_customeridtype_eq":"ACCOUNT"},
+                "codename":"Account",
+                "value": "ACCOUNT",
+                
+                "disabled": false
+            }
+            , {
+                "id": "CONTACT",
+                "label": "联系人",
+                "text": "联系人",
+                "data":{"n_customeridtype_eq":"CONTACT"},
+                "codename":"Contact",
+                "value": "CONTACT",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "Salesorder__ShippingMethodCode",
         "emptytext": "未定义",

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

@@ -89,6 +89,16 @@
         "viewtag": "0572fab51a094f738d0b1f41c3b78988",
         "memo": "系统自动添加"
     },
+    "incidentcustomerpickupview": {
+        "title": "客户",
+        "caption": "客户",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentCustomerPickupView",
+        "viewfilename": "incident-customer-pickup-view",
+        "viewtag": "05d66c9ecb6eeb18a00a23cca19bf042",
+        "memo": "系统自动添加"
+    },
     "incidenteditview": {
         "title": "案例编辑视图",
         "caption": "案例",
@@ -1559,6 +1569,16 @@
         "viewtag": "8d3e0363ae4532310000143fd6d61aae",
         "memo": ""
     },
+    "incidentcustomerpickupgridview": {
+        "title": "案例客户选择表格视图",
+        "caption": "案例客户",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "Service",
+        "viewname": "IncidentCustomerPickupGridView",
+        "viewfilename": "incident-customer-pickup-grid-view",
+        "viewtag": "8dca8823a924f513bf8c52bc3d321cff",
+        "memo": "系统自动添加"
+    },
     "productsubstitutegridview": {
         "title": "产品关系表格视图",
         "caption": "产品替换",

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

@@ -30,6 +30,11 @@ export default {
         "Contact": "联系人",
         "empty": ""
     },
+    IncidentCustomer: {
+        "ACCOUNT": "客户",
+        "CONTACT": "联系人",
+        "empty": ""
+    },
     Salesorder__ShippingMethodCode: {
         "2": "DHL",
         "3": "FedEx",

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

@@ -30,6 +30,11 @@ export default {
         "Contact": "联系人",
         "empty": "",
     },
+    IncidentCustomer: {
+        "ACCOUNT": "客户",
+        "CONTACT": "联系人",
+        "empty": "",
+    },
     Salesorder__ShippingMethodCode: {
         "2": "DHL",
         "3": "FedEx",

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_en_US.ts

@@ -5,4 +5,31 @@ export default {
     customertype: "客户类型",
     customername: "客户",
   },
+	views: {
+		pickupview: {
+			caption: "客户",
+      		title: "客户",
+		},
+		pickupgridview: {
+			caption: "案例客户",
+      		title: "案例客户选择表格视图",
+		},
+	},
+	main_grid: {
+		columns: {
+			customeridyominame: "客户",
+			customeridtype: "客户类型",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+			n_customername_like: "客户(文本包含(%))", 
+			n_customertype_eq: "客户类型(等于(=))", 
+		},
+		uiactions: {
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_zh_CN.ts

@@ -4,4 +4,31 @@ export default {
     customertype: "客户类型",
     customername: "客户",
   },
+	views: {
+		pickupview: {
+			caption: "客户",
+      		title: "客户",
+		},
+		pickupgridview: {
+			caption: "案例客户",
+      		title: "案例客户选择表格视图",
+		},
+	},
+	main_grid: {
+		columns: {
+			customeridyominame: "客户",
+			customeridtype: "客户类型",
+		},
+		uiactions: {
+		},
+	},
+	default_searchform: {
+		details: {
+			formpage1: "常规条件", 
+			n_customername_like: "客户(文本包含(%))", 
+			n_customertype_eq: "客户类型(等于(=))", 
+		},
+		uiactions: {
+		},
+	},
 };
\ No newline at end of file

app_CRM/src/mock/codelist/codelist.ts

@@ -225,6 +225,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "IncidentCustomer",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "ACCOUNT",
+                label: "客户",
+                text: "客户",
+                "data":{"n_customeridtype_eq":"ACCOUNT"},
+                "codename":"Account",
+                value: "ACCOUNT",
+                
+                disabled: false,
+            },
+            {
+                id: "CONTACT",
+                label: "联系人",
+                text: "联系人",
+                "data":{"n_customeridtype_eq":"CONTACT"},
+                "codename":"Contact",
+                value: "CONTACT",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "Salesorder__ShippingMethodCode",
         emptytext: "未定义",

app_CRM/src/mock/viewconfig/viewconfig.ts

@@ -79,6 +79,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ContactEditMarket",
             "viewtag": "0572fab51a094f738d0b1f41c3b78988"
         },
+        "incidentcustomerpickupview": {
+            "title": "客户",
+            "caption": "客户",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentCustomerPickupView",
+            "viewtag": "05d66c9ecb6eeb18a00a23cca19bf042"
+        },
         "incidenteditview": {
             "title": "案例编辑视图",
             "caption": "案例",
@@ -1255,6 +1263,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ListLeadQuickCreateByList",
             "viewtag": "8d3e0363ae4532310000143fd6d61aae"
         },
+        "incidentcustomerpickupgridview": {
+            "title": "案例客户选择表格视图",
+            "caption": "案例客户",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "Service",
+            "viewname": "IncidentCustomerPickupGridView",
+            "viewtag": "8dca8823a924f513bf8c52bc3d321cff"
+        },
         "productsubstitutegridview": {
             "title": "产品关系表格视图",
             "caption": "产品替换",

app_CRM/src/pages/service/incident-customer-pickup-grid-view/incident-customer-pickup-grid-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupGridViewBase } from '@/studio-core';
+import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
+import PickupGridViewEngine from '@engine/view/pickup-grid-view-engine';
+
+/**
+ * 案例客户选择表格视图视图基类
+ *
+ * @export
+ * @class IncidentCustomerPickupGridViewBase
+ * @extends {PickupGridViewBase}
+ */
+export class IncidentCustomerPickupGridViewBase extends PickupGridViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    protected appDeName: string = 'incidentcustomer';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    protected appDeKey: string = 'customerid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    protected appDeMajor: string = 'customername';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentCustomerService}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    protected appEntityService: IncidentCustomerService = new IncidentCustomerService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.incidentcustomer.views.pickupgridview.caption',
+        srfTitle: 'entities.incidentcustomer.views.pickupgridview.title',
+        srfSubTitle: 'entities.incidentcustomer.views.pickupgridview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    protected containerModel: any = {
+        view_grid: { name: 'grid', type: 'GRID' },
+        view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '8dca8823a924f513bf8c52bc3d321cff';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public engine: PickupGridViewEngine = new PickupGridViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            grid: this.$refs.grid,
+            searchform: this.$refs.searchform,
+            keyPSDEField: 'incidentcustomer',
+            majorPSDEField: 'customername',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * grid 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public grid_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
+    }
+
+    /**
+     * grid 部件 beforeload 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public grid_beforeload($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    }
+
+    /**
+     * grid 部件 rowdblclick 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public grid_rowdblclick($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    }
+
+    /**
+     * grid 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public grid_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('grid', 'load', $event);
+    }
+
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+    /**
+     * searchform 部件 search 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public searchform_search($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
+    }
+
+    /**
+     * searchform 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    public searchform_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
+    }
+
+
+
+    /**
+     * 是否展开搜索表单
+     *
+     * @protected
+     * @type {boolean}
+     * @memberof IncidentCustomerPickupGridViewBase
+     */
+    protected isExpandSearchForm: boolean = true;
+
+
+}
\ No newline at end of file

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

+<studio-view-style2 viewName="incidentcustomerpickupgridview" viewTitle="案例客户选择表格视图" class='depickupgridview incident-customer-pickup-grid-view'>
+    <template slot="searchForm">
+                <view_searchform 
+            :viewState="viewState"  
+            :viewparams="viewparams" 
+            :context="context" 
+            :showBusyIndicator="true"
+            v-show="isExpandSearchForm"
+            loaddraftAction="FilterGetDraft"
+            loadAction="FilterGet"
+        
+            name="searchform"  
+            ref='searchform' 
+            @save="searchform_save($event)"  
+            @search="searchform_search($event)"  
+            @load="searchform_load($event)"  
+            @closeview="closeView($event)">
+        </view_searchform>
+    </template>
+    <view_grid 
+        :viewState="viewState"  
+        :viewparams="viewparams" 
+        :context="context" 
+        :isSingleSelect="isGridSingleSelect"
+        :selectedData="selectedData"
+        :showBusyIndicator="true"
+        updateAction=""
+        removeAction="Remove"
+        loaddraftAction=""
+        loadAction=""
+        createAction=""
+        fetchAction="FetchDefault"
+        name="grid"  
+        ref='grid' 
+        @selectionchange="grid_selectionchange($event)"  
+        @beforeload="grid_beforeload($event)"  
+        @rowdblclick="grid_rowdblclick($event)"  
+        @load="grid_load($event)"  
+        @closeview="closeView($event)">
+    </view_grid>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/service/incident-customer-pickup-grid-view/incident-customer-pickup-grid-view.vue

+<template src="./incident-customer-pickup-grid-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IncidentCustomerPickupGridViewBase } from './incident-customer-pickup-grid-view-base';
+import view_grid from '@widgets/incident-customer/main-grid/main-grid.vue';
+import view_searchform from '@widgets/incident-customer/default-searchform/default-searchform.vue';
+
+/**
+ * 案例客户选择表格视图视图
+ *
+ * @export
+ * @class IncidentCustomerPickupGridView
+ * @extends {IncidentCustomerPickupGridViewBase}
+ */
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class IncidentCustomerPickupGridView extends IncidentCustomerPickupGridViewBase { }
+</script>

app_CRM/src/pages/service/incident-customer-pickup-view/incident-customer-pickup-view-base.tsx

+import { Subject } from 'rxjs';
+import { PickupViewBase } from '@/studio-core';
+import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
+import PickupViewEngine from '@engine/view/pickup-view-engine';
+
+/**
+ * 客户视图基类
+ *
+ * @export
+ * @class IncidentCustomerPickupViewBase
+ * @extends {PickupViewBase}
+ */
+export class IncidentCustomerPickupViewBase extends PickupViewBase {
+    /**
+     * 视图对应应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    protected appDeName: string = 'incidentcustomer';
+
+    /**
+     * 应用实体主键
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    protected appDeKey: string = 'customerid';
+
+    /**
+     * 应用实体主信息
+     *
+     * @protected
+     * @type {string}
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    protected appDeMajor: string = 'customername';
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentCustomerService}
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    protected appEntityService: IncidentCustomerService = new IncidentCustomerService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @protected
+     * @type {Array<*>}
+     * @memberof IncidentCustomerPickupViewBase
+     */    
+    protected counterServiceArray: Array<any> = [];
+
+    /**
+     * 视图模型数据
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    protected model: any = {
+        srfCaption: 'entities.incidentcustomer.views.pickupview.caption',
+        srfTitle: 'entities.incidentcustomer.views.pickupview.title',
+        srfSubTitle: 'entities.incidentcustomer.views.pickupview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 容器模型
+     *
+     * @protected
+     * @type {*}
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    protected containerModel: any = {
+        view_pickupviewpanel: { name: 'pickupviewpanel', type: 'PICKUPVIEWPANEL' },
+        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
+        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
+        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
+        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
+        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
+        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
+    };
+
+
+	/**
+     * 视图唯一标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof ViewBase
+     */
+	protected viewtag: string = '05d66c9ecb6eeb18a00a23cca19bf042';
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    public engine: PickupViewEngine = new PickupViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            pickupviewpanel: this.$refs.pickupviewpanel,
+            keyPSDEField: 'incidentcustomer',
+            majorPSDEField: 'customername',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * pickupviewpanel 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    public pickupviewpanel_selectionchange($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 activated 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    public pickupviewpanel_activated($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    }
+
+    /**
+     * pickupviewpanel 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof IncidentCustomerPickupViewBase
+     */
+    public pickupviewpanel_load($event: any, $event2?: any): void {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/pages/service/incident-customer-pickup-view/incident-customer-pickup-view.html

+<studio-view-style2 viewName="incidentcustomerpickupview" viewTitle="客户" class='depickupview incident-customer-pickup-view'>
+    <div class="content-container pickup-view">
+                <view_pickupviewpanel 
+                    :viewState="viewState"  
+                    :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+                    :context="JSON.parse(JSON.stringify(context))" 
+                    :isSingleSelect="isSingleSelect"
+                    :selectedData="selectedData"
+                    :isShowButton="isShowButton"
+                    name="pickupviewpanel"  
+                    ref='pickupviewpanel' 
+                    @selectionchange="pickupviewpanel_selectionchange($event)"  
+                    @activated="pickupviewpanel_activated($event)"  
+                    @load="pickupviewpanel_load($event)"  
+                    @closeview="closeView($event)">
+                </view_pickupviewpanel>
+        </div>
+        <template slot="footer">
+            <div v-if="isShowButton" :style="{ textAlign: 'right' }">
+                <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk.apply(_self, arguments)">{{this.containerModel.view_okbtn.text}}</i-button>
+                    &nbsp;&nbsp;
+                <i-button @click="onClickCancel.apply(_self, arguments)">{{this.containerModel.view_cancelbtn.text}}</i-button>
+            </div>
+        </template>
+</studio-view-style2>
\ No newline at end of file

app_CRM/src/pages/service/incident-customer-pickup-view/incident-customer-pickup-view.vue

+<template src="./incident-customer-pickup-view.html"/>
+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import { VueLifeCycleProcessing } from '@/studio-core';
+import { IncidentCustomerPickupViewBase } from './incident-customer-pickup-view-base';
+import view_pickupviewpanel from '@widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+
+/**
+ * 客户视图
+ *
+ * @export
+ * @class IncidentCustomerPickupView
+ * @extends {IncidentCustomerPickupViewBase}
+ */
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    }
+})
+@VueLifeCycleProcessing()
+export default class IncidentCustomerPickupView extends IncidentCustomerPickupViewBase { }
+</script>

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

@@ -138,8 +138,8 @@ export const PageComponents = {
         Vue.component('lead-pickup-grid-view', () => import('@pages/sales/lead-pickup-grid-view/lead-pickup-grid-view.vue'));
         Vue.component('opportunity-pickup-view', () => import('@pages/sales/opportunity-pickup-view/opportunity-pickup-view.vue'));
         Vue.component('ibiz-list-option-view', () => import('@pages/marketing/ibiz-list-option-view/ibiz-list-option-view.vue'));
-        Vue.component('account-edit-data-panel', () => import('@pages/base/account-edit-data-panel/account-edit-data-panel.vue'));
         Vue.component('contact-info-abstract', () => import('@pages/base/contact-info-abstract/contact-info-abstract.vue'));
+        Vue.component('account-edit-data-panel', () => import('@pages/base/account-edit-data-panel/account-edit-data-panel.vue'));
         Vue.component('opportunity-competitor-comp-opp-grid-view', () => import('@pages/sales/opportunity-competitor-comp-opp-grid-view/opportunity-competitor-comp-opp-grid-view.vue'));
         Vue.component('invoice-detail-edit-view', () => import('@pages/finance/invoice-detail-edit-view/invoice-detail-edit-view.vue'));
         Vue.component('opportunity-lost-grid-view', () => import('@pages/sales/opportunity-lost-grid-view/opportunity-lost-grid-view.vue'));
@@ -151,6 +151,7 @@ export const PageComponents = {
         Vue.component('sales-order-quick-create-view', () => import('@pages/sales/sales-order-quick-create-view/sales-order-quick-create-view.vue'));
         Vue.component('competitor-pickup-grid-view', () => import('@pages/sales/competitor-pickup-grid-view/competitor-pickup-grid-view.vue'));
         Vue.component('price-level-pickup-view', () => import('@pages/product/price-level-pickup-view/price-level-pickup-view.vue'));
+        Vue.component('incident-customer-pickup-view', () => import('@pages/service/incident-customer-pickup-view/incident-customer-pickup-view.vue'));
         Vue.component('opportunity-edit-view', () => import('@pages/sales/opportunity-edit-view/opportunity-edit-view.vue'));
         Vue.component('sales-literature-item-edit-view', () => import('@pages/sales/sales-literature-item-edit-view/sales-literature-item-edit-view.vue'));
         Vue.component('competitor-grid-view', () => import('@pages/sales/competitor-grid-view/competitor-grid-view.vue'));
@@ -161,6 +162,7 @@ export const PageComponents = {
         Vue.component('product-association-grid-view', () => import('@pages/product/product-association-grid-view/product-association-grid-view.vue'));
         Vue.component('appointment-quick-create', () => import('@pages/base/appointment-quick-create/appointment-quick-create.vue'));
         Vue.component('account-by-parent-key', () => import('@pages/base/account-by-parent-key/account-by-parent-key.vue'));
+        Vue.component('incident-customer-pickup-grid-view', () => import('@pages/service/incident-customer-pickup-grid-view/incident-customer-pickup-grid-view.vue'));
         Vue.component('campaign-response-edit-view', () => import('@pages/marketing/campaign-response-edit-view/campaign-response-edit-view.vue'));
         Vue.component('campaign-info', () => import('@pages/marketing/campaign-info/campaign-info.vue'));
         Vue.component('lead-competitor-edit-view', () => import('@pages/sales/lead-competitor-edit-view/lead-competitor-edit-view.vue'));

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

@@ -5138,27 +5138,27 @@ const router = new Router({
                     component: () => import('@pages/marketing/ibiz-list-option-view/ibiz-list-option-view.vue'),
                 },
                 {
-                    path: 'accounts/:account?/edit_datapanel/:edit_datapanel?',
+                    path: 'accounts/:account?/contacts/:contact?/info_abstract/:info_abstract?',
                     meta: {
-                        caption: 'entities.account.views.edit_datapanel.title',
+                        caption: 'entities.contact.views.info_abstract.title',
                         info:'',
                         parameters: [
                             { pathName: 'central', parameterName: 'central' },
                             { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'edit_datapanel', parameterName: 'edit_datapanel' },
+                            { pathName: 'contacts', parameterName: 'contact' },
+                            { pathName: 'info_abstract', parameterName: 'info_abstract' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/account-edit-data-panel/account-edit-data-panel.vue'),
+                    component: () => import('@pages/base/contact-info-abstract/contact-info-abstract.vue'),
                 },
                 {
-                    path: 'accounts/:account?/contacts/:contact?/info_abstract/:info_abstract?',
+                    path: 'contacts/:contact?/info_abstract/:info_abstract?',
                     meta: {
                         caption: 'entities.contact.views.info_abstract.title',
                         info:'',
                         parameters: [
                             { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
                             { pathName: 'contacts', parameterName: 'contact' },
                             { pathName: 'info_abstract', parameterName: 'info_abstract' },
                         ],
@@ -5167,18 +5167,18 @@ const router = new Router({
                     component: () => import('@pages/base/contact-info-abstract/contact-info-abstract.vue'),
                 },
                 {
-                    path: 'contacts/:contact?/info_abstract/:info_abstract?',
+                    path: 'accounts/:account?/edit_datapanel/:edit_datapanel?',
                     meta: {
-                        caption: 'entities.contact.views.info_abstract.title',
+                        caption: 'entities.account.views.edit_datapanel.title',
                         info:'',
                         parameters: [
                             { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'contacts', parameterName: 'contact' },
-                            { pathName: 'info_abstract', parameterName: 'info_abstract' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'edit_datapanel', parameterName: 'edit_datapanel' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/contact-info-abstract/contact-info-abstract.vue'),
+                    component: () => import('@pages/base/account-edit-data-panel/account-edit-data-panel.vue'),
                 },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/opportunitycompetitors/:opportunitycompetitor?/compoppgridview/:compoppgridview?',
@@ -5777,6 +5777,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/product/price-level-pickup-view/price-level-pickup-view.vue'),
                 },
+                {
+                    path: 'incidentcustomers/:incidentcustomer?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.incidentcustomer.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'incidentcustomers', parameterName: 'incidentcustomer' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/service/incident-customer-pickup-view/incident-customer-pickup-view.vue'),
+                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/editview/:editview?',
                     meta: {
@@ -6072,6 +6086,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/account-by-parent-key/account-by-parent-key.vue'),
                 },
+                {
+                    path: 'incidentcustomers/:incidentcustomer?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.incidentcustomer.views.pickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'incidentcustomers', parameterName: 'incidentcustomer' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/service/incident-customer-pickup-grid-view/incident-customer-pickup-grid-view.vue'),
+                },
                 {
                     path: 'campaignresponses/:campaignresponse?/editview/:editview?',
                     meta: {

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

@@ -80,6 +80,16 @@ export const viewstate: any = {
                 '1bc48b15dbe69c5f30dafe489f58aacb',
             ],
         },
+        {
+            viewtag: '05d66c9ecb6eeb18a00a23cca19bf042',
+            viewmodule: 'Service',
+            viewname: 'IncidentCustomerPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '8dca8823a924f513bf8c52bc3d321cff',
+            ],
+        },
         {
             viewtag: '0707e5c30c6ebfff55c733f4185d212e',
             viewmodule: 'Marketing',
@@ -916,6 +926,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '05d66c9ecb6eeb18a00a23cca19bf042',
                 'e52af970c14fd89546ac8ccaecab460c',
                 'ba34ee36c1d0de288403607e17e7eb3e',
                 '0dff48c04927315f77dd70a9a2767b59',
@@ -1437,6 +1448,15 @@ export const viewstate: any = {
                 '1bc48b15dbe69c5f30dafe489f58aacb',
             ],
         },
+        {
+            viewtag: '8dca8823a924f513bf8c52bc3d321cff',
+            viewmodule: 'Service',
+            viewname: 'IncidentCustomerPickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '90289db866d87ff28979dfdfd2ce583d',
             viewmodule: 'Product',

app_CRM/src/uiservice/incident-customer/incident-customer-ui-service-base.ts

@@ -79,6 +79,8 @@ export default class IncidentCustomerUIServiceBase extends UIService {
      * @memberof  IncidentCustomerUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'incidentcustomers'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'incidentcustomers'});
     }
 
     /**

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, SearchFormControlBase } from '@/studio-core';
+import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
+import DefaultService from './default-searchform-service';
+import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
+import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+
+
+/**
+ * searchform部件基类
+ *
+ * @export
+ * @class SearchFormControlBase
+ * @extends {DefaultSearchFormBase}
+ */
+export class DefaultSearchFormBase extends SearchFormControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof DefaultSearchFormBase
+     */
+    protected controlType: string = 'SEARCHFORM';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {DefaultService}
+     * @memberof DefaultSearchFormBase
+     */
+    public service: DefaultService = new DefaultService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentCustomerService}
+     * @memberof DefaultSearchFormBase
+     */
+    public appEntityService: IncidentCustomerService = new IncidentCustomerService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof DefaultSearchFormBase
+     */
+    protected appDeName: string = 'incidentcustomer';
+
+    /**
+     * 表单数据对象
+     *
+     * @type {*}
+     * @memberof DefaultSearchFormBase
+     */
+    public data: any = {
+        n_customername_like: null,
+        n_customertype_eq: null,
+    };
+
+    /**
+     * 详情模型集合
+     *
+     * @type {*}
+     * @memberof DefaultSearchFormBase
+     */
+    public detailsModel: any = {
+        formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
+, 
+        n_customername_like: new FormItemModel({ caption: '客户(文本包含(%))', detailType: 'FORMITEM', name: 'n_customername_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_customertype_eq: new FormItemModel({ caption: '客户类型(等于(=))', detailType: 'FORMITEM', name: 'n_customertype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+    };
+}
\ No newline at end of file

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform-model.ts

+/**
+ * Default 部件模型
+ *
+ * @export
+ * @class DefaultModel
+ */
+export default class DefaultModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof DefaultModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_customername_like',
+        prop: 'customername',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_customertype_eq',
+        prop: 'customertype',
+        dataType: 'SSCODELIST',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform.html

+<i-form :model="this.data" class='app-search-form' ref='searchform' style="">
+  <input style="display:none;"/>
+  <div class="search-button">
+    <i-button size="small" type="primary" ghost @click="onSearch.apply(_self, arguments)">{{$t('app.searchButton.search')}}</i-button>
+    <i-button size="small" type="default" ghost @click="onReset.apply(_self, arguments)">{{this.$t('app.searchButton.reset')}}</i-button>
+  </div>
+  <div class="form-content">
+                  
+          <i-col v-show="detailsModel.n_customername_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_customername_like' :itemRules="this.rules.n_customername_like" class='' :caption="$t('entities.incidentcustomer.default_searchform.details.n_customername_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_customername_like.error" :isEmptyCaption="false" labelPos="TOP">
+              <input-box v-model="data.n_customername_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_customername_like.disabled" type='text'  style=""></input-box>
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_customertype_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_customertype_eq' :itemRules="this.rules.n_customertype_eq" class='' :caption="$t('entities.incidentcustomer.default_searchform.details.n_customertype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_customertype_eq.error" :isEmptyCaption="false" labelPos="TOP">
+              
+           <dropdown-list 
+              v-model="data.n_customertype_eq" 
+              :data="data" 
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="detailsModel.n_customertype_eq.disabled"  
+              tag='IncidentCustomer' 
+              codelistType='STATIC'
+              placeholder='请选择...' style="">
+           </dropdown-list>
+          </app-form-item>
+          
+          </i-col>
+  </div>
+</i-form>
\ No newline at end of file

app_CRM/src/widgets/incident-customer/default-searchform/default-searchform.vue

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

app_CRM/src/widgets/incident-customer/main-grid/main-grid-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, GridControllerBase } from '@/studio-core';
+import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
+import MainService from './main-grid-service';
+import { FormItemModel } from '@/model/form-detail';
+
+
+/**
+ * grid部件基类
+ *
+ * @export
+ * @class GridControllerBase
+ * @extends {MainGridBase}
+ */
+export class MainGridBase extends GridControllerBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainGridBase
+     */
+    protected controlType: string = 'GRID';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {MainService}
+     * @memberof MainGridBase
+     */
+    public service: MainService = new MainService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentCustomerService}
+     * @memberof MainGridBase
+     */
+    public appEntityService: IncidentCustomerService = new IncidentCustomerService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof MainGridBase
+     */
+    protected appDeName: string = 'incidentcustomer';
+
+    /**
+     * 本地缓存标识
+     *
+     * @protected
+     * @type {string}
+     * @memberof GridControllerBase
+     */
+    protected localStorageTag: string = 'incidentcustomer_main_grid';
+
+    /**
+     * 所有列成员
+     *
+     * @type {any[]}
+     * @memberof MainGridBase
+     */
+    public allColumns: any[] = [
+        {
+            name: 'customeridyominame',
+            label: '客户',
+            langtag: 'entities.incidentcustomer.main_grid.columns.customeridyominame',
+            show: true,
+            util: 'PX'
+        },
+        {
+            name: 'customeridtype',
+            label: '客户类型',
+            langtag: 'entities.incidentcustomer.main_grid.columns.customeridtype',
+            show: true,
+            util: 'PX'
+        },
+    ]
+
+    /**
+     * 获取表格行模型
+     *
+     * @type {*}
+     * @memberof MainGridBase
+     */
+    public getGridRowModel(){
+        return {
+          srfkey: new FormItemModel(),
+        }
+    }
+
+    /**
+     * 属性值规则
+     *
+     * @type {*}
+     * @memberof MainGridBase
+     */
+    public rules: any = {
+        srfkey: [
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '客户 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '客户 值不能为空', trigger: 'blur' },
+        ],
+    }
+
+    /**
+     * 获取对应列class
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
+    public hasRowEdit: any = {
+        'customeridyominame':false,
+        'customeridtype':false,
+    };
+
+    /**
+     * 获取对应列class
+     *
+     * @param {*} $args row 行数据，column 列数据，rowIndex 行索引，列索引
+     * @returns {void}
+     * @memberof MainBase
+     */
+    public getCellClassName(args: {row: any, column: any, rowIndex: number, columnIndex: number}): any {
+        return ( this.hasRowEdit[args.column.property] && this.actualIsOpenEdit ) ? "edit-cell" : "info-cell";
+    }
+
+
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MainGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'customeridtype',
+                srfkey: 'IncidentCustomer',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
+}
\ No newline at end of file

app_CRM/src/widgets/incident-customer/main-grid/main-grid-model.ts

+/**
+ * Main 部件模型
+ *
+ * @export
+ * @class MainModel
+ */
+export default class MainModel {
+
+	/**
+	 * 是否是实体数据导出
+	 *
+	 * @returns {any[]}
+	 * @memberof MainGridMode
+	 */
+	public isDEExport: boolean = false;
+
+	/**
+	 * 获取数据项集合
+	 *
+	 * @returns {any[]}
+	 * @memberof MainGridMode
+	 */
+	public getDataItems(): any[] {
+    if(this.isDEExport){
+		  return [
+      ]
+    }else{
+		  return [
+        {
+          name: 'customertype',
+          prop: 'customertype',
+          dataType: 'SSCODELIST',
+        },
+        {
+          name: 'srfmajortext',
+          prop: 'customername',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'srfdataaccaction',
+          prop: 'customerid',
+          dataType: 'GUID',
+        },
+        {
+          name: 'srfkey',
+          prop: 'customerid',
+          dataType: 'GUID',
+        },
+        {
+          name: 'customername',
+          prop: 'customername',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'incidentcustomer',
+          prop: 'customerid',
+        },
+      {
+        name: 'n_customername_like',
+        prop: 'n_customername_like',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_customertype_eq',
+        prop: 'n_customertype_eq',
+        dataType: 'SSCODELIST',
+      },
+
+        {
+          name:'size',
+          prop:'size'
+        },
+        {
+          name:'query',
+          prop:'query'
+        },
+        {
+          name:'page',
+          prop:'page'
+        },
+        {
+          name:'sort',
+          prop:'sort'
+        },
+        {
+          name:'srfparentdata',
+          prop:'srfparentdata'
+        },
+        // 前端新增修改标识，新增为"0",修改为"1"或未设值
+        {
+          name: 'srffrontuf',
+          prop: 'srffrontuf',
+          dataType: 'TEXT',
+        },
+      ]
+    }
+  }
+
+}
\ No newline at end of file

app_CRM/src/widgets/incident-customer/main-grid/main-grid.html

+<div :class="{ 'grid': true, 'show-paging-bar': isEnablePagingBar, 'hidden-paging-bar': !isEnablePagingBar }">
+    <i-form>
+    <el-table v-if="isDisplay === true"
+        :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
+        @sort-change="onSortChange($event)"  
+        :border="isDragendCol"
+        :highlight-current-row ="isSingleSelect"
+        :row-class-name="getRowClassName.bind(_self)"
+        :cell-class-name="getCellClassName.bind(_self)"
+        size="mini"
+        stripe
+        @row-click="rowClick($event)"  
+        @select-all="selectAll($event)"  
+        @select="select($event)"  
+        @row-class-name="onRowClassName($event)"  
+        @row-dblclick="rowDBLClick($event)"  
+        ref='multipleTable' :data="items" :show-header="!isHideHeader">
+            <template slot="empty">
+                无数据 
+                <span class="quick-toolbar">
+                </span>
+            </template>
+            <template v-if="!isSingleSelect">
+                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
+            </template>
+            <template v-if="getColumnState('customeridyominame')">
+                <el-table-column show-overflow-tooltip :prop="'customeridyominame'" :label="$t('entities.incidentcustomer.main_grid.columns.customeridyominame')" :width="250"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.incidentcustomer.main_grid.columns.customeridyominame')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.customeridyominame}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('customeridtype')">
+                <el-table-column show-overflow-tooltip :prop="'customeridtype'" :label="$t('entities.incidentcustomer.main_grid.columns.customeridtype')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.incidentcustomer.main_grid.columns.customeridtype')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <codelist :value="row.customeridtype" tag='IncidentCustomer' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="adaptiveState">
+                <el-table-column></el-table-column>
+            </template>
+    </el-table>
+    <row class='grid-pagination' v-show="items.length > 0">
+        <page class='pull-right' @on-change="pageOnChange($event)" 
+            @on-page-size-change="onPageSizeChange($event)"
+            :transfer="true" :total="totalRecord"
+            show-sizer :current="curPage" :page-size="limit"
+            :page-size-opts="[10, 20, 30, 40, 50, 60, 70, 80, 90, 100]" show-elevator show-total>
+            <span>
+                <span class="page-column">
+                    <poptip transfer placement="top-start">
+                        <i-button icon="md-menu">{{$t('app.gridpage.choicecolumns')}}</i-button>
+                        <div slot="content">
+                            <template v-for="col in allColumns">
+                                <div :key="col.name"><el-checkbox v-model="col.show" @change="onColChange()">{{$t(col.langtag)}}</el-checkbox></div>
+                            </template>
+                        </div>
+                    </poptip>
+                </span>
+                <span v-if="selections.length > 0" class="batch-toolbar">
+                </span>
+                <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
+                <span>
+                    {{$t('app.gridpage.show')}}&nbsp;
+                    <span>
+                        <template v-if="items.length === 1">
+                        1
+                        </template>
+                        <template v-else>
+                            <span>{{(curPage - 1) * limit + 1}}&nbsp;-&nbsp;{{totalRecord > curPage * limit ? curPage * limit : totalRecord}}</span>
+                        </template>
+                    </span>&nbsp;
+                    {{$t('app.gridpage.records')}}，{{$t('app.gridpage.totle')}}&nbsp;{{totalRecord}}&nbsp;{{$t('app.gridpage.records')}}
+                </span>
+            </span>
+        </page>
+    </row>
+  </i-form>
+</div>
\ No newline at end of file

app_CRM/src/widgets/incident-customer/main-grid/main-grid.vue

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

app_CRM/src/widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.tsx

+import { Prop, Provide, Emit, Model } from 'vue-property-decorator';
+import { Subject, Subscription } from 'rxjs';
+import { Watch, MainControlBase } from '@/studio-core';
+import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
+import PickupViewpickupviewpanelService from './pickup-viewpickupviewpanel-pickupviewpanel-service';
+import PickupViewpickupviewpanelModel from './pickup-viewpickupviewpanel-pickupviewpanel-model';
+
+
+/**
+ * pickupviewpanel部件基类
+ *
+ * @export
+ * @class MainControlBase
+ * @extends {PickupViewpickupviewpanelPickupviewpanelBase}
+ */
+export class PickupViewpickupviewpanelPickupviewpanelBase extends MainControlBase {
+
+    /**
+     * 获取部件类型
+     *
+     * @protected
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    protected controlType: string = 'PICKUPVIEWPANEL';
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {PickupViewpickupviewpanelService}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    public service: PickupViewpickupviewpanelService = new PickupViewpickupviewpanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {IncidentCustomerService}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    public appEntityService: IncidentCustomerService = new IncidentCustomerService({ $store: this.$store });
+
+    /**
+     * 应用实体名称
+     *
+     * @protected
+     * @type {string}
+     * @memberof PickupViewpickupviewpanelPickupviewpanelBase
+     */
+    protected appDeName: string = 'incidentcustomer';
+
+
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop() public selectedData?: string;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 视图名称
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public view: any = {
+        viewname: 'incident-customer-pickup-grid-view',
+        data: {},
+    }
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 视图数据
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewdata: string  = JSON.stringify(this.context);
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string  = JSON.stringify(this.viewparams);
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    @Prop() public isSingleSelect?: boolean;
+
+    /**
+     * 初始化完成
+     *
+     * @type {boolean}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public inited: boolean = false;
+
+    /**
+     * 视图数据变化
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public onViewDatasChange($event: any): void {
+        if($event.length>0){
+          $event.forEach((item:any,index:any) => {
+              let srfmajortext = item['customername'];
+              if(srfmajortext){
+                Object.assign($event[index],{srfmajortext: srfmajortext});
+              }
+          });
+        }
+        this.$emit('selectionchange', $event);
+    }
+
+    /**
+     * 视图数据被激活
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewDatasActivated($event: any): void {
+        this.$emit('activated', $event);
+    }
+
+    /**
+     * 视图加载完成
+     *
+     * @param {*} $event
+     * @memberof PickupViewpickupviewpanel
+     */
+    public onViewLoad($event: any): void {
+        this.$emit('load', $event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof PickupViewpickupviewpanel
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                if (Object.is('load', action)) {
+                    this.viewdata = JSON.stringify(this.context);
+                    this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
+                    this.inited = true;
+                }
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     *  @memberof PickupViewpickupviewpanel
+     */  
+    public initNavParam(){
+        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);
+    }
+
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof PickupViewpickupviewpanel
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+}
\ No newline at end of file

app_CRM/src/widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * PickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class PickupViewpickupviewpanelModel
+ */
+export default class PickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof PickupViewpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'incidentcustomer',
+        prop: 'customerid',
+      },
+      {
+        name: 'customertype',
+      },
+      {
+        name: 'customername',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_CRM/src/widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-service.ts

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

app_CRM/src/widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.html

+<div class='pickupviewpanel'>
+    <component 
+        v-if="inited && view.viewname && !Object.is(view.viewname, '')" 
+        :is="view.viewname"
+        class="viewcontainer3"
+        :viewdata="viewdata"
+        :viewparam="viewparam"
+        :viewDefaultUsage="false"
+        :isSingleSelect="isSingleSelect"
+        :selectedData="selectedData"
+        :isShowButton="isShowButton"
+        @viewdataschange="onViewDatasChange.apply(_self, arguments)"
+        @viewdatasactivated="viewDatasActivated.apply(_self, arguments)"
+        @viewload="onViewLoad.apply(_self, arguments)">
+    </component>
+</div>
\ No newline at end of file

app_CRM/src/widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.less

+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file

app_CRM/src/widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue

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

app_CRM/src/widgets/incident/quick-create-form/quick-create-form-service.ts

@@ -3,6 +3,7 @@ import ControlService from '@/widgets/control-service';
 import IncidentService from '@/service/incident/incident-service';
 import QuickCreateModel from './quick-create-form-model';
 import SubjectService from '@/service/subject/subject-service';
+import IncidentCustomerService from '@/service/incident-customer/incident-customer-service';
 import ProductService from '@/service/product/product-service';
 import EntitlementService from '@/service/entitlement/entitlement-service';
 
@@ -52,6 +53,14 @@ export default class QuickCreateService extends ControlService {
      */
     public subjectService: SubjectService = new SubjectService();
 
+    /**
+     * 案例客户服务对象
+     *
+     * @type {IncidentCustomerService}
+     * @memberof QuickCreateService
+     */
+    public incidentcustomerService: IncidentCustomerService = new IncidentCustomerService();
+
     /**
      * product服务对象
      *
@@ -110,6 +119,9 @@ export default class QuickCreateService extends ControlService {
         if (Object.is(serviceName, 'SubjectService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.subjectService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'subjectid', 'subject');
         }
+        if (Object.is(serviceName, 'IncidentCustomerService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.incidentcustomerService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'customerid', 'incidentcustomer');
+        }
         if (Object.is(serviceName, 'ProductService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.productService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'productid', 'product');
         }

app_CRM/src/widgets/incident/quick-create-form/quick-create-form.html

@@ -41,6 +41,26 @@
 <i-col v-show="detailsModel.customername.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='customername' :itemRules="this.rules.customername" class='' :caption="$t('entities.incident.quickcreate_form.details.customername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.customername.error" :isEmptyCaption="false" labelPos="LEFT">
     
+<app-picker 
+  :formState="formState"
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.customername.disabled"
+  name='customername'
+  deMajorField='customername'
+  deKeyField='incidentcustomer'
+  :service="service"
+  :acParams="{ serviceName: 'IncidentCustomerService', interfaceName: 'FetchDefault'}"
+  valueitem='customerid' 
+  :value="data.customername" 
+  editortype="" 
+  :pickupView="{ viewname: 'incident-customer-pickup-view', title: $t('entities.incidentcustomer.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'incidentcustomers', parameterName: 'incidentcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange($event)">
+</app-picker>
 
 </app-form-item>
 

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

@@ -4771,7 +4771,7 @@
 
 
     <!--输出实体[INCIDENT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-71-59">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-incident-74-59">
         <createTable tableName="INCIDENT">
                 <column name="LASTONHOLDTIME" remarks="" type="DATETIME">
                 </column>
@@ -4971,7 +4971,7 @@
 
 
     <!--输出实体[INCIDENTCUSTOMER]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-incidentcustomer-18-60">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-incidentcustomer-20-60">
         <createTable tableName="INCIDENTCUSTOMER">
                 <column name="CUSTOMERID" remarks="" type="VARCHAR(60)">
                     <constraints primaryKey="true" primaryKeyName="PK_INCIDENTCUSTOMER_CUSTOMERID"/>
@@ -11361,43 +11361,43 @@
        <addForeignKeyConstraint baseColumnNames="RESOURCESPECID" baseTableName="SERVICE" constraintName="DER1N_SERVICE__RESOURCESPEC__R" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="RESOURCESPECID" referencedTableName="RESOURCESPEC" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-260">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__PRIMA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-261">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-261">
        <addForeignKeyConstraint baseColumnNames="RESPONSIBLECONTACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTACT__RESPO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-262">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-262">
        <addForeignKeyConstraint baseColumnNames="CONTRACTDETAILID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACTDETAIL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTDETAILID" referencedTableName="CONTRACTDETAIL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-263">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-263">
        <addForeignKeyConstraint baseColumnNames="CONTRACTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__CONTRACT__CONT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTRACTID" referencedTableName="CONTRACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-264">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-264">
        <addForeignKeyConstraint baseColumnNames="ENTITLEMENTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__ENTITLEMENT__E" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ENTITLEMENTID" referencedTableName="ENTITLEMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-265">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-265">
        <addForeignKeyConstraint baseColumnNames="EXISTINGCASE" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__EXIS" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-266">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-266">
        <addForeignKeyConstraint baseColumnNames="MASTERID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__MAST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-267">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-267">
        <addForeignKeyConstraint baseColumnNames="PARENTCASEID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__INCIDENT__PARE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="INCIDENTID" referencedTableName="INCIDENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-268">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-268">
        <addForeignKeyConstraint baseColumnNames="PRODUCTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__PRODUCT__PRODU" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRODUCTID" referencedTableName="PRODUCT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-269">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-269">
        <addForeignKeyConstraint baseColumnNames="FIRSTRESPONSEBYKPIID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLAKPIINSTANCE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAKPIINSTANCEID" referencedTableName="SLAKPIINSTANCE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-271">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-271">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-272">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-272">
        <addForeignKeyConstraint baseColumnNames="SUBJECTID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__SUBJECT__SUBJE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SUBJECTID" referencedTableName="SUBJECT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-71-273">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-incident-74-273">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="INCIDENT" constraintName="DER1N_INCIDENT__TRANSACTIONCUR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[INCIDENTCUSTOMER]外键关系 -->

businesscentral-core/src/main/resources/mapper/service/incidentcustomer/IncidentCustomerMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IncidentCustomerResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME` FROM `INCIDENTCUSTOMER` t1  ) t1 where customerid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM `INCIDENTCUSTOMER` t1  ) t1 where customerid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -39,12 +39,12 @@
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME` FROM `INCIDENTCUSTOMER` t1  
+		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM `INCIDENTCUSTOMER` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME` FROM `INCIDENTCUSTOMER` t1  
+		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM `INCIDENTCUSTOMER` t1  
 			]]>
     </sql>
 </mapper>