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.proc_def_name}} + {{datas.proc_def_name}} {{$L('待审批')}} {{$L('审批中')}} {{$L('已通过')}} {{$L('已拒绝')}} {{$L('已撤回')}}

-

请假名字

-

{{$L('提交于')}} {{data.start_time}}

+

{{datas.start_user_name}}

+

{{$L('提交于')}} {{datas.start_time}}

-
+

{{$L('假期类型')}}

-

{{data.var?.type}}

+

{{datas.var?.type}}

{{$L('开始时间')}}

-

{{data.var?.start_time}}

+

{{datas.var?.start_time}}

{{$L('结束时间')}}

-

{{data.var?.end_time}}

+

{{datas.var?.end_time}}

-

{{ $L('时长') }}(小时)

-

{{ $L('1天') }}

+

{{ $L('时长') }}({{getTimeDifference(datas.var?.start_time,datas.var?.end_time)['unit']}})

+

{{ getTimeDifference(datas.var?.start_time,datas.var?.end_time)['time'] }}

{{$L('请假事由')}}

-

{{data.var?.description}}

+

{{datas.var?.description}}

{{$L('审批记录')}}

@@ -39,7 +39,7 @@

{{$L('提交')}}

- +

{{item.approver}}

{{$L('已提交')}}

@@ -56,7 +56,7 @@ >

{{$L('审批')}}

- +

{{item.approver}}

待审批

@@ -108,6 +108,7 @@
+
@@ -144,6 +145,12 @@ export default { deep: true }, }, + mounted() { + if(this.$route.query.id){ + this.data.id = this.$route.query.id; + this.getInfo() + } + }, methods:{ // 把时间转成几小时前 getTimeAgo(time,type) { @@ -154,13 +161,34 @@ export default { } else if (timeDiff < 3600) { const minutes = Math.floor(timeDiff / 60); return type == 2 ? `${minutes}${this.$L('分钟')}` : `${minutes} ${this.$L('分钟前')}`; - } else { + } else if(timeDiff < 3600 * 24) { const hours = Math.floor(timeDiff / 3600); return type == 2 ? `${hours}${this.$L('小时')}` : `${hours} ${this.$L('小时前')}`; + } else { + const days = Math.floor(timeDiff / 3600 / 24); + return type == 2 ? `${days}${this.$L('天')}` : `${days} ${this.$L('天')}`; + } + }, + // 获取时间差 + getTimeDifference(startTime,endTime) { + const currentTime = new Date(endTime); + const timeDiff = (currentTime - new Date(startTime)) / 1000; // convert to seconds + if (timeDiff < 60) { + return {time:timeDiff,unit:this.$L('秒')}; + } else if (timeDiff < 3600) { + const minutes = Math.floor(timeDiff / 60); + return {time:minutes,unit:this.$L('分钟')}; + } else if(timeDiff < 3600 * 24) { + const hours = Math.floor(timeDiff / 3600); + return {time:hours,unit:this.$L('小时')}; + } else { + const days = Math.floor(timeDiff / 3600 / 24); + return {time:days,unit:this.$L('天')}; } }, // 获取详情 getInfo(){ + this.datas = this.data this.$store.dispatch("call", { method: 'get', url: 'workflow/process/detail', @@ -197,7 +225,7 @@ export default { this.$store.dispatch("call", { url: 'workflow/task/complete', data: { - task_id: this.data.task_id, + task_id: this.datas.task_id, pass: type == 1, comment: desc, } @@ -221,8 +249,8 @@ export default { this.$store.dispatch("call", { url: 'workflow/task/withdraw', data: { - task_id: this.data.task_id, - proc_inst_id: this.data.id, + task_id: this.datas.task_id, + proc_inst_id: this.datas.id, } }).then(({msg}) => { resolve(); diff --git a/resources/assets/js/pages/manage/review/index.vue b/resources/assets/js/pages/manage/review/index.vue index 2f34a2a8d..49df643db 100644 --- a/resources/assets/js/pages/manage/review/index.vue +++ b/resources/assets/js/pages/manage/review/index.vue @@ -7,15 +7,14 @@

{{$L('审批中心')}}

- - +
- +
- +
- +
-
+ + + + + + + + +
+ + + + + + + + + + + + +
+
+ + +
+