diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php index a391a29f4..d5482d179 100755 --- a/app/Http/Controllers/Api/WorkflowController.php +++ b/app/Http/Controllers/Api/WorkflowController.php @@ -653,6 +653,7 @@ class WorkflowController extends AbstractController public function workflowMsg($type, $dialog, $botUser, $toUser, $process, $action = null) { $data = [ + 'id' => $process['id'], 'nickname' => User::userid2nickname($type == 'workflow_submitter' ? $toUser['userid'] : $process['start_user_id']), 'proc_def_name' => $process['proc_def_name'], 'department' => $process['department'], diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 55a06b918..9853494da 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -497,6 +497,11 @@ + + + + + @@ -516,6 +521,8 @@ import DialogSelect from "./DialogSelect"; import ImgUpload from "../../../components/ImgUpload.vue"; import {choiceEmojiOne} from "./ChatInput/one"; +import ReviewDetails from "../../../pages/manage/review/details.vue"; + export default { name: "DialogWrapper", components: { @@ -528,7 +535,8 @@ export default { DialogGroupInfo, DrawerOverlay, UserInput, - DialogUpload + DialogUpload, + ReviewDetails }, props: { @@ -639,6 +647,9 @@ export default { scrollTmp: 0, positionLoad: 0, + + approveDetails:{id: 0}, + approveDetailsShow: false } }, @@ -2358,6 +2369,22 @@ export default { if (this.operateVisible) { return } + + // 打开审批详情 + let domAudits = $(target).parents(".open-review-details") + if( domAudits.length > 0 ){ + let dataId = domAudits[0].getAttribute("data-id") + if( window.innerWidth < 425 ){ + this.goForward({name: 'manage-review-details', query: { id: domAudits[0].getAttribute("data-id") } }); + }else{ + this.approveDetailsShow = true; + this.$nextTick(()=>{ + this.approveDetails = {id:dataId}; + }) + } + return; + } + switch (target.nodeName) { case "IMG": if (target.classList.contains('browse')) { @@ -2372,6 +2399,7 @@ export default { this.$store.dispatch("openTask", $A.runNum(target.getAttribute("data-id"))); } break; + } }, diff --git a/resources/assets/js/pages/manage/review/details.vue b/resources/assets/js/pages/manage/review/details.vue index 5d24ed214..a1888ec68 100644 --- a/resources/assets/js/pages/manage/review/details.vue +++ b/resources/assets/js/pages/manage/review/details.vue @@ -1,5 +1,5 @@