zhouweidong 发布系统代码 [ibz-wf，统一工作流]

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN_base.ts

@@ -35,8 +35,9 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null), 
-				taskdefinitionkey: commonLogic.appcommonhandle("",null), 
-				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
+				taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null), 
+				definitionkey: commonLogic.appcommonhandle("流程定义标识",null), 
+				wfusers: commonLogic.appcommonhandle("操作用户",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US_base.ts

@@ -35,8 +35,9 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null), 
-				taskdefinitionkey: commonLogic.appcommonhandle("",null), 
-				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
+				taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null), 
+				definitionkey: commonLogic.appcommonhandle("流程定义标识",null), 
+				wfusers: commonLogic.appcommonhandle("操作用户",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN_base.ts

@@ -35,8 +35,9 @@ function getLocaleResourceBase(){
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
 				taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null), 
-				taskdefinitionkey: commonLogic.appcommonhandle("",null), 
-				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
+				taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null), 
+				definitionkey: commonLogic.appcommonhandle("流程定义标识",null), 
+				wfusers: commonLogic.appcommonhandle("操作用户",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

app_web/src/pages/workflow/wfindex-view/page-register.ts

@@ -11,13 +11,13 @@ export const PageComponents = {
         Vue.component('wfprocess-instance-active-instance-option-view', () => import('@pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.vue'));
         Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
         Vue.component('wfprocess-node-pickup-view', () => import('@pages/workflow/wfprocess-node-pickup-view/wfprocess-node-pickup-view.vue'));
+        Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
         Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'));
         Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
-        Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
         Vue.component('wfprocess-node-pickup-grid-view', () => import('@pages/workflow/wfprocess-node-pickup-grid-view/wfprocess-node-pickup-grid-view.vue'));
+        Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
         Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'));
         Vue.component('wfgroup-pickup-view', () => import('@pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view.vue'));
         Vue.component('wfgroup-pickup-grid-view', () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'));
-        Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
     }
 };
\ No newline at end of file

app_web/src/pages/workflow/wfindex-view/router.ts

@@ -219,6 +219,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/workflow/wfprocess-node-pickup-view/wfprocess-node-pickup-view.vue'),
                 },
+                {
+                    path: 'wfusers/:wfuser?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.wfuser.views.mpickupview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
+                            { pathName: 'wfusers', parameterName: 'wfuser' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
+                },
                 {
                     path: 'wfusers/:wfuser?/wfmembers/:wfmember?/editview/:editview?',
                     meta: {
@@ -278,32 +292,32 @@ const router = new Router({
                     component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
                 },
                 {
-                    path: 'wfusers/:wfuser?/mpickupview/:mpickupview?',
+                    path: 'wfprocessnodes/:wfprocessnode?/pickupgridview/:pickupgridview?',
                     meta: {
-                        caption: 'entities.wfuser.views.mpickupview.caption',
+                        caption: 'entities.wfprocessnode.views.pickupgridview.caption',
                         info:'',
                         parameters: [
                             { pathName: 'wfindexview', parameterName: 'wfindexview' },
-                            { pathName: 'wfusers', parameterName: 'wfuser' },
-                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                            { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
+                    component: () => import('@pages/workflow/wfprocess-node-pickup-grid-view/wfprocess-node-pickup-grid-view.vue'),
                 },
                 {
-                    path: 'wfprocessnodes/:wfprocessnode?/pickupgridview/:pickupgridview?',
+                    path: 'wfusers/:wfuser?/pickupgridview/:pickupgridview?',
                     meta: {
-                        caption: 'entities.wfprocessnode.views.pickupgridview.caption',
+                        caption: 'entities.wfuser.views.pickupgridview.caption',
                         info:'',
                         parameters: [
                             { pathName: 'wfindexview', parameterName: 'wfindexview' },
-                            { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
+                            { pathName: 'wfusers', parameterName: 'wfuser' },
                             { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/workflow/wfprocess-node-pickup-grid-view/wfprocess-node-pickup-grid-view.vue'),
+                    component: () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'),
                 },
                 {
                     path: 'wfusers/:wfuser?/pickupview/:pickupview?',
@@ -347,20 +361,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
                 },
-                {
-                    path: 'wfusers/:wfuser?/pickupgridview/:pickupgridview?',
-                    meta: {
-                        caption: 'entities.wfuser.views.pickupgridview.caption',
-                        info:'',
-                        parameters: [
-                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
-                            { pathName: 'wfusers', parameterName: 'wfuser' },
-                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'),
-                },
             ...indexRoutes,
             ],
         },

app_web/src/store/modules/view-action/state.ts

@@ -202,6 +202,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '598d910e2d38250d2cdd0f9ad61100ca',
+                '84e5a5b589b434dfdc60a3d0ad087d37',
             ],
         },
         {

app_web/src/widgets/wfgroup/main-grid/main-grid-base.vue

@@ -306,6 +306,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -810,7 +824,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -905,7 +919,7 @@ export default class MainBase 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: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1011,7 +1025,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: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1798,7 +1812,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgrouppickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgroupgridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1865,7 +1879,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgrouppickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzwf_web_wfgroupgridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -1936,7 +1950,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: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.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);
@@ -1944,7 +1958,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: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.wfgroup){
@@ -2017,7 +2031,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFGroupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_web/src/widgets/wfprocess-instance/jump-form/jump-form-base.vue

@@ -58,6 +58,29 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.wfusers.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='wfusers' :itemRules="this.rules().wfusers" class='' :caption="$t('entities.wfprocessinstance.jump_form.details.wfusers')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.wfusers.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-mpicker
+    :activeData="data"
+    :disabled="detailsModel.wfusers.disabled"
+    :curvalue="data.wfusers"
+    name="wfusers"
+    :context="context"
+    :viewparams="viewparams"
+    :localContext ='{ }' 
+    :localParam ='{ }' 
+    :service="service"
+    valueitem='' 
+    :acParams="{ }"
+    :pickupView="{ viewname: 'wfuser-mpickup-view', title: $t('entities.wfuser.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'wfusers', parameterName: 'wfuser' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
+    @formitemvaluechange="onFormItemValueChange" 
+    style="">
+</app-mpicker>
+
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -470,6 +493,7 @@ export default class JumpBase extends Vue implements ControlInterface {
         taskdefinitionname: null,
         taskdefinitionkey: null,
         definitionkey: null,
+        wfusers: null,
         instanceid: null,
         wfprocessinstance:null,
     };
@@ -527,12 +551,16 @@ export default class JumpBase extends Vue implements ControlInterface {
             { required: this.detailsModel.taskdefinitionname.required, type: 'string', message: '流程步骤 值不能为空', trigger: 'blur' },
         ],
         taskdefinitionkey: [
-            { required: this.detailsModel.taskdefinitionkey.required, type: 'string', message: ' 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.taskdefinitionkey.required, type: 'string', message: ' 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.taskdefinitionkey.required, type: 'string', message: '流程步骤标识 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.taskdefinitionkey.required, type: 'string', message: '流程步骤标识 值不能为空', trigger: 'blur' },
         ],
         definitionkey: [
-            { required: this.detailsModel.definitionkey.required, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.definitionkey.required, type: 'string', message: 'DefinitionKey 值不能为空', trigger: 'blur' },
+            { required: this.detailsModel.definitionkey.required, type: 'string', message: '流程定义标识 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.definitionkey.required, type: 'string', message: '流程定义标识 值不能为空', trigger: 'blur' },
+        ],
+        wfusers: [
+            { required: this.detailsModel.wfusers.required, type: 'string', message: '操作用户 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.wfusers.required, type: 'string', message: '操作用户 值不能为空', trigger: 'blur' },
         ],
         }
     }
@@ -661,9 +689,11 @@ export default class JumpBase extends Vue implements ControlInterface {
 , 
         taskdefinitionname: new FormItemModel({ caption: '流程步骤', detailType: 'FORMITEM', name: 'taskdefinitionname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        taskdefinitionkey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'taskdefinitionkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        taskdefinitionkey: new FormItemModel({ caption: '流程步骤标识', detailType: 'FORMITEM', name: 'taskdefinitionkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        definitionkey: new FormItemModel({ caption: 'DefinitionKey', detailType: 'FORMITEM', name: 'definitionkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        definitionkey: new FormItemModel({ caption: '流程定义标识', detailType: 'FORMITEM', name: 'definitionkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        wfusers: new FormItemModel({ caption: '操作用户', detailType: 'FORMITEM', name: 'wfusers', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         instanceid: new FormItemModel({ caption: '实例标识', detailType: 'FORMITEM', name: 'instanceid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -789,6 +819,18 @@ export default class JumpBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'definitionkey', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 wfusers 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof JumpBase
+     */
+    @Watch('data.wfusers')
+    onWfusersChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'wfusers', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 instanceid 值
      *
@@ -868,6 +910,7 @@ export default class JumpBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

app_web/src/widgets/wfprocess-instance/jump-form/jump-form-model.ts

@@ -63,6 +63,10 @@ export default class JumpModel {
         prop: 'processdefinitionkey',
         dataType: 'TEXT',
       },
+      {
+        name: 'wfusers',
+        dataType:'FORMITEM',
+      },
       {
         name: 'instanceid',
         prop: 'id',