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

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

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

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

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

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

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

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

@@ -30,48 +30,6 @@
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.taskdefinitionkey.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='taskdefinitionkey' :itemRules="this.rules().taskdefinitionkey" class='' :caption="$t('entities.wfprocessinstance.jump_form.details.taskdefinitionkey')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.taskdefinitionkey.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.taskdefinitionkey"  
-    @enter="onEnter($event)"  
-      
-    :disabled="detailsModel.taskdefinitionkey.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.jump_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>
-<i-col v-show="detailsModel.definitionid.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='definitionid' :itemRules="this.rules().definitionid" class='' :caption="$t('entities.wfprocessinstance.jump_form.details.definitionid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.definitionid.error" :isEmptyCaption="false" labelPos="LEFT">
-    <input-box 
-    v-model="data.definitionid"  
-    @enter="onEnter($event)"  
-     unit=""  
-    :disabled="detailsModel.definitionid.disabled" 
-    type='text' 
-    style="">
-</input-box>
-
-</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">
@@ -505,10 +463,10 @@ export default class JumpBase extends Vue implements ControlInterface {
         srfdeid: null,
         srfsourcekey: null,
         taskdefinitionname: null,
+        wfusers: null,
         taskdefinitionkey: null,
         definitionkey: null,
         definitionid: null,
-        wfusers: null,
         instanceid: null,
         wfprocessinstance:null,
     };
@@ -565,18 +523,6 @@ export default class JumpBase extends Vue implements ControlInterface {
             { required: this.detailsModel.taskdefinitionname.required, type: 'string', message: '流程步骤 值不能为空', trigger: 'change' },
             { 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' },
-        ],
-        definitionkey: [
-            { required: this.detailsModel.definitionkey.required, type: 'string', message: '流程定义标识 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.definitionkey.required, type: 'string', message: '流程定义标识 值不能为空', trigger: 'blur' },
-        ],
-        definitionid: [
-            { required: this.detailsModel.definitionid.required, type: 'string', message: 'DefinitionId 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.definitionid.required, type: 'string', message: 'DefinitionId 值不能为空', trigger: 'blur' },
-        ],
         wfusers: [
             { required: this.detailsModel.wfusers.required, type: 'string', message: '操作用户 值不能为空', trigger: 'change' },
             { required: this.detailsModel.wfusers.required, type: 'string', message: '操作用户 值不能为空', trigger: 'blur' },
@@ -707,14 +653,14 @@ export default class JumpBase extends Vue implements ControlInterface {
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         taskdefinitionname: new FormItemModel({ caption: '流程步骤', detailType: 'FORMITEM', name: 'taskdefinitionname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
+, 
+        wfusers: new FormItemModel({ caption: '操作用户', detailType: 'FORMITEM', name: 'wfusers', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, 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: '流程定义标识', 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 })
-, 
-        wfusers: new FormItemModel({ caption: '操作用户', detailType: 'FORMITEM', name: 'wfusers', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, 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 })
 , 
@@ -816,6 +762,18 @@ export default class JumpBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'taskdefinitionname', 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 });
+    }
+
     /**
      * 监控表单属性 taskdefinitionkey 值
      *
@@ -852,18 +810,6 @@ export default class JumpBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'definitionid', 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 值
      *

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

@@ -55,9 +55,12 @@ export default class JumpModel {
         dataType:'FORMITEM',
       },
       {
-        name: 'taskdefinitionkey',
+        name: 'wfusers',
         dataType:'FORMITEM',
       },
+      {
+        name: 'taskdefinitionkey',
+      },
       {
         name: 'definitionkey',
         prop: 'processdefinitionkey',
@@ -68,10 +71,6 @@ export default class JumpModel {
         prop: 'processdefinitionid',
         dataType: 'TEXT',
       },
-      {
-        name: 'wfusers',
-        dataType:'FORMITEM',
-      },
       {
         name: 'instanceid',
         prop: 'id',