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

app_Web/src/pages/sample/app-index-view2/router.ts

@@ -3168,6 +3168,20 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizsample0021-reassignwfdyna-action-view/ibizsample0021-reassignwfdyna-action-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/pickupview/:pickupview?',
+        meta: {
+            caption: '图书',
+            captionLanResTag: 'DE.LNAME.IBIZBOOK',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'pickupview', parameterName: 'pickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/f19editview/:f19editview?',
         meta: {
@@ -3744,6 +3758,20 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-sf1-edit-view/ibizorder-sf1-edit-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/pickupgridview/:pickupgridview?',
+        meta: {
+            caption: '图书',
+            captionLanResTag: 'DE.LNAME.IBIZBOOK',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/usr2editview/:usr2editview?',
         meta: {

app_Web/src/pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.scss

+// 基于 @VIEW/实体选择表格视图/VIEW.scss.ftl 生成
+.ibizbookpickup-grid-view{
+    position: relative;
+}
+
+
+.ibizbookpickup-grid-view{
+   
+}

app_Web/src/pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZBOOKPickupGridViewBase from './ibizbookpickup-grid-view-base.vue';
+
+import view_grid from '@widgets/ibizbook/main-grid/main-grid.vue';
+import view_searchform from '@widgets/ibizbook/default-searchform/default-searchform.vue';
+// 基于 @VIEW/实体选择表格视图/VIEW.vue.ftl 生成
+
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBIZBOOKPickupGridView extends IBIZBOOKPickupGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/sample/ibizbookpickup-view/ibizbookpickup-view.scss

+// 基于 @VIEW/实体数据选择视图/VIEW.scss.ftl 生成
+.ibizbookpickup-view{
+    position: relative;
+}
+
+
+
+.depickupview {
+    .pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: 100%;
+    }
+    .footer {
+        display: flex;
+        justify-content: end;
+
+        >.ivu-btn {
+            margin-left: 10px;
+        }
+    }
+}

app_Web/src/pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import IBIZBOOKPickupViewBase from './ibizbookpickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/ibizbook/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue';
+// 基于 @VIEW/实体数据选择视图/VIEW.vue.ftl 生成
+
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class IBIZBOOKPickupView extends IBIZBOOKPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/sample/index/page-register.ts

@@ -196,6 +196,7 @@ export const PageComponents = {
         Vue.component('ibizorder-detail-sgrid-view', () => import('@pages/sample/ibizorder-detail-sgrid-view/ibizorder-detail-sgrid-view.vue'));
         Vue.component('ibizcustomer-usr2-pickup-view', () => import('@pages/sample/ibizcustomer-usr2-pickup-view/ibizcustomer-usr2-pickup-view.vue'));
         Vue.component('ibizcustomer-usr2-mpickup-view', () => import('@pages/sample/ibizcustomer-usr2-mpickup-view/ibizcustomer-usr2-mpickup-view.vue'));
+        Vue.component('ibizbookpickup-view', () => import('@pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue'));
         Vue.component('ibizcustomer-intfmpickup-view', () => import('@pages/sample/ibizcustomer-intfmpickup-view/ibizcustomer-intfmpickup-view.vue'));
         Vue.component('ibizcustomer-mpickup-view', () => import('@pages/sample/ibizcustomer-mpickup-view/ibizcustomer-mpickup-view.vue'));
         Vue.component('ibizbookusr5-edit-view', () => import('@pages/sample/ibizbookusr5-edit-view/ibizbookusr5-edit-view.vue'));
@@ -252,6 +253,7 @@ export const PageComponents = {
         Vue.component('ibizorder-detail-edit-view', () => import('@pages/sample/ibizorder-detail-edit-view/ibizorder-detail-edit-view.vue'));
         Vue.component('ibizorder-detail-sedit-view9', () => import('@pages/sample/ibizorder-detail-sedit-view9/ibizorder-detail-sedit-view9.vue'));
         Vue.component('ibizcustomer-pickup-tree-view', () => import('@pages/sample/ibizcustomer-pickup-tree-view/ibizcustomer-pickup-tree-view.vue'));
+        Vue.component('ibizbookpickup-grid-view', () => import('@pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue'));
         Vue.component('ibizcustomer-intfpickup-grid-view', () => import('@pages/sample/ibizcustomer-intfpickup-grid-view/ibizcustomer-intfpickup-grid-view.vue'));
         Vue.component('ibizhardware-index-pickup-view', () => import('@pages/sample/ibizhardware-index-pickup-view/ibizhardware-index-pickup-view.vue'));
         Vue.component('ibizcpuedit-view', () => import('@pages/sample/ibizcpuedit-view/ibizcpuedit-view.vue'));

app_Web/src/pages/sample/index/router.ts

@@ -3191,6 +3191,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizcustomer-usr2-mpickup-view/ibizcustomer-usr2-mpickup-view.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/pickupview/:pickupview?',
+                    meta: {
+                        caption: '图书',
+                        captionLanResTag: 'DE.LNAME.IBIZBOOK',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue'),
+                },
                 {
                     path: 'ibizcustomer_intfs/:ibizcustomer_intf?/mpickupview/:mpickupview?',
                     meta: {
@@ -4046,6 +4061,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizcustomer-pickup-tree-view/ibizcustomer-pickup-tree-view.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: '图书',
+                        captionLanResTag: 'DE.LNAME.IBIZBOOK',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue'),
+                },
                 {
                     path: 'ibizcustomer_intfs/:ibizcustomer_intf?/pickupgridview/:pickupgridview?',
                     meta: {
@@ -7135,6 +7165,20 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizsample0021-reassignwfdyna-action-view/ibizsample0021-reassignwfdyna-action-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/pickupview/:pickupview?',
+        meta: {
+            caption: '图书',
+            captionLanResTag: 'DE.LNAME.IBIZBOOK',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'pickupview', parameterName: 'pickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/f19editview/:f19editview?',
         meta: {
@@ -7711,6 +7755,20 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-sf1-edit-view/ibizorder-sf1-edit-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/pickupgridview/:pickupgridview?',
+        meta: {
+            caption: '图书',
+            captionLanResTag: 'DE.LNAME.IBIZBOOK',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/usr2editview/:usr2editview?',
         meta: {

app_Web/src/pages/ungroup/app-index-view/page-register.ts

@@ -196,6 +196,7 @@ export const PageComponents = {
         Vue.component('ibizorder-detail-sgrid-view', () => import('@pages/sample/ibizorder-detail-sgrid-view/ibizorder-detail-sgrid-view.vue'));
         Vue.component('ibizcustomer-usr2-pickup-view', () => import('@pages/sample/ibizcustomer-usr2-pickup-view/ibizcustomer-usr2-pickup-view.vue'));
         Vue.component('ibizcustomer-usr2-mpickup-view', () => import('@pages/sample/ibizcustomer-usr2-mpickup-view/ibizcustomer-usr2-mpickup-view.vue'));
+        Vue.component('ibizbookpickup-view', () => import('@pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue'));
         Vue.component('ibizcustomer-intfmpickup-view', () => import('@pages/sample/ibizcustomer-intfmpickup-view/ibizcustomer-intfmpickup-view.vue'));
         Vue.component('ibizcustomer-mpickup-view', () => import('@pages/sample/ibizcustomer-mpickup-view/ibizcustomer-mpickup-view.vue'));
         Vue.component('ibizbookusr5-edit-view', () => import('@pages/sample/ibizbookusr5-edit-view/ibizbookusr5-edit-view.vue'));
@@ -252,6 +253,7 @@ export const PageComponents = {
         Vue.component('ibizorder-detail-edit-view', () => import('@pages/sample/ibizorder-detail-edit-view/ibizorder-detail-edit-view.vue'));
         Vue.component('ibizorder-detail-sedit-view9', () => import('@pages/sample/ibizorder-detail-sedit-view9/ibizorder-detail-sedit-view9.vue'));
         Vue.component('ibizcustomer-pickup-tree-view', () => import('@pages/sample/ibizcustomer-pickup-tree-view/ibizcustomer-pickup-tree-view.vue'));
+        Vue.component('ibizbookpickup-grid-view', () => import('@pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue'));
         Vue.component('ibizcustomer-intfpickup-grid-view', () => import('@pages/sample/ibizcustomer-intfpickup-grid-view/ibizcustomer-intfpickup-grid-view.vue'));
         Vue.component('ibizhardware-index-pickup-view', () => import('@pages/sample/ibizhardware-index-pickup-view/ibizhardware-index-pickup-view.vue'));
         Vue.component('ibizcpuedit-view', () => import('@pages/sample/ibizcpuedit-view/ibizcpuedit-view.vue'));

app_Web/src/pages/ungroup/app-index-view/router.ts

@@ -3190,6 +3190,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizcustomer-usr2-mpickup-view/ibizcustomer-usr2-mpickup-view.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/pickupview/:pickupview?',
+                    meta: {
+                        caption: '图书',
+                        captionLanResTag: 'DE.LNAME.IBIZBOOK',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue'),
+                },
                 {
                     path: 'ibizcustomer_intfs/:ibizcustomer_intf?/mpickupview/:mpickupview?',
                     meta: {
@@ -4045,6 +4060,21 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizcustomer-pickup-tree-view/ibizcustomer-pickup-tree-view.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: '图书',
+                        captionLanResTag: 'DE.LNAME.IBIZBOOK',
+                        info:'',
+                        parameters: [
+                            { pathName: 'appindexview', parameterName: 'appindexview' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue'),
+                },
                 {
                     path: 'ibizcustomer_intfs/:ibizcustomer_intf?/pickupgridview/:pickupgridview?',
                     meta: {
@@ -7134,6 +7164,20 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizsample0021-reassignwfdyna-action-view/ibizsample0021-reassignwfdyna-action-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/pickupview/:pickupview?',
+        meta: {
+            caption: '图书',
+            captionLanResTag: 'DE.LNAME.IBIZBOOK',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'pickupview', parameterName: 'pickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookpickup-view/ibizbookpickup-view.vue'),
+    },
     {
         path: '/ibizorders/:ibizorder?/f19editview/:f19editview?',
         meta: {
@@ -7710,6 +7754,20 @@ const router = new Router({
         },
         component: () => import('@pages/sample/ibizorder-sf1-edit-view/ibizorder-sf1-edit-view.vue'),
     },
+    {
+        path: '/ibizbooks/:ibizbook?/pickupgridview/:pickupgridview?',
+        meta: {
+            caption: '图书',
+            captionLanResTag: 'DE.LNAME.IBIZBOOK',
+            info:'',
+            parameters: [
+                { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/sample/ibizbookpickup-grid-view/ibizbookpickup-grid-view.vue'),
+    },
     {
         path: '/ibizbooks/:ibizbook?/usr2editview/:usr2editview?',
         meta: {

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

@@ -2161,6 +2161,16 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: 'c00136c9f309c2b6b14f43fcf5a6338e',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'e62e63ceacd7852f687212fde5e80107',
+            ],
+        },
         {
             viewtag: 'c02089205b1bd1236ced28b71a9df413',
             viewmodule: 'Sample',
@@ -2550,6 +2560,15 @@ export const viewstate: any = {
                 '6bc6e690dc5abfc6d89703e4459c785c',
             ],
         },
+        {
+            viewtag: 'e62e63ceacd7852f687212fde5e80107',
+            viewmodule: 'Sample',
+            viewname: 'IBIZBOOKPickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'e6b64344b4671dee26c707efa2888c22',
             viewmodule: 'Sample',
@@ -2559,7 +2578,7 @@ export const viewstate: any = {
             refviews: [
                 '2dd50b1b88cf8062b625ee8b0b4fa9d7',
                 '3177e05ee25b4c215c2ce87547fcdc8c',
-                'f083dd992abed44bf15a9930b45c3895',
+                'c00136c9f309c2b6b14f43fcf5a6338e',
                 '681631239002f25ab59d3f72230e6ce5',
                 'a9c3b7c4ff10dfd9ccc9dc04531b6db9',
             ],

app_Web/src/uiservice/ibizbook/ibizbook-ui-service-base.ts

@@ -170,6 +170,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'usr6dataview',viewType:'DEDATAVIEW',srfappde:'ibizbooks',component:'ibizbookusr6-data-view'});
         this.allViewMap.set(':',{viewname:'dataviewexpview',viewType:'DEDATAVIEWEXPVIEW',srfappde:'ibizbooks',component:'ibizbookdata-view-exp-view'});
         this.allViewMap.set(':',{viewname:'newdefaultvaluegridview',viewType:'DEGRIDVIEW',srfappde:'ibizbooks',component:'ibizbooknew-default-value-grid-view'});
+        this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',viewType:'DEPICKUPVIEW',srfappde:'ibizbooks',component:'ibizbookpickup-view'});
         this.allViewMap.set(':',{viewname:'usr3dataview',viewType:'DEDATAVIEW',srfappde:'ibizbooks',component:'ibizbookusr3-data-view'});
         this.allViewMap.set(':',{viewname:'usr5editview',viewType:'DEEDITVIEW',srfappde:'ibizbooks',component:'ibizbookusr5-edit-view'});
         this.allViewMap.set(':',{viewname:'wizardview',viewType:'DEWIZARDVIEW',srfappde:'ibizbooks',component:'ibizbookwizard-view'});
@@ -190,6 +191,7 @@ export default class IBIZBOOKUIServiceBase extends UIService {
         this.allViewMap.set(':',{viewname:'usr8editview',viewType:'DEEDITVIEW',srfappde:'ibizbooks',component:'ibizbookusr8-edit-view'});
         this.allViewMap.set(':',{viewname:'listview',viewType:'DELISTVIEW',srfappde:'ibizbooks',component:'ibizbooklist-view'});
         this.allViewMap.set(':',{viewname:'ruleseditview',viewType:'DEEDITVIEW',srfappde:'ibizbooks',component:'ibizbookrules-edit-view'});
+        this.allViewMap.set(':',{viewname:'pickupgridview',viewType:'DEPICKUPGRIDVIEW',srfappde:'ibizbooks',component:'ibizbookpickup-grid-view'});
         this.allViewMap.set(':',{viewname:'usr2editview',viewType:'DEEDITVIEW',srfappde:'ibizbooks',component:'ibizbookusr2-edit-view'});
         this.allViewMap.set(':',{viewname:'testlogiccustomview',viewType:'DECUSTOMVIEW',srfappde:'ibizbooks',component:'ibizbooktest-logic-custom-view'});
         this.allViewMap.set(':',{viewname:'usr4listview_layout',viewType:'DELISTVIEW',srfappde:'ibizbooks',component:'ibizbookusr4-list-view-layout'});

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: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (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: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (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 });
@@ -1799,7 +1799,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: 'IBIZBOOKWizardView' + (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: 'IBIZBOOKWizardView' + (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: 'IBIZBOOKWizardView' + (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: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1765,7 +1765,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: 'IBIZBOOKWizardView' + (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: 'IBIZBOOKWizardView' + (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: 'IBIZBOOKWizardView' + (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: 'IBIZBOOKWizardView' + (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: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1869,7 +1869,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: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-base.vue

@@ -369,7 +369,7 @@ export default class GuideBase extends Vue implements ControlInterface {
      * @type {Boolean}
      * @memberof GuideBase
      */
-    public isShowStepBar: Boolean =  true ;
+    public isShowStepBar: Boolean =  false ;
 
     /**
       * 获取多项数据

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form-base.vue

@@ -66,7 +66,7 @@
   valueitem='borrower2_id' 
   :value="data.borrower2"
   editortype="pickup-no-ac" 
-  :pickupView="{ viewname: 'ibizcustomer-pickup-view', title: $t('DE.LNAME.IBIZCUSTOMER', '客户'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  :pickupView="{ viewname: 'ibizbookpickup-view', title: $t('DE.LNAME.IBIZBOOK', '图书'), deResParameters: [], parameters: [{ pathName: 'ibizbooks', parameterName: 'ibizbook' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
   style=""  
   @formitemvaluechange="onFormItemValueChange">
 </app-picker>

app_Web/src/widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list-base.vue

@@ -26,7 +26,7 @@
             <span class="quick-toolbar">
                             <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_quicktoolbarModels.deuiaction1.visabled" :disabled="listviewlist_quicktoolbarModels.deuiaction1.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-file-text-o'></i>
                             <span class='caption'>{{$t('TBB.TEXT.*.NEW', '新建')}}</span>
                         </i-button>
@@ -41,14 +41,14 @@
         <span class="batch-toolbar">
                     <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction1.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction1.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
                             <span class='caption'>{{$t('TBB.TEXT.*.EDIT', '编辑')}}</span>
                         </i-button>
                     <div slot='content'>{{$t('TBB.TEXT.*.EDIT', '编辑')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction2.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction2.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.disabled" class=' srfactionlevel100' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
                             <span class='caption'>{{$t('TBB.TEXT.*.REMOVE', '删除')}}</span>
                         </i-button>
@@ -362,7 +362,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
          const _this: any = this;
@@ -382,7 +382,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -408,7 +408,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -604,9 +604,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_quicktoolbarModels: any = {
+    public usr4listview_layoutlist_quicktoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
     };
@@ -616,9 +616,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_batchtoolbarModels: any = {
+    public usr4listview_layoutlist_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' } },
@@ -841,7 +841,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -971,7 +971,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -1076,7 +1076,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (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);
@@ -1084,7 +1084,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

+// 基于 @CONTROL/选择视图面板/MODEL.ts.ftl 生成
+/**
+ * PickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class PickupViewpickupviewpanelModel
+ */
+export default class PickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof PickupViewpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'createman',
+      },
+      {
+        name: 'ibizbookname',
+      },
+      {
+        name: 'ibizbook',
+        prop: 'ibizbookid',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updateman',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'author',
+      },
+      {
+        name: 'price',
+      },
+      {
+        name: 'press',
+      },
+      {
+        name: 'type',
+      },
+      {
+        name: 'booknumber',
+      },
+      {
+        name: 'subtext',
+      },
+      {
+        name: 'lendouttime',
+      },
+      {
+        name: 'returntime',
+      },
+      {
+        name: 'icon',
+      },
+      {
+        name: 'sailstate',
+      },
+      {
+        name: 'borrowstatus',
+      },
+      {
+        name: 'stepstatus',
+      },
+      {
+        name: 'borrower',
+      },
+      {
+        name: 'borrowway',
+      },
+      {
+        name: 'returnlib',
+      },
+      {
+        name: 'borrowerid',
+      },
+      {
+        name: 'borrower1',
+      },
+      {
+        name: 'borrower1_id',
+      },
+      {
+        name: 'borrower2',
+      },
+      {
+        name: 'borrower2_id',
+      },
+      {
+        name: 'borrower3',
+      },
+      {
+        name: 'borrower3_id',
+      },
+      {
+        name: 'tag',
+      },
+      {
+        name: 'orgid',
+      },
+      {
+        name: 'deptid',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_Web/src/widgets/ibizbook/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-service.ts

+// 基于 @CONTROL/选择视图面板/SERVICE.ts.ftl 生成
+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * PickupViewpickupviewpanel 部件服务对象
+ *
+ * @export
+ * @class PickupViewpickupviewpanelService
+ */
+export default class PickupViewpickupviewpanelService extends ControlService {
+}
\ No newline at end of file

app_Web/src/widgets/ibizbook/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.scss

+// 基于 @CONTROL/选择视图面板/CONTROL.scss.ftl 生成
+// this is scss
+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file

app_Web/src/widgets/ibizbook/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import PickupViewpickupviewpanelBase from './pickup-viewpickupviewpanel-pickupviewpanel-base.vue';
+
+ 
+// 基于 @CONTROL/选择视图面板/CONTROL.vue.ftl 生成
+
+@Component({
+    components: {
+         
+    }
+})
+export default class PickupViewpickupviewpanel extends PickupViewpickupviewpanelBase {
+
+}
+</script>
\ No newline at end of file

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/usr4-dataview/usr4-dataview-base.vue

@@ -718,7 +718,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -812,7 +812,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -928,7 +928,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (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);
@@ -936,7 +936,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -70,11 +70,6 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
 
 
       {

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

@@ -933,7 +933,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderDetailSGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderDetailGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1073,7 +1073,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1187,7 +1187,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2082,7 +2082,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2091,7 +2091,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: 'IBIZOrderDetailSGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2167,7 +2167,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -7807,6 +7807,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKNewDefaultValueGridView.json",
     "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupView.json",
+    "viewType" : "DEPICKUPVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr3DataView.json",
@@ -7887,6 +7891,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKRulesEditView.json",
     "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2EditView.json",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSFORMS/InterFuncForm_2.json

@@ -331,13 +331,13 @@
           "handlerType" : "PickupText",
           "getLinkPSAppView" : {
             "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerPickupView.json",
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupView.json",
             "viewType" : "DEPICKUPVIEW"
           },
           "name" : "borrower2",
           "getPickupPSAppView" : {
             "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerPickupView.json",
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupView.json",
             "viewType" : "DEPICKUPVIEW"
           },
           "valueItemName" : "borrower2_id",

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

@@ -851,13 +851,13 @@
             "handlerType" : "PickupText",
             "getLinkPSAppView" : {
               "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerPickupView.json",
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupView.json",
               "viewType" : "DEPICKUPVIEW"
             },
             "name" : "borrower2",
             "getPickupPSAppView" : {
               "modelref" : true,
-              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerPickupView.json",
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupView.json",
               "viewType" : "DEPICKUPVIEW"
             },
             "valueItemName" : "borrower2_id",

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

@@ -17703,6 +17703,12 @@
     "viewType" : "DEWFDYNAACTIONVIEW",
     "resource" : "IBIZSample0021",
     "view" : "REASSIGNWFDynaActionView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupView.json",
+    "viewType" : "DEPICKUPVIEW",
+    "resource" : "IBIZBOOK",
+    "view" : "PickupView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderF19EditView.json",
@@ -18003,6 +18009,12 @@
     "viewType" : "DEEDITVIEW",
     "resource" : "IBIZOrder",
     "view" : "SF1EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "IBIZBOOK",
+    "view" : "PickupGridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2EditView.json",
@@ -38534,6 +38546,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKNewDefaultValueGridView.json",
         "viewType" : "DEGRIDVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupView.json",
+        "viewType" : "DEPICKUPVIEW"
       }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr3DataView.json",
@@ -38614,6 +38630,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKRulesEditView.json",
         "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKPickupGridView.json",
+        "viewType" : "DEPICKUPGRIDVIEW"
       }, {
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr2EditView.json",

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1381-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1386-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -282,7 +282,7 @@
 
 
     <!--输出实体[IBIZCUSTOMER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-501-10">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-504-10">
         <createTable tableName="T_IBIZCUSTOMER">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -344,7 +344,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-801-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-809-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>
@@ -394,7 +394,7 @@
 
 
     <!--输出实体[IBIZORDERDETAIL]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorderdetail-21-15">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorderdetail-25-15">
         <createTable tableName="T_IBIZORDERDETAIL">
                 <column name="IBIZORDERDETAILNAME" remarks="" type="VARCHAR(200)">
                 </column>

demo-core/src/main/resources/liquibase/view.xml

@@ -19,7 +19,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZCUSTOMER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-501-4" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-504-4" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCUSTOMER">
                <![CDATA[ SELECT t1.[ADDRESS], t1.[CREATEDATE], t1.[CREATEMAN], t1.[CUSTOMERUID], t1.[IBIZCUSTOMERID], t1.[IBIZCUSTOMERNAME], t1.[SN], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCUSTOMER] t1  ]]>
          </createView>
@@ -37,13 +37,13 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-801-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-809-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
                <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDERDETAIL]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorderdetail-21-9" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorderdetail-25-9" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDERDETAIL">
                <![CDATA[ SELECT t1.[QUANTITY]*t11.[UNITPRICE] AS [AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[IBIZORDERDETAILA], t1.[IBIZORDERDETAILID], t1.[IBIZORDERDETAILNAME], t1.[IBIZORDERID], t21.[IBIZORDERNAME], t1.[IBIZUNIPRODUCTID], t11.[IBIZUNIPRODUCTNAME], t21.[ORDERUID], t1.[QUANTITY], t11.[UNIT], t11.[UNITPRICE], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZORDERDETAIL] t1  LEFT JOIN T_IBIZUNIPRODUCT t11 ON t1.IBIZUNIPRODUCTID = t11.IBIZUNIPRODUCTID  LEFT JOIN T_IBIZORDER t21 ON t1.IBIZORDERID = t21.IBIZORDERID  ]]>
          </createView>