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

app_Web/src/engine/view/edit-view-engine.ts

@@ -205,7 +205,7 @@ export default class EditViewEngine extends ViewEngine {
             if(this.view.$route){
                 this.view.$route.meta.info = info;
             }
-            this.view.model.srfCaption = `${this.view.$t(viewdata.srfCaption)}-${this.view.$t(viewdata.dataInfo)}`;
+            // this.view.model.srfCaption = `${this.view.$t(viewdata.srfCaption)}-${this.view.$t(viewdata.dataInfo)}`;
             this.view.initNavDataWithRoute(null,isNew);
         }
     }

app_Web/src/layout/grid-view-layout/grid-view-layout.scss

@@ -8,8 +8,14 @@
     .view-header__top {
         height: 60px;
         display: flex;
+        position: relative;
         align-items: center;
         justify-content: flex-end;
+
+        .app-caption {
+            position: absolute;
+            left: 0;
+        }
     }
     .view-header__content {
         display: flex;

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

@@ -712,7 +712,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: 'IBIZBOOKUsr3GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -748,7 +748,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: 'IBIZBOOKUsr3GridView' + (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

@@ -1378,7 +1378,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 };
@@ -1429,7 +1429,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 } ;
@@ -1499,7 +1499,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});
@@ -1607,7 +1607,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 });
@@ -1799,7 +1799,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

@@ -1344,7 +1344,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 };
@@ -1395,7 +1395,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 } ;
@@ -1465,7 +1465,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});
@@ -1573,7 +1573,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 });
@@ -1765,7 +1765,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

@@ -1447,7 +1447,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 };
@@ -1499,7 +1499,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 } ;
@@ -1569,7 +1569,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});
@@ -1677,7 +1677,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 });
@@ -1869,7 +1869,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/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: '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 };
@@ -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: '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 } ;

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

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

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

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

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

@@ -40,32 +40,32 @@
             <flowable:form process-form="refuseForm" wfversion="1"/>
           </extensionElements>
      </startEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('GeneralManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-231a5bc1d07984bb6688e43908488b9a" name="总经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('GeneralManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-231a5bc1d07984bb6688e43908488b9a" name="总经理审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <exclusiveGateway id="sid-949b4465982b3effb960001f33003315"></exclusiveGateway>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-30-58dbe066e02f3b8769d564ddc9316e6d" name="财务总监审批" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-30-58dbe066e02f3b8769d564ddc9316e6d" name="财务总监审批" >
          <documentation>${majortext}</documentation>
-     </userTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-5-169c10a35ed0da0f748ed4176aab8351" name="部门经理审核" >
+    </subProcess>
+    <subProcess 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="addstepbefore;addstepafter;reassign" process-form="operationForm" process-utilform="Main" process-util2form="Main2" process-util3form="refuseForm" process-utilformname="主编辑表单" process-util2formname="主编辑表单2" process-util3formname="部门领导审批不通过操作表单" process-mobutilform="Main2" process-mobutil2form="Main" process-mobutil3form="approvedForm" process-mobutilformname="主编辑表单2" process-mobutil2formname="主编辑表单" process-mobutil3formname="部门领导审批通过操作表单"  />
          </extensionElements>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-216251a03f16216cc13936346c9ee68b" name="结束">
      </endEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-cec5ba3ae05225e0f4b71f4fd4bc080b" name="财务经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-cec5ba3ae05225e0f4b71f4fd4bc080b" name="财务经理审核" >
          <documentation>${majortext}</documentation>
          <extensionElements>
          <flowable:form procfunc="sendback;reassign"  />
          </extensionElements>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-7beb141fff9888c0e14b4bf505f2d87f" name="结束">
      </endEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-1-4125d1c26a85d94fadef7323d35f424d" name="发起人调整" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-1-4125d1c26a85d94fadef7323d35f424d" name="发起人调整" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
       <sequenceFlow id="rid-e7ad1564216ad79861c2a9951fdeb1c8" sourceRef="sid-3c7cbc7deeb1177d73e9647df35ba7b7" targetRef="tid-5-169c10a35ed0da0f748ed4176aab8351" name="">
      </sequenceFlow>
       <sequenceFlow id="lid-C69-9b8fd4c7b5f55d87d789269eef6539ab" sourceRef="tid-20-231a5bc1d07984bb6688e43908488b9a" targetRef="tid-1-4125d1c26a85d94fadef7323d35f424d" name="不同意">

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

@@ -40,29 +40,29 @@
             <flowable:form process-form="Start001" wfversion="2"/>
           </extensionElements>
      </startEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-b2100e0a472c7e23cd936fbb272eaa67" name="财务经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-b2100e0a472c7e23cd936fbb272eaa67" name="财务经理审核" >
          <documentation>${majortext}</documentation>
          <extensionElements>
          <flowable:form procfunc="sendback"  />
          </extensionElements>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-0b976fca9f1aa7981b1c0c7fc628e6cd" name="结束">
      </endEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.deptheadsid},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-5-b43328c7712bd3739742121269b6c386" name="部门经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.deptheadsid},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-5-b43328c7712bd3739742121269b6c386" name="部门经理审核" >
          <documentation>${majortext}</documentation>
          <extensionElements>
          <flowable:form procfunc="addstepbefore;reassign" process-form="operationForm" process-utilform="beforeSign" process-util3form="transfer" process-utilformname="加签" process-util3formname="工作转移"  />
          </extensionElements>
-     </userTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-1-6dc784ef240f35883923cabac210590c" name="发起人调整" >
+    </subProcess>
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-1-6dc784ef240f35883923cabac210590c" name="发起人调整" >
          <documentation>${majortext}</documentation>
-     </userTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('GeneralManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-79d7bde95dd67ca0f58d5f8961664af9" name="总经理审核" >
+    </subProcess>
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('GeneralManager|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-79d7bde95dd67ca0f58d5f8961664af9" name="总经理审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-30-f33ca3120694e870ea7e1b5eed392750" name="财务总监审批" >
+    </subProcess>
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialDirector|org|CURORGID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-30-f33ca3120694e870ea7e1b5eed392750" name="财务总监审批" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-ebd510afdeda7eba09cf1a56679ca382" name="结束">
      </endEvent>
      <exclusiveGateway id="sid-21588a1284c496701e00f32c79702e57"></exclusiveGateway>

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/LP/PSWFVERSIONS/LPv1.json.bpmn

@@ -53,9 +53,9 @@
          <extensionElements>
          </extensionElements>
      </serviceTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WFNextPerson',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-62f9c5a5ec0f7b98d815a63b61f50903" name="内部会签" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${wfCoreService.getGroupUsers('WFNextPerson',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-62f9c5a5ec0f7b98d815a63b61f50903" name="内部会签" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
       <sequenceFlow id="rid-8f379f0e33ea1da342bac574daea728c" sourceRef="sid-80401b74a1d2e4105b09bb43bf96dea1" targetRef="tid-10-62f9c5a5ec0f7b98d815a63b61f50903" name="">
      </sequenceFlow>
       <sequenceFlow id="rid-d3aef652a725ebd332d97e6b9db906b2" sourceRef="sid-9c374f416d53c13c15e0a5a7618c7ebe" targetRef="sid-0acfc4a7bd69ca12b9243415d8c1fd60" name="">

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/MN/PSWFVERSIONS/MNv1.json.bpmn

@@ -47,18 +47,18 @@
          <extensionElements>
          </extensionElements>
      </serviceTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-adc8fca0f3c13356e9ae430b7dce05a2" name="部门领导审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-adc8fca0f3c13356e9ae430b7dce05a2" name="部门领导审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <serviceTask id="sid-2ba22a096a6555b2de93ed04b18dfdfd" name="审核通过" flowable:expression="${wfCoreService.execute(execution, activedata)}" >
          <extensionElements>
          </extensionElements>
      </serviceTask>
      <endEvent id="sid-dca9c7f4c245233b462231f744072f19" name="结束">
      </endEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-6b4a02f112b6d0fc38b45f004b7c2bbb" name="部门会签" flowable:formKey="EMBED">
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-6b4a02f112b6d0fc38b45f004b7c2bbb" name="部门会签" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
       <sequenceFlow id="rid-ce0760eeb5ff8a8aa18f25d5ff880405" sourceRef="sid-6249a50fdb096a401668a86ee2c158ac" targetRef="tid-10-adc8fca0f3c13356e9ae430b7dce05a2" name="">
      </sequenceFlow>
       <sequenceFlow id="rid-b7f8f3a491f4a2af95a49a14f01a9083" sourceRef="sid-df7f0fe719fdedf8a4b669d7df16d703" targetRef="sid-dca9c7f4c245233b462231f744072f19" name="">

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ODSP/PSWFVERSIONS/ODSPv1.json.bpmn

@@ -40,12 +40,12 @@
 
      <startEvent id="sid-4628cd862028e0e56ac47dd1bb7f1047" name="开始流程">
      </startEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-0d5239b54dcdea417a130288e7fb6712" name="财务经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-0d5239b54dcdea417a130288e7fb6712" name="财务经理审核" >
          <documentation>${majortext}</documentation>
          <extensionElements>
          <flowable:form memofield="OPINION"  />
          </extensionElements>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-5b5b4cdf7fc99bbd46b9657e0e63aef6" name="结束">
      </endEvent>
      <serviceTask id="sid-b142478667ccdf074c7f4febbc60926f" name="审核未通过" flowable:expression="${wfCoreService.execute(execution, activedata)}" >

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ODSPMM/PSWFVERSIONS/ODSPMMv1.json.bpmn

@@ -57,9 +57,9 @@
         <flowable:field name="params-wfmmstate"><flowable:string>30</flowable:string></flowable:field>
          </extensionElements>
      </serviceTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-49096ca4b656ffb97b8c451626671bd2" name="财务经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-49096ca4b656ffb97b8c451626671bd2" name="财务经理审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-c4a2d21dc2e5935415c79a737570587c" name="结束">
      </endEvent>
       <sequenceFlow id="rid-da5149cc05dd987a879c6b62a39c24be" sourceRef="sid-6ee99fd1d57739be89bc5595d9db9323" targetRef="tid-10-49096ca4b656ffb97b8c451626671bd2" name="">

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ODSPMM/PSWFVERSIONS/ODSPMMv2.json.bpmn

@@ -45,9 +45,9 @@
      </startEvent>
      <endEvent id="sid-ab965dd91ced2c2e616cb9d4f2238fe7" name="结束">
      </endEvent>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-3ba95ab9317afcd8d20657c857a527af" name="财务经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-3ba95ab9317afcd8d20657c857a527af" name="财务经理审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <serviceTask id="sid-e3500bfb8f6f106b082562a352b642f8" name="审核未通过" flowable:expression="${wfCoreService.execute(execution, activedata)}" >
          <extensionElements>
          <flowable:field name="service-entity"><flowable:string>ibizsample0005</flowable:string></flowable:field>
@@ -62,9 +62,9 @@
         <flowable:field name="params-wfmmstate"><flowable:string>30</flowable:string></flowable:field>
          </extensionElements>
      </serviceTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-d2a34145a7b5f2949352642cf1278030" name="公司领导审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-20-d2a34145a7b5f2949352642cf1278030" name="公司领导审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
       <sequenceFlow id="rid-f5e1569e8d1f22be03a71e215bb80cd1" sourceRef="sid-e1623bc9add3d96419ed39212b04fc53" targetRef="tid-10-3ba95ab9317afcd8d20657c857a527af" name="">
      </sequenceFlow>
       <sequenceFlow id="lid-C100-d35a1029fc89adcd1bc829da376c969f" sourceRef="tid-10-3ba95ab9317afcd8d20657c857a527af" targetRef="tid-20-d2a34145a7b5f2949352642cf1278030" name="审核通过">

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ODSPMV/PSWFVERSIONS/ODSPMVv1.json.bpmn

@@ -50,9 +50,9 @@
         <flowable:field name="params-wfmvstate"><flowable:string>30</flowable:string></flowable:field>
          </extensionElements>
      </serviceTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-601f637f445d84b56c8100e94e255214" name="财务经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-601f637f445d84b56c8100e94e255214" name="财务经理审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <serviceTask id="sid-19c6d189e55e21a965fb71ceeb4df0e3" name="审核未通过" flowable:expression="${wfCoreService.execute(execution, activedata)}" >
          <extensionElements>
          <flowable:field name="service-entity"><flowable:string>ibizsample0004</flowable:string></flowable:field>

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/ODSPMV/PSWFVERSIONS/ODSPMVv2.json.bpmn

@@ -57,9 +57,9 @@
         <flowable:field name="params-wfmvstate"><flowable:string>40</flowable:string></flowable:field>
          </extensionElements>
      </serviceTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-93958c235c57c659ee1166d06b5bebb1" name="财务经理审核" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-93958c235c57c659ee1166d06b5bebb1" name="财务经理审核" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-f0a14a06c82baa38c67c8341ff416c9f" name="结束">
      </endEvent>
       <sequenceFlow id="rid-be379d57475d787b7aeedf073a370f5b" sourceRef="sid-aff16e6297aac5cb0666e83cacd58a19" targetRef="tid-10-93958c235c57c659ee1166d06b5bebb1" name="">

demo-boot/src/main/resources/static/remotemodel/PSWORKFLOWS/SN/PSWFVERSIONS/SNv1.json.bpmn

@@ -52,9 +52,9 @@
          <flowable:field name="service-deaction"><flowable:string>update</flowable:string></flowable:field>
          </extensionElements>
      </serviceTask>
-     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-4a234b4a1763d91cdff3f61cfe5c583d" name="会签" >
+    <subProcess flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-10-4a234b4a1763d91cdff3f61cfe5c583d" name="会签" >
          <documentation>${majortext}</documentation>
-     </userTask>
+    </subProcess>
      <endEvent id="sid-2b9a66c764cbcc7d0562dd6dedfdc6fa" name="结束">
      </endEvent>
       <sequenceFlow id="rid-cf46c82b6f0240db32312f252b02ff45" sourceRef="sid-3aba621a8b5c04ee4976005266b6b234" targetRef="tid-10-4a234b4a1763d91cdff3f61cfe5c583d" name="">