ibiz4j 发布系统代码

app_web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_en_US.ts

@@ -190,6 +190,10 @@ export default {
 			caption: "新建行",
 			tip: "新建行",
 		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
 		tbitem26: {
 			caption: "-",
 			tip: "",

app_web/src/locale/lanres/entities/ibzdepartment/ibzdepartment_zh_CN.ts

@@ -189,6 +189,10 @@ export default {
 			caption: "新建行",
 			tip: "新建行",
 		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
 		tbitem26: {
 			caption: "-",
 			tip: "",

app_web/src/locale/lanres/entities/ibzemployee/ibzemployee_en_US.ts

@@ -220,6 +220,10 @@ export default {
 			caption: "新建行",
 			tip: "新建行",
 		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
 		tbitem26: {
 			caption: "-",
 			tip: "",

app_web/src/locale/lanres/entities/ibzemployee/ibzemployee_zh_CN.ts

@@ -219,6 +219,10 @@ export default {
 			caption: "新建行",
 			tip: "新建行",
 		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
 		tbitem26: {
 			caption: "-",
 			tip: "",

app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_en_US.ts

@@ -7,7 +7,7 @@ export default {
     userid: "用户标识",
     personname: "姓名",
     postid: "岗位标识",
-    postname: "岗位标识",
+    postname: "岗位",
     domains: "区属",
   },
 	views: {
@@ -32,7 +32,7 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			personname: "姓名", 
-			postname: "岗位标识", 
+			postname: "岗位", 
 			domains: "区属", 
 			teamid: "组标识", 
 			postid: "岗位标识", 
@@ -45,8 +45,9 @@ export default {
 	main_grid: {
 		columns: {
 			personname: "姓名",
-			postname: "岗位标识",
-			domains: "区属",
+			postname: "岗位",
+			postid: "岗位标识",
+			userid: "用户标识",
 		},
 		uiactions: {
 		},
@@ -59,22 +60,6 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem8: {
 			caption: "Remove",
 			tip: "Remove {0}",
@@ -83,14 +68,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",

app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_zh_CN.ts

@@ -6,7 +6,7 @@ export default {
     userid: "用户标识",
     personname: "姓名",
     postid: "岗位标识",
-    postname: "岗位标识",
+    postname: "岗位",
     domains: "区属",
   },
 	views: {
@@ -31,7 +31,7 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			personname: "姓名", 
-			postname: "岗位标识", 
+			postname: "岗位", 
 			domains: "区属", 
 			teamid: "组标识", 
 			postid: "岗位标识", 
@@ -44,8 +44,9 @@ export default {
 	main_grid: {
 		columns: {
 			personname: "姓名",
-			postname: "岗位标识",
-			domains: "区属",
+			postname: "岗位",
+			postid: "岗位标识",
+			userid: "用户标识",
 		},
 		uiactions: {
 		},
@@ -58,22 +59,6 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem8: {
 			caption: "删除",
 			tip: "删除",
@@ -82,14 +67,6 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "过滤",
 			tip: "过滤",

app_web/src/pages/ou/ibzteam-member-grid-view/ibzteam-member-grid-view-base.vue

@@ -13,37 +13,12 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
-                                    <i class='fa fa-file-text-o'></i>
-                                    <span class='caption'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.deuiaction1.caption')}}</span>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.deuiaction1.tip')}}</div>
-                        </tooltip>
-                        <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem4.visabled" :disabled="toolBarModels.tbitem4.disabled" class='' @click="toolbar_click({ tag: 'tbitem4' }, $event)">
-                                    <i class='fa fa-edit'></i>
-                                    <span class='caption'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem4.caption')}}</span>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem4.tip')}}</div>
-                        </tooltip>
-                        <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem6.visabled" :disabled="toolBarModels.tbitem6.disabled" class='' @click="toolbar_click({ tag: 'tbitem6' }, $event)">
-                                    <i class='fa fa-copy'></i>
-                                    <span class='caption'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem6.caption')}}</span>
-                                </i-button>
-                            <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem6.tip')}}</div>
-                        </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)">
                                     <i class='fa fa-remove'></i>
                                     <span class='caption'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem8.caption')}}</span>
                                 </i-button>
                             <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem8.tip')}}</div>
                         </tooltip>
-                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
-                            <app-export-excel :item="toolBarModels.tbitem13" :caption="$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem13.caption')" @exportexcel="toolbar_click({ tag: 'tbitem13' }, $event)"></app-export-excel>
-                            <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem13.tip')}}</div>
-                        </tooltip>
                         <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem19.visabled" :disabled="toolBarModels.tbitem19.disabled" class='' @click="toolbar_click({ tag: 'tbitem19' }, $event)">
                                     <i class='fa fa-filter'></i>
@@ -76,7 +51,7 @@
                 :context="context" 
                 :isSingleSelect="isSingleSelect"
                 :showBusyIndicator="true"
-                :isOpenEdit="false"
+                :isOpenEdit="true"
                 :gridRowActiveMode="gridRowActiveMode"
                 @save="onSave"
                 updateAction=""
@@ -304,19 +279,9 @@ export default class IBZTeamMemberGridViewBase extends Vue {
      * @memberof IBZTeamMemberGridView
      */
     public toolBarModels: any = {
-        deuiaction1: { name: 'deuiaction1', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
-
-        tbitem4: { name: 'tbitem4', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
-
-        tbitem6: { name: 'tbitem6', caption: '拷贝', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Copy', target: 'SINGLEKEY' } },
-
-        tbitem7: {  name: 'tbitem7', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem13: { name: 'tbitem13', caption: '导出', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ExportExcel', target: '' }, MaxRowCount: 1000  },
-
-        tbitem10: {  name: 'tbitem10', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem19: { name: 'tbitem19', caption: '过滤', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleFilter', target: '' } },
 
     };
@@ -635,33 +600,18 @@ export default class IBZTeamMemberGridViewBase extends Vue {
      * @memberof IBZTeamMemberGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'deuiaction1')) {
-            this.toolbar_deuiaction1_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem25')) {
             this.toolbar_tbitem25_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem8')) {
             this.toolbar_tbitem8_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem19')) {
             this.toolbar_tbitem19_click(null, '', $event2);
         }
@@ -765,118 +715,6 @@ export default class IBZTeamMemberGridViewBase extends Vue {
 
 
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this.$refs.grid;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.New(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem4_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this.$refs.grid;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.Edit(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this.$refs.grid;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.View(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem6_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this.$refs.grid;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.Copy(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
-    }
-
     /**
      * 逻辑事件
      *
@@ -941,35 +779,7 @@ export default class IBZTeamMemberGridViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this.$refs.grid;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.Remove(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem13_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -986,7 +796,7 @@ export default class IBZTeamMemberGridViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.ExportExcel(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
+        this.SaveRow(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
     }
 
     /**
@@ -997,7 +807,7 @@ export default class IBZTeamMemberGridViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem11_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1014,7 +824,7 @@ export default class IBZTeamMemberGridViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.Print(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
+        this.Remove(datas, contextJO,paramJO,  $event, xData,this,"IBZTeamMember");
     }
 
     /**
@@ -1158,110 +968,6 @@ export default class IBZTeamMemberGridViewBase extends Vue {
     }
 
 
-    /**
-     * 新建
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZTeamMemberGridViewBase
-     */
-    public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-         const _this: any = this;
-        if (_this.newdata && _this.newdata instanceof Function) {
-            const data: any = {};
-            _this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
-        }
-    }
-    /**
-     * 编辑
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZTeamMemberGridViewBase
-     */
-    public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        if (args.length === 0) {
-            return;
-        }
-        const _this: any = this;
-        if (_this.opendata && _this.opendata instanceof Function) {
-            const data: any = { };
-            if (args.length > 0) {
-                Object.assign(data, { ibzteammember: args[0].ibzteammember })
-            }
-            _this.opendata([{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
-        }
-    }
-    /**
-     * 查看
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZTeamMemberGridViewBase
-     */
-    public View(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        if (args.length === 0) {
-            return;
-        }
-        const _this: any = this;
-        if (_this.opendata && _this.opendata instanceof Function) {
-            const data: any = { };
-            if (args.length > 0) {
-                Object.assign(data, { ibzteammember: args[0].ibzteammember })
-            }
-            _this.opendata([{ ...data }], params, $event, xData);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
-        }
-    }
-    /**
-     * 拷贝
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZTeamMemberGridViewBase
-     */
-    public Copy(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        if (args.length === 0) {
-            return;
-        }
-        const _this: any = this;
-        if (_this.newdata && _this.newdata instanceof Function) {
-            const data: any = {};
-            if (args.length > 0) {
-                Object.assign(data, { srfsourcekey: args[0].srfkey })
-                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
-            }
-            _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
-        } else if (xData && xData.copy instanceof Function) {
-            if (args.length > 0) {
-                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
-            }
-            xData.copy(args[0].srfkey);
-        } else {
-            _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
-        }
-    }
     /**
      * 行编辑
      *
@@ -1299,7 +1005,7 @@ export default class IBZTeamMemberGridViewBase extends Vue {
         }
     }
     /**
-     * 删除
+     * 保存行
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文
@@ -1309,16 +1015,17 @@ export default class IBZTeamMemberGridViewBase extends Vue {
      * @param {*} [actionContext]  执行行为上下文
      * @memberof IBZTeamMemberGridViewBase
      */
-    public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    public SaveRow(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
         const _this: any = this;
-        if (!xData || !(xData.remove instanceof Function)) {
-            return ;
+        if (xData && xData.save instanceof Function) {
+            xData.save();
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
         }
-        xData.remove(args);
     }
-
     /**
-     * 导出
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文
@@ -1328,31 +1035,14 @@ export default class IBZTeamMemberGridViewBase extends Vue {
      * @param {*} [actionContext]  执行行为上下文
      * @memberof IBZTeamMemberGridViewBase
      */
-    public ExportExcel(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+    public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
-        if (!xData || !(xData.exportExcel instanceof Function) || !$event) {
-            return ;
-        }
-        xData.exportExcel($event.exportparms);
-    }
-    /**
-     * 打印
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZTeamMemberGridViewBase
-     */
-    public Print(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        let _this:any = this;
-        if (!xData || !(xData.print instanceof Function) || !$event) {
+        if (!xData || !(xData.remove instanceof Function)) {
             return ;
         }
-        xData.print();
+        xData.remove(args);
     }
+
     /**
      * 过滤
      *

app_web/src/widgets/ibzteam-member/main-form/main-form-base.vue

@@ -479,10 +479,10 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
         ],
         postname: [
-            { type: 'string', message: '岗位标识 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '岗位标识 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '岗位标识 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '岗位标识 值不能为空', trigger: 'blur' },
+            { type: 'string', message: '岗位 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '岗位 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '岗位 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '岗位 值不能为空', trigger: 'blur' },
         ],
         domains: [
             { type: 'string', message: '区属 值必须为字符串类型', trigger: 'change' },
@@ -543,7 +543,7 @@ export default class MainBase extends Vue implements ControlInterface {
 , 
         personname: new FormItemModel({ caption: '姓名', detailType: 'FORMITEM', name: 'personname', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
-        postname: new FormItemModel({ caption: '岗位标识', detailType: 'FORMITEM', name: 'postname', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
+        postname: new FormItemModel({ caption: '岗位', detailType: 'FORMITEM', name: 'postname', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
         domains: new FormItemModel({ caption: '区属', detailType: 'FORMITEM', name: 'domains', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 

app_web/src/widgets/ibzteam-member/main-grid/main-grid-base.vue

@@ -29,7 +29,9 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.personname}}</span>
+                        <template >
+                                <app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -41,19 +43,37 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.postname}}</span>
+                        <template >
+                                <app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('postid')">
+                <el-table-column show-overflow-tooltip :prop="'postid'" :label="$t('entities.ibzteammember.main_grid.columns.postid')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibzteammember.main_grid.columns.postid')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+                                <app-span name='postid' editorType="HIDDEN" :value="row.postid"></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('domains')">
-                <el-table-column show-overflow-tooltip :prop="'domains'" :label="$t('entities.ibzteammember.main_grid.columns.domains')" :width="200"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('userid')">
+                <el-table-column show-overflow-tooltip :prop="'userid'" :label="$t('entities.ibzteammember.main_grid.columns.userid')" :width="100"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibzteammember.main_grid.columns.domains')}}
+                        {{$t('entities.ibzteammember.main_grid.columns.userid')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.domains}}</span>
+                        <template >
+                                <app-span name='userid' editorType="HIDDEN" :value="row.userid"></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -389,7 +409,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {number}
      * @memberof MainBase
      */
-    public limit: number = 20;
+    public limit: number = 100;
 
     /**
      * 是否显示标题
@@ -554,17 +574,25 @@ export default class MainBase extends Vue implements ControlInterface {
         },
         {
             name: 'postname',
-            label: '岗位标识',
+            label: '岗位',
             langtag: 'entities.ibzteammember.main_grid.columns.postname',
             show: true,
             util: 'PX',
             isEnableRowEdit: false,
         },
         {
-            name: 'domains',
-            label: '区属',
-            langtag: 'entities.ibzteammember.main_grid.columns.domains',
-            show: true,
+            name: 'postid',
+            label: '岗位标识',
+            langtag: 'entities.ibzteammember.main_grid.columns.postid',
+            show: false,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
+        {
+            name: 'userid',
+            label: '用户标识',
+            langtag: 'entities.ibzteammember.main_grid.columns.userid',
+            show: false,
             util: 'PX',
             isEnableRowEdit: false,
         },
@@ -586,6 +614,10 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public getGridRowModel(){
         return {
+          postid: new FormItemModel(),
+          postname: new FormItemModel(),
+          userid: new FormItemModel(),
+          personname: new FormItemModel(),
           srfkey: new FormItemModel(),
         }
     }
@@ -597,6 +629,22 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public rules: any = {
+        postid: [
+             { 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' },
+        ],
+        postname: [
+             { 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' },
+        ],
+        userid: [
+             { 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' },
+        ],
+        personname: [
+             { 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' },
+        ],
         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' },

app_web/src/widgets/ibzteam-member/main-grid/main-grid-model.ts

@@ -41,11 +41,6 @@ export default class MainModel {
           prop: 'postname',
           dataType: 'PICKUPTEXT',
         },
-        {
-          name: 'domains',
-          prop: 'domains',
-          dataType: 'TEXT',
-        },
         {
           name: 'userid',
           prop: 'userid',

app_web/src/widgets/ibzteam-member/main-grid/main-grid-service.ts

@@ -2,6 +2,8 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import IBZTeamMemberService from '@/service/ibzteam-member/ibzteam-member-service';
 import MainModel from './main-grid-model';
+import IBZPostService from '@/service/ibzpost/ibzpost-service';
+import IBZEmployeeService from '@/service/ibzemployee/ibzemployee-service';
 
 
 /**
@@ -42,6 +44,22 @@ export default class MainService extends ControlService {
     }
 
 
+    /**
+     * 岗位服务对象
+     *
+     * @type {IBZPostService}
+     * @memberof MainService
+     */
+    public ibzpostService: IBZPostService = new IBZPostService();
+
+    /**
+     * 人员服务对象
+     *
+     * @type {IBZEmployeeService}
+     * @memberof MainService
+     */
+    public ibzemployeeService: IBZEmployeeService = new IBZEmployeeService();
+
     /**
      * 处理数据
      *
@@ -83,6 +101,12 @@ export default class MainService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
+        if (Object.is(serviceName, 'IBZPostService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.ibzpostService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'postid', 'ibzpost');
+        }
+        if (Object.is(serviceName, 'IBZEmployeeService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.ibzemployeeService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'userid', 'ibzemployee');
+        }
 
         return Promise.reject([])
     }

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/IBZTeamMember.java

@@ -83,7 +83,7 @@ public class IBZTeamMember extends EntityMP implements Serializable {
     @JsonProperty("postid")
     private String postid;
     /**
-     * 岗位标识
+     * 岗位
      */
     @TableField(exist = false)
     @JSONField(name = "postname")

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZTeamMemberSearchContext.java

@@ -83,14 +83,14 @@ public class IBZTeamMemberSearchContext extends QueryWrapperContext<IBZTeamMembe
             this.getSearchCond().eq("postid", n_postid_eq);
         }
     }
-	private String n_postname_eq;//[岗位标识]
+	private String n_postname_eq;//[岗位]
 	public void setN_postname_eq(String n_postname_eq) {
         this.n_postname_eq = n_postname_eq;
         if(!ObjectUtils.isEmpty(this.n_postname_eq)){
             this.getSearchCond().eq("postname", n_postname_eq);
         }
     }
-	private String n_postname_like;//[岗位标识]
+	private String n_postname_like;//[岗位]
 	public void setN_postname_like(String n_postname_like) {
         this.n_postname_like = n_postname_like;
         if(!ObjectUtils.isEmpty(this.n_postname_like)){

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

@@ -204,7 +204,7 @@
 
 
     <!--输出实体[IBZTEAMMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzteammember-55-7">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzteammember-58-7">
         <createTable tableName="IBZTEAMMEMBER">
                 <column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZTEAMMEMBER_TEAMMEMBERID"/>
@@ -254,13 +254,13 @@
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZTEAMMEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzteammember-55-17">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzteammember-58-17">
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzteammember-55-18">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzteammember-58-18">
        <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZPOST_PO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzteammember-55-19">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzteammember-58-19">
        <addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_IBZTEAMMEMBER_IBZTEAM_TE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
     </changeSet>