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

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

@@ -23,12 +23,10 @@ function getLocaleResourceBase(){
 				title: commonLogic.appcommonhandle("流程中实例选项操作视图",null),
 			},
 		},
-		main_form: {
+		jump_form: {
 			details: {
-				group1: commonLogic.appcommonhandle("实例基本信息",null), 
+				group1: commonLogic.appcommonhandle("流程实例基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("实例标识",null), 
 				srfmajortext: commonLogic.appcommonhandle("实例名称",null), 
@@ -36,7 +34,8 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				businesskey: commonLogic.appcommonhandle("业务键值",null), 
+				taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null), 
+				taskdefinitionkey: commonLogic.appcommonhandle("",null), 
 				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},

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

@@ -23,12 +23,10 @@ function getLocaleResourceBase(){
 				title: commonLogic.appcommonhandle("流程中实例选项操作视图",null),
 			},
 		},
-		main_form: {
+		jump_form: {
 			details: {
-				group1: commonLogic.appcommonhandle("实例基本信息",null), 
+				group1: commonLogic.appcommonhandle("流程实例基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("实例标识",null), 
 				srfmajortext: commonLogic.appcommonhandle("实例名称",null), 
@@ -36,7 +34,8 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				businesskey: commonLogic.appcommonhandle("业务键值",null), 
+				taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null), 
+				taskdefinitionkey: commonLogic.appcommonhandle("",null), 
 				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},

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

@@ -23,12 +23,10 @@ function getLocaleResourceBase(){
 				title: commonLogic.appcommonhandle("流程中实例选项操作视图",null),
 			},
 		},
-		main_form: {
+		jump_form: {
 			details: {
-				group1: commonLogic.appcommonhandle("实例基本信息",null), 
+				group1: commonLogic.appcommonhandle("流程实例基本信息",null), 
 				formpage1: commonLogic.appcommonhandle("基本信息",null), 
-				group2: commonLogic.appcommonhandle("操作信息",null), 
-				formpage2: commonLogic.appcommonhandle("其它",null), 
 				srforikey: commonLogic.appcommonhandle("",null), 
 				srfkey: commonLogic.appcommonhandle("实例标识",null), 
 				srfmajortext: commonLogic.appcommonhandle("实例名称",null), 
@@ -36,7 +34,8 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
-				businesskey: commonLogic.appcommonhandle("业务键值",null), 
+				taskdefinitionname: commonLogic.appcommonhandle("流程步骤",null), 
+				taskdefinitionkey: commonLogic.appcommonhandle("",null), 
 				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},

app_web/src/pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.vue

@@ -2,7 +2,7 @@
 import { Component } from 'vue-property-decorator';
 import WFProcessInstanceActiveInstanceOptionViewBase from './wfprocess-instance-active-instance-option-view-base.vue';
 
-import view_form from '@widgets/wfprocess-instance/main-form/main-form.vue';
+import view_form from '@widgets/wfprocess-instance/jump-form/jump-form.vue';
 @Component({
     components: {
         view_form, 

app_web/src/uiservice/wfprocess-instance/wfprocess-instance-ui-service-base.ts

@@ -134,6 +134,7 @@ export default class WFProcessInstanceUIServiceBase extends UIService {
         let parentContext:any = {};
         let parentViewParam:any = {};
         const _this: any = actionContext;
+        Object.assign(params,{definitionkey:"%definitionkey%"});
         const _args: any[] = Util.deepCopy(args);
         const actionTarget: string | null = 'SINGLEKEY';
         Object.assign(context, { wfprocessinstance: '%wfprocessinstance%' });

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

+/**
+ * Jump 部件模型
+ *
+ * @export
+ * @class JumpModel
+ */
+export default class JumpModel {
+
+  /**
+  * 获取数据项集合
+  *
+  * @returns {any[]}
+  * @memberof JumpModel
+  */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'srfwfmemo',
+        prop: 'srfwfmemo',
+        dataType: 'TEXT',
+      },
+      // 前端新增修改标识，新增为"0",修改为"1"或未设值
+      {
+        name: 'srffrontuf',
+        prop: 'srffrontuf',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srforikey',
+      },
+      {
+        name: 'srfkey',
+        prop: 'id',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srfmajortext',
+        prop: 'name',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'srftempmode',
+      },
+      {
+        name: 'srfuf',
+      },
+      {
+        name: 'srfdeid',
+      },
+      {
+        name: 'srfsourcekey',
+      },
+      {
+        name: 'taskdefinitionname',
+        dataType:'FORMITEM',
+      },
+      {
+        name: 'taskdefinitionkey',
+        dataType:'FORMITEM',
+      },
+      {
+        name: 'definitionkey',
+        prop: 'processdefinitionkey',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'instanceid',
+        prop: 'id',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'wfprocessinstance',
+        prop: 'id',
+        dataType: 'FONTKEY',
+      },
+    ]
+  }
+
+}
\ No newline at end of file

app_web/src/widgets/wfprocess-instance/jump-form/jump-form.less

+.ivu-tabs-no-animation>.ivu-tabs-content{
+    padding: 0 16px;
+}
+.ivu-card-head{
+    padding: 14px 0;
+}
+.app-form {
+    overflow: auto;
+    padding: 6px;
+    > .ivu-row {
+        > .ivu-tabs {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            > .ivu-tabs-content {
+                flex-grow: 1;
+                overflow: auto;
+                > .ivu-tabs-tabpane {
+                    height: 100%;
+                }
+            }
+        }
+    }
+}
+.app-tabpanel-flex {
+    height: 100%;
+    > .ivu-tabs-content {
+        height: calc(100% - 52px);
+        > .ivu-tabs-tabpane {
+            height: 100%;
+        }
+    }
+}
+
+.app-form {
+    >.ivu-row:nth-child(2) {
+        >.ivu-col:nth-child(1) {
+            >.ivu-row.app-form-group.app-group-hiddden-caption:nth-child(1) {
+                margin-top: 12px;
+            }
+        }
+    }
+}
+.app-form{
+  // 表单行间距
+  .app-form-item{
+    margin-bottom: 20px;
+  }
+  // 表单按钮margin
+  .app-form-button{
+      margin:0 6px;
+  }
+}
+// this is less

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

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import JumpBase from './jump-form-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class Jump extends JumpBase {
+
+}
+</script>
\ No newline at end of file