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

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

@@ -36,6 +36,8 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				businesskey: commonLogic.appcommonhandle("业务键值",null), 
+				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

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

@@ -36,6 +36,8 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				businesskey: commonLogic.appcommonhandle("业务键值",null), 
+				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

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

@@ -36,6 +36,8 @@ function getLocaleResourceBase(){
 				srfuf: commonLogic.appcommonhandle("",null), 
 				srfdeid: commonLogic.appcommonhandle("",null), 
 				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				businesskey: commonLogic.appcommonhandle("业务键值",null), 
+				definitionkey: commonLogic.appcommonhandle("DefinitionKey",null), 
 				instanceid: commonLogic.appcommonhandle("实例标识",null), 
 			},
 			uiactions: {

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

@@ -154,15 +154,25 @@ export default class WFProcessInstanceUIServiceBase extends UIService {
         let deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'wfprocessinstances', parameterName: 'wfprocessinstance' },
-            { pathName: 'activeinstanceoptionview', parameterName: 'activeinstanceoptionview' },
         ];
-        const openIndexViewTab = (data: any) => {
-            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
-            actionContext.$router.push(routePath);
-            actionContext.closeView(null);
-            return null;
+            const openPopupModal = (view: any, data: any) => {
+                let container: Subject<any> = actionContext.$appmodal.openModal(view, context, data);
+                container.subscribe((result: any) => {
+                    if (!result || !Object.is(result.ret, 'OK')) {
+                        return;
+                    }
+                    const _this: any = actionContext;
+                    _this.closeView(null);
+                    return result.datas;
+                });
             }
-        openIndexViewTab(data);
+            const view: any = {
+                viewname: 'wfprocess-instance-active-instance-option-view', 
+                height: 0, 
+                width: 0,  
+                title: actionContext.$t('entities.wfprocessinstance.views.activeinstanceoptionview.title'),
+            };
+            openPopupModal(view, data);
     }
 
     /**

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

@@ -15,6 +15,34 @@
                     <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.wfprocessinstance.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
+        <i-col v-show="detailsModel.businesskey.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='businesskey' :itemRules="this.rules().businesskey" class='' :caption="$t('entities.wfprocessinstance.main_form.details.businesskey')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.businesskey.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.businesskey"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.businesskey.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.definitionkey.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='definitionkey' :itemRules="this.rules().definitionkey" class='' :caption="$t('entities.wfprocessinstance.main_form.details.definitionkey')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.definitionkey.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.definitionkey"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.definitionkey.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
+</i-col>
     
     </row>
 </app-form-group>
@@ -444,6 +472,8 @@ export default class MainBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
+        businesskey: null,
+        definitionkey: null,
         instanceid: null,
         wfprocessinstance:null,
     };
@@ -496,6 +526,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public rules() :any {
     return {
+        businesskey: [
+            { required: this.detailsModel.businesskey.required, type: 'string', message: '业务键值 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.businesskey.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' },
+        ],
         }
     }
 
@@ -624,6 +662,10 @@ export default class MainBase extends Vue implements ControlInterface {
         srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', 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 })
+, 
+        definitionkey: new FormItemModel({ caption: 'DefinitionKey', detailType: 'FORMITEM', name: 'definitionkey', 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 })
 , 
@@ -714,6 +756,30 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 businesskey 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.businesskey')
+    onBusinesskeyChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'businesskey', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 definitionkey 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.definitionkey')
+    onDefinitionkeyChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'definitionkey', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 instanceid 值
      *
@@ -792,6 +858,8 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
+
     }
 
     /**

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

@@ -50,6 +50,16 @@ export default class MainModel {
       {
         name: 'srfsourcekey',
       },
+      {
+        name: 'businesskey',
+        prop: 'businesskey',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'definitionkey',
+        prop: 'processdefinitionkey',
+        dataType: 'TEXT',
+      },
       {
         name: 'instanceid',
         prop: 'id',