diff --git a/ruoyi-ui/src/views/hrm/components/BizDetailContainer/index.vue b/ruoyi-ui/src/views/hrm/components/BizDetailContainer/index.vue index caa6205..f2d1681 100644 --- a/ruoyi-ui/src/views/hrm/components/BizDetailContainer/index.vue +++ b/ruoyi-ui/src/views/hrm/components/BizDetailContainer/index.vue @@ -4,14 +4,13 @@
{{ bizTitle }}
- 返回 + 返回 刷新 - - + 通过 - + 驳回
@@ -54,20 +53,21 @@ -
审批操作
- -
系统将自动识别你在该单据上的“当前待办任务”。若你不是当前办理人,将不会显示办理按钮。
-
- -
- 通过 - 驳回 +
+
审批操作
+ +
+ +
+ 通过 + 驳回 +
-
-
当前无待办任务(可能已处理完成,或你不是当前审批人)
- +
当前无待办任务(可能已处理完成,或你不是当前审批人)
+ +
@@ -75,7 +75,7 @@ 操作汇报
-
+
@@ -89,7 +89,7 @@
{{ item.createByName }} {{ item.createTime }} - 删除
@@ -132,7 +132,8 @@ export default { name: 'BizDetailContainer', props: { bizId: { type: String, required: true }, - bizType: { type: String, required: true } + bizType: { type: String, required: true }, + preview: { type: Boolean, default: false } }, components: { FilePreview, @@ -414,7 +415,7 @@ export default { async exportComment () { try { this.buttonLoading = true - const res = await addFlowComment({ + await addFlowComment({ instId: this.flowInstance.instId, commentContent: this.commentForm.commentContent, attachments: this.commentForm.attachments diff --git a/ruoyi-ui/src/views/hrm/flow/taskHistory.vue b/ruoyi-ui/src/views/hrm/flow/taskHistory.vue index 05db498..894a3c2 100644 --- a/ruoyi-ui/src/views/hrm/flow/taskHistory.vue +++ b/ruoyi-ui/src/views/hrm/flow/taskHistory.vue @@ -1,81 +1,68 @@