diff --git a/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_BO_CN_base.ts b/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_BO_CN_base.ts index 314cf9573095e68324c6b513bf788ee254e53a93..4ee1beafa8ae8dc61599c9f132fd24edbc1318e3 100644 --- a/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_BO_CN_base.ts +++ b/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_BO_CN_base.ts @@ -795,6 +795,7 @@ function getLocaleResourceBase(){ details: { orderdetail1: commonLogic.appcommonhandle("琛ㄦ牸",null), grouppanel1: commonLogic.appcommonhandle("澶氭暟鎹儴浠�-琛ㄦ牸",null), + orderdetailinfo: commonLogic.appcommonhandle("",null), orderdetail2: commonLogic.appcommonhandle("璁㈠崟鏄庣粏",null), grouppanel2: commonLogic.appcommonhandle("澶氭暟鎹儴浠�-閲嶅鍣紙琛ㄥ崟锛�",null), orderdetail3: commonLogic.appcommonhandle("",null), diff --git a/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts b/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts index 2748d89662d83a60a71cbc9625a68702a0ec2e45..3684abf674f187a1f945e5cd42bd3570907c02db 100644 --- a/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts +++ b/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts @@ -795,6 +795,7 @@ function getLocaleResourceBase(){ details: { orderdetail1: commonLogic.appcommonhandle("琛ㄦ牸",null), grouppanel1: commonLogic.appcommonhandle("澶氭暟鎹儴浠�-琛ㄦ牸",null), + orderdetailinfo: commonLogic.appcommonhandle("",null), orderdetail2: commonLogic.appcommonhandle("璁㈠崟鏄庣粏",null), grouppanel2: commonLogic.appcommonhandle("澶氭暟鎹儴浠�-閲嶅鍣紙琛ㄥ崟锛�",null), orderdetail3: commonLogic.appcommonhandle("",null), diff --git a/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts b/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts index d897154b28dc82eb03fa31eaf6e8ad0ca3f27594..277219399122c6c1ae7834633510befbf1c47dfa 100644 --- a/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts +++ b/app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts @@ -795,6 +795,7 @@ function getLocaleResourceBase(){ details: { orderdetail1: commonLogic.appcommonhandle("琛ㄦ牸",null), grouppanel1: commonLogic.appcommonhandle("澶氭暟鎹儴浠�-琛ㄦ牸",null), + orderdetailinfo: commonLogic.appcommonhandle("",null), orderdetail2: commonLogic.appcommonhandle("璁㈠崟鏄庣粏",null), grouppanel2: commonLogic.appcommonhandle("澶氭暟鎹儴浠�-閲嶅鍣紙琛ㄥ崟锛�",null), orderdetail3: commonLogic.appcommonhandle("",null), 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 c3f3f35ebdb4b624b4324c60e30995d9e6e4e00a..4bccdce022bcdc3f11a4db77ec82613d4cbf46f6 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 @@ -719,7 +719,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 }; @@ -755,7 +755,7 @@ export default class DefaultBase extends Vue implements ControlInterface { */ public async loadDraft(opt: any = {},mode?:string): Promise<any> { if(!this.loaddraftAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); return; } const arg: any = { ...opt } ; 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 1ad2f7af927845701684ce8cb25b49c4e010822c..f916855215ecc4a397a6eba03131f598a677e795 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 @@ -1443,7 +1443,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 }; @@ -1490,7 +1490,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 } ; @@ -1560,7 +1560,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}); @@ -1670,7 +1670,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 }); @@ -1762,7 +1762,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]; 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 9fca8e513887c8e317ee7baa7eb7574751adc0e8..863faa9d52bda89954ce4889e609698700f70711 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 @@ -1405,7 +1405,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 }; @@ -1452,7 +1452,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 } ; @@ -1522,7 +1522,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}); @@ -1632,7 +1632,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 }); @@ -1724,7 +1724,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]; 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 be9e042b885d4727f0d98eff8982457c2fbb974b..0045099b511756bbb6d0a0e4672594ef1aab5fb7 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 @@ -1524,7 +1524,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 }; @@ -1571,7 +1571,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 } ; @@ -1641,7 +1641,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}); @@ -1751,7 +1751,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 }); @@ -1843,7 +1843,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]; diff --git a/app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-base.vue b/app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-base.vue index 8c4cb34c088453ac22acce5c125496e03f1ff71e..c7b17eb0f3cb4b93204bf970501c063debb96a6a 100644 --- a/app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-base.vue +++ b/app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-base.vue @@ -369,7 +369,7 @@ export default class GuideBase extends Vue implements ControlInterface { * @type {Boolean} * @memberof GuideBase */ - public isShowStepBar: Boolean = false ; + public isShowStepBar: Boolean = true ; /** * 鑾峰彇澶氶」鏁版嵁 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 c4b655f4cd3db5f7cb18d4cabbad23a36974508a..4e63f81e6abc80bc3b6a5389f45c0da54c2a024e 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> @@ -202,18 +202,18 @@ export default class Usr2Base extends Vue implements ControlInterface { public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store }); /** - * dataviewexpbar_dataview_batchtoolbar 閮ㄤ欢 click 浜嬩欢 + * dataview_batchtoolbar 閮ㄤ欢 click 浜嬩欢 * * @param {*} [args={}] * @param {*} $event * @memberof Usr2Base */ - public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) { + public dataview_batchtoolbar_click($event: any, $event2?: any) { if (Object.is($event.tag, 'deuiaction1')) { - this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2); + this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2); } if (Object.is($event.tag, 'deuiaction2')) { - this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2); + this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2); } } @@ -226,7 +226,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) { + public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) { // 鍙傛暟 // 鍙栨暟 let datas: any[] = []; @@ -254,7 +254,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) { + public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) { // 鍙傛暟 // 鍙栨暟 let datas: any[] = []; @@ -282,7 +282,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) { + public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) { // 鍙栨暟 let datas: any[] = []; let xData: any = null; @@ -309,7 +309,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] * @memberof */ - public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) { + public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) { // 鍙栨暟 let datas: any[] = []; let xData: any = null; @@ -337,7 +337,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] 浜嬩欢婧� * @param {*} [xData] 鎵ц琛屼负鎵€闇€褰撳墠閮ㄤ欢 * @param {*} [actionContext] 鎵ц琛屼负涓婁笅鏂� - * @memberof IBIZBOOKDataViewExpViewBase + * @memberof IBIZBOOKUsr2DataViewBase */ public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { if (args.length === 0) { @@ -363,7 +363,7 @@ export default class Usr2Base extends Vue implements ControlInterface { * @param {*} [$event] 浜嬩欢婧� * @param {*} [xData] 鎵ц琛屼负鎵€闇€褰撳墠閮ㄤ欢 * @param {*} [actionContext] 鎵ц琛屼负涓婁笅鏂� - * @memberof IBIZBOOKDataViewExpViewBase + * @memberof IBIZBOOKUsr2DataViewBase */ public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { const _this: any = this; @@ -427,12 +427,6 @@ export default class Usr2Base extends Vue implements ControlInterface { } let result: boolean = true; Object.assign(actionData, args); - if ('selectionchange'.indexOf(eventName) !== -1) { - result = await this.execute_dataviewexpbar_selectionchange_ctrl_logic(actionData) && result; - } - if ('load'.indexOf(eventName) !== -1) { - result = await this.execute_dataviewexpbar_load_ctrl_logic(actionData) && result; - } if (!result) { return false; } @@ -440,30 +434,6 @@ export default class Usr2Base extends Vue implements ControlInterface { return true; } - /** - * 閮ㄤ欢閫昏緫 -- dataviewexpbar_selectionchange - * - * @param {string} eventName 閮ㄤ欢浜嬩欢鍚嶇О - * @param {any[]} data 鏁版嵁 - * @param {*} event 婧愪簨浠跺璞� - * @memberof Usr2Base - */ - public async execute_dataviewexpbar_selectionchange_ctrl_logic(actionData: any): Promise<boolean> { - console.log('鏆傛湭鏀寔 CUSTOM 绫诲瀷'); - return true; - } - /** - * 閮ㄤ欢閫昏緫 -- dataviewexpbar_load - * - * @param {string} eventName 閮ㄤ欢浜嬩欢鍚嶇О - * @param {any[]} data 鏁版嵁 - * @param {*} event 婧愪簨浠跺璞� - * @memberof Usr2Base - */ - public async execute_dataviewexpbar_load_ctrl_logic(actionData: any): Promise<boolean> { - console.log('鏆傛湭鏀寔 CUSTOM 绫诲瀷'); - return true; - } @@ -708,9 +678,9 @@ export default class Usr2Base extends Vue implements ControlInterface { * 宸ュ叿鏍忔ā鍨� * * @type {*} - * @memberof IBIZBOOKDataViewExpView + * @memberof IBIZBOOKUsr2DataView */ - public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = { + public usr2dataviewdataview_batchtoolbarModels: any = { deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '缂栬緫', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } }, deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '鍒犻櫎', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } }, @@ -1035,7 +1005,7 @@ export default class Usr2Base extends Vue implements ControlInterface { */ public async load(opt: any = {}, isReset: boolean = false): Promise<any> { if(!this.fetchAction){ - this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) }); return; } const arg: any = {...opt}; @@ -1130,7 +1100,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[] = []; @@ -1247,7 +1217,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); @@ -1255,7 +1225,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){ @@ -1357,16 +1327,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 8dcd1c0a466778db8983cb4c0599f6b3e60802d0..ce23bf930e74bb0736505dc684d52fdba8f86d72 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 @@ -11,7 +11,7 @@ export default class Usr2Model { * 鑾峰彇鏁版嵁椤归泦鍚� * * @returns {any[]} - * @memberof Usr2Dataviewexpbar_dataviewMode + * @memberof Usr2DataViewMode */ public getDataItems(): any[] { return [ @@ -43,6 +43,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-detail/main-grid/main-grid-base.vue b/app_Web/src/widgets/ibizorder-detail/main-grid/main-grid-base.vue index e4847a80e227a2f7c6ee6ceebff6b72994e3ccfa..27f26d842866fcfe79a805a377bdb9ad774bf035 100644 --- a/app_Web/src/widgets/ibizorder-detail/main-grid/main-grid-base.vue +++ b/app_Web/src/widgets/ibizorder-detail/main-grid/main-grid-base.vue @@ -964,7 +964,7 @@ export default class MainBase extends Vue implements ControlInterface { if (!this.fetchAction) { this.$Notice.error({ title: this.$t("app.commonWords.wrong") as string, - desc: "IBIZOrderDetailSGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string), + desc: "IBIZOrderDetailGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string), }); return; } @@ -1093,7 +1093,7 @@ export default class MainBase extends Vue implements ControlInterface { if (!this.removeAction) { this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), - desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string) + desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string) }); return; } @@ -1207,7 +1207,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: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); return; } if(!arg){ @@ -2101,7 +2101,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: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) }); } else { Object.assign(item, { viewparams: this.viewparams }); const tempContext = Util.deepCopy(this.context); @@ -2110,7 +2110,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: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); + this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); } else { Object.assign(item, { viewparams: this.viewparams }); const tempContext = Util.deepCopy(this.context); @@ -2186,7 +2186,7 @@ export default class MainBase extends Vue implements ControlInterface { if(!this.loaddraftAction){ this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), - desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string) + desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); return; } diff --git a/app_Web/src/widgets/ibizorder/test-mdctrl-form/test-mdctrl-form-base.vue b/app_Web/src/widgets/ibizorder/test-mdctrl-form/test-mdctrl-form-base.vue index 9fa42d148c0abc0dd3b2a5a546cb1770584be94a..4cb5ae67f7361c01df3b0f5a6d967af50fe6aefe 100644 --- a/app_Web/src/widgets/ibizorder/test-mdctrl-form/test-mdctrl-form-base.vue +++ b/app_Web/src/widgets/ibizorder/test-mdctrl-form/test-mdctrl-form-base.vue @@ -74,6 +74,7 @@ :children="{ 'orderdetailname1': { type: 'FORMITEM', caption: '鏄庣粏鍚嶇О' }, 'quantity1': { type: 'FORMITEM', caption: '鏁伴噺' }, + 'orderdetailinfo': { type: 'MDCTRL', caption: '' }, }" mode='DEFAULT' :data="data['orderdetail2']" @@ -114,6 +115,66 @@ </app-form-item> +</div> + +<div v-show="detailsModel.orderdetailinfo.visible"> + <app-form-mdctrl-repeater + + :context="context" + :viewparams="viewparams" + :formState="formState" + name="orderdetailinfo" + :caption="$t('entities.ibizorder.testmdctrl_form.details.orderdetailinfo')" + :children="{ + 'formitem1': { type: 'FORMITEM', caption: '绫诲瀷' }, + 'formitem': { type: 'FORMITEM', caption: '淇℃伅' }, + }" + mode='STYLE2' + :data="data['orderdetailinfo']" + > +<template #formitem1='{ context, viewparams, data, onFormItemValueChange }'> + <div v-show="detailsModel.formitem1.visible"> + + <dropdown-list + v-model="data.formitem1" + :data="data" + :context="context" + :viewparams="viewparams" + :formState="formState" + :localContext ='{ }' + :localParam ='{ }' + :disabled="detailsModel.formitem1.disabled" + :clearable='true' + :filterable='true' + tag='OrderType' + codelistType='STATIC' + placeholder='璇烽€夋嫨...' style=""> + </dropdown-list> + + +</div> + +</template> +<template #formitem='{ context, viewparams, data, onFormItemValueChange }'> + <div v-show="detailsModel.formitem.visible"> + <input-box + v-model="data.formitem" + @enter="onEnter($event)" + + :disabled="detailsModel.formitem.disabled" + type='text' + @change="($event)=>{onFormItemValueChange({name:'formitem',value:$event})}" + @focus="($event)=>{formDetailFocus({name:'formitem',value:$event})}" + @blur="($event)=>{formDetailBlur({name:'formitem',value:$event})}" + style=""> +</input-box> + + +</div> + +</template> +</app-form-mdctrl-repeater> + </div> </template> @@ -642,6 +703,7 @@ export default class TestMDCtrlBase extends Vue implements ControlInterface { * @memberof TestMDCtrlBase */ public data: any = { + orderdetailinfo: null, orderdetail2: null, orderdetail3: null, srfupdatedate: null, @@ -828,11 +890,19 @@ export default class TestMDCtrlBase extends Vue implements ControlInterface { , grouppanel1: new FormGroupPanelModel({ caption: '澶氭暟鎹儴浠�-琛ㄦ牸', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizorder.testmdctrl_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: [] }) , + orderdetailinfo: new FormMdCtrlModel({ caption: '', detailType: 'MDCTRL', name: 'orderdetailinfo', visible: true, isShowCaption: true, form: this, isControlledContent: false }) +, + formitem1: new FormItemModel({ caption: '绫诲瀷', detailType: 'FORMITEM', name: 'formitem1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) +, + formitem: new FormItemModel({ caption: '淇℃伅', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) +, orderdetail2: new FormMdCtrlModel({ caption: '璁㈠崟鏄庣粏', detailType: 'MDCTRL', name: 'orderdetail2', visible: true, isShowCaption: true, form: this, isControlledContent: false }) , orderdetailname1: new FormItemModel({ caption: '鏄庣粏鍚嶇О', detailType: 'FORMITEM', name: 'orderdetailname1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) , quantity1: new FormItemModel({ caption: '鏁伴噺', detailType: 'FORMITEM', name: 'quantity1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) +, + orderdetailinfo: new FormMdCtrlModel({ caption: '', detailType: 'MDCTRL', name: 'orderdetailinfo', visible: true, isShowCaption: true, form: this, isControlledContent: false }) , grouppanel2: new FormGroupPanelModel({ caption: '澶氭暟鎹儴浠�-閲嶅鍣紙琛ㄥ崟锛�', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizorder.testmdctrl_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: [] }) , @@ -1110,6 +1180,7 @@ export default class TestMDCtrlBase extends Vue implements ControlInterface { + } /** diff --git a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json index 847416385f89a106ce88bbfe6bdf9df4d4e3cd86..43b5b462c745b9d4c2fee5c38ef19a51107a9cca 100644 --- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json +++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json @@ -35,18 +35,6 @@ "widthUnit" : "px", "enableExpand" : false, "enableSort" : false - }, { - "caption" : "鍥句功鍚嶇О", - "codeName" : "ibizbookname", - "columnType" : "DEFGRIDCOLUMN", - "dataItemName" : "ibizbookname", - "mOSFilePath" : "psdetreecols/ibizbookname", - "name" : "ibizbookname", - "rTMOSFilePath" : "psdetreecols/ibizbookname", - "width" : 200, - "widthUnit" : "px", - "enableExpand" : false, - "enableSort" : false }, { "caption" : "鍑虹増绀�", "codeName" : "press", @@ -59,6 +47,18 @@ "widthUnit" : "px", "enableExpand" : false, "enableSort" : false + }, { + "caption" : "鍥句功鍚嶇О", + "codeName" : "ibizbookname", + "columnType" : "DEFGRIDCOLUMN", + "dataItemName" : "ibizbookname", + "mOSFilePath" : "psdetreecols/ibizbookname", + "name" : "ibizbookname", + "rTMOSFilePath" : "psdetreecols/ibizbookname", + "width" : 200, + "widthUnit" : "px", + "enableExpand" : false, + "enableSort" : false }, { "caption" : "鍊熷嚭鏃ユ湡", "codeName" : "lendouttime", diff --git a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json index d9b29a21d2d8b1b48e984615c8571303526f5b15..e0d94cf815136818a9d2c35e7e80e558ed87fa6a 100644 --- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json +++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json @@ -20,18 +20,6 @@ } } ], "getPSDETreeColumns" : [ { - "caption" : "浣滆€�", - "codeName" : "author", - "columnType" : "DEFGRIDCOLUMN", - "dataItemName" : "author", - "mOSFilePath" : "psdetreecols/author", - "name" : "author", - "rTMOSFilePath" : "psdetreecols/author", - "width" : 50, - "widthUnit" : "px", - "enableExpand" : false, - "enableSort" : false - }, { "caption" : "鍥句功鎻忚堪", "codeName" : "subtext", "columnType" : "DEFGRIDCOLUMN", @@ -43,6 +31,18 @@ "widthUnit" : "px", "enableExpand" : false, "enableSort" : false + }, { + "caption" : "浣滆€�", + "codeName" : "author", + "columnType" : "DEFGRIDCOLUMN", + "dataItemName" : "author", + "mOSFilePath" : "psdetreecols/author", + "name" : "author", + "rTMOSFilePath" : "psdetreecols/author", + "width" : 50, + "widthUnit" : "px", + "enableExpand" : false, + "enableSort" : false }, { "caption" : "鍥句功鍚嶇О", "codeName" : "ibizbookname", diff --git a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSFORMS/TestMDCtrl.json b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSFORMS/TestMDCtrl.json index e37cb97c315110a5e6678471b8d489487307abe9..bd92fdccfc4f9e123675b6637ea20c83e0a9625e 100644 --- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSFORMS/TestMDCtrl.json +++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSFORMS/TestMDCtrl.json @@ -712,6 +712,75 @@ "allowEmpty" : true, "repeatContent" : true, "showCaption" : true + }, { + "codeName" : "orderdetailinfo", + "columnAlign" : "RIGHT", + "contentType" : "REPEATER", + "detailStyle" : "STYLE2", + "detailType" : "MDCTRL", + "mOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo", + "name" : "orderdetailinfo", + "getPSDEFormDetails" : [ { + "caption" : "绫诲瀷", + "codeName" : "formitem1", + "dataType" : 25, + "detailStyle" : "DEFAULT", + "detailType" : "FORMITEM", + "enableCond" : 3, + "ignoreInput" : 0, + "labelPos" : "LEFT", + "labelWidth" : 130, + "mOSFilePath" : "psdeformdetail_formitems/formitem1", + "name" : "formitem1", + "noPrivDisplayMode" : 1, + "getPSEditor" : { + "editorType" : "DROPDOWNLIST", + "name" : "formitem1", + "getPSAppCodeList" : { + "modelref" : true, + "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/OrderType.json" + }, + "singleSelect" : true + }, + "rTMOSFilePath" : "psdeformdetail_formitems/formitem1", + "allowEmpty" : true, + "needCodeListConfig" : true, + "repeatContent" : true, + "showCaption" : true + }, { + "caption" : "淇℃伅", + "codeName" : "formitem", + "dataType" : 25, + "detailStyle" : "DEFAULT", + "detailType" : "FORMITEM", + "enableCond" : 3, + "ignoreInput" : 0, + "labelPos" : "LEFT", + "labelWidth" : 130, + "mOSFilePath" : "psdeformdetail_formitems/formitem", + "name" : "formitem", + "noPrivDisplayMode" : 1, + "getPSEditor" : { + "editorType" : "TEXTBOX", + "name" : "formitem" + }, + "rTMOSFilePath" : "psdeformdetail_formitems/formitem", + "allowEmpty" : true, + "repeatContent" : true, + "showCaption" : true + } ], + "getPSLayout" : { + "childColLG" : -1, + "childColMD" : 24, + "childColSM" : -1, + "childColXS" : -1, + "columnCount" : 24, + "layout" : "TABLE_24COL" + }, + "rTMOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo", + "infoGroupMode" : false, + "repeatContent" : true, + "showCaption" : true } ], "getPSLayout" : { "childColLG" : -1, diff --git a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json index df1c2f44af2fb84eb5a32338e1b40c25673f4491..4e49ec6f05b8f19a2bb4e6fafeb8c24e44e245ed 100644 --- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json +++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json @@ -69,18 +69,6 @@ "widthUnit" : "px", "enableExpand" : false, "enableSort" : false - }, { - "caption" : "鍥句功鍚嶇О", - "codeName" : "ibizbookname", - "columnType" : "DEFGRIDCOLUMN", - "dataItemName" : "ibizbookname", - "mOSFilePath" : "psdetreecols/ibizbookname", - "name" : "ibizbookname", - "rTMOSFilePath" : "psdetreecols/ibizbookname", - "width" : 200, - "widthUnit" : "px", - "enableExpand" : false, - "enableSort" : false }, { "caption" : "鍑虹増绀�", "codeName" : "press", @@ -93,6 +81,18 @@ "widthUnit" : "px", "enableExpand" : false, "enableSort" : false + }, { + "caption" : "鍥句功鍚嶇О", + "codeName" : "ibizbookname", + "columnType" : "DEFGRIDCOLUMN", + "dataItemName" : "ibizbookname", + "mOSFilePath" : "psdetreecols/ibizbookname", + "name" : "ibizbookname", + "rTMOSFilePath" : "psdetreecols/ibizbookname", + "width" : 200, + "widthUnit" : "px", + "enableExpand" : false, + "enableSort" : false }, { "caption" : "鍊熷嚭鏃ユ湡", "codeName" : "lendouttime", diff --git a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json index a8c601471ac986316898bb148770768df178ff96..89842c35131058cad7241ca27d51eee8fcd9d8c4 100644 --- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json +++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json @@ -100,18 +100,6 @@ "id" : "TREEGRIDEX" }, "getPSDETreeColumns" : [ { - "caption" : "浣滆€�", - "codeName" : "author", - "columnType" : "DEFGRIDCOLUMN", - "dataItemName" : "author", - "mOSFilePath" : "psdetreecols/author", - "name" : "author", - "rTMOSFilePath" : "psdetreecols/author", - "width" : 50, - "widthUnit" : "px", - "enableExpand" : false, - "enableSort" : false - }, { "caption" : "鍥句功鎻忚堪", "codeName" : "subtext", "columnType" : "DEFGRIDCOLUMN", @@ -123,6 +111,18 @@ "widthUnit" : "px", "enableExpand" : false, "enableSort" : false + }, { + "caption" : "浣滆€�", + "codeName" : "author", + "columnType" : "DEFGRIDCOLUMN", + "dataItemName" : "author", + "mOSFilePath" : "psdetreecols/author", + "name" : "author", + "rTMOSFilePath" : "psdetreecols/author", + "width" : 50, + "widthUnit" : "px", + "enableExpand" : false, + "enableSort" : false }, { "caption" : "鍥句功鍚嶇О", "codeName" : "ibizbookname", diff --git a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderTestFormMDCtrlEditView.json b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderTestFormMDCtrlEditView.json index e2278543e90a160a9119e3f0312346f2c5368a47..48d91de9f31716ce519a0d0ab1302e0271f4b691 100644 --- a/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderTestFormMDCtrlEditView.json +++ b/demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderTestFormMDCtrlEditView.json @@ -1470,6 +1470,75 @@ "allowEmpty" : true, "repeatContent" : true, "showCaption" : true + }, { + "codeName" : "orderdetailinfo", + "columnAlign" : "RIGHT", + "contentType" : "REPEATER", + "detailStyle" : "STYLE2", + "detailType" : "MDCTRL", + "mOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo", + "name" : "orderdetailinfo", + "getPSDEFormDetails" : [ { + "caption" : "绫诲瀷", + "codeName" : "formitem1", + "dataType" : 25, + "detailStyle" : "DEFAULT", + "detailType" : "FORMITEM", + "enableCond" : 3, + "ignoreInput" : 0, + "labelPos" : "LEFT", + "labelWidth" : 130, + "mOSFilePath" : "psdeformdetail_formitems/formitem1", + "name" : "formitem1", + "noPrivDisplayMode" : 1, + "getPSEditor" : { + "editorType" : "DROPDOWNLIST", + "name" : "formitem1", + "getPSAppCodeList" : { + "modelref" : true, + "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/OrderType.json" + }, + "singleSelect" : true + }, + "rTMOSFilePath" : "psdeformdetail_formitems/formitem1", + "allowEmpty" : true, + "needCodeListConfig" : true, + "repeatContent" : true, + "showCaption" : true + }, { + "caption" : "淇℃伅", + "codeName" : "formitem", + "dataType" : 25, + "detailStyle" : "DEFAULT", + "detailType" : "FORMITEM", + "enableCond" : 3, + "ignoreInput" : 0, + "labelPos" : "LEFT", + "labelWidth" : 130, + "mOSFilePath" : "psdeformdetail_formitems/formitem", + "name" : "formitem", + "noPrivDisplayMode" : 1, + "getPSEditor" : { + "editorType" : "TEXTBOX", + "name" : "formitem" + }, + "rTMOSFilePath" : "psdeformdetail_formitems/formitem", + "allowEmpty" : true, + "repeatContent" : true, + "showCaption" : true + } ], + "getPSLayout" : { + "childColLG" : -1, + "childColMD" : 24, + "childColSM" : -1, + "childColXS" : -1, + "columnCount" : 24, + "layout" : "TABLE_24COL" + }, + "rTMOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo", + "infoGroupMode" : false, + "repeatContent" : true, + "showCaption" : true } ], "getPSLayout" : { "childColLG" : -1, diff --git a/demo-core/src/main/resources/liquibase/h2_table.xml b/demo-core/src/main/resources/liquibase/h2_table.xml index c13967bdb0f6b1f591d986eeecff99bea6d2a722..95b71c3f870bb92062549a5366e6ca6357509781 100644 --- a/demo-core/src/main/resources/liquibase/h2_table.xml +++ b/demo-core/src/main/resources/liquibase/h2_table.xml @@ -343,7 +343,7 @@ <!--杈撳嚭瀹炰綋[IBIZORDER]鏁版嵁缁撴瀯 --> - <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-1013-13"> + <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-1017-13"> <createTable tableName="T_IBIZORDER"> <column name="TP" remarks="" type="TEXT(1048576)"> </column> diff --git a/demo-core/src/main/resources/liquibase/view.xml b/demo-core/src/main/resources/liquibase/view.xml index 33f77f9fc5f512cc7bb3242dc70aa7fa0619149e..36b2eb5750a8f9b666075342afdbc576b32137bc 100644 --- a/demo-core/src/main/resources/liquibase/view.xml +++ b/demo-core/src/main/resources/liquibase/view.xml @@ -31,7 +31,7 @@ </createView> </changeSet> <!--杈撳嚭瀹炰綋[IBIZORDER]瑙嗗浘缁撴瀯淇℃伅 runOnChange="true" 褰撹鍥惧彂鐢熷彉鏇存椂锛岄€氳繃liquibase寮哄埛prod鐨勮鍥撅紝瀹炵幇瑙嗗浘鐨勫悓姝�--> - <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-1013-7" runOnChange="true"> + <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-1017-7" runOnChange="true"> <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER"> <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1 LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID ]]> </createView>