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

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

@@ -711,7 +711,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: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -747,7 +747,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: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

@@ -669,7 +669,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: 'IBIZBOOKListView' + (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 };
@@ -705,7 +705,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: 'IBIZBOOKListView' + (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 } ;

app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue

@@ -735,7 +735,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -829,7 +829,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' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -945,7 +945,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' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (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);
@@ -953,7 +953,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' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (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

@@ -318,7 +318,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) {
@@ -461,6 +461,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;
     
     /**
     * 是否嵌入关系界面
@@ -995,7 +1009,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;
         }
@@ -1124,7 +1138,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;
         }
@@ -1238,7 +1252,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){
@@ -2169,7 +2183,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);
@@ -2178,7 +2192,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);
@@ -2254,7 +2268,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/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -11,26 +11,6 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "出版社",
-    "codeName" : "press",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "press",
-    "name" : "press",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
-    "caption" : "借出日期",
-    "codeName" : "lendouttime",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "lendouttime",
-    "name" : "lendouttime",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "作者",
     "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
@@ -60,6 +40,26 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "出版社",
+    "codeName" : "press",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "press",
+    "name" : "press",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
+    "caption" : "借出日期",
+    "codeName" : "lendouttime",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "lendouttime",
+    "name" : "lendouttime",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -19,16 +19,6 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "图书描述",
     "codeName" : "subtext",
     "columnType" : "DEFGRIDCOLUMN",
@@ -48,6 +38,16 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "作者",
+    "codeName" : "author",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "author",
+    "name" : "author",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -34,26 +34,6 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "出版社",
-      "codeName" : "press",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "press",
-      "name" : "press",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
-      "caption" : "借出日期",
-      "codeName" : "lendouttime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "lendouttime",
-      "name" : "lendouttime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "作者",
       "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
@@ -83,6 +63,26 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "出版社",
+      "codeName" : "press",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "press",
+      "name" : "press",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
+      "caption" : "借出日期",
+      "codeName" : "lendouttime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "lendouttime",
+      "name" : "lendouttime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

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

@@ -75,16 +75,6 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "图书描述",
       "codeName" : "subtext",
       "columnType" : "DEFGRIDCOLUMN",
@@ -104,6 +94,16 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "作者",
+      "codeName" : "author",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "author",
+      "name" : "author",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ACT/PSWFVERSIONS/ACTv1.json

@@ -330,8 +330,8 @@
     "predefinedActions" : [ "SENDBACK", "ADDSTEPBEFORE", "SENDCOPY", "REASSIGN" ],
     "timeout" : -1,
     "topPos" : 30,
-    "util3FormCodeName" : "operationForm",
-    "util3FormName" : "操作表单",
+    "util3FormCodeName" : "refuseForm",
+    "util3FormName" : "部门领导审批不通过操作表单",
     "wFProcessType" : "INTERACTIVE",
     "wFStepValue" : "5",
     "width" : 100,

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ACT/PSWFVERSIONS/ACTv1.json.bpmn

@@ -44,7 +44,7 @@
      <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-5-169c10a35ed0da0f748ed4176aab8351" name="部门经理审核" >
          <documentation>${majortext}</documentation>
          <extensionElements>
-         <flowable:form procfunc="sendback;addstepbefore;sendcopy;reassign" process-form="Main2" process-util3form="operationForm" process-util3formname="操作表单"  />
+         <flowable:form procfunc="sendback;addstepbefore;sendcopy;reassign" process-form="Main2" process-util3form="refuseForm" process-util3formname="部门领导审批不通过操作表单"  />
          </extensionElements>
      </userTask>
      <endEvent id="sid-216251a03f16216cc13936346c9ee68b" name="结束">