mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 11:07:06 +00:00
perf: 1.优化审批流程-审批人审核过后自动通过 2. 优化审批评论图片可以左右滑动查看
This commit is contained in:
parent
72c70fe494
commit
ced25e0cd2
@ -149,7 +149,7 @@ services:
|
|||||||
|
|
||||||
approve:
|
approve:
|
||||||
container_name: "dootask-approve-${APP_ID}"
|
container_name: "dootask-approve-${APP_ID}"
|
||||||
image: "kuaifan/dooapprove:0.0.11"
|
image: "kuaifan/dooapprove:0.0.12"
|
||||||
environment:
|
environment:
|
||||||
TZ: "${TIMEZONE:-PRC}"
|
TZ: "${TIMEZONE:-PRC}"
|
||||||
MYSQL_HOST: "${DB_HOST}"
|
MYSQL_HOST: "${DB_HOST}"
|
||||||
|
|||||||
@ -54,7 +54,7 @@
|
|||||||
<div class="approve-details-text" v-if="datas.var?.other">
|
<div class="approve-details-text" v-if="datas.var?.other">
|
||||||
<h4>{{$L('图片')}}</h4>
|
<h4>{{$L('图片')}}</h4>
|
||||||
<div class="img-body">
|
<div class="img-body">
|
||||||
<div v-for="(src,key) in (datas.var.other).split(',') " @click="onViewPicture(src)">
|
<div v-for="(src,key) in (datas.var.other).split(',')" @click="onViewPicture(src, datas.var.other, 1)">
|
||||||
<ImgView :src="src" :key="key" class="img-view"/>
|
<ImgView :src="src" :key="key" class="img-view"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -164,7 +164,7 @@
|
|||||||
{{ getContent(item.content) }}
|
{{ getContent(item.content) }}
|
||||||
</div>
|
</div>
|
||||||
<div class="content" style="display: flex; gap: 10px;">
|
<div class="content" style="display: flex; gap: 10px;">
|
||||||
<div v-for="(src,k) in getPictures(item.content)" :key="k" @click="onViewPicture(src)">
|
<div v-for="(src,k) in getPictures(item.content)" :key="k" @click="onViewPicture(src, item.content, 2)">
|
||||||
<ImgView :src="src" class="img-view"/>
|
<ImgView :src="src" class="img-view"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -475,8 +475,20 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 打开图片
|
// 打开图片
|
||||||
onViewPicture(currentUrl) {
|
onViewPicture(currentUrl, datas, type) {
|
||||||
this.$store.dispatch("previewImage", $A.mainUrl(currentUrl))
|
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 })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -159,11 +159,7 @@
|
|||||||
<span>[图片]</span>
|
<span>[图片]</span>
|
||||||
@endif
|
@endif
|
||||||
</div><div class="btn-raw no-dark-content">
|
</div><div class="btn-raw no-dark-content">
|
||||||
@if ($is_finished == 1)
|
|
||||||
<button class="ivu-btn ivu-btn-grey">已同意</button>
|
|
||||||
@else
|
|
||||||
<button class="ivu-btn ivu-btn-grey">查看详情</button>
|
<button class="ivu-btn ivu-btn-grey">查看详情</button>
|
||||||
@endif
|
|
||||||
</div></span>
|
</div></span>
|
||||||
@elseif ($type === 'approve_submitter')
|
@elseif ($type === 'approve_submitter')
|
||||||
<span class="open-approve-details" data-id="{{$data->id}}"><b>@if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif</b>
|
<span class="open-approve-details" data-id="{{$data->id}}"><b>@if ($action === 'pass')您发起的「{{$data->proc_def_name}}」已通过 @else您发起的「{{$data->proc_def_name}}」被{{$data->nickname}}拒绝 @endif</b>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user