From 836d4f8209335a83a3caa5c02ab17b4d02ccc5cb Mon Sep 17 00:00:00 2001 From: weifs <605403358@qq.com> Date: Tue, 18 Apr 2023 15:54:36 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B7=A5=E4=BD=9C=E6=B5=81=20-=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=9B=E5=BA=A6=2070%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/WorkflowController.php | 2 +- .../assets/js/pages/manage/review/details.vue | 60 ++-- .../assets/js/pages/manage/review/index.vue | 200 ++++++++++---- resources/assets/js/routes.js | 5 + resources/assets/sass/pages/page-review.scss | 260 +++++++++--------- 5 files changed, 336 insertions(+), 191 deletions(-) diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php index 3ef828512..d164c371b 100755 --- a/app/Http/Controllers/Api/WorkflowController.php +++ b/app/Http/Controllers/Api/WorkflowController.php @@ -63,7 +63,7 @@ class WorkflowController extends AbstractController */ public function procdef__all() { - User::auth('admin'); + User::auth(); $data['name'] = Request::input('name'); $ret = Ihttp::ihttp_post($this->flow_url.'/api/v1/workflow/procdef/findAll', json_encode($data)); $procdef = json_decode($ret['ret'] == 1 ? $ret['data'] : '{}', true); diff --git a/resources/assets/js/pages/manage/review/details.vue b/resources/assets/js/pages/manage/review/details.vue index b977a94b0..5d24ed214 100644 --- a/resources/assets/js/pages/manage/review/details.vue +++ b/resources/assets/js/pages/manage/review/details.vue @@ -2,35 +2,35 @@
{{data.var?.type}}
+{{datas.var?.type}}
{{data.var?.start_time}}
+{{datas.var?.start_time}}
{{data.var?.end_time}}
+{{datas.var?.end_time}}
{{ $L('1天') }}
+{{ getTimeDifference(datas.var?.start_time,datas.var?.end_time)['time'] }}
{{data.var?.description}}
+{{datas.var?.description}}
{{$L('提交')}}
{{item.approver}}
{{$L('已提交')}}
@@ -56,7 +56,7 @@ >{{$L('审批')}}
{{item.approver}}
待审批
@@ -108,6 +108,7 @@