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 @@