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

app_Web/src/components/app-breadcrumb/app-breadcrumb.scss

@@ -6,7 +6,8 @@
 .app-breadcrumb.el-breadcrumb {
   display: inline-block;
   font-size: 14px;
-  margin-bottom: 16px;
+  background-color: var(--ey-color-gray-250);
+  padding: 16px 5%;
   .no-redirect {
     color: var(--ey-color-black);
     font-weight: bold;

app_Web/src/layout/edit-view-layout/edit-view-layout.vue

 <template>
-    <layout :class="layoutClassName">
+    <layout :class="layoutClassName" ref="editViewLayout">
         <header class="view-header">
             <div class="view-header__top">
                 <slot name="headerTop" />
@@ -41,7 +41,7 @@ export default class AppEditViewLayout extends Vue {
      * @type {boolean}
      * @memberof AppEditViewLayout
      */
-    @Prop({ default: true }) public viewDefaultUsage?: boolean;
+    @Prop({ default: false }) public viewDefaultUsage?: boolean;
 
     /**
      * 布局类名
@@ -54,6 +54,21 @@ export default class AppEditViewLayout extends Vue {
         'view-default-usage': this.viewDefaultUsage ? true :false}
     }
 
+    mounted(){
+      if (this.viewDefaultUsage) {
+        const layout:any = this.$refs.editViewLayout;
+        if (layout && layout.$el ){
+          const header = layout.$el.querySelector('.view-header');
+          const content = layout.$el.querySelector('.view-content');
+          console.log(layout, header, content);
+          setTimeout(() => {
+            const height = header.offsetHeight;
+            content.style.marginTop = height + 'px';
+          }, 500);
+        }
+      }
+    }
+
 }
 </script>
 

app_Web/src/layout/index-view-layout-top/index-view-layout-top.scss

@@ -38,7 +38,7 @@
     .index-view-content {
         height: calc(100% - 64px);
         overflow: auto;
-        padding: 20px 80px 0 80px;
+        padding: 0 5%;
         background-color: var(--ey-color-gray-250);
         display: flex;
         flex-direction: column;
@@ -73,13 +73,14 @@
   .index-view-content{
     // 编辑视图默认使用
     .edit-view-layout.view-default-usage{
-      // 为什么写在这边，因为只有上布局会有copyright，这里算高度算上
-      height: calc(100% - 130px);
-      display: flex;
-      flex-direction: column;
-      .view-content{
-        flex: 1;
-        overflow-y: auto;
+      position: inherit;
+      .view-header{
+        position: absolute;
+        z-index: 100;
+        top: 106px;
+        width: calc(90% - 4px);
+        background-color: var(--ey-color-white);
+        border-radius: 6px 6px 0 0;
       }
     }
     // 表格视图默认使用

app_Web/src/layout/index-view-layout-top/index-view-layout-top.vue

@@ -11,8 +11,8 @@
                 <slot name="headerRight" />
             </div>
         </header>
+        <slot name="breadcrumb" />
         <content class="index-view-content">
-            <slot name="breadcrumb" />
             <slot name="navPos" />
             <div class="copyright-notice">
                 <div class="notice">Copyright 1999-2021 Ernst & Young. All Rights Reserved.</div>

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

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

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (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 };
@@ -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' + (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 } ;
@@ -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' + (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});
@@ -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' + (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 });
@@ -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' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

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

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

app_Web/src/widgets/ibizbook/main-multieditviewpanel/main-multieditviewpanel-base.vue

@@ -542,7 +542,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async load(data: any) {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2MEditView9_layout' + (this.$t('app.multiEditView.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKMEditView9' + (this.$t('app.multiEditView.notConfig.fetchAction') as string) });
             return;
         }
         let arg: any = {};
@@ -593,7 +593,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public handleAdd(){
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2MEditView9_layout' + (this.$t('app.multiEditView.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKMEditView9' + (this.$t('app.multiEditView.notConfig.loaddraftAction') as string) });
             return;
         }
         const promice: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:this.viewparams}, this.showBusyIndicator);

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

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

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

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

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

@@ -933,7 +933,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "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;
         }

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" : "lendouttime",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "lendouttime",
-    "mOSFilePath" : "psdetreecols/lendouttime",
-    "name" : "lendouttime",
-    "rTMOSFilePath" : "psdetreecols/lendouttime",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   }, {
     "caption" : "作者",
     "codeName" : "author",
@@ -59,6 +47,18 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "借出日期",
+    "codeName" : "lendouttime",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "lendouttime",
+    "mOSFilePath" : "psdetreecols/lendouttime",
+    "name" : "lendouttime",
+    "rTMOSFilePath" : "psdetreecols/lendouttime",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   }, {
     "caption" : "图书名称",
     "codeName" : "ibizbookname",

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

@@ -20,6 +20,18 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
+    "caption" : "图书描述",
+    "codeName" : "subtext",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "subtext",
+    "mOSFilePath" : "psdetreecols/subtext",
+    "name" : "subtext",
+    "rTMOSFilePath" : "psdetreecols/subtext",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
     "caption" : "作者",
     "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
@@ -43,18 +55,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "图书描述",
-    "codeName" : "subtext",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "subtext",
-    "mOSFilePath" : "psdetreecols/subtext",
-    "name" : "subtext",
-    "rTMOSFilePath" : "psdetreecols/subtext",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -65,18 +65,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "借出日期",
-      "codeName" : "lendouttime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "lendouttime",
-      "mOSFilePath" : "psdetreecols/lendouttime",
-      "name" : "lendouttime",
-      "rTMOSFilePath" : "psdetreecols/lendouttime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     }, {
       "caption" : "作者",
       "codeName" : "author",
@@ -89,6 +77,18 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "借出日期",
+      "codeName" : "lendouttime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "lendouttime",
+      "mOSFilePath" : "psdetreecols/lendouttime",
+      "name" : "lendouttime",
+      "rTMOSFilePath" : "psdetreecols/lendouttime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     }, {
       "caption" : "图书名称",
       "codeName" : "ibizbookname",

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

@@ -88,6 +88,18 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
+      "caption" : "图书描述",
+      "codeName" : "subtext",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "subtext",
+      "mOSFilePath" : "psdetreecols/subtext",
+      "name" : "subtext",
+      "rTMOSFilePath" : "psdetreecols/subtext",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
       "caption" : "作者",
       "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
@@ -111,18 +123,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "图书描述",
-      "codeName" : "subtext",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "subtext",
-      "mOSFilePath" : "psdetreecols/subtext",
-      "name" : "subtext",
-      "rTMOSFilePath" : "psdetreecols/subtext",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -314,6 +314,7 @@
         "id" : "item1"
       } ],
       "rTMOSFilePath" : "pssysapps/Web/psappdeviews/IBIZOrderCalendarExpView/psappviewctrls/calendarexpbar_calendar",
+      "enableEdit" : true,
       "enableGroup" : false,
       "name" : "calendarexpbar_calendar",
       "modelid" : "6999d77a8cd313ef3e7fc0038e128591",

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

@@ -344,7 +344,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-797-14">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-798-14">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>
@@ -1288,7 +1288,7 @@
 
 
     <!--输出实体[IBIZTASKTEAM]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibiztaskteam-1-44">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibiztaskteam-2-44">
         <createTable tableName="T_IBIZTASKTEAM">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -1511,7 +1511,7 @@
         <!--输出实体[IBIZSUPPLIER]外键关系 -->
         <!--输出实体[IBIZTASK]外键关系 -->
         <!--输出实体[IBIZTASKTEAM]外键关系 -->
-    <changeSet author="a_LAB01_df847bdfd" id="fk-ibiztaskteam-1-51">
+    <changeSet author="a_LAB01_df847bdfd" id="fk-ibiztaskteam-2-51">
        <addForeignKeyConstraint baseColumnNames="ROOT" baseTableName="T_IBIZTASKTEAM" constraintName="DER1N_IBIZTASKTEAM_IBIZTASK_RO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZTASKID" referencedTableName="T_IBIZTASK" validate="true"/>
     </changeSet>
         <!--输出实体[IBIZUNIPRODUCT]外键关系 -->

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

@@ -37,7 +37,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-797-8" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-798-8" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
                <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1  LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID  ]]>
          </createView>