diff --git a/docker-compose.yml b/docker-compose.yml index d229a696d..853bf23b5 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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}" diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue index b2fd8c984..a81e8e674 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -102,7 +102,7 @@

{{$L('系统')}}

-

{{$L('自动抄送')}} +

{{$L('自动抄送')}} {{ item.node_user_list?.map(h=>h.name).join(',') }} {{$L('等'+item.node_user_list?.length+'人')}} @@ -113,13 +113,13 @@ - +

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

{{$L('系统')}}

-

{{ datas.is_finished ? $L('已结束') : $L('未结束') }}

+

{{ datas.is_finished ? $L('已结束') : $L('未结束') }}

@@ -140,7 +140,7 @@

{{item.nickname}}

{{item.created_at}}

- {{ getTimeAgo(item.created_at ,2) }} + {{ getTimeAgo(item.created_at) }}
{{ getContent(item.content) }} diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index 65cfb9d54..e8f5048af 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -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', diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index 96dbe5e59..a0b6b0449 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -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;