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

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_BO_CN_base.ts

@@ -85,23 +85,6 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		approvedform_form: {
-			details: {
-				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
-				srforikey: commonLogic.appcommonhandle("",null), 
-				srfkey: commonLogic.appcommonhandle("订单标识",null), 
-				srfmajortext: commonLogic.appcommonhandle("订单名称",null), 
-				srftempmode: commonLogic.appcommonhandle("",null), 
-				srfuf: commonLogic.appcommonhandle("",null), 
-				srfdeid: commonLogic.appcommonhandle("",null), 
-				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				toopinions: commonLogic.appcommonhandle("通过意见",null), 
-				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
-			},
-			uiactions: {
-			},
-		},
 		main_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_en_US_base.ts

@@ -85,23 +85,6 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		approvedform_form: {
-			details: {
-				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
-				srforikey: commonLogic.appcommonhandle("",null), 
-				srfkey: commonLogic.appcommonhandle("订单标识",null), 
-				srfmajortext: commonLogic.appcommonhandle("订单名称",null), 
-				srftempmode: commonLogic.appcommonhandle("",null), 
-				srfuf: commonLogic.appcommonhandle("",null), 
-				srfdeid: commonLogic.appcommonhandle("",null), 
-				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				toopinions: commonLogic.appcommonhandle("通过意见",null), 
-				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
-			},
-			uiactions: {
-			},
-		},
 		main_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_zh_CN_base.ts

@@ -85,23 +85,6 @@ function getLocaleResourceBase(){
 			uiactions: {
 			},
 		},
-		approvedform_form: {
-			details: {
-				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				srfupdatedate: commonLogic.appcommonhandle("更新时间",null), 
-				srforikey: commonLogic.appcommonhandle("",null), 
-				srfkey: commonLogic.appcommonhandle("订单标识",null), 
-				srfmajortext: commonLogic.appcommonhandle("订单名称",null), 
-				srftempmode: commonLogic.appcommonhandle("",null), 
-				srfuf: commonLogic.appcommonhandle("",null), 
-				srfdeid: commonLogic.appcommonhandle("",null), 
-				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				toopinions: commonLogic.appcommonhandle("通过意见",null), 
-				ibizsample0021id: commonLogic.appcommonhandle("订单标识",null), 
-			},
-			uiactions: {
-			},
-		},
 		main_form: {
 			details: {
 				group1: commonLogic.appcommonhandle("订单基本信息",null), 

app_Web/src/pages/sample/ibizsample0021-wfdyna-action-view/ibizsample0021-wfdyna-action-view-base.vue

@@ -213,9 +213,9 @@ export default class IBIZSample0021WFDynaActionViewBase extends Vue {
      * @memberof IBIZSample0021WFDynaActionViewBase
      */
     public containerModel: any = {
+        view_wfform_operationform: { name: 'wfform_operationform', type: 'FORM' },
         view_form: { name: 'form', type: 'FORM' },
         view_wfform_refuseform: { name: 'wfform_refuseform', type: 'FORM' },
-        view_wfform_approvedform: { name: 'wfform_approvedform', type: 'FORM' },
         wflinks: [],
     };
 
@@ -709,9 +709,9 @@ export default class IBIZSample0021WFDynaActionViewBase extends Vue {
      * @memberof IBIZSample0021WFDynaActionViewBase
      */
     public allForm: any = {
+        "wfform_operationform":{name:"view_wfform_operationform",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""},
         "form":{name:"view_form",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""},
-        "wfform_refuseform":{name:"view_wfform_refuseform",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""},
-        "wfform_approvedform":{name:"view_wfform_approvedform",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""}
+        "wfform_refuseform":{name:"view_wfform_refuseform",autosave:"false",showBusyIndicator:"true",updateAction:"Update",removeAction:"Remove",loaddraftAction:"GetDraft",loadAction:"Get",createAction:"Create",WFSubmitAction:"",WFStartAction:""}
     };
 
     /**

app_Web/src/pages/sample/ibizsample0021-wfdyna-action-view/ibizsample0021-wfdyna-action-view.vue

@@ -2,14 +2,14 @@
 import { Component } from 'vue-property-decorator';
 import IBIZSample0021WFDynaActionViewBase from './ibizsample0021-wfdyna-action-view-base.vue';
 
+import view_wfform_operationform from '@widgets/ibizsample0021/operation-form-form/operation-form-form.vue';
 import view_form from '@widgets/ibizsample0021/operation-form-form/operation-form-form.vue';
 import view_wfform_refuseform from '@widgets/ibizsample0021/refuse-form-form/refuse-form-form.vue';
-import view_wfform_approvedform from '@widgets/ibizsample0021/approved-form-form/approved-form-form.vue';
 @Component({
     components: {
+        view_wfform_operationform, 
         view_form, 
         view_wfform_refuseform, 
-        view_wfform_approvedform, 
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {

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: 'IBIZBOOKUsr5GridView' + (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 };
@@ -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: 'IBIZBOOKUsr5GridView' + (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/usr4-dataview/usr4-dataview-base.vue

@@ -697,7 +697,7 @@ export default class Usr4Base 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: '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};
@@ -791,7 +791,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[] = [];
@@ -907,7 +907,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);
@@ -915,7 +915,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

@@ -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_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};
@@ -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_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[] = [];
@@ -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_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);
@@ -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_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/default-searchform/default-searchform-base.vue

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

app_Web/src/widgets/ibizorder/list-exp-list/list-exp-list-base.vue

@@ -600,7 +600,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -730,7 +730,7 @@ export default class ListExpBase 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: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -835,7 +835,7 @@ export default class ListExpBase 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: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (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);
@@ -843,7 +843,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

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

@@ -135,7 +135,7 @@
     "getPSControlParam" : {
       "autoLoad" : true,
       "showBusyIndicator" : true,
-      "id" : "FORM"
+      "id" : "wfform_operationform"
     },
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -293,18 +293,17 @@
       "id" : "WFSUBMIT"
     },
     "noTabHeader" : true,
-    "name" : "form",
+    "name" : "wfform_operationform",
     "modelid" : "4d32352cb9f17d077353b81cae29bac0",
     "modeltype" : "PSDEFORM_EDITFORM"
   }, {
-    "codeName" : "RefuseForm",
+    "codeName" : "OperationForm",
     "controlType" : "FORM",
     "getCreatePSControlAction" : {
       "modelref" : true,
       "id" : "create"
     },
-    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/RefuseForm.json",
-    "formFuncMode" : "WFACTION",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/OperationForm.json",
     "getGetDraftFromPSControlAction" : {
       "modelref" : true,
       "id" : "loaddraftfrom"
@@ -317,7 +316,7 @@
       "modelref" : true,
       "id" : "load"
     },
-    "logicName" : "部门领导审批不通过操作表单",
+    "logicName" : "操作表单",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021.json"
@@ -420,7 +419,7 @@
     "getPSControlParam" : {
       "autoLoad" : true,
       "showBusyIndicator" : true,
-      "id" : "wfform_refuseform"
+      "id" : "FORM"
     },
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -467,7 +466,14 @@
       "hidden" : true,
       "dataType" : 25
     }, {
-      "id" : "returnopinions",
+      "id" : "ibizsample0021name",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "IBIZSAMPLE0021NAME",
+        "codeName" : "IBIZSample0021Name"
+      }
+    }, {
+      "id" : "approvalopinions",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -485,8 +491,38 @@
       "detailType" : "FORMPAGE",
       "name" : "formpage1",
       "getPSDEFormDetails" : [ {
-        "caption" : "驳回意见",
-        "codeName" : "returnopinions",
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "DEF.LNAME.IBIZSAMPLE0021NAME"
+        },
+        "caption" : "订单名称",
+        "codeName" : "ibizsample0021name",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "ibizsample0021name",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "IBIZSAMPLE0021NAME",
+          "codeName" : "IBIZSample0021Name"
+        },
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "ibizsample0021name",
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "审批意见",
+        "codeName" : "approvalopinions",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -495,7 +531,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "returnopinions",
+        "name" : "approvalopinions",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -503,7 +539,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "returnopinions",
+          "name" : "approvalopinions",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {
@@ -541,17 +577,17 @@
       "id" : "WFSUBMIT"
     },
     "noTabHeader" : true,
-    "name" : "wfform_refuseform",
-    "modelid" : "d8e8d67fdd1f77f100d2c4aa5e0ccaef",
+    "name" : "form",
+    "modelid" : "4d32352cb9f17d077353b81cae29bac0",
     "modeltype" : "PSDEFORM_EDITFORM"
   }, {
-    "codeName" : "ApprovedForm",
+    "codeName" : "RefuseForm",
     "controlType" : "FORM",
     "getCreatePSControlAction" : {
       "modelref" : true,
       "id" : "create"
     },
-    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/ApprovedForm.json",
+    "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021/PSFORMS/RefuseForm.json",
     "formFuncMode" : "WFACTION",
     "getGetDraftFromPSControlAction" : {
       "modelref" : true,
@@ -565,7 +601,7 @@
       "modelref" : true,
       "id" : "load"
     },
-    "logicName" : "部门领导审批通过操作表单",
+    "logicName" : "部门领导审批不通过操作表单",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZSample0021.json"
@@ -668,7 +704,7 @@
     "getPSControlParam" : {
       "autoLoad" : true,
       "showBusyIndicator" : true,
-      "id" : "wfform_approvedform"
+      "id" : "wfform_refuseform"
     },
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -715,7 +751,7 @@
       "hidden" : true,
       "dataType" : 25
     }, {
-      "id" : "toopinions",
+      "id" : "returnopinions",
       "dataType" : 25
     }, {
       "id" : "ibizsample0021id",
@@ -733,8 +769,8 @@
       "detailType" : "FORMPAGE",
       "name" : "formpage1",
       "getPSDEFormDetails" : [ {
-        "caption" : "通过意见",
-        "codeName" : "toopinions",
+        "caption" : "驳回意见",
+        "codeName" : "returnopinions",
         "dataType" : 25,
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
@@ -743,7 +779,7 @@
         "itemHeight" : 200.0,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
-        "name" : "toopinions",
+        "name" : "returnopinions",
         "noPrivDisplayMode" : 1,
         "getPSEditor" : {
           "editorHeight" : 200.0,
@@ -751,7 +787,7 @@
             "HEIGHT" : "200"
           },
           "editorType" : "TEXTAREA_10",
-          "name" : "toopinions",
+          "name" : "returnopinions",
           "showMaxLength" : true
         },
         "getPSLayoutPos" : {
@@ -789,8 +825,8 @@
       "id" : "WFSUBMIT"
     },
     "noTabHeader" : true,
-    "name" : "wfform_approvedform",
-    "modelid" : "0a9714548e9ccd3923c386d1b522dde8",
+    "name" : "wfform_refuseform",
+    "modelid" : "d8e8d67fdd1f77f100d2c4aa5e0ccaef",
     "modeltype" : "PSDEFORM_EDITFORM"
   } ],
   "getPSDEViewCodeName" : "WFDynaActionView",

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

@@ -114,7 +114,7 @@
     },
     "wFLinkType" : "IAACTION"
   }, {
-    "formCodeName" : "approvedForm",
+    "formCodeName" : "operationForm",
     "getFromPSWFProcess" : {
       "modelref" : true,
       "id" : "Interactive001"

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

@@ -95,7 +95,7 @@
       <sequenceFlow id="lid-C61-051b6fd9ac8247a5521a16680508eb62" sourceRef="tid-5-169c10a35ed0da0f748ed4176aab8351" targetRef="tid-10-cec5ba3ae05225e0f4b71f4fd4bc080b" name="同意">
         <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-051b6fd9ac8247a5521a16680508eb62"}]]></conditionExpression>
          <extensionElements>
-             <flowable:form sequenceFlowForm="approvedForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY"  />
+             <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY"  />
          </extensionElements>
      </sequenceFlow>
       <sequenceFlow id="lid-C70-add04a0cc52aa622eda073732ee91c90" sourceRef="tid-5-169c10a35ed0da0f748ed4176aab8351" targetRef="tid-1-4125d1c26a85d94fadef7323d35f424d" name="不同意">