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

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

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

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

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

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

@@ -2205,5 +2205,4 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
 
 <style lang='scss'>
 @import './guide-return-form-form.scss';
-</style>de-return-form-form.scss';
 </style>
\ No newline at end of file

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

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

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

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

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

@@ -933,7 +933,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderDetailSGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderDetailGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1073,7 +1073,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1187,7 +1187,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: '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){
@@ -2082,7 +2082,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: '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);
@@ -2091,7 +2091,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: '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);
@@ -2167,7 +2167,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/calendar-exp-view-layoutcalendarexpbar-calendarexpbar/calendar-exp-view-layoutcalendarexpbar-calendarexpbar-base.vue

@@ -382,6 +382,7 @@ export default class CalendarExpView_layoutcalendarexpbarBase extends Vue implem
      * @memberof CalendarExpView_layoutcalendarexpbarBase
      */
     public navViewName: any = {
+        book: "",
         item1: "ibizorder-detail-sgrid-view9"
     };
 
@@ -392,6 +393,10 @@ export default class CalendarExpView_layoutcalendarexpbarBase extends Vue implem
      * @memberof CalendarExpView_layoutcalendarexpbarBase
      */
     public navParam: any = {
+        book: {
+            navigateContext:null,
+            navigateParams:null
+        },
         item1: {
             navigateContext:null,
             navigateParams:null
@@ -405,6 +410,7 @@ export default class CalendarExpView_layoutcalendarexpbarBase extends Vue implem
      * @memberof CalendarExpView_layoutcalendarexpbarBase
      */
     public navFilter: any = {
+        book: "",
         item1: ""
     };
 
@@ -415,6 +421,7 @@ export default class CalendarExpView_layoutcalendarexpbarBase extends Vue implem
      * @memberof CalendarExpView_layoutcalendarexpbarBase
      */
     public navPSDer: any = {
+        book: "",
         item1: "n_ibizorderid_eq"
     };
 
@@ -549,6 +556,24 @@ export default class CalendarExpView_layoutcalendarexpbarBase extends Vue implem
             Object.assign(tempContext,JSON.parse(JSON.stringify(this.context)));
         }
         switch (arg.itemType) {
+            case "book":
+                Object.assign(tempContext,{ ibizbook : arg.ibizbook});
+                Object.assign(tempContext,{srfparentdename:'IBIZBOOK',srfparentkey:arg['ibizbook']});
+                if(this.navFilter && this.navFilter['book'] && !Object.is(this.navFilter['book'],"")){
+                    Object.assign(tempViewParam,{[this.navFilter['book']]:arg['ibizbook']});
+                }
+                if(this.navPSDer && this.navFilter['book'] && !Object.is(this.navPSDer['book'],"")){
+                    Object.assign(tempViewParam,{[this.navPSDer['book']]:arg['ibizbook']});
+                }
+                if(this.navParam && this.navParam['book'] && this.navParam['book'].navigateContext && Object.keys(this.navParam['book'].navigateContext).length >0){
+                    let _context:any = this.$util.computedNavData(arg,tempContext,tempViewParam,this.navParam['book'].navigateContext);
+                    Object.assign(tempContext,_context);
+                }
+                if(this.navParam && this.navParam['book'] && this.navParam['book'].navigateParams && Object.keys(this.navParam['book'].navigateParams).length >0){
+                    let _params:any = this.$util.computedNavData(arg,tempContext,tempViewParam,this.navParam['book'].navigateParams);
+                    Object.assign(tempViewParam,_params);
+                }
+                break;
             case "item1":
                 Object.assign(tempContext,{ ibizorder : arg.ibizorder});
                 Object.assign(tempContext,{srfparentdename:'IBIZOrder',srfparentkey:arg['ibizorder']});

app_Web/src/widgets/ibizorder/calendar-exp-viewcalendarexpbar-calendarexpbar/calendar-exp-viewcalendarexpbar-calendarexpbar-base.vue

@@ -382,6 +382,7 @@ export default class CalendarExpViewcalendarexpbarBase extends Vue implements Co
      * @memberof CalendarExpViewcalendarexpbarBase
      */
     public navViewName: any = {
+        book: "",
         item1: "ibizorder-detail-sgrid-view9"
     };
 
@@ -392,6 +393,10 @@ export default class CalendarExpViewcalendarexpbarBase extends Vue implements Co
      * @memberof CalendarExpViewcalendarexpbarBase
      */
     public navParam: any = {
+        book: {
+            navigateContext:null,
+            navigateParams:null
+        },
         item1: {
             navigateContext:null,
             navigateParams:null
@@ -405,6 +410,7 @@ export default class CalendarExpViewcalendarexpbarBase extends Vue implements Co
      * @memberof CalendarExpViewcalendarexpbarBase
      */
     public navFilter: any = {
+        book: "",
         item1: ""
     };
 
@@ -415,6 +421,7 @@ export default class CalendarExpViewcalendarexpbarBase extends Vue implements Co
      * @memberof CalendarExpViewcalendarexpbarBase
      */
     public navPSDer: any = {
+        book: "",
         item1: "n_ibizorderid_eq"
     };
 
@@ -549,6 +556,24 @@ export default class CalendarExpViewcalendarexpbarBase extends Vue implements Co
             Object.assign(tempContext,JSON.parse(JSON.stringify(this.context)));
         }
         switch (arg.itemType) {
+            case "book":
+                Object.assign(tempContext,{ ibizbook : arg.ibizbook});
+                Object.assign(tempContext,{srfparentdename:'IBIZBOOK',srfparentkey:arg['ibizbook']});
+                if(this.navFilter && this.navFilter['book'] && !Object.is(this.navFilter['book'],"")){
+                    Object.assign(tempViewParam,{[this.navFilter['book']]:arg['ibizbook']});
+                }
+                if(this.navPSDer && this.navFilter['book'] && !Object.is(this.navPSDer['book'],"")){
+                    Object.assign(tempViewParam,{[this.navPSDer['book']]:arg['ibizbook']});
+                }
+                if(this.navParam && this.navParam['book'] && this.navParam['book'].navigateContext && Object.keys(this.navParam['book'].navigateContext).length >0){
+                    let _context:any = this.$util.computedNavData(arg,tempContext,tempViewParam,this.navParam['book'].navigateContext);
+                    Object.assign(tempContext,_context);
+                }
+                if(this.navParam && this.navParam['book'] && this.navParam['book'].navigateParams && Object.keys(this.navParam['book'].navigateParams).length >0){
+                    let _params:any = this.$util.computedNavData(arg,tempContext,tempViewParam,this.navParam['book'].navigateParams);
+                    Object.assign(tempViewParam,_params);
+                }
+                break;
             case "item1":
                 Object.assign(tempContext,{ ibizorder : arg.ibizorder});
                 Object.assign(tempContext,{srfparentdename:'IBIZOrder',srfparentkey:arg['ibizorder']});

app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue

@@ -768,7 +768,7 @@ export default class CardNavigationBase 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: '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};
@@ -862,7 +862,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[] = [];
@@ -978,7 +978,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);
@@ -986,7 +986,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){

app_Web/src/widgets/ibizorder/order-calendar-navigation-calendar/order-calendar-navigation-calendar-base.vue

@@ -3,6 +3,10 @@
       <context-menu-container>
         <template>
         <div class="event-legends">
+          <div :class="{'event-lengend':true, 'book':true, 'event-disabled':!isShowlegend.book}" @click="legendTrigger('book')">
+            <div class="lengend-icon" style="background:rgba(248, 209, 37, 1);"></div>
+            <span style="color:rgba(170, 230, 145, 1);">图书</span>
+          </div>
           <div :class="{'event-lengend':true, 'item1':true, 'event-disabled':!isShowlegend.item1}" @click="legendTrigger('item1')">
             <div class="lengend-icon" style="background:rgba(188, 190, 197, 1);"></div>
             <span style="color:rgba(235, 219, 47, 1);">订单</span>
@@ -525,6 +529,7 @@ export default class OrderCalendarNavigationBase extends Vue implements ControlI
      * @memberof OrderCalendarNavigationBase
      */
     public isShowlegend: any = {
+        book:true,
         item1:true,
     };
 
@@ -727,6 +732,10 @@ export default class OrderCalendarNavigationBase extends Vue implements ControlI
             let _context: any = Object.assign({},this.context);
             let _viewparams:any = Object.assign({start:event.start,end:event.end},this.viewparams);
             switch(event.itemType) {
+                case "book":
+                    _context.ibizbook = event.ibizbook;
+                    view = this.getEditView("ibizbook");
+                    break;
                 case "item1":
                     _context.ibizorder = event.ibizorder;
                     view = this.getEditView("ibizorder");
@@ -795,6 +804,10 @@ export default class OrderCalendarNavigationBase extends Vue implements ControlI
         arg.end = this.$util.dateFormat($event.event.end);
         let itemType = $event.event._def.extendedProps.itemType;
         switch(itemType) {
+            case "book":
+                arg.ibizbook = $event.event._def.extendedProps.ibizbook;
+                _context.ibizbook = $event.event._def.extendedProps.ibizbook;
+                break;
             case "item1":
                 arg.ibizorder = $event.event._def.extendedProps.ibizorder;
                 _context.ibizorder = $event.event._def.extendedProps.ibizorder;
@@ -1001,7 +1014,7 @@ export default class OrderCalendarNavigationBase extends Vue implements ControlI
             if(Object.keys(this.copyActionModel).length === 0){
                 return;
             }
-            let dataMapping:any ={'item1':'ibizorder'};
+            let dataMapping:any ={'book':'ibizbook','item1':'ibizorder'};
             this.computeNodeState(data,dataMapping[data.itemType]).then((result:any) => {
                 let flag:boolean = false;
                 if(Object.values(result).length>0){

app_Web/src/widgets/ibizorder/order-calendar-navigation-calendar/order-calendar-navigation-calendar-model.ts

@@ -44,6 +44,26 @@ export default class OrderCalendarNavigationModel {
           },
       ];
       switch(this.itemType){
+          case "book":
+              dataItems = [...dataItems,
+                  {
+                    name: 'ibizbook',
+                    prop: 'ibizbookid'
+                  },
+                  {
+                    name: 'title',
+                    prop: 'ibizbookname'
+                  },
+                  {
+                    name:'start',
+                    prop:'lendouttime'
+                  },
+                  {
+                    name:'end',
+                    prop:'returntime'
+                  },
+              ];
+              break;
           case "item1":
               dataItems = [...dataItems,
                   {

app_Web/src/widgets/ibizorder/order-calendar-navigation-calendar/order-calendar-navigation-calendar-service.ts

@@ -3,6 +3,7 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import IBIZOrderService from '@/service/ibizorder/ibizorder-service';
 import OrderCalendarNavigationModel from './order-calendar-navigation-calendar-model';
+import IBIZBOOKService from '@/service/ibizbook/ibizbook-service';
 
 
 /**
@@ -42,6 +43,13 @@ export default class OrderCalendarNavigationService extends ControlService {
         this.model = new OrderCalendarNavigationModel();
     }
 
+    /**
+     * 图书服务对象
+     *
+     * @type {IBIZBOOKService}
+     * @memberof OrderCalendarNavigationService
+     */
+    public ibizbookService: IBIZBOOKService = new IBIZBOOKService();
 
     /**
      * 事件配置集合
@@ -51,6 +59,12 @@ export default class OrderCalendarNavigationService extends ControlService {
      * @memberof OrderCalendarNavigation
      */
     public eventsConfig: any[] = [
+        {
+          itemName : '图书',
+          itemType : 'book',
+          color : 'rgba(248, 209, 37, 1)',
+          textColor : 'rgba(170, 230, 145, 1)',
+        },
         {
           itemName : '订单',
           itemType : 'item1',
@@ -75,6 +89,8 @@ export default class OrderCalendarNavigationService extends ControlService {
         return new Promise((resolve: any, reject: any) => {
             let promises:any = [];
             let tempRequest:any;
+            tempRequest = this.handleRequestData(action,context,data,true,"book");
+            promises.push(this.ibizbookService.FetchDefault(tempRequest.context, tempRequest.data, isloading));
             tempRequest = this.handleRequestData(action,context,data,true,"item1");
             promises.push(this.appEntityService.FetchDefault(tempRequest.context, tempRequest.data, isloading));
             Promise.all(promises).then((resArray: any) => {
@@ -126,6 +142,10 @@ export default class OrderCalendarNavigationService extends ControlService {
             let result: any;
             let tempRequest:any;
             switch(itemType) {
+                case "book":
+                    tempRequest = this.handleRequestData("",context,data,false,"book");
+                    result = this.ibizbookService.Update(tempRequest.context, tempRequest.data, isloading);
+                    break;
                 case "item1":
                     tempRequest = this.handleRequestData("",context,data,false,"item1");
                     result = this.appEntityService.Update(tempRequest.context, tempRequest.data, isloading);

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSCALENDARS/OrderCalendarNavigation.json

@@ -5,7 +5,7 @@
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSCALENDARS/OrderCalendarNavigation.json",
   "groupMode" : "NONE",
   "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
-  "legendPos" : "NONE",
+  "legendPos" : "TOP",
   "logicName" : "订单日历导航",
   "mOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDER/pssyscalendars/OrderCalendarNavigation",
   "getPSAppDataEntity" : {
@@ -24,6 +24,39 @@
     "name" : "calendarexpbar_load"
   } ],
   "getPSSysCalendarItems" : [ {
+    "bKColor" : "rgba(248, 209, 37, 1)",
+    "getBeginTimePSAppDEField" : {
+      "name" : "LENDOUTTIME",
+      "codeName" : "Lendouttime"
+    },
+    "color" : "rgba(170, 230, 145, 1)",
+    "getEndTimePSAppDEField" : {
+      "name" : "RETURNTIME",
+      "codeName" : "Returntime"
+    },
+    "getIdPSAppDEField" : {
+      "name" : "IBIZBOOKID",
+      "codeName" : "IBIZBOOKId"
+    },
+    "itemStyle" : "DEFAULT",
+    "itemType" : "book",
+    "maxSize" : -1,
+    "name" : "图书",
+    "getPSAppDEDataSet" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+    },
+    "getTextPSAppDEField" : {
+      "name" : "IBIZBOOKNAME",
+      "codeName" : "IBIZBOOKName"
+    },
+    "enableQuickCreate" : false,
+    "id" : "book"
+  }, {
     "bKColor" : "rgba(188, 190, 197, 1)",
     "getBeginTimePSAppDEField" : {
       "name" : "STARTTIME",

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

@@ -196,7 +196,7 @@
       "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSCALENDARS/OrderCalendarNavigation.json",
       "groupMode" : "NONE",
       "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
-      "legendPos" : "NONE",
+      "legendPos" : "TOP",
       "logicName" : "订单日历导航",
       "mOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDER/pssyscalendars/OrderCalendarNavigation",
       "getPSAppDataEntity" : {
@@ -224,6 +224,39 @@
         "id" : "calendarexpbar_calendar"
       },
       "getPSSysCalendarItems" : [ {
+        "bKColor" : "rgba(248, 209, 37, 1)",
+        "getBeginTimePSAppDEField" : {
+          "name" : "LENDOUTTIME",
+          "codeName" : "Lendouttime"
+        },
+        "color" : "rgba(170, 230, 145, 1)",
+        "getEndTimePSAppDEField" : {
+          "name" : "RETURNTIME",
+          "codeName" : "Returntime"
+        },
+        "getIdPSAppDEField" : {
+          "name" : "IBIZBOOKID",
+          "codeName" : "IBIZBOOKId"
+        },
+        "itemStyle" : "DEFAULT",
+        "itemType" : "book",
+        "maxSize" : -1,
+        "name" : "图书",
+        "getPSAppDEDataSet" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+        },
+        "getTextPSAppDEField" : {
+          "name" : "IBIZBOOKNAME",
+          "codeName" : "IBIZBOOKName"
+        },
+        "enableQuickCreate" : false,
+        "id" : "book"
+      }, {
         "bKColor" : "rgba(188, 190, 197, 1)",
         "getBeginTimePSAppDEField" : {
           "name" : "STARTTIME",

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

@@ -196,7 +196,7 @@
       "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSCALENDARS/OrderCalendarNavigation.json",
       "groupMode" : "NONE",
       "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
-      "legendPos" : "NONE",
+      "legendPos" : "TOP",
       "logicName" : "订单日历导航",
       "mOSFilePath" : "psmodules/Sample/psdataentities/IBIZORDER/pssyscalendars/OrderCalendarNavigation",
       "getPSAppDataEntity" : {
@@ -224,6 +224,39 @@
         "id" : "calendarexpbar_calendar"
       },
       "getPSSysCalendarItems" : [ {
+        "bKColor" : "rgba(248, 209, 37, 1)",
+        "getBeginTimePSAppDEField" : {
+          "name" : "LENDOUTTIME",
+          "codeName" : "Lendouttime"
+        },
+        "color" : "rgba(170, 230, 145, 1)",
+        "getEndTimePSAppDEField" : {
+          "name" : "RETURNTIME",
+          "codeName" : "Returntime"
+        },
+        "getIdPSAppDEField" : {
+          "name" : "IBIZBOOKID",
+          "codeName" : "IBIZBOOKId"
+        },
+        "itemStyle" : "DEFAULT",
+        "itemType" : "book",
+        "maxSize" : -1,
+        "name" : "图书",
+        "getPSAppDEDataSet" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+        },
+        "getTextPSAppDEField" : {
+          "name" : "IBIZBOOKNAME",
+          "codeName" : "IBIZBOOKName"
+        },
+        "enableQuickCreate" : false,
+        "id" : "book"
+      }, {
         "bKColor" : "rgba(188, 190, 197, 1)",
         "getBeginTimePSAppDEField" : {
           "name" : "STARTTIME",