diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http index 2b4b9b7a0..96bbf964d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http @@ -6,7 +6,7 @@ Authorization: Bearer {{token}} { "startTime": "2022-03-01", - "endTime": "2022-03-03", + "endTime": "2022-03-05", "type": 1, "reason": "我要请假啦啦啦!" } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java index 6d5ae6876..de6999c65 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java @@ -36,6 +36,9 @@ public class BpmProcessInstanceRespVO { @ApiModelProperty(value = "提交的表单值", required = true) private Map formVariables; + @ApiModelProperty(value = "业务的唯一标识", example = "1", notes = "例如说,请假申请的编号") + private String businessKey; + /** * 发起流程的用户 */ diff --git a/yudao-admin-ui/src/views/bpm/processInstance/detail.vue b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue index 587b004c6..5716de8ea 100644 --- a/yudao-admin-ui/src/views/bpm/processInstance/detail.vue +++ b/yudao-admin-ui/src/views/bpm/processInstance/detail.vue @@ -32,11 +32,18 @@
申请信息【{{ processInstance.name }}】
- -
+ +
+
+ + 点击查看 + +
@@ -188,19 +195,21 @@ export default { this.processInstance = response.data; // 设置表单信息 - this.detailForm = { - ...JSON.parse(this.processInstance.processDefinition.formConf), - disabled: true, // 表单禁用 - formBtns: false, // 按钮隐藏 - fields: decodeFields(this.processInstance.processDefinition.formFields) - } - // 设置表单的值 - this.detailForm.fields.forEach(item => { - const val = this.processInstance.formVariables[item.__vModel__] - if (val) { - item.__config__.defaultValue = val + if (this.processInstance.processDefinition.formType === 10) { + this.detailForm = { + ...JSON.parse(this.processInstance.processDefinition.formConf), + disabled: true, // 表单禁用 + formBtns: false, // 按钮隐藏 + fields: decodeFields(this.processInstance.processDefinition.formFields) } - }); + // 设置表单的值 + this.detailForm.fields.forEach(item => { + const val = this.processInstance.formVariables[item.__vModel__] + if (val) { + item.__config__.defaultValue = val + } + }); + } // 加载流程图 getProcessDefinitionBpmnXML(this.processInstance.processDefinition.id).then(response => {