From dd8405df1ef12cc5d473c738df8d9b64740b1dc1 Mon Sep 17 00:00:00 2001 From: ibizdev <ibizdev@ibizsys.net> Date: Wed, 9 Nov 2022 14:44:38 +0800 Subject: [PATCH] =?UTF-8?q?=20Mosher=20=E5=8F=91=E5=B8=83=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BB=A3=E7=A0=81=20[=E5=90=8E=E5=8F=B0=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E6=BC=94=E7=A4=BA=E5=BA=94=E7=94=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibizbook/custom-edit-ui-logic-base.ts | 6 +-- .../ibizorder/open-yu-que-ui-logic-base.ts | 6 +-- .../default-searchform-base.vue | 4 +- .../default-searchform-base.vue | 4 +- .../guide-borrow-form-form-base.vue | 10 ++-- .../guide-return-form-form-base.vue | 10 ++-- .../guide-view-form-form-base.vue | 10 ++-- .../usr2-dataview/usr2-dataview-base.vue | 52 +++++++++---------- .../usr2-dataview/usr2-dataview-model.ts | 13 ++++- .../card-navigation-dataview-base.vue | 8 +-- .../ibizorder/main-grid/main-grid-base.vue | 28 +++------- .../ibizorder/main-grid/main-grid-model.ts | 15 ------ .../default-searchform-base.vue | 4 +- .../main-grid/main-grid-base.vue | 19 +++---- 14 files changed, 82 insertions(+), 107 deletions(-) diff --git a/app_Web/src/uiservice/ibizbook/custom-edit-ui-logic-base.ts b/app_Web/src/uiservice/ibizbook/custom-edit-ui-logic-base.ts index 636bebf2a..a15a04439 100644 --- a/app_Web/src/uiservice/ibizbook/custom-edit-ui-logic-base.ts +++ b/app_Web/src/uiservice/ibizbook/custom-edit-ui-logic-base.ts @@ -217,14 +217,14 @@ export default class CustomEditUILogicBase { * @memberof CustomEditUILogicBase */ protected async execute_deuiaction1_node(actionContext: UIActionContext) { - const data = actionContext.getParam('SA.SRFDA.PS.Core.DataEntity.Logic.PSDEUILogicParamImpl@265e611b.codeName'); + const data = actionContext.getParam('SA.SRFDA.PS.Core.DataEntity.Logic.PSDEUILogicParamImpl@61012b46.codeName'); const { context, viewparams } = actionContext; const additionalParam = actionContext.additionalParam; const uiService = await window.uiServiceRegister.getService('ibizbook'); - if (uiService && uiService['Edit'] && uiService['Edit'] instanceof Function) { + if (uiService && uiService['IBIZBOOK_Edit'] && uiService['IBIZBOOK_Edit'] instanceof Function) { const xData = actionContext.activeCtrlParamName ? actionContext.getParam(actionContext.activeCtrlParamName).getReal() : additionalParam && additionalParam.xData ? additionalParam.xData : {}; const container = actionContext.activeContainerParamName ? actionContext.getParam(actionContext.activeContainerParamName).getReal() : additionalParam && additionalParam.actioncontext ? additionalParam.actioncontext : {}; - const result = await uiService['Edit']( + const result = await uiService['IBIZBOOK_Edit']( Object.prototype.toString.call(data) === '[object Array]' ? data : [data], context, viewparams, diff --git a/app_Web/src/uiservice/ibizorder/open-yu-que-ui-logic-base.ts b/app_Web/src/uiservice/ibizorder/open-yu-que-ui-logic-base.ts index a55811e78..c49f94109 100644 --- a/app_Web/src/uiservice/ibizorder/open-yu-que-ui-logic-base.ts +++ b/app_Web/src/uiservice/ibizorder/open-yu-que-ui-logic-base.ts @@ -143,14 +143,14 @@ export default class OpenYuQueUILogicBase { * @memberof OpenYuQueUILogicBase */ protected async execute_deuiaction1_node(actionContext: UIActionContext) { - const data = actionContext.getParam('SA.SRFDA.PS.Core.DataEntity.Logic.PSDEUILogicParamImpl@61e6b328.codeName'); + const data = actionContext.getParam('SA.SRFDA.PS.Core.DataEntity.Logic.PSDEUILogicParamImpl@6d9f4321.codeName'); const { context, viewparams } = actionContext; const additionalParam = actionContext.additionalParam; const uiService = await window.uiServiceRegister.getService('ibizorder'); - if (uiService && uiService['open_document'] && uiService['open_document'] instanceof Function) { + if (uiService && uiService['IBIZOrder_open_document'] && uiService['IBIZOrder_open_document'] instanceof Function) { const xData = actionContext.activeCtrlParamName ? actionContext.getParam(actionContext.activeCtrlParamName).getReal() : additionalParam && additionalParam.xData ? additionalParam.xData : {}; const container = actionContext.activeContainerParamName ? actionContext.getParam(actionContext.activeContainerParamName).getReal() : additionalParam && additionalParam.actioncontext ? additionalParam.actioncontext : {}; - const result = await uiService['open_document']( + const result = await uiService['IBIZOrder_open_document']( Object.prototype.toString.call(data) === '[object Array]' ? data : [data], context, viewparams, diff --git a/app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue b/app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue index 8fe277c89..25bc19f0e 100644 --- a/app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue +++ b/app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue @@ -598,7 +598,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 }; @@ -634,7 +634,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 } ; diff --git a/app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue b/app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue index 4b766bc03..1f4ff22e5 100644 --- a/app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue +++ b/app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue @@ -671,7 +671,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 }; @@ -707,7 +707,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: '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 } ; diff --git a/app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue b/app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue index 960d19c61..95875b56f 100644 --- a/app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue +++ b/app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue @@ -1308,7 +1308,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface */ public load(opt: any = {}): void { 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 }; @@ -1343,7 +1343,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface */ public loadDraft(opt: any = {}): void { 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 } ; @@ -1404,7 +1404,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}); @@ -1512,7 +1512,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}); @@ -1586,7 +1586,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]; diff --git a/app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue b/app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue index 2ba920419..6f2405840 100644 --- a/app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue +++ b/app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue @@ -1274,7 +1274,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface */ public load(opt: any = {}): void { 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 }; @@ -1309,7 +1309,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface */ public loadDraft(opt: any = {}): void { 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 } ; @@ -1370,7 +1370,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}); @@ -1478,7 +1478,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}); @@ -1552,7 +1552,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]; diff --git a/app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue b/app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue index 95e423e9c..504a943c8 100644 --- a/app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue +++ b/app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue @@ -1377,7 +1377,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { */ public load(opt: any = {}): void { 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 }; @@ -1412,7 +1412,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface { */ public loadDraft(opt: any = {}): void { 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 } ; @@ -1473,7 +1473,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}); @@ -1581,7 +1581,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}); @@ -1655,7 +1655,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]; diff --git a/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-base.vue b/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-base.vue index c83477476..15e02e62c 100644 --- a/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-base.vue +++ b/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-base.vue @@ -48,18 +48,18 @@ <div v-show="flag" class="batch-toolbar"> <div class='toolbar-container'> <tooltip :transfer="true" :max-width="600"> - <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)"> + <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction1.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)"> <i class='fa fa-edit'></i> - <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span> + <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span> </i-button> - <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div> + <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div> </tooltip> <tooltip :transfer="true" :max-width="600"> - <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)"> + <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction2.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)"> <i class='fa fa-remove'></i> - <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span> + <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span> </i-button> - <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div> + <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div> </tooltip> </div> </div> @@ -182,18 +182,18 @@ export default class Usr2Base extends Vue implements ControlInterface { public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store }); /** - * dataviewexpbar_dataview_batchtoolbar 閮ㄤ欢 click 浜嬩欢 + * dataview_batchtoolbar 閮ㄤ欢 click 浜嬩欢 * * @param {*} [args={}] * @param {*} $event * @memberof Usr2Base */ - public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) { + public dataview_batchtoolbar_click($event: any, $event2?: any) { if (Object.is($event.tag, 'deuiaction1')) { - this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2); + this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2); } if (Object.is($event.tag, 'deuiaction2')) { - this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2); + this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2); } } @@ -206,7 +206,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) { + public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) { // 鍙傛暟 // 鍙栨暟 let datas: any[] = []; @@ -234,7 +234,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) { + public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) { // 鍙傛暟 // 鍙栨暟 let datas: any[] = []; @@ -262,7 +262,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) { + public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) { // 鍙栨暟 let datas: any[] = []; let xData: any = null; @@ -289,7 +289,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) { + public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) { // 鍙栨暟 let datas: any[] = []; let xData: any = null; @@ -317,7 +317,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] 浜嬩欢婧� * @param {*} [xData] 鎵ц琛屼负鎵€闇€褰撳墠閮ㄤ欢 * @param {*} [actionContext] 鎵ц琛屼负涓婁笅鏂� - * @memberof IBIZBOOKDataViewExpViewBase + * @memberof IBIZBOOKUsr2DataViewBase */ public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { if (args.length === 0) { @@ -343,7 +343,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] 浜嬩欢婧� * @param {*} [xData] 鎵ц琛屼负鎵€闇€褰撳墠閮ㄤ欢 * @param {*} [actionContext] 鎵ц琛屼负涓婁笅鏂� - * @memberof IBIZBOOKDataViewExpViewBase + * @memberof IBIZBOOKUsr2DataViewBase */ public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { const _this: any = this; @@ -637,9 +637,9 @@ export default class Usr2Base extends Vue implements ControlInterface { * 宸ュ叿鏍忔ā鍨� * * @type {*} - * @memberof IBIZBOOKDataViewExpView + * @memberof IBIZBOOKUsr2DataView */ - public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = { + public usr2dataviewdataview_batchtoolbarModels: any = { deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '缂栬緫', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } }, deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '鍒犻櫎', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } }, @@ -964,7 +964,7 @@ export default class Usr2Base extends Vue implements ControlInterface { */ public load(opt: any = {}, isReset: boolean = false): void { if(!this.fetchAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) }); return; } const arg: any = {...opt}; @@ -1044,7 +1044,7 @@ export default class Usr2Base extends Vue implements ControlInterface { */ public async remove(datas: any[]): Promise<any> { if(!this.removeAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) }); return; } let _datas:any[] = []; @@ -1154,7 +1154,7 @@ export default class Usr2Base extends Vue implements ControlInterface { try { if(Object.is(item.rowDataState, 'create')){ if(!this.createAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.createAction') as string) }); }else{ Object.assign(item,{viewparams:this.viewparams}); let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator); @@ -1162,7 +1162,7 @@ export default class Usr2Base extends Vue implements ControlInterface { } }else if(Object.is(item.rowDataState, 'update')){ if(!this.updateAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.updateAction') as string) }); }else{ Object.assign(item,{viewparams:this.viewparams}); if(item.ibizbook){ @@ -1253,16 +1253,16 @@ export default class Usr2Base extends Vue implements ControlInterface { public uiAction(data: any, tag: any, $event: any) { $event.stopPropagation(); if(Object.is('Edit', tag)) { - this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(data, tag, $event); + this.dataview_batchtoolbar_deuiaction1_click(data, tag, $event); } if(Object.is('Remove', tag)) { - this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(data, tag, $event); + this.dataview_batchtoolbar_deuiaction2_click(data, tag, $event); } if(Object.is('Edit', tag)) { - this.dataviewexpbar_dataview_memo1_u37f11a8_click(data, tag, $event); + this.dataview_memo1_u37f11a8_click(data, tag, $event); } if(Object.is('Remove', tag)) { - this.dataviewexpbar_dataview_memo1_uc365542_click(data, tag, $event); + this.dataview_memo1_uc365542_click(data, tag, $event); } } diff --git a/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts b/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts index fbcb49d15..ed9209b35 100644 --- a/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts +++ b/app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts @@ -10,7 +10,7 @@ export default class Usr2Model { * 鑾峰彇鏁版嵁椤归泦鍚� * * @returns {any[]} - * @memberof Usr2Dataviewexpbar_dataviewMode + * @memberof Usr2DataViewMode */ public getDataItems(): any[] { return [ @@ -39,6 +39,17 @@ export default class Usr2Model { dataType: 'FONTKEY', }, + { + name: 'n_ibizbookname_like', + prop: 'n_ibizbookname_like', + dataType: 'QUERYPARAM' + }, + { + name: 'n_price_gtandeq', + prop: 'n_price_gtandeq', + dataType: 'QUERYPARAM' + }, + { name:'size', diff --git a/app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue b/app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue index 1a763fb17..3e6eb397e 100644 --- a/app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue +++ b/app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue @@ -665,7 +665,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface */ public load(opt: any = {}, isReset: boolean = false): void { if(!this.fetchAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) }); return; } const arg: any = {...opt}; @@ -744,7 +744,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) }); return; } let _datas:any[] = []; @@ -853,7 +853,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (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); @@ -861,7 +861,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) }); }else{ Object.assign(item,{viewparams:this.viewparams}); if(item.ibizorder){ diff --git a/app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue b/app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue index 296a1545d..4edae3198 100644 --- a/app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue +++ b/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 IBIZOrderSF1GridViewBase + * @memberof IBIZOrderPickupGridViewBase */ public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { if (args.length === 0) { @@ -421,20 +421,6 @@ export default class MainBase extends Vue implements ControlInterface { return this.selections[0]; } - /** - * 鎵撳紑鏂板缓鏁版嵁瑙嗗浘 - * - * @type {any} - * @memberof MainBase - */ - @Prop() public newdata: any; - /** - * 鎵撳紑缂栬緫鏁版嵁瑙嗗浘 - * - * @type {any} - * @memberof MainBase - */ - @Prop() public opendata: any; /** * 鏄惁宓屽叆鍏崇郴鐣岄潰 @@ -967,7 +953,7 @@ export default class MainBase extends Vue implements ControlInterface { */ public load(opt: any = {}, pageReset: boolean = false): void { if(!this.fetchAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); return; } if(pageReset){ @@ -1062,7 +1048,7 @@ export default class MainBase 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: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); return; } let _datas:any[] = []; @@ -1168,7 +1154,7 @@ export default class MainBase extends Vue implements ControlInterface { */ public addBatch(arg: any = {}): void { if(!this.fetchAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); return; } if(!arg){ @@ -2085,7 +2071,7 @@ export default class MainBase extends Vue implements ControlInterface { try { if(Object.is(item.rowDataState, 'create')){ if(!this.createAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); }else{ Object.assign(item,{viewparams:this.viewparams}); let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator); @@ -2093,7 +2079,7 @@ export default class MainBase extends Vue implements ControlInterface { } }else if(Object.is(item.rowDataState, 'update')){ if(!this.updateAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); }else{ Object.assign(item,{viewparams:this.viewparams}); if(item.ibizorder){ @@ -2160,7 +2146,7 @@ export default class MainBase extends Vue implements ControlInterface { */ public newRow(args: any[], params?: any, $event?: any, xData?: any): void { if(!this.loaddraftAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); return; } let _this = this; diff --git a/app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts b/app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts index 12de999f7..5a7acf31b 100644 --- a/app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts +++ b/app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts @@ -104,21 +104,6 @@ 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', diff --git a/app_Web/src/widgets/ibizsample0021/default-searchform/default-searchform-base.vue b/app_Web/src/widgets/ibizsample0021/default-searchform/default-searchform-base.vue index b886afc23..6e20932a9 100644 --- a/app_Web/src/widgets/ibizsample0021/default-searchform/default-searchform-base.vue +++ b/app_Web/src/widgets/ibizsample0021/default-searchform/default-searchform-base.vue @@ -598,7 +598,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: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); return; } const arg: any = { ...opt }; @@ -634,7 +634,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: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); return; } const arg: any = { ...opt } ; diff --git a/app_Web/src/widgets/ibizsample0021/main-grid/main-grid-base.vue b/app_Web/src/widgets/ibizsample0021/main-grid/main-grid-base.vue index dc687e68d..8fdd994d9 100644 --- a/app_Web/src/widgets/ibizsample0021/main-grid/main-grid-base.vue +++ b/app_Web/src/widgets/ibizsample0021/main-grid/main-grid-base.vue @@ -353,13 +353,6 @@ export default class MainBase extends Vue implements ControlInterface { return this.selections[0]; } - /** - * 鎵撳紑鏂板缓鏁版嵁瑙嗗浘 - * - * @type {any} - * @memberof MainBase - */ - @Prop() public newdata: any; /** * 鎵撳紑缂栬緫鏁版嵁瑙嗗浘 * @@ -890,7 +883,7 @@ export default class MainBase extends Vue implements ControlInterface { */ public load(opt: any = {}, pageReset: boolean = false): void { if(!this.fetchAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); return; } if(pageReset){ @@ -985,7 +978,7 @@ export default class MainBase 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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); return; } let _datas:any[] = []; @@ -1091,7 +1084,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); return; } if(!arg){ @@ -1984,7 +1977,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.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); @@ -1992,7 +1985,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); }else{ Object.assign(item,{viewparams:this.viewparams}); if(item.ibizsample0021){ @@ -2059,7 +2052,7 @@ export default class MainBase extends Vue implements ControlInterface { */ public newRow(args: any[], params?: any, $event?: any, xData?: any): void { if(!this.loaddraftAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); return; } let _this = this; -- 2.21.0