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

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_BO_CN_base.ts

@@ -915,6 +915,7 @@ function getLocaleResourceBase(){
 				press: commonLogic.appcommonhandle("图书出版社",null),
 				price: commonLogic.appcommonhandle("图书价格",null),
 				uagridcolumn1: commonLogic.appcommonhandle("操作",null),
+				borrower2: commonLogic.appcommonhandle("借阅人2",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US_base.ts

@@ -915,6 +915,7 @@ function getLocaleResourceBase(){
 				press: commonLogic.appcommonhandle("图书出版社",null),
 				price: commonLogic.appcommonhandle("图书价格",null),
 				uagridcolumn1: commonLogic.appcommonhandle("操作",null),
+				borrower2: commonLogic.appcommonhandle("借阅人2",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN_base.ts

@@ -915,6 +915,7 @@ function getLocaleResourceBase(){
 				press: commonLogic.appcommonhandle("图书出版社",null),
 				price: commonLogic.appcommonhandle("图书价格",null),
 				uagridcolumn1: commonLogic.appcommonhandle("操作",null),
+				borrower2: commonLogic.appcommonhandle("借阅人2",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

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

@@ -1422,7 +1422,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_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 };
@@ -1469,7 +1469,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_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 } ;
@@ -1539,7 +1539,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1649,7 +1649,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1741,7 +1741,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

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

@@ -1541,7 +1541,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 };
@@ -1588,7 +1588,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 } ;
@@ -1658,7 +1658,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});
@@ -1768,7 +1768,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 });
@@ -1860,7 +1860,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/internal-func-grid/internal-func-grid-base.vue

@@ -137,6 +137,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('borrower2')">
+                <el-table-column show-overflow-tooltip :prop="'borrower2'" :label="$t('entities.ibizbook.internalfunc_grid.columns.borrower2')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ibizbook.internalfunc_grid.columns.borrower2')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.borrower2}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -914,6 +926,15 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'borrower2',
+            label: '借阅人2',
+            langtag: 'entities.ibizbook.internalfunc_grid.columns.borrower2',
+            show: false,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
     ]
 
     /**
@@ -1684,7 +1705,7 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
     * @memberof InternalFuncBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ibizbookname','author','type','press','price','uagridcolumn1'];
+        let allColumns:Array<any> = ['ibizbookname','author','type','press','price','uagridcolumn1','borrower2'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1775,6 +1796,7 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
                 Remove:{
                     visabled: false
                 },
+                borrower2:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1812,6 +1834,7 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             Remove:{
                 visabled: false
             },
+            borrower2:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1869,6 +1892,7 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
                 Remove:{
                     visabled: false
                 },
+                borrower2:'',
                 children: children,
             }
             groupTree.push(tree);

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-model.ts

@@ -52,6 +52,16 @@ export default class InternalFuncModel {
           prop: 'price',
           dataType: 'FLOAT',
         },
+        {
+          name: 'borrower2',
+          prop: 'borrower2',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'borrower',
+          prop: 'borrower',
+          dataType: 'TEXT',
+        },
         {
           name: 'ibizbookid',
           prop: 'ibizbookid',

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

 <template>
-    <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
+    <i-form :model="this.data" class='app-search-form' ref='quicksearchform' style="">
   <input style="display:none;"/>
   <row>
     <i-col span="20" class="form-content">
@@ -519,7 +519,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      * @memberof QUICKSEARCHFORMBase
      */
     public formValidateStatus(): boolean {
-        const form: any = this.$refs.searchform;
+        const form: any = this.$refs.quicksearchform;
         let validatestate: boolean = true;
         form.validate((valid: boolean) => {
             validatestate = valid ? true : false;
@@ -673,7 +673,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: 'IBIZBOOKUsrGridView_ctrlPlugin' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -709,7 +709,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: 'IBIZBOOKUsrGridView_ctrlPlugin' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZBOOK.json

@@ -565,6 +565,41 @@
         "name" : "PRICE",
         "codeName" : "Price"
       }
+    }, {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "借阅人",
+        "lanResTag" : "DEF.LNAME.BORROWER",
+        "lanResType" : "DEF.LNAME",
+        "mOSFilePath" : "pslanguageres/Auto1872",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER]",
+        "rTMOSFilePath" : "pslanguageres/Auto1872",
+        "refFlag" : true
+      },
+      "caption" : "借阅人",
+      "format" : "%1$s",
+      "name" : "borrower",
+      "getPSDEField" : {
+        "name" : "BORROWER",
+        "codeName" : "Borrower"
+      },
+      "hidden" : true
+    }, {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "借阅人2",
+        "lanResTag" : "DEF.LNAME.BORROWER2",
+        "lanResType" : "DEF.LNAME",
+        "mOSFilePath" : "pslanguageres/Auto1805",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER2]",
+        "rTMOSFilePath" : "pslanguageres/Auto1805",
+        "refFlag" : true
+      },
+      "caption" : "借阅人2",
+      "format" : "%1$s",
+      "name" : "borrower2",
+      "getPSDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      }
     } ],
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZBOOK/psdedataexps/DataExport",
     "enableBackend" : true,

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0023.json

@@ -1711,6 +1711,10 @@
       "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0023Ext.json"
     },
     "name" : "DERCUSTOM_IBIZSAMPLE0023EXT_IBIZSAMPLE0023",
+    "getOne2XDataPSDEField" : {
+      "name" : "FIELDEXT",
+      "codeName" : "FieldExt"
+    },
     "orderValue" : 100,
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0023EXT/minorpsders/DERCUSTOM_IBIZSAMPLE0023EXT_IBIZSAMPLE0023",
     "removeActionType" : 0,
@@ -1731,6 +1735,10 @@
       "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0024.json"
     },
     "name" : "DERCUSTOM_IBIZSAMPLE0024_IBIZSAMPLE0023",
+    "getOne2XDataPSDEField" : {
+      "name" : "FIELD24",
+      "codeName" : "Field24"
+    },
     "orderValue" : 100,
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0024/minorpsders/DERCUSTOM_IBIZSAMPLE0024_IBIZSAMPLE0023",
     "removeActionType" : 0,

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0023Ext.json

@@ -784,6 +784,10 @@
       "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0023Ext.json"
     },
     "name" : "DERCUSTOM_IBIZSAMPLE0023EXT_IBIZSAMPLE0023",
+    "getOne2XDataPSDEField" : {
+      "name" : "FIELDEXT",
+      "codeName" : "FieldExt"
+    },
     "orderValue" : 100,
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0023EXT/minorpsders/DERCUSTOM_IBIZSAMPLE0023EXT_IBIZSAMPLE0023",
     "removeActionType" : 0,

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0023Ext/PSDERS/DERCUSTOM_IBIZSAMPLE0023EXT_IBIZSAMPLE0023.json

@@ -14,6 +14,10 @@
     "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0023Ext.json"
   },
   "name" : "DERCUSTOM_IBIZSAMPLE0023EXT_IBIZSAMPLE0023",
+  "getOne2XDataPSDEField" : {
+    "name" : "FIELDEXT",
+    "codeName" : "FieldExt"
+  },
   "orderValue" : 100,
   "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0023EXT/minorpsders/DERCUSTOM_IBIZSAMPLE0023EXT_IBIZSAMPLE0023",
   "removeActionType" : 0,

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0024.json

@@ -699,6 +699,10 @@
       "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0025.json"
     },
     "name" : "DERCUSTOM_IBIZSAMPLE0025_IBIZSAMPLE0024",
+    "getOne2XDataPSDEField" : {
+      "name" : "FEILD25",
+      "codeName" : "Feild25"
+    },
     "orderValue" : 100,
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0025/minorpsders/DERCUSTOM_IBIZSAMPLE0025_IBIZSAMPLE0024",
     "removeActionType" : 0,
@@ -721,6 +725,10 @@
       "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0024.json"
     },
     "name" : "DERCUSTOM_IBIZSAMPLE0024_IBIZSAMPLE0023",
+    "getOne2XDataPSDEField" : {
+      "name" : "FIELD24",
+      "codeName" : "Field24"
+    },
     "orderValue" : 100,
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0024/minorpsders/DERCUSTOM_IBIZSAMPLE0024_IBIZSAMPLE0023",
     "removeActionType" : 0,

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0024/PSDERS/DERCUSTOM_IBIZSAMPLE0024_IBIZSAMPLE0023.json

@@ -14,6 +14,10 @@
     "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0024.json"
   },
   "name" : "DERCUSTOM_IBIZSAMPLE0024_IBIZSAMPLE0023",
+  "getOne2XDataPSDEField" : {
+    "name" : "FIELD24",
+    "codeName" : "Field24"
+  },
   "orderValue" : 100,
   "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0024/minorpsders/DERCUSTOM_IBIZSAMPLE0024_IBIZSAMPLE0023",
   "removeActionType" : 0,

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0025.json

@@ -690,6 +690,10 @@
       "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0025.json"
     },
     "name" : "DERCUSTOM_IBIZSAMPLE0025_IBIZSAMPLE0024",
+    "getOne2XDataPSDEField" : {
+      "name" : "FEILD25",
+      "codeName" : "Feild25"
+    },
     "orderValue" : 100,
     "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0025/minorpsders/DERCUSTOM_IBIZSAMPLE0025_IBIZSAMPLE0024",
     "removeActionType" : 0,

demo-boot/src/main/resources/static/remotemodel/PSMODULES/Sample/PSDATAENTITIES/IBIZSample0025/PSDERS/DERCUSTOM_IBIZSAMPLE0025_IBIZSAMPLE0024.json

@@ -14,6 +14,10 @@
     "path" : "PSMODULES/Sample/PSDATAENTITIES/IBIZSample0025.json"
   },
   "name" : "DERCUSTOM_IBIZSAMPLE0025_IBIZSAMPLE0024",
+  "getOne2XDataPSDEField" : {
+    "name" : "FEILD25",
+    "codeName" : "Feild25"
+  },
   "orderValue" : 100,
   "rTMOSFilePath" : "psmodules/Sample/psdataentities/IBIZSAMPLE0025/minorpsders/DERCUSTOM_IBIZSAMPLE0025_IBIZSAMPLE0024",
   "removeActionType" : 0,

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

@@ -626,6 +626,49 @@
         "name" : "PRICE",
         "codeName" : "Price"
       }
+    }, {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "借阅人",
+        "lanResTag" : "DEF.LNAME.BORROWER",
+        "lanResType" : "DEF.LNAME",
+        "mOSFilePath" : "pslanguageres/Auto1872",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER]",
+        "rTMOSFilePath" : "pslanguageres/Auto1872",
+        "refFlag" : true
+      },
+      "caption" : "借阅人",
+      "format" : "%1$s",
+      "name" : "borrower",
+      "getPSAppDEField" : {
+        "name" : "BORROWER",
+        "codeName" : "Borrower"
+      },
+      "getPSDEField" : {
+        "name" : "BORROWER",
+        "codeName" : "Borrower"
+      },
+      "hidden" : true
+    }, {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "借阅人2",
+        "lanResTag" : "DEF.LNAME.BORROWER2",
+        "lanResType" : "DEF.LNAME",
+        "mOSFilePath" : "pslanguageres/Auto1805",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER2]",
+        "rTMOSFilePath" : "pslanguageres/Auto1805",
+        "refFlag" : true
+      },
+      "caption" : "借阅人2",
+      "format" : "%1$s",
+      "name" : "borrower2",
+      "getPSAppDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      },
+      "getPSDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      }
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappdataentities/IBIZBOOK/psappdedataexps/DataExport",
     "enableBackend" : true,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -12,6 +12,18 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
+    "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" : "returntime",
     "columnType" : "DEFGRIDCOLUMN",
@@ -59,18 +71,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
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGRIDS/InternalFunc.json

@@ -322,6 +322,35 @@
     "width" : 200,
     "widthUnit" : "PX",
     "enableSort" : false
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "getCapPSLanguageRes" : {
+      "defaultContent" : "借阅人2",
+      "lanResTag" : "DEF.LNAME.BORROWER2",
+      "lanResType" : "DEF.LNAME",
+      "mOSFilePath" : "pslanguageres/Auto1805",
+      "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER2]",
+      "rTMOSFilePath" : "pslanguageres/Auto1805",
+      "refFlag" : true
+    },
+    "caption" : "借阅人2",
+    "codeName" : "borrower2",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "borrower2",
+    "excelCaption" : "借阅人2",
+    "mOSFilePath" : "psdegridcols/borrower2",
+    "name" : "borrower2",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BORROWER2",
+      "codeName" : "Borrower2"
+    },
+    "rTMOSFilePath" : "psdegridcols/borrower2",
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true,
+    "hideDefault" : true
   } ],
   "getPSDEGridDataItems" : [ {
     "dataType" : 25,
@@ -358,6 +387,20 @@
       "name" : "PRICE",
       "codeName" : "Price"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "borrower2",
+    "getPSAppDEField" : {
+      "name" : "BORROWER2",
+      "codeName" : "Borrower2"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "borrower",
+    "getPSAppDEField" : {
+      "name" : "BORROWER",
+      "codeName" : "Borrower"
+    }
   }, {
     "dataType" : 25,
     "name" : "ibizbookid",

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",
@@ -55,6 +43,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
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -46,6 +46,18 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
+      "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" : "returntime",
       "columnType" : "DEFGRIDCOLUMN",
@@ -93,18 +105,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
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -943,6 +943,35 @@
       "width" : 200,
       "widthUnit" : "PX",
       "enableSort" : false
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "借阅人2",
+        "lanResTag" : "DEF.LNAME.BORROWER2",
+        "lanResType" : "DEF.LNAME",
+        "mOSFilePath" : "pslanguageres/Auto1805",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER2]",
+        "rTMOSFilePath" : "pslanguageres/Auto1805",
+        "refFlag" : true
+      },
+      "caption" : "借阅人2",
+      "codeName" : "borrower2",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "borrower2",
+      "excelCaption" : "借阅人2",
+      "mOSFilePath" : "psdegridcols/borrower2",
+      "name" : "borrower2",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      },
+      "rTMOSFilePath" : "psdegridcols/borrower2",
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true,
+      "hideDefault" : true
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
@@ -979,6 +1008,20 @@
         "name" : "PRICE",
         "codeName" : "Price"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "borrower2",
+      "getPSAppDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "borrower",
+      "getPSAppDEField" : {
+        "name" : "BORROWER",
+        "codeName" : "Borrower"
+      }
     }, {
       "dataType" : 25,
       "name" : "ibizbookid",

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",
@@ -135,6 +123,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
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -797,6 +797,35 @@
       "width" : 200,
       "widthUnit" : "PX",
       "enableSort" : false
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "借阅人2",
+        "lanResTag" : "DEF.LNAME.BORROWER2",
+        "lanResType" : "DEF.LNAME",
+        "mOSFilePath" : "pslanguageres/Auto1805",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER2]",
+        "rTMOSFilePath" : "pslanguageres/Auto1805",
+        "refFlag" : true
+      },
+      "caption" : "借阅人2",
+      "codeName" : "borrower2",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "borrower2",
+      "excelCaption" : "借阅人2",
+      "mOSFilePath" : "psdegridcols/borrower2",
+      "name" : "borrower2",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      },
+      "rTMOSFilePath" : "psdegridcols/borrower2",
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true,
+      "hideDefault" : true
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
@@ -833,6 +862,20 @@
         "name" : "PRICE",
         "codeName" : "Price"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "borrower2",
+      "getPSAppDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "borrower",
+      "getPSAppDEField" : {
+        "name" : "BORROWER",
+        "codeName" : "Borrower"
+      }
     }, {
       "dataType" : 25,
       "name" : "ibizbookid",

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

@@ -797,6 +797,35 @@
       "width" : 200,
       "widthUnit" : "PX",
       "enableSort" : false
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "借阅人2",
+        "lanResTag" : "DEF.LNAME.BORROWER2",
+        "lanResType" : "DEF.LNAME",
+        "mOSFilePath" : "pslanguageres/Auto1805",
+        "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER2]",
+        "rTMOSFilePath" : "pslanguageres/Auto1805",
+        "refFlag" : true
+      },
+      "caption" : "借阅人2",
+      "codeName" : "borrower2",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "borrower2",
+      "excelCaption" : "借阅人2",
+      "mOSFilePath" : "psdegridcols/borrower2",
+      "name" : "borrower2",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      },
+      "rTMOSFilePath" : "psdegridcols/borrower2",
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true,
+      "hideDefault" : true
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
@@ -833,6 +862,20 @@
         "name" : "PRICE",
         "codeName" : "Price"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "borrower2",
+      "getPSAppDEField" : {
+        "name" : "BORROWER2",
+        "codeName" : "Borrower2"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "borrower",
+      "getPSAppDEField" : {
+        "name" : "BORROWER",
+        "codeName" : "Borrower"
+      }
     }, {
       "dataType" : 25,
       "name" : "ibizbookid",

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

@@ -34383,6 +34383,49 @@
             "name" : "PRICE",
             "codeName" : "Price"
           }
+        }, {
+          "getCapPSLanguageRes" : {
+            "defaultContent" : "借阅人",
+            "lanResTag" : "DEF.LNAME.BORROWER",
+            "lanResType" : "DEF.LNAME",
+            "mOSFilePath" : "pslanguageres/Auto1872",
+            "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER]",
+            "rTMOSFilePath" : "pslanguageres/Auto1872",
+            "refFlag" : true
+          },
+          "caption" : "借阅人",
+          "format" : "%1$s",
+          "name" : "borrower",
+          "getPSAppDEField" : {
+            "name" : "BORROWER",
+            "codeName" : "Borrower"
+          },
+          "getPSDEField" : {
+            "name" : "BORROWER",
+            "codeName" : "Borrower"
+          },
+          "hidden" : true
+        }, {
+          "getCapPSLanguageRes" : {
+            "defaultContent" : "借阅人2",
+            "lanResTag" : "DEF.LNAME.BORROWER2",
+            "lanResType" : "DEF.LNAME",
+            "mOSFilePath" : "pslanguageres/Auto1805",
+            "name" : "属性逻辑名称（DEF.LNAME.*）[BORROWER2]",
+            "rTMOSFilePath" : "pslanguageres/Auto1805",
+            "refFlag" : true
+          },
+          "caption" : "借阅人2",
+          "format" : "%1$s",
+          "name" : "borrower2",
+          "getPSAppDEField" : {
+            "name" : "BORROWER2",
+            "codeName" : "Borrower2"
+          },
+          "getPSDEField" : {
+            "name" : "BORROWER2",
+            "codeName" : "Borrower2"
+          }
         } ],
         "rTMOSFilePath" : "pssysapps/Web/psappdataentities/IBIZBOOK/psappdedataexps/DataExport",
         "enableBackend" : true,

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

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-1-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-2-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>