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

app_Web/src/pages/sample/ibizbookusr2-option-view/ibizbookusr2-option-view.scss

@@ -3,6 +3,9 @@
     position: relative;
 }
 
+.test-ctrl-style {
+	color:red!important;
+}
 
 .app-modal{
   .view-container {

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/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: "IBIZOrderDetailSGridView9" + (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: 'IBIZOrderDetailSGridView9' + (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: 'IBIZOrderDetailSGridView9'+(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: 'IBIZOrderDetailSGridView9'+(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: 'IBIZOrderDetailSGridView9'+(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: 'IBIZOrderDetailSGridView9' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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

@@ -288,7 +288,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) {
@@ -431,6 +431,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;
     
     /**
     * 是否嵌入关系界面
@@ -965,7 +979,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;
         }
@@ -1105,7 +1119,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;
         }
@@ -1219,7 +1233,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){
@@ -2152,7 +2166,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);
@@ -2161,7 +2175,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);
@@ -2237,7 +2251,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

@@ -105,6 +105,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/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -12,18 +12,6 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "mOSFilePath" : "psdetreecols/author",
-    "name" : "author",
-    "rTMOSFilePath" : "psdetreecols/author",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "归还日期",
     "codeName" : "returntime",
     "columnType" : "DEFGRIDCOLUMN",
@@ -35,18 +23,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",
@@ -71,6 +47,30 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "作者",
+    "codeName" : "author",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "author",
+    "mOSFilePath" : "psdetreecols/author",
+    "name" : "author",
+    "rTMOSFilePath" : "psdetreecols/author",
+    "width" : 200,
+    "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/PSTREEGRIDICES/TreeTable.json

@@ -31,18 +31,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
   }, {
     "caption" : "作者",
     "codeName" : "author",
@@ -55,6 +43,18 @@
     "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

@@ -42,18 +42,6 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "mOSFilePath" : "psdetreecols/author",
-      "name" : "author",
-      "rTMOSFilePath" : "psdetreecols/author",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "归还日期",
       "codeName" : "returntime",
       "columnType" : "DEFGRIDCOLUMN",
@@ -65,18 +53,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",
@@ -101,6 +77,30 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "作者",
+      "codeName" : "author",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "author",
+      "mOSFilePath" : "psdetreecols/author",
+      "name" : "author",
+      "rTMOSFilePath" : "psdetreecols/author",
+      "width" : 200,
+      "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/IBIZBOOKTreeGridExView.json

@@ -99,18 +99,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
     }, {
       "caption" : "作者",
       "codeName" : "author",
@@ -123,6 +111,18 @@
       "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/IBIZBOOKUsr2OptionView.json

@@ -1128,6 +1128,9 @@
       "columnCount" : 24,
       "layout" : "TABLE_24COL"
     },
+    "getPSSysCss" : {
+      "cssName" : "test-ctrl-style"
+    },
     "getPSSysPFPlugin" : {
       "pluginType" : "CUSTOM",
       "pluginCode" : "formIframe"

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

@@ -76,6 +76,9 @@
     .greenToolBar {color:white !important;background-color:rgba(0, 166, 90, 0.7) !important;}
 
     .deepskyblueToolBar {color:white !important;background-color:#108cee !important;}
+    .test-ctrl-style {
+	color:red!important;
+}
     .login-bg {
     background-color: #ffffff;
 }

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

@@ -76,6 +76,9 @@
     .greenToolBar {color:white !important;background-color:rgba(0, 166, 90, 0.7) !important;}
 
     .deepskyblueToolBar {color:white !important;background-color:#108cee !important;}
+    .test-ctrl-style {
+	color:red!important;
+}
     .login-bg {
     background-color: #ffffff;
 }

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

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