github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 03:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ffb05d5aabbc11fe523b88153abfa3bc4760655a' into pro

Browse Source 
# Conflicts:
#	resources/views/push/bot.blade.php
This commit is contained in:
kuaifan 2023-07-28 15:36:11 +08:00
commit 23cb7ffd6f
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -151,7 +151,7 @@ services:
approve:
container_name: "dootask-approve-${APP_ID}"
image: "hitosea2020/go-approve:0.1.2"
image: "hitosea2020/go-approve:0.1.3"
environment:
TZ: "Asia/Shanghai"
MYSQL_HOST: "${DB_HOST}"

8
resources/assets/js/pages/manage/approve/details.vue
View File

@ -102,7 +102,7 @@
<Avatar :src="$A.apiUrl('../images/avatar/default_approval.png')" size="38"/>
<div class="approve-process-left">
<p class="approve-process-name">{{$L('系统')}}</p>
<p style="font-size: 12px;">{{$L('自动抄送')}}
<p class="approve-process-desc">{{$L('自动抄送')}}
<span style="color: #486fed;">
{{ item.node_user_list?.map(h=>h.name).join(',') }}
{{$L('等'+item.node_user_list?.length+'人')}}
@ -113,13 +113,13 @@
</TimelineItem>
<!-- 结束 -->
<TimelineItem :key="key" :color="item.is_finished ? 'green' : '#ccc'" v-if="item.aprover_type == 'end'">
<TimelineItem class="finish" :key="key" :color="item.is_finished ? 'green' : '#ccc'" v-if="item.aprover_type == 'end'">
<p class="timeline-title">{{$L('结束')}}</p>
<div class="timeline-body">
<Avatar :src="$A.apiUrl('../images/avatar/default_approval.png')" size="38"/>
<div class="approve-process-left">
<p class="approve-process-name">{{$L('系统')}}</p>
<p style="font-size: 12px;"> {{ datas.is_finished ? $L('已结束') : $L('未结束') }}</p>
<p class="approve-process-desc"> {{ datas.is_finished ? $L('已结束') : $L('未结束') }}</p>
</div>
</div>
</TimelineItem>
@ -140,7 +140,7 @@
<p>{{item.nickname}}</p>
<p class="time">{{item.created_at}}</p>
</div>
<span>{{ getTimeAgo(item.created_at ,2) }}</span>
<span>{{ getTimeAgo(item.created_at) }}</span>
</div>
<div class="content">
{{ getContent(item.content) }}

4
resources/assets/js/pages/manage/approve/index.vue
View File

@ -506,10 +506,6 @@ export default {
skipAuthError: true
}).then(({data}) => {
this.addData.department_id = data[0]?.department[0] || 0;
if( !this.addData.department_id ){
$A.modalError("您当前未加入任何部门，不能发起！");
return false;
}
this.$store.dispatch("call", {
url: 'approve/procdef/all',
method: 'post',

16
resources/assets/sass/pages/page-approve.scss vendored
View File

@ -228,6 +228,9 @@
.approve-process-left {
margin-left: 10px;
flex: 1;
.approve-process-desc{
font-size: 12px;
}
}
.approve-process-right {
@ -237,6 +240,13 @@
> li:last-child {
padding-bottom: 0;
}
.finish{
.ivu-timeline-item-content{
padding-bottom: 0;
}
}
}
@ -266,6 +276,10 @@
margin-top: 3px;
padding-left: 45px;
}
.ivu-list-items>li:last-child{
padding-bottom: 0;
}
}
.approve-details-text:nth-last-child(1) {
@ -317,7 +331,7 @@
.comment {
margin-top: 5px;
margin-left: 45px;
font-size: 12px;
span {
background-color: #eaeaea;
border-radius: 5px;