ShineKOT 发布系统代码 [后台服务，演示应用]

app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts

@@ -2891,7 +2891,7 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	hidesidebar: false,
 	opendefault: false,
 	iconcls: '',
-	icon: '',
+	icon: '/assets/img/operation.svg',
 	textcls: '',
 	appfunctag: '',
 	resourcetag: '',
@@ -3057,7 +3057,7 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	hidesidebar: false,
 	opendefault: false,
 	iconcls: '',
-	icon: '',
+	icon: '/assets/img/operation.svg',
 	textcls: '',
 	appfunctag: '',
 	resourcetag: '',
@@ -3865,7 +3865,7 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	hidesidebar: false,
 	opendefault: false,
 	iconcls: '',
-	icon: '',
+	icon: '/assets/img/operation.svg',
 	textcls: '',
 	appfunctag: '',
 	resourcetag: '',

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts

@@ -3208,7 +3208,7 @@ export default class MainMenuModel {
 	hidesidebar: false,
 	opendefault: false,
 	iconcls: '',
-	icon: '',
+	icon: '/assets/img/operation.svg',
 	textcls: '',
 	appfunctag: '',
 	resourcetag: '',
@@ -3392,7 +3392,7 @@ export default class MainMenuModel {
 	hidesidebar: false,
 	opendefault: false,
 	iconcls: '',
-	icon: '',
+	icon: '/assets/img/operation.svg',
 	textcls: '',
 	appfunctag: '',
 	resourcetag: '',
@@ -4288,7 +4288,7 @@ export default class MainMenuModel {
 	hidesidebar: false,
 	opendefault: false,
 	iconcls: '',
-	icon: '',
+	icon: '/assets/img/operation.svg',
 	textcls: '',
 	appfunctag: '',
 	resourcetag: '',

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1429,7 +1429,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1499,7 +1499,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1607,7 +1607,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1815,7 +1815,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue

@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1395,7 +1395,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1465,7 +1465,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1573,7 +1573,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1781,7 +1781,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue

@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1499,7 +1499,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1569,7 +1569,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1677,7 +1677,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1885,7 +1885,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrWizardView_plugin' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue

@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-base.vue

@@ -48,14 +48,14 @@
                     <div v-show="flag" class="batch-toolbar">
                                 <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction1.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
                             <span class='caption'>{{'编辑'}}</span>
                         </i-button>
                     <div slot='content'>{{$t('TBB.TEXT.*.EDIT', '编辑')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction2.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
                             <span class='caption'>{{'删除'}}</span>
                         </i-button>
@@ -202,18 +202,18 @@ export default class Usr2Base extends Vue implements ControlInterface {
     public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store });
 
     /**
-     * dataviewexpbar_dataview_batchtoolbar 部件 click 事件
+     * dataview_batchtoolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof Usr2Base
      */
-    public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) {
+    public dataview_batchtoolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'deuiaction1')) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
+            this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2);
         }
         if (Object.is($event.tag, 'deuiaction2')) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
+            this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2);
         }
     }
     
@@ -226,7 +226,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -254,7 +254,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -282,7 +282,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -309,7 +309,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -337,7 +337,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKDataViewExpViewBase
+     * @memberof IBIZBOOKUsr2DataViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -363,7 +363,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKDataViewExpViewBase
+     * @memberof IBIZBOOKUsr2DataViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -427,12 +427,6 @@ export default class Usr2Base extends Vue implements ControlInterface {
         }
         let result: boolean = true;
         Object.assign(actionData, args);
-        if ('selectionchange'.indexOf(eventName) !== -1) {
-            result = await this.execute_dataviewexpbar_selectionchange_ctrl_logic(actionData) && result;
-        }
-        if ('load'.indexOf(eventName) !== -1) {
-            result = await this.execute_dataviewexpbar_load_ctrl_logic(actionData) && result;
-        }
         if (!result) {
             return false;
         }
@@ -440,30 +434,6 @@ export default class Usr2Base extends Vue implements ControlInterface {
         return true;
     }
 
-    /**
-     * 部件逻辑 -- dataviewexpbar_selectionchange
-     *
-     * @param {string} eventName 部件事件名称
-     * @param {any[]} data 数据
-     * @param {*} event 源事件对象
-     * @memberof Usr2Base
-     */
-    public async execute_dataviewexpbar_selectionchange_ctrl_logic(actionData: any): Promise<boolean> {
-        console.log('暂未支持 CUSTOM 类型');
-        return true;
-    }
-    /**
-     * 部件逻辑 -- dataviewexpbar_load
-     *
-     * @param {string} eventName 部件事件名称
-     * @param {any[]} data 数据
-     * @param {*} event 源事件对象
-     * @memberof Usr2Base
-     */
-    public async execute_dataviewexpbar_load_ctrl_logic(actionData: any): Promise<boolean> {
-        console.log('暂未支持 CUSTOM 类型');
-        return true;
-    }
 
 
 
@@ -708,9 +678,9 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKDataViewExpView
+     * @memberof IBIZBOOKUsr2DataView
      */
-    public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = {
+    public usr2dataviewdataview_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -1043,7 +1013,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -1138,7 +1108,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1255,7 +1225,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1263,7 +1233,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){
@@ -1365,16 +1335,16 @@ export default class Usr2Base extends Vue implements ControlInterface {
 	public uiAction(data: any, tag: any, $event: any) {
         $event.stopPropagation();
         if(Object.is('Edit', tag)) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
+            this.dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
+            this.dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
         }
         if(Object.is('Edit', tag)) {
-            this.dataviewexpbar_dataview_memo1_u37f11a8_click(data, tag, $event);
+            this.dataview_memo1_u37f11a8_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataviewexpbar_dataview_memo1_uc365542_click(data, tag, $event);
+            this.dataview_memo1_uc365542_click(data, tag, $event);
         }
     }
 

app_Web/src/widgets/ibizorder-detail/main-grid/main-grid-base.vue

@@ -964,7 +964,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderDetailGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderDetailSGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1123,7 +1123,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1237,7 +1237,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2132,7 +2132,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2141,7 +2141,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2217,7 +2217,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -320,7 +320,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -463,20 +463,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -1011,7 +997,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1170,7 +1156,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1284,7 +1270,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2217,7 +2203,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2226,7 +2212,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2302,7 +2288,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -100,6 +100,27 @@ export default class MainModel {
           name: 'ibizorder',
           prop: 'ibizorderid',
         },
+      {
+        name: 'n_ibizcustomername_like',
+        prop: 'n_ibizcustomername_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ibizordername_like',
+        prop: 'n_ibizordername_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_gtandeq',
+        prop: 'n_ordertime_gtandeq',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertype_eq',
+        prop: 'n_ordertype_eq',
+        dataType: 'QUERYPARAM'
+      },
+
         {
           name:'size',
           prop:'size',

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndexView.json

@@ -4260,6 +4260,10 @@
         "getPSLayoutPos" : {
           "layout" : "TABLE"
         },
+        "getPSSysImage" : {
+          "imagePath" : "/assets/img/operation.svg",
+          "imagePathX" : "/assets/img/operation@{0}x.svg"
+        },
         "tooltip" : "测试"
       }, {
         "accUserMode" : 0,
@@ -4942,7 +4946,13 @@
           "layout" : "TABLE"
         },
         "getPSLayoutPos" : {
-          "layout" : "TABLE"
+          "layout" : "TABLE",
+          "width" : 28,
+          "widthMode" : "PX"
+        },
+        "getPSSysImage" : {
+          "imagePath" : "/assets/img/operation.svg",
+          "imagePathX" : "/assets/img/operation@{0}x.svg"
         },
         "tooltip" : "视图布局面板测试"
       }, {
@@ -5056,7 +5066,13 @@
           "layout" : "TABLE"
         },
         "getPSLayoutPos" : {
-          "layout" : "TABLE"
+          "layout" : "TABLE",
+          "width" : 42,
+          "widthMode" : "PX"
+        },
+        "getPSSysImage" : {
+          "imagePath" : "/assets/img/operation.svg",
+          "imagePathX" : "/assets/img/operation@{0}x.svg"
         },
         "tooltip" : "插件"
       }, {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPINDEXVIEWS/index.json

@@ -3381,6 +3381,10 @@
       "getPSLayoutPos" : {
         "layout" : "TABLE"
       },
+      "getPSSysImage" : {
+        "imagePath" : "/assets/img/operation.svg",
+        "imagePathX" : "/assets/img/operation@{0}x.svg"
+      },
       "tooltip" : "测试"
     }, {
       "accUserMode" : 0,
@@ -4063,7 +4067,13 @@
         "layout" : "TABLE"
       },
       "getPSLayoutPos" : {
-        "layout" : "TABLE"
+        "layout" : "TABLE",
+        "width" : 28,
+        "widthMode" : "PX"
+      },
+      "getPSSysImage" : {
+        "imagePath" : "/assets/img/operation.svg",
+        "imagePathX" : "/assets/img/operation@{0}x.svg"
       },
       "tooltip" : "视图布局面板测试"
     }, {
@@ -4177,7 +4187,13 @@
         "layout" : "TABLE"
       },
       "getPSLayoutPos" : {
-        "layout" : "TABLE"
+        "layout" : "TABLE",
+        "width" : 42,
+        "widthMode" : "PX"
+      },
+      "getPSSysImage" : {
+        "imagePath" : "/assets/img/operation.svg",
+        "imagePathX" : "/assets/img/operation@{0}x.svg"
       },
       "tooltip" : "插件"
     }, {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPMENUS/MainMenu.json

@@ -2366,6 +2366,10 @@
       } ],
       "tooltip" : "界面逻辑测试"
     } ],
+    "getPSSysImage" : {
+      "imagePath" : "/assets/img/operation.svg",
+      "imagePathX" : "/assets/img/operation@{0}x.svg"
+    },
     "tooltip" : "测试"
   }, {
     "accUserMode" : 0,
@@ -2786,6 +2790,10 @@
       } ],
       "tooltip" : "视图"
     } ],
+    "getPSSysImage" : {
+      "imagePath" : "/assets/img/operation.svg",
+      "imagePathX" : "/assets/img/operation@{0}x.svg"
+    },
     "tooltip" : "视图布局面板测试"
   }, {
     "accUserMode" : 0,
@@ -2858,6 +2866,10 @@
       },
       "tooltip" : "界面样式表"
     } ],
+    "getPSSysImage" : {
+      "imagePath" : "/assets/img/operation.svg",
+      "imagePathX" : "/assets/img/operation@{0}x.svg"
+    },
     "tooltip" : "插件"
   }, {
     "accUserMode" : 0,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json

@@ -24745,6 +24745,10 @@
           "getPSLayoutPos" : {
             "layout" : "TABLE"
           },
+          "getPSSysImage" : {
+            "imagePath" : "/assets/img/operation.svg",
+            "imagePathX" : "/assets/img/operation@{0}x.svg"
+          },
           "tooltip" : "测试"
         }, {
           "accUserMode" : 0,
@@ -25427,7 +25431,13 @@
             "layout" : "TABLE"
           },
           "getPSLayoutPos" : {
-            "layout" : "TABLE"
+            "layout" : "TABLE",
+            "width" : 28,
+            "widthMode" : "PX"
+          },
+          "getPSSysImage" : {
+            "imagePath" : "/assets/img/operation.svg",
+            "imagePathX" : "/assets/img/operation@{0}x.svg"
           },
           "tooltip" : "视图布局面板测试"
         }, {
@@ -25541,7 +25551,13 @@
             "layout" : "TABLE"
           },
           "getPSLayoutPos" : {
-            "layout" : "TABLE"
+            "layout" : "TABLE",
+            "width" : 42,
+            "widthMode" : "PX"
+          },
+          "getPSSysImage" : {
+            "imagePath" : "/assets/img/operation.svg",
+            "imagePathX" : "/assets/img/operation@{0}x.svg"
           },
           "tooltip" : "插件"
         }, {