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

app_Web/src/pages/sample/ibizbookform-load-custom-view/ibizbookform-load-custom-view-base.vue

@@ -803,7 +803,7 @@ export default class IBIZBOOKFormLoadCustomViewBase extends Vue {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
             _this.isLayoutLoadding = false;
-            window.uiServiceRegister.getService('IBIZBOOK').then((service: any) => {
+            window.uiServiceRegister.getService('ibizbook').then((service: any) => {
                 service.executeUILogic('CustomViewFormLoad', [], this.context, this.viewparams, {}, {}, this, 'IBIZBOOK').then((result: any) => {
                     if (result && result.hasOwnProperty('srfret') && !result.srfret) {
                         return;

app_Web/src/pages/sample/ibizbookgrid-load-custom-view/ibizbookgrid-load-custom-view-base.vue

@@ -845,7 +845,7 @@ export default class IBIZBOOKGridLoadCustomViewBase extends Vue {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
             _this.isLayoutLoadding = false;
-            window.uiServiceRegister.getService('IBIZBOOK').then((service: any) => {
+            window.uiServiceRegister.getService('ibizbook').then((service: any) => {
                 service.executeUILogic('CustomViewGridLoad', [], this.context, this.viewparams, {}, {}, this, 'IBIZBOOK').then((result: any) => {
                     if (result && result.hasOwnProperty('srfret') && !result.srfret) {
                         return;
@@ -926,7 +926,7 @@ export default class IBIZBOOKGridLoadCustomViewBase extends Vue {
      * @memberof IBIZBOOKGridLoadCustomViewBase
      */
     public afterDestroyed(){
-        window.uiServiceRegister.getService('IBIZBOOK').then((service: any) => {
+        window.uiServiceRegister.getService('ibizbook').then((service: any) => {
             service.executeUILogic('customViewDestroy', [], this.context, this.viewparams, {}, {}, this, 'IBIZBOOK').then((result: any) => {
                 if (result && result.hasOwnProperty('srfret') && !result.srfret) {
                     return;

app_Web/src/pages/sample/ibizbooktest-logic-custom-view/ibizbooktest-logic-custom-view-base.vue

@@ -803,7 +803,7 @@ export default class IBIZBOOKTestLogicCustomViewBase extends Vue {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
             _this.isLayoutLoadding = false;
-            window.uiServiceRegister.getService('IBIZBOOK').then((service: any) => {
+            window.uiServiceRegister.getService('ibizbook').then((service: any) => {
                 service.executeUILogic('FormLoad', [], this.context, this.viewparams, {}, {}, this, 'IBIZBOOK').then((result: any) => {
                     if (result && result.hasOwnProperty('srfret') && !result.srfret) {
                         return;
@@ -851,7 +851,7 @@ export default class IBIZBOOKTestLogicCustomViewBase extends Vue {
      * @memberof IBIZBOOKTestLogicCustomViewBase
      */
     public afterDestroyed(){
-        window.uiServiceRegister.getService('IBIZBOOK').then((service: any) => {
+        window.uiServiceRegister.getService('ibizbook').then((service: any) => {
             service.executeUILogic('FormLoad', [], this.context, this.viewparams, {}, {}, this, 'IBIZBOOK').then((result: any) => {
                 if (result && result.hasOwnProperty('srfret') && !result.srfret) {
                     return;

app_Web/src/pages/sample/ibizcustom-custom-edit-view/ibizcustom-custom-edit-view-base.vue

@@ -837,7 +837,7 @@ export default class IBIZCustomCustomEditViewBase extends Vue {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
             _this.isLayoutLoadding = false;
-            window.uiServiceRegister.getService('IBIZCustom').then((service: any) => {
+            window.uiServiceRegister.getService('ibizcustom').then((service: any) => {
                 service.executeUILogic('CustomViewFormLoad', [], this.context, this.viewparams, {}, {}, this, 'IBIZCustom').then((result: any) => {
                     if (result && result.hasOwnProperty('srfret') && !result.srfret) {
                         return;

app_Web/src/pages/sample/ibizcustom-custom-grid-view/ibizcustom-custom-grid-view-base.vue

@@ -931,7 +931,7 @@ export default class IBIZCustomCustomGridViewBase extends Vue {
         const _this: any = this;
         _this.initLayout().then((result: any) => {
             _this.isLayoutLoadding = false;
-            window.uiServiceRegister.getService('IBIZCustom').then((service: any) => {
+            window.uiServiceRegister.getService('ibizcustom').then((service: any) => {
                 service.executeUILogic('CustomViewGridLoad', [], this.context, this.viewparams, {}, {}, this, 'IBIZCustom').then((result: any) => {
                     if (result && result.hasOwnProperty('srfret') && !result.srfret) {
                         return;

app_Web/src/pages/sample/ibizcustomer-pickup-view-layout/ibizcustomer-pickup-view-layout-base.vue

@@ -28,12 +28,6 @@
     <app-scroll-container name="container_scroll_bottom1" :layoutModelDetails="layoutModelDetails">
         <template #container1>
     <app-standard-container name="container1" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
-        <template #button_calluilogic2>
-        <app-login-button class="app-reset-button" name="button_calluilogic2" :layoutModelDetails="layoutModelDetails" @itemClick="handleButtonClick" />
-        </template>
-        <template #button_calluilogic1>
-        <app-preset-button name="button_calluilogic1" :layoutModelDetails="layoutModelDetails" @itemClick="handleButtonClick" />
-        </template>
     </app-standard-container>
         </template>
     </app-scroll-container>
@@ -284,9 +278,7 @@ export default class IBIZCustomerPickupView_layoutBase extends Vue {
     public layoutItems:any = {
         pickupviewpanel:{ name: 'pickupviewpanel', type: 'VIEWLAYOUT', caption: 'PICKUPVIEWPANEL部件', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this },
         container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['pickupviewpanel'] , dataRegionType: 'INHERIT' },
-        button_calluilogic2:{ name: 'button_calluilogic2', type: 'VIEWLAYOUT', caption: '确认', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:32, heightMode:'PX', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'OUTERSMALL', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'PRIMARY', borderStyle: '', iconAlign: '', uiAction: { actiontarget: '', noprivdisplaymode: '2', dataaccaction: '', visabled: true, disabled: false }, predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
-        button_calluilogic1:{ name: 'button_calluilogic1', type: 'VIEWLAYOUT', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:32, heightMode:'PX', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', uiAction: { actiontarget: '', noprivdisplaymode: '2', dataaccaction: '', visabled: true, disabled: false }, predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
-        container1:{ name: 'container1', type: 'VIEWLAYOUT', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'INNERMEDIUM', spacingLeft:'', spacingRight:'', spacingTop:'INNERMEDIUM', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'flex-end',dir:'row',vAlign:'center'}, parentName: 'container_scroll_bottom1', panel: this , details:['button_calluilogic2','button_calluilogic1'] , dataRegionType: 'INHERIT' },
+        container1:{ name: 'container1', type: 'VIEWLAYOUT', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'INNERMEDIUM', spacingLeft:'', spacingRight:'', spacingTop:'INNERMEDIUM', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_bottom1', panel: this , details:[] , dataRegionType: 'INHERIT' },
         container_scroll_bottom1:{ name: 'container_scroll_bottom1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'SOUTH', layoutHeight:64, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['container1'] , dataRegionType: 'INHERIT' },
         container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1','container_scroll_bottom1'] , dataRegionType: 'INHERIT' }
     };
@@ -445,94 +437,8 @@ export default class IBIZCustomerPickupView_layoutBase extends Vue {
         const paramJO: any = {};
         const contextJO: any = {};
         const _this: any = this;
-        if (Object.is(name, 'button_calluilogic2')) {
-            _this.panel_Layoutpanel_button_calluilogic2_click(datas, contextJO, paramJO,  $event, xData, this, undefined);
-        }
-        if (Object.is(name, 'button_calluilogic1')) {
-            _this.panel_Layoutpanel_button_calluilogic1_click(datas, contextJO, paramJO,  $event, xData, this, undefined);
-        }
     }
 
-    /**
-     * 取消
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName]  父实体名称
-     */
-    public panel_Layoutpanel_button_calluilogic2_click(args: any[], contextJO?:any, params?: any, $event?: any, xData?: any, actionContext?:any, srfParentDeName?:string) {
-        if (this.viewType === 'APPLOGINVIEW') {
-            const length = Object.keys(this.layoutData).length;
-            for (let i = length - 1; i >= 0; i--) {
-                const name = Object.keys(this.layoutData)[i];
-                if (this.layoutData.hasOwnProperty(name) && !Object.is(this.layoutModelDetails[name].itemType, 'CONTAINER')) {
-                    this.handleValueChange({ name, value: null });
-                }
-            }
-            this.$nextTick(() => {
-                this.$forceUpdate();
-            })
-        } else {
-            const parentRef: any = this.$parent;
-            if (parentRef.closeView && (parentRef.closeView instanceof Function)) {
-                parentRef.closeView(args);
-            } else if (this.closeView && (this.closeView instanceof Function)) {
-                this.closeView(args);
-            }
-        }
-    }
-    /**
-     * 确认
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName]  父实体名称
-     */
-    public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
-        // 准备上下文参数
-        const tempContext = {...context};
-        if (xData && xData.context) {
-            Object.assign(tempContext, xData.context);
-        }
-        const data = args[0];
-        let action: string | undefined = undefined;
-        const service = await window.entityServiceRegister.getService('IBIZCustomer');
-        if (service) {
-            const key = service.APPDEKEY.toLowerCase();
-            const name = service.APPDENAME.toLowerCase();
-            if (data.hasOwnProperty(key) || data.hasOwnProperty(name)) {
-                if (data.hasOwnProperty(key)) {
-                    Object.assign(context, { [name]: data[key] });
-                } else {
-                    Object.assign(context, { [name]: data[name] });
-                }
-                action = 'Update';
-            } else {
-                action = 'Create';
-            }
-            try {
-                if (service[action] && service[action] instanceof Function) {
-                    service[action](tempContext, data).then((response: any) => {
-                        if (!response.status || response.status !== 200) {
-                            this.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
-                        }
-                    })
-                } else {
-                    this.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
-                }
-            } catch (error: any) {
-                this.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
-            }
-        }
-    }
 
 
 

app_Web/src/pages/sample/ibizcustomer-usr2-mpickup-view-layout/ibizcustomer-usr2-mpickup-view-layout-base.vue

@@ -26,6 +26,16 @@
         </template>
         <template #container_scroll_bottom1>
     <app-scroll-container name="container_scroll_bottom1" :layoutModelDetails="layoutModelDetails">
+        <template #container1>
+    <app-standard-container name="container1" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
+        <template #button_calluilogic1>
+        <app-preset-button name="button_calluilogic1" :layoutModelDetails="layoutModelDetails" @itemClick="handleButtonClick" />
+        </template>
+        <template #button_calluilogic2>
+        <app-login-button class="app-reset-button" name="button_calluilogic2" :layoutModelDetails="layoutModelDetails" @itemClick="handleButtonClick" />
+        </template>
+    </app-standard-container>
+        </template>
     </app-scroll-container>
         </template>
     </app-scroll-container>
@@ -275,7 +285,10 @@ export default class IBIZCustomerUsr2MPickupView_layoutBase extends Vue {
     public layoutItems:any = {
         pickupviewpanel:{ name: 'pickupviewpanel', type: 'VIEWLAYOUT', caption: 'PICKUPVIEWPANEL部件', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this },
         container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['pickupviewpanel'] , dataRegionType: 'INHERIT' },
-        container_scroll_bottom1:{ name: 'container_scroll_bottom1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'SOUTH', layoutHeight:64, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:[] , dataRegionType: 'INHERIT' },
+        button_calluilogic1:{ name: 'button_calluilogic1', type: 'VIEWLAYOUT', caption: '确定', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'PRIMARY', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:32, heightMode:'PX', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'OUTERSMALL', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'PRIMARY', borderStyle: '', iconAlign: '', uiAction: { actiontarget: '', noprivdisplaymode: '2', dataaccaction: '', visabled: true, disabled: false }, predefinedType: 'DATA_SAVECHANGES', renderMode: '', },
+        button_calluilogic2:{ name: 'button_calluilogic2', type: 'VIEWLAYOUT', caption: '取消', isShowCaption: true, sysCss: '', itemType: 'BUTTON', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:32, heightMode:'PX', layoutWidth:60, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , buttonStyle: 'DEFAULT', borderStyle: '', iconAlign: '', uiAction: { actiontarget: '', noprivdisplaymode: '2', dataaccaction: '', visabled: true, disabled: false }, predefinedType: 'DATA_CANCELCHANGES', renderMode: '', },
+        container1:{ name: 'container1', type: 'VIEWLAYOUT', caption: '面板', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'INNERMEDIUM', spacingLeft:'', spacingRight:'', spacingTop:'INNERMEDIUM', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'flex-end',dir:'row',vAlign:'center'}, parentName: 'container_scroll_bottom1', panel: this , details:['button_calluilogic1','button_calluilogic2'] , dataRegionType: 'INHERIT' },
+        container_scroll_bottom1:{ name: 'container_scroll_bottom1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'SOUTH', layoutHeight:64, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['container1'] , dataRegionType: 'INHERIT' },
         container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1','container_scroll_bottom1'] , dataRegionType: 'INHERIT' }
     };
     
@@ -433,8 +446,94 @@ export default class IBIZCustomerUsr2MPickupView_layoutBase extends Vue {
         const paramJO: any = {};
         const contextJO: any = {};
         const _this: any = this;
+        if (Object.is(name, 'button_calluilogic1')) {
+            _this.panel_Layoutpanel_button_calluilogic1_click(datas, contextJO, paramJO,  $event, xData, this, undefined);
+        }
+        if (Object.is(name, 'button_calluilogic2')) {
+            _this.panel_Layoutpanel_button_calluilogic2_click(datas, contextJO, paramJO,  $event, xData, this, undefined);
+        }
     }
 
+    /**
+     * 确认
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} context 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName]  父实体名称
+     */
+    public async panel_Layoutpanel_button_calluilogic1_click(args: any[], context: any = {}, params: any = {}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?: string) {
+        // 准备上下文参数
+        const tempContext = {...context};
+        if (xData && xData.context) {
+            Object.assign(tempContext, xData.context);
+        }
+        const data = args[0];
+        let action: string | undefined = undefined;
+        const service = await window.entityServiceRegister.getService('IBIZCustomer');
+        if (service) {
+            const key = service.APPDEKEY.toLowerCase();
+            const name = service.APPDENAME.toLowerCase();
+            if (data.hasOwnProperty(key) || data.hasOwnProperty(name)) {
+                if (data.hasOwnProperty(key)) {
+                    Object.assign(context, { [name]: data[key] });
+                } else {
+                    Object.assign(context, { [name]: data[name] });
+                }
+                action = 'Update';
+            } else {
+                action = 'Create';
+            }
+            try {
+                if (service[action] && service[action] instanceof Function) {
+                    service[action](tempContext, data).then((response: any) => {
+                        if (!response.status || response.status !== 200) {
+                            this.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
+                        }
+                    })
+                } else {
+                    this.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
+                }
+            } catch (error: any) {
+                this.$Notice.error({ title: '错误', desc: '当前环境无法执行保存变更逻辑[执行行为异常]' });
+            }
+        }
+    }
+    /**
+     * 取消
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @param {*} [srfParentDeName]  父实体名称
+     */
+    public panel_Layoutpanel_button_calluilogic2_click(args: any[], contextJO?:any, params?: any, $event?: any, xData?: any, actionContext?:any, srfParentDeName?:string) {
+        if (this.viewType === 'APPLOGINVIEW') {
+            const length = Object.keys(this.layoutData).length;
+            for (let i = length - 1; i >= 0; i--) {
+                const name = Object.keys(this.layoutData)[i];
+                if (this.layoutData.hasOwnProperty(name) && !Object.is(this.layoutModelDetails[name].itemType, 'CONTAINER')) {
+                    this.handleValueChange({ name, value: null });
+                }
+            }
+            this.$nextTick(() => {
+                this.$forceUpdate();
+            })
+        } else {
+            const parentRef: any = this.$parent;
+            if (parentRef.closeView && (parentRef.closeView instanceof Function)) {
+                parentRef.closeView(args);
+            } else if (this.closeView && (this.closeView instanceof Function)) {
+                this.closeView(args);
+            }
+        }
+    }
 
 
 

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

@@ -618,7 +618,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: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -654,7 +654,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -691,7 +691,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: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr3GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -727,7 +727,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr3GridView' + (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

@@ -1356,7 +1356,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' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1403,7 +1403,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' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1473,7 +1473,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1581,7 +1581,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1673,7 +1673,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' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (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

@@ -1322,7 +1322,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' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1369,7 +1369,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' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1439,7 +1439,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1547,7 +1547,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1639,7 +1639,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' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (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

@@ -1425,7 +1425,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' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1472,7 +1472,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' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1542,7 +1542,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1650,7 +1650,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' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1742,7 +1742,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' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (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

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

app_Web/src/widgets/ibizorder/list-exp-list/list-exp-list-base.vue

@@ -578,7 +578,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -694,7 +694,7 @@ export default class ListExpBase 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: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -789,7 +789,7 @@ export default class ListExpBase 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: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_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);
@@ -797,7 +797,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

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

@@ -299,7 +299,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderPickupGridViewBase
+     * @memberof IBIZOrderSF1GridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -441,6 +441,20 @@ 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;
     
     /**
     * 是否嵌入关系界面
@@ -975,7 +989,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1104,7 +1118,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1218,7 +1232,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2147,7 +2161,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2156,7 +2170,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2232,7 +2246,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -104,6 +104,21 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_orderstate_eq',
+        prop: 'n_orderstate_eq',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_gt',
+        prop: 'n_ordertime_gt',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_lt',
+        prop: 'n_ordertime_lt',
+        dataType: 'QUERYPARAM'
+      },
 
         {
           name:'size',

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

@@ -618,7 +618,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: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -654,7 +654,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -373,6 +373,13 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
     /**
      * 打开编辑数据视图
      *
@@ -905,7 +912,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZSample0021WFDynaExpGridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZSample0021GridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1034,7 +1041,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1148,7 +1155,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2053,7 +2060,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2062,7 +2069,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2138,7 +2145,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -580,46 +580,6 @@
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
     },
-    "getPSAppViewLogics" : [ {
-      "logicTrigger" : "CUSTOM",
-      "logicType" : "APPVIEWUIACTION",
-      "name" : "layoutpanel_button_calluilogic2_click",
-      "getPSAppViewUIAction" : {
-        "modelref" : true,
-        "id" : "layoutpanel_button_calluilogic2"
-      }
-    }, {
-      "logicTrigger" : "CUSTOM",
-      "logicType" : "APPVIEWUIACTION",
-      "name" : "layoutpanel_button_calluilogic1_click",
-      "getPSAppViewUIAction" : {
-        "modelref" : true,
-        "id" : "layoutpanel_button_calluilogic1"
-      }
-    } ],
-    "getPSAppViewUIActions" : [ {
-      "name" : "layoutpanel_button_calluilogic2",
-      "getPSUIAction" : {
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
-        },
-        "modelref" : true,
-        "id" : "panel_Layoutpanel_button_calluilogic2_click"
-      },
-      "xDataControlName" : "layoutpanel"
-    }, {
-      "name" : "layoutpanel_button_calluilogic1",
-      "getPSUIAction" : {
-        "getPSAppDataEntity" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
-        },
-        "modelref" : true,
-        "id" : "panel_Layoutpanel_button_calluilogic1_click"
-      },
-      "xDataControlName" : "layoutpanel"
-    } ],
     "getPSControlParam" : { },
     "getPSLayout" : {
       "columnCount" : 24,
@@ -685,10 +645,7 @@
           "itemType" : "CONTAINER",
           "name" : "container1",
           "getPSLayout" : {
-            "align" : "flex-end",
-            "dir" : "row",
-            "layout" : "FLEX",
-            "vAlign" : "center"
+            "layout" : "FLEX"
           },
           "getPSLayoutPos" : {
             "heightMode" : "FULL",
@@ -697,93 +654,7 @@
             "spacingBottom" : "INNERMEDIUM",
             "spacingTop" : "INNERMEDIUM",
             "widthMode" : "FULL"
-          },
-          "getPSPanelItems" : [ {
-            "actionType" : "UIACTION",
-            "buttonHeight" : 32.0,
-            "buttonStyle" : "PRIMARY",
-            "buttonWidth" : 60.0,
-            "caption" : "确认",
-            "contentHeight" : 32.0,
-            "contentWidth" : 60.0,
-            "height" : 32.0,
-            "itemStyle" : "PRIMARY",
-            "itemType" : "BUTTON",
-            "name" : "button_calluilogic2",
-            "getPSAppViewUIAction" : {
-              "modelref" : true,
-              "id" : "layoutpanel_button_calluilogic2"
-            },
-            "getPSLayoutPos" : {
-              "grow" : -1,
-              "height" : 32,
-              "heightMode" : "PX",
-              "layout" : "FLEX",
-              "spacingRight" : "OUTERSMALL",
-              "width" : 60,
-              "widthMode" : "PX"
-            },
-            "getPSUIAction" : {
-              "caption" : "取消",
-              "codeName" : "panel_Layoutpanel_button_calluilogic2_click",
-              "fullCodeName" : "panel_Layoutpanel_button_calluilogic2_click",
-              "name" : "取消",
-              "getPSAppDataEntity" : {
-                "modelref" : true,
-                "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
-              },
-              "predefinedType" : "DATA_CANCELCHANGES",
-              "timeout" : 60000,
-              "uIActionMode" : "SYS",
-              "uIActionTag" : "panel_Layoutpanel_button_calluilogic2_click",
-              "uIActionType" : "DEUIACTION"
-            },
-            "tooltip" : "确认",
-            "width" : 60.0,
-            "showCaption" : true
-          }, {
-            "actionType" : "UIACTION",
-            "buttonHeight" : 32.0,
-            "buttonStyle" : "DEFAULT",
-            "buttonWidth" : 60.0,
-            "caption" : "取消",
-            "contentHeight" : 32.0,
-            "contentWidth" : 60.0,
-            "height" : 32.0,
-            "itemStyle" : "DEFAULT",
-            "itemType" : "BUTTON",
-            "name" : "button_calluilogic1",
-            "getPSAppViewUIAction" : {
-              "modelref" : true,
-              "id" : "layoutpanel_button_calluilogic1"
-            },
-            "getPSLayoutPos" : {
-              "grow" : -1,
-              "height" : 32,
-              "heightMode" : "PX",
-              "layout" : "FLEX",
-              "width" : 60,
-              "widthMode" : "PX"
-            },
-            "getPSUIAction" : {
-              "caption" : "确认",
-              "codeName" : "panel_Layoutpanel_button_calluilogic1_click",
-              "fullCodeName" : "panel_Layoutpanel_button_calluilogic1_click",
-              "name" : "确认",
-              "getPSAppDataEntity" : {
-                "modelref" : true,
-                "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
-              },
-              "predefinedType" : "DATA_SAVECHANGES",
-              "timeout" : 60000,
-              "uIActionMode" : "SYS",
-              "uIActionTag" : "panel_Layoutpanel_button_calluilogic1_click",
-              "uIActionType" : "DEUIACTION"
-            },
-            "tooltip" : "取消",
-            "width" : 60.0,
-            "showCaption" : true
-          } ]
+          }
         } ],
         "showCaption" : true
       } ]

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

@@ -340,6 +340,46 @@
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
     },
+    "getPSAppViewLogics" : [ {
+      "logicTrigger" : "CUSTOM",
+      "logicType" : "APPVIEWUIACTION",
+      "name" : "layoutpanel_button_calluilogic1_click",
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "layoutpanel_button_calluilogic1"
+      }
+    }, {
+      "logicTrigger" : "CUSTOM",
+      "logicType" : "APPVIEWUIACTION",
+      "name" : "layoutpanel_button_calluilogic2_click",
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "layoutpanel_button_calluilogic2"
+      }
+    } ],
+    "getPSAppViewUIActions" : [ {
+      "name" : "layoutpanel_button_calluilogic1",
+      "getPSUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+        },
+        "modelref" : true,
+        "id" : "panel_Layoutpanel_button_calluilogic1_click"
+      },
+      "xDataControlName" : "layoutpanel"
+    }, {
+      "name" : "layoutpanel_button_calluilogic2",
+      "getPSUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+        },
+        "modelref" : true,
+        "id" : "panel_Layoutpanel_button_calluilogic2_click"
+      },
+      "xDataControlName" : "layoutpanel"
+    } ],
     "getPSControlParam" : { },
     "getPSLayout" : {
       "columnCount" : 24,
@@ -399,6 +439,112 @@
           "layout" : "BORDER",
           "layoutPos" : "SOUTH"
         },
+        "getPSPanelItems" : [ {
+          "caption" : "面板",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container1",
+          "getPSLayout" : {
+            "align" : "flex-end",
+            "dir" : "row",
+            "layout" : "FLEX",
+            "vAlign" : "center"
+          },
+          "getPSLayoutPos" : {
+            "heightMode" : "FULL",
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER",
+            "spacingBottom" : "INNERMEDIUM",
+            "spacingTop" : "INNERMEDIUM",
+            "widthMode" : "FULL"
+          },
+          "getPSPanelItems" : [ {
+            "actionType" : "UIACTION",
+            "buttonHeight" : 32.0,
+            "buttonStyle" : "PRIMARY",
+            "buttonWidth" : 60.0,
+            "caption" : "确定",
+            "contentHeight" : 32.0,
+            "contentWidth" : 60.0,
+            "height" : 32.0,
+            "itemStyle" : "PRIMARY",
+            "itemType" : "BUTTON",
+            "name" : "button_calluilogic1",
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "layoutpanel_button_calluilogic1"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "height" : 32,
+              "heightMode" : "PX",
+              "layout" : "FLEX",
+              "spacingRight" : "OUTERSMALL",
+              "width" : 60,
+              "widthMode" : "PX"
+            },
+            "getPSUIAction" : {
+              "caption" : "确认",
+              "codeName" : "panel_Layoutpanel_button_calluilogic1_click",
+              "fullCodeName" : "panel_Layoutpanel_button_calluilogic1_click",
+              "name" : "确认",
+              "getPSAppDataEntity" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+              },
+              "predefinedType" : "DATA_SAVECHANGES",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "panel_Layoutpanel_button_calluilogic1_click",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "确定",
+            "width" : 60.0,
+            "showCaption" : true
+          }, {
+            "actionType" : "UIACTION",
+            "buttonHeight" : 32.0,
+            "buttonStyle" : "DEFAULT",
+            "buttonWidth" : 60.0,
+            "caption" : "取消",
+            "contentHeight" : 32.0,
+            "contentWidth" : 60.0,
+            "height" : 32.0,
+            "itemStyle" : "DEFAULT",
+            "itemType" : "BUTTON",
+            "name" : "button_calluilogic2",
+            "getPSAppViewUIAction" : {
+              "modelref" : true,
+              "id" : "layoutpanel_button_calluilogic2"
+            },
+            "getPSLayoutPos" : {
+              "grow" : -1,
+              "height" : 32,
+              "heightMode" : "PX",
+              "layout" : "FLEX",
+              "width" : 60,
+              "widthMode" : "PX"
+            },
+            "getPSUIAction" : {
+              "caption" : "取消",
+              "codeName" : "panel_Layoutpanel_button_calluilogic2_click",
+              "fullCodeName" : "panel_Layoutpanel_button_calluilogic2_click",
+              "name" : "取消",
+              "getPSAppDataEntity" : {
+                "modelref" : true,
+                "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
+              },
+              "predefinedType" : "DATA_CANCELCHANGES",
+              "timeout" : 60000,
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "panel_Layoutpanel_button_calluilogic2_click",
+              "uIActionType" : "DEUIACTION"
+            },
+            "tooltip" : "取消",
+            "width" : 60.0,
+            "showCaption" : true
+          } ]
+        } ],
         "showCaption" : true
       } ]
     } ],

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

@@ -278,7 +278,7 @@
 
 
     <!--输出实体[IBIZCUSTOMER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-396-10">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-408-10">
         <createTable tableName="T_IBIZCUSTOMER">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </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-396-4" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-408-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>