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

app_Web/src/pages/sample/ibizsample0021-edit-view/ibizsample0021-edit-view-base.vue

@@ -30,7 +30,7 @@
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem9_saveandstart.visabled" :disabled="toolBarModels.tbitem9_saveandstart.disabled" class='' v-button-loading:i-button @click="toolbar_click({ tag: 'tbitem9_saveandstart' }, $event)">
-                    <i class='fa fa-play'></i>
+                    <i class=''></i>
                     <span class='caption'>{{$t('entities.ibizsample0021.editviewtoolbar_toolbar.tbitem9_saveandstart.caption')}}</span>
                 </i-button>
             <div slot='content'>{{$t('entities.ibizsample0021.editviewtoolbar_toolbar.tbitem9_saveandstart.tip')}}</div>
@@ -307,7 +307,7 @@ export default class IBIZSample0021EditViewBase extends Vue {
         tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem9_saveandstart: { name: 'tbitem9_saveandstart', actiontarget: 'NONE', caption: '开始', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: 'WFSTART', uiaction: { tag: 'SaveAndStart', target: '' } },
+        tbitem9_saveandstart: { name: 'tbitem9_saveandstart', actiontarget: 'NONE', caption: '开始', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndStart', target: '' } },
 
     };
 

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: 'IBIZBOOKCustomView_layout' + (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 };
@@ -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: 'IBIZBOOKCustomView_layout' + (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/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_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1425,7 +1425,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_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1495,7 +1495,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1603,7 +1603,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1695,7 +1695,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_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (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_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1391,7 +1391,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_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1461,7 +1461,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1569,7 +1569,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1661,7 +1661,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_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (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_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1494,7 +1494,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_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1564,7 +1564,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1672,7 +1672,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_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1764,7 +1764,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_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (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

@@ -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/ibizbook/usr2-dataview/usr2-dataview-base.vue

@@ -48,18 +48,18 @@
                     <div v-show="flag" class="batch-toolbar">
                                 <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction1.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction2.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
                     </div>
@@ -201,18 +201,18 @@ export default class Usr2Base extends Vue implements ControlInterface {
     public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store });
 
     /**
-     * dataviewexpbar_dataview_batchtoolbar 部件 click 事件
+     * dataview_batchtoolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof Usr2Base
      */
-    public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) {
+    public dataview_batchtoolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'deuiaction1')) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
+            this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2);
         }
         if (Object.is($event.tag, 'deuiaction2')) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
+            this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2);
         }
     }
     
@@ -225,7 +225,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -253,7 +253,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -281,7 +281,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -308,7 +308,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
+    public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -336,7 +336,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKDataViewExpViewBase
+     * @memberof IBIZBOOKUsr2DataViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -362,7 +362,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKDataViewExpViewBase
+     * @memberof IBIZBOOKUsr2DataViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -426,12 +426,6 @@ export default class Usr2Base extends Vue implements ControlInterface {
         }
         let result: boolean = true;
         Object.assign(actionData, args);
-        if ('selectionchange'.indexOf(eventName) !== -1) {
-            result = await this.execute_dataviewexpbar_selectionchange_ctrl_logic(actionData) && result;
-        }
-        if ('load'.indexOf(eventName) !== -1) {
-            result = await this.execute_dataviewexpbar_load_ctrl_logic(actionData) && result;
-        }
         if (!result) {
             return false;
         }
@@ -439,30 +433,6 @@ export default class Usr2Base extends Vue implements ControlInterface {
         return true;
     }
 
-    /**
-     * 部件逻辑 -- dataviewexpbar_selectionchange
-     *
-     * @param {string} eventName 部件事件名称
-     * @param {any[]} data 数据
-     * @param {*} event 源事件对象
-     * @memberof Usr2Base
-     */
-    public async execute_dataviewexpbar_selectionchange_ctrl_logic(actionData: any): Promise<boolean> {
-        console.log('暂未支持 CUSTOM 类型');
-        return true;
-    }
-    /**
-     * 部件逻辑 -- dataviewexpbar_load
-     *
-     * @param {string} eventName 部件事件名称
-     * @param {any[]} data 数据
-     * @param {*} event 源事件对象
-     * @memberof Usr2Base
-     */
-    public async execute_dataviewexpbar_load_ctrl_logic(actionData: any): Promise<boolean> {
-        console.log('暂未支持 CUSTOM 类型');
-        return true;
-    }
 
 
 
@@ -707,9 +677,9 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKDataViewExpView
+     * @memberof IBIZBOOKUsr2DataView
      */
-    public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = {
+    public usr2dataviewdataview_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -1034,7 +1004,7 @@ export default class Usr2Base 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: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -1129,7 +1099,7 @@ export default class Usr2Base 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: 'IBIZBOOKDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1246,7 +1216,7 @@ export default class Usr2Base 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: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (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);
@@ -1254,7 +1224,7 @@ export default class Usr2Base 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: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){
@@ -1356,16 +1326,16 @@ export default class Usr2Base extends Vue implements ControlInterface {
 	public uiAction(data: any, tag: any, $event: any) {
         $event.stopPropagation();
         if(Object.is('Edit', tag)) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
+            this.dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
+            this.dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
         }
         if(Object.is('Edit', tag)) {
-            this.dataviewexpbar_dataview_memo1_u37f11a8_click(data, tag, $event);
+            this.dataview_memo1_u37f11a8_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataviewexpbar_dataview_memo1_uc365542_click(data, tag, $event);
+            this.dataview_memo1_uc365542_click(data, tag, $event);
         }
     }
 

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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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,6 +69,11 @@ 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-detail/main-grid/main-grid-base.vue

@@ -956,7 +956,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;
         }
@@ -1085,7 +1085,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;
         }
@@ -1199,7 +1199,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){
@@ -2093,7 +2093,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);
@@ -2102,7 +2102,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);
@@ -2178,7 +2178,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/ibizsample0021/default-searchform/default-searchform-base.vue

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

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

@@ -393,6 +393,13 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
     /**
      * 打开编辑数据视图
      *
@@ -925,7 +932,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZSample0021WFDynaExpGridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZSample0021GridView_layout" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1054,7 +1061,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1168,7 +1175,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2075,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2084,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: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     } else {
                         Object.assign(item, { viewparams: this.viewparams });
                         const tempContext = Util.deepCopy(this.context);
@@ -2160,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: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZSample0021GridView_layout' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -11,51 +11,51 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "出版社",
-    "codeName" : "press",
+    "caption" : "作者",
+    "codeName" : "author",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "press",
-    "name" : "press",
+    "dataItemName" : "author",
+    "name" : "author",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "借出日期",
-    "codeName" : "lendouttime",
+    "caption" : "归还日期",
+    "codeName" : "returntime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "lendouttime",
-    "name" : "lendouttime",
+    "dataItemName" : "returntime",
+    "name" : "returntime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "作者",
-    "codeName" : "author",
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
+    "caption" : "出版社",
+    "codeName" : "press",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
+    "dataItemName" : "press",
+    "name" : "press",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
   }, {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
+    "caption" : "借出日期",
+    "codeName" : "lendouttime",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "name" : "returntime",
+    "dataItemName" : "lendouttime",
+    "name" : "lendouttime",
     "width" : 200,
     "widthUnit" : "px",
     "enableExpand" : false,

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

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

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

@@ -34,51 +34,51 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "出版社",
-      "codeName" : "press",
+      "caption" : "作者",
+      "codeName" : "author",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "press",
-      "name" : "press",
+      "dataItemName" : "author",
+      "name" : "author",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "借出日期",
-      "codeName" : "lendouttime",
+      "caption" : "归还日期",
+      "codeName" : "returntime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "lendouttime",
-      "name" : "lendouttime",
+      "dataItemName" : "returntime",
+      "name" : "returntime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "作者",
-      "codeName" : "author",
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
+      "caption" : "出版社",
+      "codeName" : "press",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
+      "dataItemName" : "press",
+      "name" : "press",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
     }, {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
+      "caption" : "借出日期",
+      "codeName" : "lendouttime",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "name" : "returntime",
+      "dataItemName" : "lendouttime",
+      "name" : "lendouttime",
       "width" : 200,
       "widthUnit" : "px",
       "enableExpand" : false,

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

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

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

@@ -330,24 +330,11 @@
         "modelref" : true,
         "id" : "toolbar_tbitem9_saveandstart"
       },
-      "getPSSysImage" : {
-        "glyph" : "xf04b@FontAwesome",
-        "cssClass" : "fa fa-play"
-      },
       "getPSUIAction" : {
         "caption" : "开始",
         "codeName" : "SaveAndStart",
-        "dataAccessAction" : "WFSTART",
         "fullCodeName" : "SaveAndStart",
         "name" : "开始",
-        "getPSDEOPPriv" : {
-          "modelref" : true,
-          "id" : "WFSTART"
-        },
-        "getPSSysImage" : {
-          "glyph" : "xf04b@FontAwesome",
-          "cssClass" : "fa fa-play"
-        },
         "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
         "timeout" : 60000,
         "uIActionMode" : "SYS",

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

@@ -37,6 +37,9 @@
   "getPSWFVersions" : [ {
     "modelref" : true,
     "path" : "PSWORKFLOWS/ACT/PSWFVERSIONS/ACTv1.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSWORKFLOWS/ACT/PSWFVERSIONS/ACTv2.json"
   } ],
   "wFEngineCat" : "ACTIVITI",
   "wFEngineType" : "ACTIVITI",

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

@@ -450,5 +450,5 @@
   "wFVersion" : 1,
   "hasMobStartView" : false,
   "hasStartView" : false,
-  "valid" : true
+  "valid" : false
 }
\ No newline at end of file

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

@@ -28,7 +28,7 @@
                 <flowable:string>ibizsample0021name</flowable:string>
             </flowable:field>
             <flowable:field name="isvalid">
-                <flowable:string>1</flowable:string>
+                <flowable:string>0</flowable:string>
             </flowable:field>
         </extensionElements>
 

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

+{
+  "codeName" : "ACTv2",
+  "dynaModelFilePath" : "PSWORKFLOWS/ACT/PSWFVERSIONS/ACTv2.json",
+  "name" : "订单审批 v2",
+  "getPSWFLinks" : [ {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Start001"
+    },
+    "name" : "提交",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive001"
+    },
+    "wFLinkType" : "ROUTE"
+  }, {
+    "formCodeName" : "operationForm",
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive001"
+    },
+    "logicName" : "同意2",
+    "name" : "C61",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive002"
+    },
+    "viewCodeName" : "WFDynaActionView",
+    "wFLinkType" : "IAACTION"
+  }, {
+    "formCodeName" : "operationForm",
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive001"
+    },
+    "logicName" : "不同意",
+    "name" : "C70",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive005"
+    },
+    "viewCodeName" : "WFDynaActionView",
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive005"
+    },
+    "logicName" : "取消",
+    "name" : "C96",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "End002"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "formCodeName" : "approvedForm",
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive005"
+    },
+    "logicName" : "重新提交",
+    "name" : "C49",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive001"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive003"
+    },
+    "logicName" : "不同意",
+    "name" : "C69",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive005"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive003"
+    },
+    "logicName" : "同意",
+    "name" : "C40",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive004"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive002"
+    },
+    "logicName" : "同意",
+    "name" : "C52",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Exclusivegateway001"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive002"
+    },
+    "logicName" : "不同意",
+    "name" : "C28",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive005"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive004"
+    },
+    "logicName" : "不同意",
+    "name" : "C22",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive005"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive004"
+    },
+    "logicName" : "完成",
+    "name" : "C41",
+    "nextCondition" : "ANY",
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "End001"
+    },
+    "wFLinkType" : "IAACTION"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Exclusivegateway001"
+    },
+    "name" : "小于1W",
+    "getPSWFLinkGroupCond" : {
+      "condType" : "GROUP",
+      "groupOP" : "AND",
+      "name" : "连接条件",
+      "getPSWFLinkConds" : [ {
+        "condOP" : "LT",
+        "condType" : "SINGLE",
+        "fieldName" : "AMOUNT",
+        "name" : "[AMOUNT] 小于(<) (10000)",
+        "paramValue" : "10000"
+      } ],
+      "notMode" : false
+    },
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "End001"
+    },
+    "wFLinkType" : "ROUTE"
+  }, {
+    "getFromPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Exclusivegateway001"
+    },
+    "name" : "大于1W",
+    "getPSWFLinkGroupCond" : {
+      "condType" : "GROUP",
+      "groupOP" : "AND",
+      "name" : "连接条件",
+      "getPSWFLinkConds" : [ {
+        "condOP" : "GTANDEQ",
+        "condType" : "SINGLE",
+        "fieldName" : "AMOUNT",
+        "name" : "[AMOUNT] 大于等于(>=) (10000)",
+        "paramValue" : "10000"
+      } ],
+      "notMode" : false
+    },
+    "getToPSWFProcess" : {
+      "modelref" : true,
+      "id" : "Interactive003"
+    },
+    "wFLinkType" : "ROUTE"
+  } ],
+  "getPSWFProcesses" : [ {
+    "codeName" : "Start001",
+    "formCodeName" : "refuseForm",
+    "height" : 30,
+    "leftPos" : 15,
+    "logicName" : "开始",
+    "name" : "开始",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "提交"
+    } ],
+    "timeout" : -1,
+    "topPos" : 55,
+    "wFProcessType" : "START",
+    "width" : 30,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "startProcess" : true
+  }, {
+    "codeName" : "Interactive001",
+    "formCodeName" : "operationForm",
+    "height" : 80,
+    "leftPos" : 150,
+    "logicName" : "部门经理审核",
+    "mobUtil2FormCodeName" : "Main",
+    "mobUtil2FormName" : "主编辑表单",
+    "mobUtil3FormCodeName" : "approvedForm",
+    "mobUtil3FormName" : "部门领导审批通过操作表单",
+    "mobUtilFormCodeName" : "Main2",
+    "mobUtilFormName" : "主编辑表单2",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "部门经理审核",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "C61"
+    }, {
+      "modelref" : true,
+      "id" : "C70"
+    } ],
+    "getPSWFProcessRoles" : [ {
+      "name" : "部门领导",
+      "getPSWFRole" : {
+        "modelref" : true,
+        "path" : "PSWFROLES/DepartmentHeads.json"
+      },
+      "userData" : "dept",
+      "userData2" : "CURDEPTID",
+      "wFProcessRoleType" : "WFROLE"
+    }, {
+      "name" : "[当前操作者]",
+      "wFProcessRoleType" : "CURACTOR"
+    } ],
+    "predefinedActions" : [ "ADDSTEPBEFORE", "ADDSTEPAFTER", "REASSIGN" ],
+    "timeout" : -1,
+    "topPos" : 30,
+    "util2FormCodeName" : "Main2",
+    "util2FormName" : "主编辑表单2",
+    "util3FormCodeName" : "refuseForm",
+    "util3FormName" : "部门领导审批不通过操作表单",
+    "utilFormCodeName" : "Main",
+    "utilFormName" : "主编辑表单",
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "5",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "End001",
+    "height" : 30,
+    "leftPos" : 780,
+    "logicName" : "结束",
+    "name" : "结束",
+    "timeout" : -1,
+    "topPos" : 221,
+    "wFProcessType" : "END",
+    "width" : 30,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "terminalProcess" : true
+  }, {
+    "codeName" : "End002",
+    "height" : 30,
+    "leftPos" : 186,
+    "logicName" : "结束",
+    "name" : "结束",
+    "timeout" : -1,
+    "topPos" : 389,
+    "wFProcessType" : "END",
+    "width" : 30,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "terminalProcess" : true
+  }, {
+    "codeName" : "Interactive005",
+    "height" : 80,
+    "leftPos" : 150,
+    "logicName" : "发起人调整",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "发起人调整",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "C96"
+    }, {
+      "modelref" : true,
+      "id" : "C49"
+    } ],
+    "getPSWFProcessRoles" : [ {
+      "name" : "[当前数据属性]",
+      "uDField" : "CREATEMAN",
+      "wFProcessRoleType" : "UDACTOR"
+    } ],
+    "timeout" : -1,
+    "topPos" : 195,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "1",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "Interactive003",
+    "height" : 80,
+    "leftPos" : 555,
+    "logicName" : "总经理审核",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "总经理审核",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "C69"
+    }, {
+      "modelref" : true,
+      "id" : "C40"
+    } ],
+    "getPSWFProcessRoles" : [ {
+      "name" : "总经理",
+      "getPSWFRole" : {
+        "modelref" : true,
+        "path" : "PSWFROLES/GeneralManager.json"
+      },
+      "userData" : "org",
+      "userData2" : "CURORGID",
+      "wFProcessRoleType" : "WFROLE"
+    } ],
+    "timeout" : -1,
+    "topPos" : 195,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "20",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "Interactive002",
+    "height" : 80,
+    "leftPos" : 360,
+    "logicName" : "财务经理审核",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "财务经理审核",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "C52"
+    }, {
+      "modelref" : true,
+      "id" : "C28"
+    } ],
+    "getPSWFProcessRoles" : [ {
+      "name" : "财务经理",
+      "getPSWFRole" : {
+        "modelref" : true,
+        "path" : "PSWFROLES/FinancialManager.json"
+      },
+      "userData" : "org",
+      "userData2" : "CURORGID",
+      "wFProcessRoleType" : "WFROLE"
+    }, {
+      "name" : "[当前操作者]",
+      "wFProcessRoleType" : "CURACTOR"
+    } ],
+    "predefinedActions" : [ "SENDBACK", "REASSIGN" ],
+    "timeout" : -1,
+    "topPos" : 30,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "10",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "Interactive004",
+    "height" : 80,
+    "leftPos" : 555,
+    "logicName" : "财务总监审批",
+    "msgType" : 0,
+    "multiInstMode" : "NONE",
+    "name" : "财务总监审批",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "C22"
+    }, {
+      "modelref" : true,
+      "id" : "C41"
+    } ],
+    "getPSWFProcessRoles" : [ {
+      "name" : "财务总监",
+      "getPSWFRole" : {
+        "modelref" : true,
+        "path" : "PSWFROLES/FinancialDirector.json"
+      },
+      "userData" : "org",
+      "userData2" : "CURORGID",
+      "wFProcessRoleType" : "WFROLE"
+    } ],
+    "timeout" : -1,
+    "topPos" : 360,
+    "wFProcessType" : "INTERACTIVE",
+    "wFStepValue" : "30",
+    "width" : 100,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false,
+    "sendInform" : false
+  }, {
+    "codeName" : "Exclusivegateway001",
+    "height" : 40,
+    "leftPos" : 585,
+    "logicName" : "订单金额判断",
+    "name" : "订单金额判断",
+    "getPSWFLinks" : [ {
+      "modelref" : true,
+      "id" : "小于1W"
+    }, {
+      "modelref" : true,
+      "id" : "大于1W"
+    } ],
+    "timeout" : -1,
+    "topPos" : 50,
+    "wFProcessType" : "EXCLUSIVEGATEWAY",
+    "width" : 40,
+    "asynchronousProcess" : false,
+    "enableTimeout" : false
+  } ],
+  "getStartPSWFProcess" : {
+    "modelref" : true,
+    "id" : "Start001"
+  },
+  "wFCodeName" : "ACT",
+  "wFVersion" : 2,
+  "hasMobStartView" : false,
+  "hasStartView" : false,
+  "valid" : true
+}
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
+    <process id="demosys-actv2" isClosed="false" isExecutable="true" name="订单审批 v2" processType="None">
+        <extensionElements>
+            <flowable:eventListener delegateExpression="${processInstanceListener}"  />
+            <flowable:field name="refgroups">
+                <flowable:string>DepartmentHeads|部门领导|USERGROUP,GeneralManager|总经理|USERGROUP,FinancialManager|财务经理|USERGROUP,FinancialDirector|财务总监|USERGROUP</flowable:string>
+            </flowable:field>
+            <flowable:field name="bookings">
+                <flowable:string>ibizsample0021</flowable:string>
+            </flowable:field>
+            <flowable:field name="bookingapps_ibizsample0021">
+                <flowable:string>Web</flowable:string>
+            </flowable:field>
+            <flowable:field name="udstatefield_ibizsample0021">
+                <flowable:string>orderstate</flowable:string>
+            </flowable:field>
+            <flowable:field name="udstateingval_ibizsample0021">
+                <flowable:string>20</flowable:string>
+            </flowable:field>
+            <flowable:field name="wffinishval_ibizsample0021">
+                <flowable:string></flowable:string>
+            </flowable:field>
+            <flowable:field name="wferrorval_ibizsample0021">
+                <flowable:string></flowable:string>
+            </flowable:field>
+            <flowable:field name="majortext_ibizsample0021">
+                <flowable:string>ibizsample0021name</flowable:string>
+            </flowable:field>
+            <flowable:field name="isvalid">
+                <flowable:string>1</flowable:string>
+            </flowable:field>
+        </extensionElements>
+
+     <startEvent id="sid-137c359f364406040df60ee70baba8a0" name="开始">
+          <extensionElements>
+            <flowable:form process-form="refuseForm" wfversion="2"/>
+          </extensionElements>
+     </startEvent>
+     <userTask flowable:category="${businessKey}"   flowable:candidateUsers="${activedata.createman},${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)},${activedata.srfwfpredefinedusers}" flowable:exclusive="true" id="tid-5-b43328c7712bd3739742121269b6c386" 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>
+     <endEvent id="sid-ebd510afdeda7eba09cf1a56679ca382" name="结束">
+     </endEvent>
+     <endEvent id="sid-0b976fca9f1aa7981b1c0c7fc628e6cd" name="结束">
+     </endEvent>
+     <userTask 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="总经理审核" >
+         <documentation>${majortext}</documentation>
+     </userTask>
+     <userTask 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;reassign"  />
+         </extensionElements>
+     </userTask>
+     <userTask 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>
+     <exclusiveGateway id="sid-21588a1284c496701e00f32c79702e57"></exclusiveGateway>
+      <sequenceFlow id="rid-976141cef110c4efb00cafe135288c04" sourceRef="sid-137c359f364406040df60ee70baba8a0" targetRef="tid-5-b43328c7712bd3739742121269b6c386" name="">
+     </sequenceFlow>
+      <sequenceFlow id="lid-C61-8183153acb66d3c4237581187af3a227" sourceRef="tid-5-b43328c7712bd3739742121269b6c386" targetRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" name="同意2">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C61-8183153acb66d3c4237581187af3a227"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C70-90f718c5ff94eb8c7fe8cadf6950f7e4" sourceRef="tid-5-b43328c7712bd3739742121269b6c386" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C70-90f718c5ff94eb8c7fe8cadf6950f7e4"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form sequenceFlowForm="operationForm" sequenceFlowView="WFDynaActionView" nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C96-d115f5fb86f20d932cb1baa11f2a5138" sourceRef="tid-1-6dc784ef240f35883923cabac210590c" targetRef="sid-0b976fca9f1aa7981b1c0c7fc628e6cd" name="取消">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C96-d115f5fb86f20d932cb1baa11f2a5138"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C49-3d92186d5394a2a122703f0732066c47" sourceRef="tid-1-6dc784ef240f35883923cabac210590c" targetRef="tid-5-b43328c7712bd3739742121269b6c386" name="重新提交">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C49-3d92186d5394a2a122703f0732066c47"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form sequenceFlowForm="approvedForm" nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C69-4852d80f9c11b172c526057d238adef9" sourceRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C69-4852d80f9c11b172c526057d238adef9"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C40-fc8f513305b0b6ac566c20ab4670ce9d" sourceRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" targetRef="tid-30-f33ca3120694e870ea7e1b5eed392750" name="同意">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C40-fc8f513305b0b6ac566c20ab4670ce9d"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C52-a18b2bf9744642988ac97be1a9e9205d" sourceRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" targetRef="sid-21588a1284c496701e00f32c79702e57" name="同意">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C52-a18b2bf9744642988ac97be1a9e9205d"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C28-d9897ed1a39b41623c277c87de14e349" sourceRef="tid-10-b2100e0a472c7e23cd936fbb272eaa67" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C28-d9897ed1a39b41623c277c87de14e349"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C22-e99e05c2a93ffb2de2bc8b4ed1d99b0f" sourceRef="tid-30-f33ca3120694e870ea7e1b5eed392750" targetRef="tid-1-6dc784ef240f35883923cabac210590c" name="不同意">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C22-e99e05c2a93ffb2de2bc8b4ed1d99b0f"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="lid-C41-3359e3877299195a9c8cfb5625b5f033" sourceRef="tid-30-f33ca3120694e870ea7e1b5eed392750" targetRef="sid-ebd510afdeda7eba09cf1a56679ca382" name="完成">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C41-3359e3877299195a9c8cfb5625b5f033"}]]></conditionExpression>
+         <extensionElements>
+             <flowable:form nextCondition="ANY"  />
+         </extensionElements>
+     </sequenceFlow>
+      <sequenceFlow id="rid-28b1982fa36160a9a2736aebc7e9c4f3" sourceRef="sid-21588a1284c496701e00f32c79702e57" targetRef="sid-ebd510afdeda7eba09cf1a56679ca382" name="">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'LT', '10000')))} ]]></conditionExpression>
+     </sequenceFlow>
+      <sequenceFlow id="rid-a8db49267262165c5257ac0813b9620d" sourceRef="sid-21588a1284c496701e00f32c79702e57" targetRef="tid-20-79d7bde95dd67ca0f58d5f8961664af9" name="">
+        <conditionExpression  xsi:type="tFormalExpression" ><![CDATA[${((wfCoreService.test(activedata.amount, 'GTANDEQ', '10000')))} ]]></conditionExpression>
+     </sequenceFlow>
+    </process>
+    <bpmndi:BPMNDiagram id="BPMNDiagram_demosys-actv2">
+        <bpmndi:BPMNPlane id="BPMNPlane_demosys-actv2" bpmnElement="demosys-actv2">
+                 <bpmndi:BPMNShape id="BPMNShape-137c359f364406040df60ee70baba8a0" bpmnElement="sid-137c359f364406040df60ee70baba8a0">
+                     <omgdi:Bounds x="15" y="55" width="30" height="30" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-b43328c7712bd3739742121269b6c386" bpmnElement="tid-5-b43328c7712bd3739742121269b6c386">
+                     <omgdi:Bounds x="150" y="30" width="100" height="80" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-ebd510afdeda7eba09cf1a56679ca382" bpmnElement="sid-ebd510afdeda7eba09cf1a56679ca382">
+                     <omgdi:Bounds x="780" y="221" width="30" height="30" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-0b976fca9f1aa7981b1c0c7fc628e6cd" bpmnElement="sid-0b976fca9f1aa7981b1c0c7fc628e6cd">
+                     <omgdi:Bounds x="186" y="389" width="30" height="30" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-6dc784ef240f35883923cabac210590c" bpmnElement="tid-1-6dc784ef240f35883923cabac210590c">
+                     <omgdi:Bounds x="150" y="195" width="100" height="80" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-79d7bde95dd67ca0f58d5f8961664af9" bpmnElement="tid-20-79d7bde95dd67ca0f58d5f8961664af9">
+                     <omgdi:Bounds x="555" y="195" width="100" height="80" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-b2100e0a472c7e23cd936fbb272eaa67" bpmnElement="tid-10-b2100e0a472c7e23cd936fbb272eaa67">
+                     <omgdi:Bounds x="360" y="30" width="100" height="80" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-f33ca3120694e870ea7e1b5eed392750" bpmnElement="tid-30-f33ca3120694e870ea7e1b5eed392750">
+                     <omgdi:Bounds x="555" y="360" width="100" height="80" />
+                 </bpmndi:BPMNShape>
+                 <bpmndi:BPMNShape id="BPMNShape-21588a1284c496701e00f32c79702e57" bpmnElement="sid-21588a1284c496701e00f32c79702e57">
+                     <omgdi:Bounds x="585" y="50" width="40" height="40" />
+                 </bpmndi:BPMNShape>
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-976141cef110c4efb00cafe135288c04" bpmnElement="rid-976141cef110c4efb00cafe135288c04">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C61-8183153acb66d3c4237581187af3a227" bpmnElement="lid-C61-8183153acb66d3c4237581187af3a227">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C70-90f718c5ff94eb8c7fe8cadf6950f7e4" bpmnElement="lid-C70-90f718c5ff94eb8c7fe8cadf6950f7e4">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C96-d115f5fb86f20d932cb1baa11f2a5138" bpmnElement="lid-C96-d115f5fb86f20d932cb1baa11f2a5138">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C49-3d92186d5394a2a122703f0732066c47" bpmnElement="lid-C49-3d92186d5394a2a122703f0732066c47">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C69-4852d80f9c11b172c526057d238adef9" bpmnElement="lid-C69-4852d80f9c11b172c526057d238adef9">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C40-fc8f513305b0b6ac566c20ab4670ce9d" bpmnElement="lid-C40-fc8f513305b0b6ac566c20ab4670ce9d">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C52-a18b2bf9744642988ac97be1a9e9205d" bpmnElement="lid-C52-a18b2bf9744642988ac97be1a9e9205d">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C28-d9897ed1a39b41623c277c87de14e349" bpmnElement="lid-C28-d9897ed1a39b41623c277c87de14e349">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C22-e99e05c2a93ffb2de2bc8b4ed1d99b0f" bpmnElement="lid-C22-e99e05c2a93ffb2de2bc8b4ed1d99b0f">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-lid-C41-3359e3877299195a9c8cfb5625b5f033" bpmnElement="lid-C41-3359e3877299195a9c8cfb5625b5f033">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-28b1982fa36160a9a2736aebc7e9c4f3" bpmnElement="rid-28b1982fa36160a9a2736aebc7e9c4f3">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+               <bpmndi:BPMNEdge id="BPMNEdge-rid-a8db49267262165c5257ac0813b9620d" bpmnElement="rid-a8db49267262165c5257ac0813b9620d">
+                   <omgdi:waypoint x="0" y="0" />
+                   <omgdi:waypoint x="0" y="0" />
+               </bpmndi:BPMNEdge>
+        </bpmndi:BPMNPlane>
+    </bpmndi:BPMNDiagram>
+</definitions>
\ No newline at end of file