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

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

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

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -677,7 +677,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -756,7 +756,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -865,7 +865,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (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);
@@ -873,7 +873,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

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

@@ -69,11 +69,6 @@ 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/card-navigation-dataview/card-navigation-dataview-base.vue

@@ -713,7 +713,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -792,7 +792,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -901,7 +901,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -909,7 +909,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

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

@@ -299,7 +299,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderPickupGridViewBase
+     * @memberof IBIZOrderSF1GridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -441,6 +441,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -975,7 +989,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1104,7 +1118,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1218,7 +1232,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2149,7 +2163,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2158,7 +2172,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: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2234,7 +2248,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -104,6 +104,21 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_orderstate_eq',
+        prop: 'n_orderstate_eq',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_gt',
+        prop: 'n_ordertime_gt',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_ordertime_lt',
+        prop: 'n_ordertime_lt',
+        dataType: 'QUERYPARAM'
+      },
 
         {
           name:'size',

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

@@ -11,175 +11,6 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
-  "getPSAppViewMsgGroup" : {
-    "modelref" : true,
-    "id" : "VMGroup50"
-  },
-  "getPSAppViewNavContexts" : [ {
-    "key" : "IBIZBOOK",
-    "name" : "IBIZBOOK",
-    "value" : "333",
-    "rawValue" : true
-  }, {
-    "key" : "IBIZBOOKNAME",
-    "name" : "IBIZBOOKNAME",
-    "value" : "dataView",
-    "rawValue" : true
-  } ],
-  "getPSDEViewCodeName" : "Usr2EditView",
-  "getPSDEViewId" : "cb8bb996f98d1fe8918a48d66802794d",
-  "getPSViewLayoutPanel" : {
-    "getAllPSPanelFields" : [ {
-      "id" : "view_pagecaption"
-    } ],
-    "codeName" : "Usr1104252192",
-    "controlType" : "VIEWLAYOUTPANEL",
-    "layoutMode" : "FLEX",
-    "logicName" : "Usr2EditViewDEEDITVIEW",
-    "name" : "layoutpanel",
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
-    },
-    "getPSControlParam" : { },
-    "getPSLayout" : {
-      "layout" : "FLEX"
-    },
-    "getRootPSPanelItems" : [ {
-      "caption" : "滚动条容器",
-      "itemStyle" : "DEFAULT",
-      "itemType" : "CONTAINER",
-      "name" : "container_scroll1",
-      "getPSLayout" : {
-        "layout" : "BORDER"
-      },
-      "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
-      },
-      "getPSPanelItems" : [ {
-        "caption" : "面板容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container_scroll_main1",
-        "getPSLayout" : {
-          "layout" : "BORDER"
-        },
-        "getPSLayoutPos" : {
-          "layout" : "BORDER",
-          "layoutPos" : "CENTER"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "FORM",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CTRLPOS",
-          "name" : "form",
-          "getPSLayoutPos" : {
-            "heightMode" : "FULL",
-            "layout" : "BORDER",
-            "layoutPos" : "CENTER",
-            "widthMode" : "FULL"
-          },
-          "showCaption" : true
-        } ],
-        "showCaption" : true
-      }, {
-        "caption" : "面板容器",
-        "contentHeight" : 50.0,
-        "height" : 50.0,
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container_scroll_header1",
-        "getPSLayout" : {
-          "layout" : "BORDER"
-        },
-        "getPSLayoutPos" : {
-          "height" : 50,
-          "heightMode" : "PX",
-          "layout" : "BORDER",
-          "layoutPos" : "NORTH"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "栅格容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container_grid2",
-          "getPSLayout" : {
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSLayoutPos" : {
-            "layout" : "BORDER",
-            "layoutPos" : "CENTER"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "面板容器",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CONTAINER",
-            "name" : "container2",
-            "getPSLayout" : {
-              "layout" : "SIMPLEFLEX"
-            },
-            "getPSLayoutPos" : {
-              "grow" : 3,
-              "layout" : "SIMPLEFLEX"
-            },
-            "getPSPanelItems" : [ {
-              "caption" : "页面标题",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "FIELD",
-              "name" : "view_pagecaption",
-              "getPSEditor" : {
-                "editorType" : "SPAN",
-                "name" : "view_pagecaption",
-                "predefinedType" : "VIEW_PAGECAPTION",
-                "renderMode" : "HEADING1",
-                "enableLinkView" : false
-              },
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "hAlignSelf" : "LEFT",
-                "layout" : "SIMPLEFLEX",
-                "vAlignSelf" : "MIDDLE"
-              },
-              "hidden" : false,
-              "showCaption" : false
-            } ]
-          }, {
-            "caption" : "面板容器",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "CONTAINER",
-            "name" : "container4",
-            "getPSLayout" : {
-              "layout" : "SIMPLEFLEX"
-            },
-            "getPSLayoutPos" : {
-              "grow" : 9,
-              "layout" : "SIMPLEFLEX"
-            },
-            "getPSPanelItems" : [ {
-              "caption" : "TOOLBAR",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "CTRLPOS",
-              "name" : "toolbar",
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "hAlignSelf" : "RIGHT",
-                "layout" : "SIMPLEFLEX",
-                "vAlignSelf" : "MIDDLE"
-              },
-              "showCaption" : true
-            } ]
-          } ]
-        } ],
-        "showCaption" : true
-      } ]
-    } ],
-    "layoutBodyOnly" : false,
-    "layoutPanel" : true,
-    "useDefaultLayout" : false,
-    "viewProxyMode" : true,
-    "modelid" : "5598D5F3-EFCE-4CF6-B1EA-3D2E5C41CAEE",
-    "modeltype" : "PSSYSVIEWLAYOUTPANEL",
   "getPSAppViewEngines" : [ {
     "engineCat" : "VIEW",
     "engineType" : "EditView",
@@ -250,6 +81,21 @@
     },
     "getPSViewCtrlName" : "toolbar"
   } ],
+  "getPSAppViewMsgGroup" : {
+    "modelref" : true,
+    "id" : "VMGroup50"
+  },
+  "getPSAppViewNavContexts" : [ {
+    "key" : "IBIZBOOK",
+    "name" : "IBIZBOOK",
+    "value" : "333",
+    "rawValue" : true
+  }, {
+    "key" : "IBIZBOOKNAME",
+    "name" : "IBIZBOOKNAME",
+    "value" : "dataView",
+    "rawValue" : true
+  } ],
   "getPSAppViewUIActions" : [ {
     "name" : "toolbar_deuiaction1",
     "getPSUIAction" : {
@@ -1046,7 +892,22 @@
     "name" : "form",
     "modelid" : "fb5e4317f8472b252287eba99b2b1e6e",
     "modeltype" : "PSDEFORM_EDITFORM"
-    } ]
+  } ],
+  "getPSDEViewCodeName" : "Usr2EditView",
+  "getPSDEViewId" : "cb8bb996f98d1fe8918a48d66802794d",
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPDEEDITVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
+    },
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
   },
   "subCaption" : "实体数据选择视图",
   "title" : "实体数据选择视图",

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

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