xignzi006 发布系统代码

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

@@ -29,6 +29,16 @@
         "viewtag": "0326a502bb574cddc41da4323786dcb5",
         "memo": ""
     },
+    "accountinnerpickupview": {
+        "title": "account数据选择视图",
+        "caption": "客户",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "Base",
+        "viewname": "AccountInnerPickupView",
+        "viewfilename": "account-inner-pickup-view",
+        "viewtag": "054fb10ed157549dc619f06af1c21a31",
+        "memo": "系统自动添加"
+    },
     "incidenteditview": {
         "title": "incident编辑视图",
         "caption": "案例",
@@ -489,6 +499,16 @@
         "viewtag": "6e18ac74e5685439110f9b4e534ee005",
         "memo": "系统自动添加"
     },
+    "accountinnerpickupgridview": {
+        "title": "account选择表格视图",
+        "caption": "客户",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "Base",
+        "viewname": "AccountInnerPickupGridView",
+        "viewfilename": "account-inner-pickup-grid-view",
+        "viewtag": "7217511947b8833ba5683e54c06b0271",
+        "memo": "系统自动添加"
+    },
     "accountinfo_introduction": {
         "title": "account编辑视图",
         "caption": "客户",

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

@@ -168,6 +168,10 @@ export default {
 		summary: {
 			caption: "客户概览",
       title: '客户概览',
+		},
+		innerpickupview: {
+			caption: "客户",
+      title: 'account数据选择视图',
 		},
 		info_account: {
 			caption: "客户",
@@ -192,6 +196,10 @@ export default {
 		editview: {
 			caption: "客户",
       title: 'account编辑视图',
+		},
+		innerpickupgridview: {
+			caption: "客户",
+      title: 'account选择表格视图',
 		},
 		info_introduction: {
 			caption: "客户",
@@ -498,6 +506,14 @@ export default {
 		uiactions: {
 		},
 	},
+	innerpickip_grid: {
+		columns: {
+			accountname: "客户名称",
+			emailaddress1: "电子邮件",
+		},
+		uiactions: {
+		},
+	},
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 

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

@@ -167,6 +167,10 @@ export default {
 		summary: {
 			caption: '客户概览',
       title: '客户概览',
+		},
+		innerpickupview: {
+			caption: '客户',
+      title: 'account数据选择视图',
 		},
 		info_account: {
 			caption: '客户',
@@ -191,6 +195,10 @@ export default {
 		editview: {
 			caption: '客户',
       title: 'account编辑视图',
+		},
+		innerpickupgridview: {
+			caption: '客户',
+      title: 'account选择表格视图',
 		},
 		info_introduction: {
 			caption: '客户',
@@ -497,6 +505,14 @@ export default {
 		uiactions: {
 		},
 	},
+	innerpickip_grid: {
+		columns: {
+			accountname: '客户名称',
+			emailaddress1: '电子邮件',
+		},
+		uiactions: {
+		},
+	},
 	default_searchform: {
 		details: {
 			formpage1: '常规条件', 

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

@@ -40,6 +40,7 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			entity2name: "客户", 
+			entity2id: "客户", 
 			relationshipsid: "关系标识", 
 		},
 		uiactions: {

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

@@ -39,6 +39,7 @@ export default {
 			srfdeid: '', 
 			srfsourcekey: '', 
 			entity2name: '客户', 
+			entity2id: '客户', 
 			relationshipsid: '关系标识', 
 		},
 		uiactions: {

app_BusinessCentral/src/mock/app/central-appmenu/central-appmenu.ts

@@ -204,7 +204,7 @@ mock.onGet('v7/centralappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: 'fa fa-file-o',
+	iconcls: 'fa fa-paper-plane',
 	icon: '',
 	textcls: '',
 	appfunctag: 'Auto9',

app_BusinessCentral/src/mock/viewconfig/viewconfig.ts

@@ -31,6 +31,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "ContactGridView",
             "viewtag": "0326a502bb574cddc41da4323786dcb5"
         },
+        "accountinnerpickupview": {
+            "title": "account数据选择视图",
+            "caption": "客户",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "Base",
+            "viewname": "AccountInnerPickupView",
+            "viewtag": "054fb10ed157549dc619f06af1c21a31"
+        },
         "incidenteditview": {
             "title": "incident编辑视图",
             "caption": "案例",
@@ -399,6 +407,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AccountEditView",
             "viewtag": "6e18ac74e5685439110f9b4e534ee005"
         },
+        "accountinnerpickupgridview": {
+            "title": "account选择表格视图",
+            "caption": "客户",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "Base",
+            "viewname": "AccountInnerPickupGridView",
+            "viewtag": "7217511947b8833ba5683e54c06b0271"
+        },
         "accountinfo_introduction": {
             "title": "account编辑视图",
             "caption": "客户",

app_BusinessCentral/src/pages/base/account-inner-pickup-view/account-inner-pickup-view-base.vue

+<template>
+<div class="view-container depickupview account-inner-pickup-view">
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="accountinnerpickupview"></app-studioaction>
+    <card class='view-card view-no-caption  view-no-toolbar' :dis-hover="true" :padding="0" :bordered="false">
+        <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>
+            <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
+                <row :style="{ textAlign: 'right' }">
+                    <i-button type="primary" :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
+                        &nbsp;&nbsp;
+                    <i-button @click="onClickCancel">{{this.containerModel.view_cancelbtn.text}}</i-button>
+                </row>
+            </card>
+        </div>
+    </card>
+</div>
+</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 AccountService from '@/service/account/account-service';
+
+import PickupViewEngine from '@engine/view/pickup-view-engine';
+
+
+
+@Component({
+    components: {
+    },
+})
+export default class AccountInnerPickupViewBase extends Vue {
+
+    /**
+     * 实体服务对象
+     *
+     * @type {AccountService}
+     * @memberof AccountInnerPickupViewBase
+     */
+    public appEntityService: AccountService = new AccountService;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof AccountInnerPickupViewBase
+     */    
+    public counterServiceArray:Array<any> = [];
+    
+    /**
+     * 数据变化
+     *
+     * @param {*} val
+     * @returns {*}
+     * @memberof AccountInnerPickupViewBase
+     */
+    @Emit() 
+    public viewDatasChange(val: any):any {
+        return val;
+    }
+
+    /**
+     * 传入视图上下文
+     *
+     * @type {string}
+     * @memberof AccountInnerPickupViewBase
+     */
+    @Prop() public viewdata!: string;
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof AccountInnerPickupViewBase
+     */
+    @Prop() public viewparam!: string;
+
+    /**
+     * 视图默认使用
+     *
+     * @type {boolean}
+     * @memberof AccountInnerPickupViewBase
+     */
+    @Prop({ default: true }) public viewDefaultUsage!: boolean;
+
+	/**
+	 * 视图标识
+	 *
+	 * @type {string}
+	 * @memberof AccountInnerPickupViewBase
+	 */
+	public viewtag: string = '054fb10ed157549dc619f06af1c21a31';
+
+	/**
+	 * 自定义视图导航上下文集合
+	 *
+	 * @type {*}
+	 * @memberof AccountInnerPickupViewBase
+	 */
+    public customViewNavContexts:any ={
+    };
+
+	/**
+	 * 自定义视图导航参数集合
+	 *
+	 * @type {*}
+	 * @memberof AccountInnerPickupViewBase
+	 */
+    public customViewParams:any ={
+    };
+
+    /**
+     * 视图模型数据
+     *
+     * @type {*}
+     * @memberof AccountInnerPickupViewBase
+     */
+    public model: any = {
+        srfCaption: 'entities.account.views.innerpickupview.caption',
+        srfTitle: 'entities.account.views.innerpickupview.title',
+        srfSubTitle: 'entities.account.views.innerpickupview.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 视图参数变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof AccountInnerPickupViewBase
+     */
+    @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));
+            if(this.viewparams.selectedData){
+                this.selectedData = JSON.stringify(this.viewparams.selectedData);
+            }
+
+        } 
+    }
+
+    /**
+     * 处理应用上下文变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof AccountInnerPickupViewBase
+     */
+    @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 AccountInnerPickupViewBase
+     */
+    public 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 },
+    };
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof AccountInnerPickupViewBase
+     */
+    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 AccountInnerPickupViewBase
+     */
+    public viewState: Subject<ViewState> = new Subject();
+
+
+
+    /**
+     * 视图引擎
+     *
+     * @public
+     * @type {Engine}
+     * @memberof AccountInnerPickupViewBase
+     */
+    public engine: PickupViewEngine = new PickupViewEngine();
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof AccountInnerPickupViewBase
+     */
+    public engineInit(): void {
+        this.engine.init({
+            view: this,
+            pickupviewpanel: this.$refs.pickupviewpanel,
+            keyPSDEField: 'account',
+            majorPSDEField: 'accountname',
+            isLoadDefault: true,
+        });
+    }
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof AccountInnerPickupViewBase
+     */
+    public context:any = {};
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AccountInnerPickupViewBase
+     */
+    public viewparams:any = {};
+
+    /**
+     * 解析视图参数
+     *
+     * @public
+     * @memberof AccountInnerPickupViewBase
+     */
+    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 AccountInnerPickupViewBase
+     */
+	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 AccountInnerPickupViewBase
+     */
+	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 AccountInnerPickupViewBase
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     * @memberof AccountInnerPickupViewBase
+     */    
+    public afterCreated(){
+        const secondtag = this.$util.createUUID();
+        this.$store.commit('viewaction/createdView', { viewtag: this.viewtag, secondtag: secondtag });
+        this.viewtag = secondtag;
+        this.parseViewParam();
+        
+    }
+
+    /**
+     * 销毁之前
+     *
+     * @memberof AccountInnerPickupViewBase
+     */
+    public beforeDestroy() {
+        this.$store.commit('viewaction/removeView', this.viewtag);
+    }
+
+    /**
+     * Vue声明周期(组件初始化完毕)
+     *
+     * @memberof AccountInnerPickupViewBase
+     */
+    public mounted() {
+        this.afterMounted();
+    }
+
+    /**
+     * 执行mounted后的逻辑
+     * 
+     * @memberof AccountInnerPickupViewBase
+     */
+    public afterMounted(){
+        const _this: any = this;
+        _this.engineInit();
+        if (_this.loadModel && _this.loadModel instanceof Function) {
+            _this.loadModel();
+        }
+        if(this.viewparams.selectedData){
+            this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', this.viewparams.selectedData);
+        }
+
+    }
+
+
+    /**
+     * pickupviewpanel 部件 selectionchange 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof AccountInnerPickupViewBase
+     */
+    public pickupviewpanel_selectionchange($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'selectionchange', $event);
+    }
+
+
+    /**
+     * pickupviewpanel 部件 activated 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof AccountInnerPickupViewBase
+     */
+    public pickupviewpanel_activated($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    }
+
+
+    /**
+     * pickupviewpanel 部件 load 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof AccountInnerPickupViewBase
+     */
+    public pickupviewpanel_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    }
+
+
+
+
+    /**
+     * 关闭视图
+     *
+     * @param {any[]} args
+     * @memberof AccountInnerPickupViewBase
+     */
+    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 AccountInnerPickupViewBase
+     */
+    public destroyed(){
+        this.afterDestroyed();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     * 
+     * @memberof AccountInnerPickupViewBase
+     */
+    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 {string}
+     * @memberof AccountInnerPickupView
+     */
+    public selectedData: string = "";
+
+    /**
+     * 视图选中数据
+     *
+     * @type {any[]}
+     * @memberof AccountInnerPickupViewBase
+     */
+    public viewSelections:any[] = [];
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof AccountInnerPickupViewBase
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof AccountInnerPickupViewBase
+     */
+    public isSingleSelect: boolean = true;
+
+    /**
+     * 确定
+     *
+     * @memberof AccountInnerPickupViewBase
+     */
+    public onClickOk(): void {
+        this.$emit('viewdataschange', this.viewSelections);
+        this.$emit('close', null);
+    }
+
+    /**
+     * 取消
+     *
+     * @memberof AccountInnerPickupViewBase
+     */
+    public onClickCancel(): void {
+        this.$emit('close', null);
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './account-inner-pickup-view.less';
+</style>
\ No newline at end of file

app_BusinessCentral/src/pages/base/account-inner-pickup-view/account-inner-pickup-view.less

+// 避免空文件，后台不让空文件过
+.account-inner-pickup-view {
+    --account-inner-pickup-view: 0;
+}
+
+
+
+.pickup-view {
+    >.pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_BusinessCentral/src/pages/base/account-inner-pickup-view/account-inner-pickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import AccountInnerPickupViewBase from './account-inner-pickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/account/inner-pickup-viewpickupviewpanel-pickupviewpanel/inner-pickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class AccountInnerPickupView extends AccountInnerPickupViewBase {
+
+}
+</script>
\ No newline at end of file

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

@@ -71,6 +71,7 @@ export const PageComponents = {
         Vue.component('sales-order-grid-view', () => import('@pages/sales/sales-order-grid-view/sales-order-grid-view.vue'));
         Vue.component('contact-option-view', () => import('@pages/base/contact-option-view/contact-option-view.vue'));
         Vue.component('activity-pointer-by-parent-key', () => import('@pages/base/activity-pointer-by-parent-key/activity-pointer-by-parent-key.vue'));
+        Vue.component('account-inner-pickup-grid-view', () => import('@pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view.vue'));
         Vue.component('list-lead-grid-view', () => import('@pages/marketing/list-lead-grid-view/list-lead-grid-view.vue'));
         Vue.component('lead-edit-view', () => import('@pages/sales/lead-edit-view/lead-edit-view.vue'));
         Vue.component('phone-call-edit-view', () => import('@pages/base/phone-call-edit-view/phone-call-edit-view.vue'));
@@ -85,6 +86,7 @@ export const PageComponents = {
         Vue.component('quote-edit-view', () => import('@pages/sales/quote-edit-view/quote-edit-view.vue'));
         Vue.component('account-summary', () => import('@pages/base/account-summary/account-summary.vue'));
         Vue.component('incident-grid-view', () => import('@pages/service/incident-grid-view/incident-grid-view.vue'));
+        Vue.component('account-inner-pickup-view', () => import('@pages/base/account-inner-pickup-view/account-inner-pickup-view.vue'));
         Vue.component('ibiz-list-quick-create', () => import('@pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue'));
         Vue.component('campaign-summary-head', () => import('@pages/marketing/campaign-summary-head/campaign-summary-head.vue'));
         Vue.component('account-edit-account-info', () => import('@pages/base/account-edit-account-info/account-edit-account-info.vue'));

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

@@ -1417,6 +1417,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/activity-pointer-by-parent-key/activity-pointer-by-parent-key.vue'),
                 },
+                {
+                    path: 'accounts/:account?/innerpickupgridview/:innerpickupgridview?',
+                    meta: {
+                        caption: 'entities.account.views.innerpickupgridview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'innerpickupgridview', parameterName: 'innerpickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view.vue'),
+                },
                 {
                     path: 'contacts/:contact?/leads/:lead?/listleads/:listlead?/gridview/:gridview?',
                     meta: {
@@ -1764,6 +1778,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/service/incident-grid-view/incident-grid-view.vue'),
                 },
+                {
+                    path: 'accounts/:account?/innerpickupview/:innerpickupview?',
+                    meta: {
+                        caption: 'entities.account.views.innerpickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'central', parameterName: 'central' },
+                            { pathName: 'accounts', parameterName: 'account' },
+                            { pathName: 'innerpickupview', parameterName: 'innerpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/account-inner-pickup-view/account-inner-pickup-view.vue'),
+                },
                 {
                     path: 'ibizlists/:ibizlist?/quickcreate/:quickcreate?',
                     meta: {
@@ -1820,6 +1848,19 @@ const router = new Router({
         },
         component: () => import('@pages/base/contact-grid-view/contact-grid-view.vue'),
     },
+    {
+        path: '/accounts/:account?/innerpickupview/:innerpickupview?',
+        meta: {
+            caption: 'entities.account.views.innerpickupview.title',
+            info:'',
+            parameters: [
+                { pathName: 'accounts', parameterName: 'account' },
+                { pathName: 'innerpickupview', parameterName: 'innerpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/base/account-inner-pickup-view/account-inner-pickup-view.vue'),
+    },
     {
         path: '/incidents/:incident?/editview/:editview?',
         meta: {

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

@@ -43,6 +43,16 @@ export const viewstate: any = {
                 'fcdb236b65d78c4a8ae64e74f9483a63',
             ],
         },
+        {
+            viewtag: '054fb10ed157549dc619f06af1c21a31',
+            viewmodule: 'Base',
+            viewname: 'AccountInnerPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '7217511947b8833ba5683e54c06b0271',
+            ],
+        },
         {
             viewtag: '06c6da1c8093784a9e76e1ccc52231b7',
             viewmodule: 'Service',
@@ -676,6 +686,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '054fb10ed157549dc619f06af1c21a31',
             ],
         },
         {

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

@@ -80,12 +80,14 @@ export default class AccountUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set(':',{viewname:'summary',srfappde:'accounts'});
+        this.allViewMap.set(':',{viewname:'innerpickupview',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'info_account',srfappde:'accounts'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'info',srfappde:'accounts'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'edit_accountinfo',srfappde:'accounts'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'accounts'});
+        this.allViewMap.set(':',{viewname:'innerpickupgridview',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'info_introduction',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'info_address',srfappde:'accounts'});
         this.allViewMap.set(':',{viewname:'quickcreate',srfappde:'accounts'});

app_BusinessCentral/src/widgets/account/inner-pickup-viewpickupviewpanel-pickupviewpanel/inner-pickup-viewpickupviewpanel-pickupviewpanel-base.vue

+<template>
+    <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"
+          @viewdatasactivated="viewDatasActivated"
+          @viewload="onViewLoad">
+        </component>
+    </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 InnerPickupViewpickupviewpanelService from './inner-pickup-viewpickupviewpanel-pickupviewpanel-service';
+
+import InnerPickupViewpickupviewpanelModel from './inner-pickup-viewpickupviewpanel-pickupviewpanel-model';
+
+
+@Component({
+    components: {
+      
+    }
+})
+export default class InnerPickupViewpickupviewpanelBase extends Vue implements ControlInterface {
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    @Prop() public name?: string;
+
+    /**
+     * 视图通讯对象
+     *
+     * @type {Subject<ViewState>}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    @Prop() public viewState!: Subject<ViewState>;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    @Prop() public context: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    @Prop() public viewparams: any;
+
+    /**
+     * 视图状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public viewStateEvent: Subscription | undefined;
+
+    /**
+     * 获取部件类型
+     *
+     * @returns {string}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public getControlType(): string {
+        return 'PICKUPVIEWPANEL'
+    }
+
+
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {InnerPickupViewpickupviewpanelService}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public service: InnerPickupViewpickupviewpanelService = new InnerPickupViewpickupviewpanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {AccountService}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public appEntityService: AccountService = new AccountService({ $store: this.$store });
+    
+
+
+    /**
+     * 关闭视图
+     *
+     * @param {any} args
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public closeView(args: any): void {
+        let _this: any = this;
+        _this.$emit('closeview', [args]);
+    }
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    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();
+                }
+            })
+        }
+    }
+
+
+
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    @Prop() public selectedData?: string;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 视图名称
+     *
+     * @type {*}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public view: any = {
+        viewname: 'account-inner-pickup-grid-view',
+        data: {},
+    }
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 视图数据
+     *
+     * @type {*}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public viewdata: string  = JSON.stringify(this.context);
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string  = JSON.stringify(this.viewparams);
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    @Prop() public isSingleSelect?: boolean;
+
+    /**
+     * 初始化完成
+     *
+     * @type {boolean}
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public inited: boolean = false;
+
+    /**
+     * 视图数据变化
+     *
+     * @param {*} $event
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public onViewDatasChange($event: any): void {
+        if($event.length>0){
+          $event.forEach((item:any,index:any) => {
+              let srfmajortext = item['accountname'];
+              if(srfmajortext){
+                Object.assign($event[index],{srfmajortext: srfmajortext});
+              }
+          });
+        }
+        this.$emit('selectionchange', $event);
+    }
+
+    /**
+     * 视图数据被激活
+     *
+     * @param {*} $event
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public viewDatasActivated($event: any): void {
+        this.$emit('activated', $event);
+    }
+
+    /**
+     * 视图加载完成
+     *
+     * @param {*} $event
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public onViewLoad($event: any): void {
+        this.$emit('load', $event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof InnerPickupViewpickupviewpanel
+     */    
+    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 InnerPickupViewpickupviewpanel
+     */  
+    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 InnerPickupViewpickupviewpanel
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof InnerPickupViewpickupviewpanel
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './inner-pickup-viewpickupviewpanel-pickupviewpanel.less';
+</style>
\ No newline at end of file

app_BusinessCentral/src/widgets/account/inner-pickup-viewpickupviewpanel-pickupviewpanel/inner-pickup-viewpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * InnerPickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class InnerPickupViewpickupviewpanelModel
+ */
+export default class InnerPickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof InnerPickupViewpickupviewpanelModel
+    */
+  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/inner-pickup-viewpickupviewpanel-pickupviewpanel/inner-pickup-viewpickupviewpanel-pickupviewpanel-service.ts

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

app_BusinessCentral/src/widgets/account/inner-pickup-viewpickupviewpanel-pickupviewpanel/inner-pickup-viewpickupviewpanel-pickupviewpanel.less

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

app_BusinessCentral/src/widgets/account/inner-pickup-viewpickupviewpanel-pickupviewpanel/inner-pickup-viewpickupviewpanel-pickupviewpanel.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import InnerPickupViewpickupviewpanelBase from './inner-pickup-viewpickupviewpanel-pickupviewpanel-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class InnerPickupViewpickupviewpanel extends InnerPickupViewpickupviewpanelBase {
+
+}
+</script>
\ No newline at end of file

app_BusinessCentral/src/widgets/app/central-appmenu/central-appmenu-model.ts

@@ -218,7 +218,7 @@ export default class CentralModel {
                         	hidden: false,
                         	hidesidebar: false,
                         	opendefault: false,
-                        	iconcls: 'fa fa-file-o',
+                        	iconcls: 'fa fa-paper-plane',
                         	icon: '',
                         	textcls: '',
                         	appfunctag: 'Auto9',

app_BusinessCentral/src/widgets/list-account/main-grid/main-grid-base.vue

@@ -24,7 +24,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('entity2name')">
-                <el-table-column show-overflow-tooltip :prop="'entity2name'" :label="$t('entities.listaccount.main_grid.columns.entity2name')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'entity2name'" :label="$t('entities.listaccount.main_grid.columns.entity2name')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.listaccount.main_grid.columns.entity2name')}}
@@ -48,7 +48,7 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('primarycontactname')">
-                <el-table-column show-overflow-tooltip :prop="'primarycontactname'" :label="$t('entities.listaccount.main_grid.columns.primarycontactname')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'primarycontactname'" :label="$t('entities.listaccount.main_grid.columns.primarycontactname')" :width="150"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.listaccount.main_grid.columns.primarycontactname')}}

app_BusinessCentral/src/widgets/list-account/quick-create-by-list-form/quick-create-by-list-form-base.vue

@@ -9,6 +9,24 @@
         <i-col v-show="detailsModel.entity2name.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entity2name' :itemRules="this.rules.entity2name" class='' :caption="$t('entities.listaccount.quickcreatebylist_form.details.entity2name')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entity2name.error" :isEmptyCaption="false" labelPos="LEFT">
     
+<app-picker-select-view 
+  :formState="formState" 
+  :data="data"
+  :context="context"
+  :viewparams="viewparams"
+  :localContext ='{ }' 
+  :localParam ='{ }' 
+  :disabled="detailsModel.entity2name.disabled" 
+  name='entity2name'
+  deMajorField='accountname'
+  deKeyField='account'
+  :service="service"
+  valueitem='entity2id' 
+  :value="data.entity2name"
+  :pickupView="{ viewname: 'account-inner-pickup-view', title: $t('entities.account.views.innerpickupview.title'), deResParameters: [], parameters: [{ pathName: 'accounts', parameterName: 'account' }, { pathName: 'innerpickupview', parameterName: 'innerpickupview' } ], placement:'' }"
+  style=""  
+  @formitemvaluechange="onFormItemValueChange">
+</app-picker-select-view>
 
 </app-form-item>
 
@@ -325,6 +343,7 @@ export default class QuickCreateByListBase extends Vue implements ControlInterfa
         srfdeid: null,
         srfsourcekey: null,
         entity2name: null,
+        entity2id: null,
         relationshipsid: null,
         listaccount:null,
     };
@@ -422,6 +441,12 @@ export default class QuickCreateByListBase extends Vue implements ControlInterfa
             { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
         ],
+        entity2id: [
+            { type: 'string', message: '客户 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '客户 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '客户 值不能为空', trigger: 'blur' },
+        ],
         relationshipsid: [
             { type: 'string', message: '关系标识 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '关系标识 值必须为字符串类型', trigger: 'blur' },
@@ -458,6 +483,8 @@ export default class QuickCreateByListBase extends Vue implements ControlInterfa
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         entity2name: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'entity2name', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        entity2id: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'entity2id', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         relationshipsid: new FormItemModel({ caption: '关系标识', detailType: 'FORMITEM', name: 'relationshipsid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -571,6 +598,18 @@ export default class QuickCreateByListBase extends Vue implements ControlInterfa
         this.formDataChange({ name: 'entity2name', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 entity2id 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof QuickCreateByList
+     */
+    @Watch('data.entity2id')
+    onEntity2idChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'entity2id', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 relationshipsid 值
      *
@@ -631,6 +670,7 @@ export default class QuickCreateByListBase extends Vue implements ControlInterfa
 
 
 
+
     }
 
     /**

app_BusinessCentral/src/widgets/list-account/quick-create-by-list-form/quick-create-by-list-form-model.ts

@@ -60,6 +60,11 @@ export default class QuickCreateByListModel {
         prop: 'entity2name',
         dataType: 'PICKUPTEXT',
       },
+      {
+        name: 'entity2id',
+        prop: 'entity2id',
+        dataType: 'PICKUP',
+      },
       {
         name: 'relationshipsid',
         prop: 'relationshipsid',

app_BusinessCentral/src/widgets/list-account/quick-create-by-list-form/quick-create-by-list-form-service.ts

@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import ListAccountService from '@/service/list-account/list-account-service';
 import QuickCreateByListModel from './quick-create-by-list-form-model';
+import AccountService from '@/service/account/account-service';
 
 
 /**
@@ -41,6 +42,14 @@ export default class QuickCreateByListService extends ControlService {
         this.model = new QuickCreateByListModel();
     }
 
+    /**
+     * 客户服务对象
+     *
+     * @type {AccountService}
+     * @memberof QuickCreateByListService
+     */
+    public accountService: AccountService = new AccountService();
+
     /**
      * 处理数据
      *
@@ -80,6 +89,9 @@ export default class QuickCreateByListService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
+        }
 
         return Promise.reject([])
     }

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

@@ -3182,7 +3182,7 @@
 
 
     <!--输出实体[CONTACT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-133-43">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-contact-134-43">
         <createTable tableName="CONTACT">
                 <column name="ADDRESS1_FREIGHTTERMSCODE" remarks="" type="VARCHAR(30)">
                 </column>
@@ -4510,7 +4510,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-216-54">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-224-54">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -11021,22 +11021,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-133-212">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-134-212">
        <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-133-213">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-134-213">
        <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-133-214">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-134-214">
        <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-133-215">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-134-215">
        <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-133-216">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-134-216">
        <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-133-217">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-contact-134-217">
        <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]外键关系 -->
@@ -11122,31 +11122,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-216-252">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-252">
        <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-216-253">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-253">
        <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-216-254">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-254">
        <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-216-255">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-255">
        <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-216-256">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-256">
        <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-216-257">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-257">
        <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-216-258">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-258">
        <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-216-259">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-259">
        <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-216-260">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-224-260">
        <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]外键关系 -->