diff --git a/docker-compose.yml b/docker-compose.yml index 53386c3af..45c289978 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -149,7 +149,7 @@ services: approve: container_name: "dootask-approve-${APP_ID}" - image: "kuaifan/dooapprove:0.0.11" + image: "kuaifan/dooapprove:0.0.12" environment: TZ: "${TIMEZONE:-PRC}" 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 cf62da9cc..c4cef6b7b 100644 --- a/resources/assets/js/pages/manage/approve/details.vue +++ b/resources/assets/js/pages/manage/approve/details.vue @@ -54,7 +54,7 @@

{{$L('图片')}}

-
+
@@ -164,7 +164,7 @@ {{ getContent(item.content) }}
-
+
@@ -475,8 +475,20 @@ export default { } }, // 打开图片 - onViewPicture(currentUrl) { - this.$store.dispatch("previewImage", $A.mainUrl(currentUrl)) + onViewPicture(currentUrl, datas, type) { + if (type == 1) { + datas = datas.split(',') + } + if (type == 2) { + datas = this.getPictures(datas) + } + const list = datas.map(src => { + return { + src: $A.mainUrl(src) + } + }); + const index = list.findIndex(({ src }) => src === $A.mainUrl(currentUrl)); + this.$store.dispatch("previewImage", { index, list }) } } } diff --git a/resources/views/push/bot.blade.php b/resources/views/push/bot.blade.php index 4df84e457..a1a9bda71 100755 --- a/resources/views/push/bot.blade.php +++ b/resources/views/push/bot.blade.php @@ -159,11 +159,7 @@ [图片] @endif
- @if ($is_finished == 1) - - @else - @endif
@elseif ($type === 'approve_submitter') @if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif