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

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_BO_CN_base.ts

@@ -795,6 +795,7 @@ function getLocaleResourceBase(){
 			details: {
 				orderdetail1: commonLogic.appcommonhandle("表格",null), 
 				grouppanel1: commonLogic.appcommonhandle("多数据部件-表格",null), 
+				orderdetailinfo: commonLogic.appcommonhandle("",null), 
 				orderdetail2: commonLogic.appcommonhandle("订单明细",null), 
 				grouppanel2: commonLogic.appcommonhandle("多数据部件-重复器（表单）",null), 
 				orderdetail3: commonLogic.appcommonhandle("",null), 

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts

@@ -795,6 +795,7 @@ function getLocaleResourceBase(){
 			details: {
 				orderdetail1: commonLogic.appcommonhandle("表格",null), 
 				grouppanel1: commonLogic.appcommonhandle("多数据部件-表格",null), 
+				orderdetailinfo: commonLogic.appcommonhandle("",null), 
 				orderdetail2: commonLogic.appcommonhandle("订单明细",null), 
 				grouppanel2: commonLogic.appcommonhandle("多数据部件-重复器（表单）",null), 
 				orderdetail3: commonLogic.appcommonhandle("",null), 

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts

@@ -795,6 +795,7 @@ function getLocaleResourceBase(){
 			details: {
 				orderdetail1: commonLogic.appcommonhandle("表格",null), 
 				grouppanel1: commonLogic.appcommonhandle("多数据部件-表格",null), 
+				orderdetailinfo: commonLogic.appcommonhandle("",null), 
 				orderdetail2: commonLogic.appcommonhandle("订单明细",null), 
 				grouppanel2: commonLogic.appcommonhandle("多数据部件-重复器（表单）",null), 
 				orderdetail3: commonLogic.appcommonhandle("",null), 

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

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

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@ export default class Usr2Model {
 	 * 获取数据项集合
 	 *
 	 * @returns {any[]}
-	 * @memberof Usr2Dataviewexpbar_dataviewMode
+	 * @memberof Usr2DataViewMode
 	 */
 	public getDataItems(): any[] {
 		return [
@@ -43,6 +43,17 @@ export default class Usr2Model {
 				dataType: 'FONTKEY',
 			},
 
+      {
+        name: 'n_ibizbookname_like',
+        prop: 'n_ibizbookname_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_price_gtandeq',
+        prop: 'n_price_gtandeq',
+        dataType: 'QUERYPARAM'
+      },
+
 
       {
         name:'size',

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

@@ -964,7 +964,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderDetailSGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderDetailGridView9" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1093,7 +1093,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1207,7 +1207,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2101,7 +2101,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if (Object.is(item.rowDataState, 'create')) {
                     if (!this.createAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2110,7 +2110,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if (Object.is(item.rowDataState, 'update')){
                     if (!this.updateAction) {
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2186,7 +2186,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderDetailSGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderDetailGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/test-mdctrl-form/test-mdctrl-form-base.vue

@@ -74,6 +74,7 @@
     :children="{
         'orderdetailname1': { type: 'FORMITEM', caption: '明细名称' },
         'quantity1': { type: 'FORMITEM', caption: '数量' },
+        'orderdetailinfo': { type: 'MDCTRL', caption: '' },
     }"
     mode='DEFAULT'
     :data="data['orderdetail2']"
@@ -114,6 +115,66 @@
 
 </app-form-item>
 
+</div>
+
+<div v-show="detailsModel.orderdetailinfo.visible">
+    <app-form-mdctrl-repeater
+    
+    :context="context"
+    :viewparams="viewparams"
+    :formState="formState"
+    name="orderdetailinfo"
+    :caption="$t('entities.ibizorder.testmdctrl_form.details.orderdetailinfo')"
+    :children="{
+        'formitem1': { type: 'FORMITEM', caption: '类型' },
+        'formitem': { type: 'FORMITEM', caption: '信息' },
+    }"
+    mode='STYLE2'
+    :data="data['orderdetailinfo']"
+    >
+<template #formitem1='{ context, viewparams, data, onFormItemValueChange }'>
+    <div v-show="detailsModel.formitem1.visible">
+    
+ <dropdown-list 
+    v-model="data.formitem1" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :formState="formState" 
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :disabled="detailsModel.formitem1.disabled" 
+    :clearable='true'
+    :filterable='true'
+    tag='OrderType' 
+    codelistType='STATIC'
+    placeholder='请选择...' style="">
+ </dropdown-list>
+
+
+</div>
+
+</template>
+<template #formitem='{ context, viewparams, data, onFormItemValueChange }'>
+    <div v-show="detailsModel.formitem.visible">
+    <input-box 
+    v-model="data.formitem"  
+    @enter="onEnter($event)"  
+      
+    :disabled="detailsModel.formitem.disabled" 
+    type='text' 
+    @change="($event)=>{onFormItemValueChange({name:'formitem',value:$event})}" 
+    @focus="($event)=>{formDetailFocus({name:'formitem',value:$event})}"
+    @blur="($event)=>{formDetailBlur({name:'formitem',value:$event})}"
+    style="">
+</input-box>
+
+
+</div>
+
+</template>
+</app-form-mdctrl-repeater>
+
 </div>
 
     </template>
@@ -642,6 +703,7 @@ export default class TestMDCtrlBase extends Vue implements ControlInterface {
      * @memberof TestMDCtrlBase
      */
     public data: any = {
+        orderdetailinfo: null,
         orderdetail2: null,
         orderdetail3: null,
         srfupdatedate: null,
@@ -828,11 +890,19 @@ export default class TestMDCtrlBase extends Vue implements ControlInterface {
 ,
         grouppanel1: new FormGroupPanelModel({ caption: '多数据部件-表格', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizorder.testmdctrl_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 ,
+        orderdetailinfo: new FormMdCtrlModel({ caption: '', detailType: 'MDCTRL', name: 'orderdetailinfo', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
+,
+        formitem1: new FormItemModel({ caption: '类型', detailType: 'FORMITEM', name: 'formitem1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        formitem: new FormItemModel({ caption: '信息', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
         orderdetail2: new FormMdCtrlModel({ caption: '订单明细', detailType: 'MDCTRL', name: 'orderdetail2', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
 ,
         orderdetailname1: new FormItemModel({ caption: '明细名称', detailType: 'FORMITEM', name: 'orderdetailname1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         quantity1: new FormItemModel({ caption: '数量', detailType: 'FORMITEM', name: 'quantity1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        orderdetailinfo: new FormMdCtrlModel({ caption: '', detailType: 'MDCTRL', name: 'orderdetailinfo', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
 , 
         grouppanel2: new FormGroupPanelModel({ caption: '多数据部件-重复器（表单）', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.ibizorder.testmdctrl_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 ,
@@ -1110,6 +1180,7 @@ export default class TestMDCtrlBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

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

@@ -35,18 +35,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "mOSFilePath" : "psdetreecols/ibizbookname",
-    "name" : "ibizbookname",
-    "rTMOSFilePath" : "psdetreecols/ibizbookname",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   }, {
     "caption" : "出版社",
     "codeName" : "press",
@@ -59,6 +47,18 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "mOSFilePath" : "psdetreecols/ibizbookname",
+    "name" : "ibizbookname",
+    "rTMOSFilePath" : "psdetreecols/ibizbookname",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   }, {
     "caption" : "借出日期",
     "codeName" : "lendouttime",

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

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

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder/PSFORMS/TestMDCtrl.json

@@ -712,6 +712,75 @@
             "allowEmpty" : true,
             "repeatContent" : true,
             "showCaption" : true
+          }, {
+            "codeName" : "orderdetailinfo",
+            "columnAlign" : "RIGHT",
+            "contentType" : "REPEATER",
+            "detailStyle" : "STYLE2",
+            "detailType" : "MDCTRL",
+            "mOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo",
+            "name" : "orderdetailinfo",
+            "getPSDEFormDetails" : [ {
+              "caption" : "类型",
+              "codeName" : "formitem1",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/formitem1",
+              "name" : "formitem1",
+              "noPrivDisplayMode" : 1,
+              "getPSEditor" : {
+                "editorType" : "DROPDOWNLIST",
+                "name" : "formitem1",
+                "getPSAppCodeList" : {
+                  "modelref" : true,
+                  "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/OrderType.json"
+                },
+                "singleSelect" : true
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/formitem1",
+              "allowEmpty" : true,
+              "needCodeListConfig" : true,
+              "repeatContent" : true,
+              "showCaption" : true
+            }, {
+              "caption" : "信息",
+              "codeName" : "formitem",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "mOSFilePath" : "psdeformdetail_formitems/formitem",
+              "name" : "formitem",
+              "noPrivDisplayMode" : 1,
+              "getPSEditor" : {
+                "editorType" : "TEXTBOX",
+                "name" : "formitem"
+              },
+              "rTMOSFilePath" : "psdeformdetail_formitems/formitem",
+              "allowEmpty" : true,
+              "repeatContent" : true,
+              "showCaption" : true
+            } ],
+            "getPSLayout" : {
+              "childColLG" : -1,
+              "childColMD" : 24,
+              "childColSM" : -1,
+              "childColXS" : -1,
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "rTMOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo",
+            "infoGroupMode" : false,
+            "repeatContent" : true,
+            "showCaption" : true
           } ],
           "getPSLayout" : {
             "childColLG" : -1,

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

@@ -69,18 +69,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     }, {
       "caption" : "出版社",
       "codeName" : "press",
@@ -93,6 +81,18 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     }, {
       "caption" : "借出日期",
       "codeName" : "lendouttime",

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

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

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

@@ -1470,6 +1470,75 @@
               "allowEmpty" : true,
               "repeatContent" : true,
               "showCaption" : true
+            }, {
+              "codeName" : "orderdetailinfo",
+              "columnAlign" : "RIGHT",
+              "contentType" : "REPEATER",
+              "detailStyle" : "STYLE2",
+              "detailType" : "MDCTRL",
+              "mOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo",
+              "name" : "orderdetailinfo",
+              "getPSDEFormDetails" : [ {
+                "caption" : "类型",
+                "codeName" : "formitem1",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/formitem1",
+                "name" : "formitem1",
+                "noPrivDisplayMode" : 1,
+                "getPSEditor" : {
+                  "editorType" : "DROPDOWNLIST",
+                  "name" : "formitem1",
+                  "getPSAppCodeList" : {
+                    "modelref" : true,
+                    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/OrderType.json"
+                  },
+                  "singleSelect" : true
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/formitem1",
+                "allowEmpty" : true,
+                "needCodeListConfig" : true,
+                "repeatContent" : true,
+                "showCaption" : true
+              }, {
+                "caption" : "信息",
+                "codeName" : "formitem",
+                "dataType" : 25,
+                "detailStyle" : "DEFAULT",
+                "detailType" : "FORMITEM",
+                "enableCond" : 3,
+                "ignoreInput" : 0,
+                "labelPos" : "LEFT",
+                "labelWidth" : 130,
+                "mOSFilePath" : "psdeformdetail_formitems/formitem",
+                "name" : "formitem",
+                "noPrivDisplayMode" : 1,
+                "getPSEditor" : {
+                  "editorType" : "TEXTBOX",
+                  "name" : "formitem"
+                },
+                "rTMOSFilePath" : "psdeformdetail_formitems/formitem",
+                "allowEmpty" : true,
+                "repeatContent" : true,
+                "showCaption" : true
+              } ],
+              "getPSLayout" : {
+                "childColLG" : -1,
+                "childColMD" : 24,
+                "childColSM" : -1,
+                "childColXS" : -1,
+                "columnCount" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "rTMOSFilePath" : "psdeformdetail_mdctrls/orderdetailinfo",
+              "infoGroupMode" : false,
+              "repeatContent" : true,
+              "showCaption" : true
             } ],
             "getPSLayout" : {
               "childColLG" : -1,

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

@@ -343,7 +343,7 @@
 
 
     <!--输出实体[IBIZORDER]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-1013-13">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-1017-13">
         <createTable tableName="T_IBIZORDER">
                 <column name="TP" remarks="" type="TEXT(1048576)">
                 </column>

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

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