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

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

@@ -42,6 +42,7 @@ function getLocaleResourceBase(){
 				taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null), 
 				definitionkey: commonLogic.appcommonhandle("流程定义标识",null), 
 				definitionid: commonLogic.appcommonhandle("DefinitionId",null), 
+				businesskey: commonLogic.appcommonhandle("业务键值",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

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

@@ -42,6 +42,7 @@ function getLocaleResourceBase(){
 				taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null), 
 				definitionkey: commonLogic.appcommonhandle("流程定义标识",null), 
 				definitionid: commonLogic.appcommonhandle("DefinitionId",null), 
+				businesskey: commonLogic.appcommonhandle("业务键值",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

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

@@ -42,6 +42,7 @@ function getLocaleResourceBase(){
 				taskdefinitionkey: commonLogic.appcommonhandle("流程步骤标识",null), 
 				definitionkey: commonLogic.appcommonhandle("流程定义标识",null), 
 				definitionid: commonLogic.appcommonhandle("DefinitionId",null), 
+				businesskey: commonLogic.appcommonhandle("业务键值",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

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

@@ -467,6 +467,7 @@ export default class JumpBase extends Vue implements ControlInterface {
         taskdefinitionkey: null,
         definitionkey: null,
         definitionid: null,
+        businesskey: null,
         instanceid: null,
         wfprocessinstance:null,
     };
@@ -661,6 +662,8 @@ export default class JumpBase extends Vue implements ControlInterface {
         definitionkey: new FormItemModel({ caption: '流程定义标识', detailType: 'FORMITEM', name: 'definitionkey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         definitionid: new FormItemModel({ caption: 'DefinitionId', detailType: 'FORMITEM', name: 'definitionid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        businesskey: new FormItemModel({ caption: '业务键值', detailType: 'FORMITEM', name: 'businesskey', 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 })
 , 
@@ -810,6 +813,18 @@ export default class JumpBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'definitionid', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 businesskey 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof JumpBase
+     */
+    @Watch('data.businesskey')
+    onBusinesskeyChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'businesskey', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 instanceid 值
      *
@@ -891,6 +906,7 @@ export default class JumpBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

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

@@ -74,6 +74,11 @@ export default class JumpModel {
         prop: 'processdefinitionid',
         dataType: 'TEXT',
       },
+      {
+        name: 'businesskey',
+        prop: 'businesskey',
+        dataType: 'TEXT',
+      },
       {
         name: 'instanceid',
         prop: 'id',

app_web/src/widgets/wfuser/default-searchform/default-searchform-base.vue

@@ -626,7 +626,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: 'WFUserGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -662,7 +662,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;