|
|
@@ -513,7 +513,7 @@
|
|
|
</div>
|
|
|
|
|
|
<!--审批意见-->
|
|
|
- <% if(auditor.status !== auditConst.status.uncheck) { %>
|
|
|
+ <% if(auditor.times === advance.times && auditor.status !== auditConst.status.uncheck) { %>
|
|
|
<div class="card-body p-3 border-top">
|
|
|
<% if (ctx.advance.times === idx + 1 && auditor.status === auditConst.status.checking) { %>
|
|
|
<label>审批意见<b class="text-danger">*</b></label>
|
|
|
@@ -587,7 +587,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!--审批意见-->
|
|
|
- <% if(auditor.status !== auditConst.status.uncheck) { %>
|
|
|
+ <% if(auditor.times === advance.times && auditor.status !== auditConst.status.uncheck) { %>
|
|
|
<div class="card-body p-3 border-top">
|
|
|
<% if (ctx.advance.times === idx + 1 && auditor.status === auditConst.status.checking) { %>
|
|
|
<label>审批意见<b class="text-danger">*</b></label>
|
|
|
@@ -664,14 +664,9 @@
|
|
|
return true;
|
|
|
}
|
|
|
$('.sp-location-list').on('shown.bs.modal', function () {
|
|
|
- const height = $(this)[0].scrollHeight;
|
|
|
const scrollBox = $(this).find('div[class="col-8 modal-height-500"]');
|
|
|
+ console.log('scrollBox', scrollBox)
|
|
|
const bdiv = (scrollBox.offset() && scrollBox.offset().top) || 0;
|
|
|
-
|
|
|
- // 450是modal没有滚动条时的最大高度，超过则出现滚动条，需要自动下拉到底部
|
|
|
- // if (scrollBox.length && scrollBox[0].scrollHeight > 450) {
|
|
|
- // scrollBox.scrollTop(height);
|
|
|
- // }
|
|
|
scrollBox.scrollTop(0);
|
|
|
const hdiv = divSearch($(this).find('textarea')) ? $(this).find('textarea') : null;
|
|
|
const hdheight = hdiv ? hdiv.parents('.list-group-item').offset().top : null;
|
lanjianrong