|
@@ -41,16 +41,23 @@
|
|
|
</div>
|
|
|
<form method="post" action="/tender/<%- tender.id %>/change/<%- change.cid %>/save">
|
|
|
<div class="modal-body">
|
|
|
- <!--如未创建清单-->
|
|
|
- <!--<h5>还没添加任何变更清单,无法提交。</h5>-->
|
|
|
- <!--可以提交审批 但需要设置审批流程-->
|
|
|
<div class="form-group">
|
|
|
- <label>搜索审批人</label>
|
|
|
+ <label>选择审批人</label>
|
|
|
<div class="input-group">
|
|
|
- <input class="form-control" placeholder="请输入姓名进行检索" type="text" id="search_audit_input">
|
|
|
- <div class="input-group-append">
|
|
|
- <button class="btn btn-outline-secondary" type="button" id="search_audit_btn"><i class="fa fa-search"></i></button>
|
|
|
+ <div class="input-group-prepend">
|
|
|
+ <select class="form-control" id="account_group">
|
|
|
+ <option value="0">所有分组</option>
|
|
|
+ <% for (const dw in accountGroup) { %>
|
|
|
+ <option value="<%= dw %>"><%= accountGroup[dw] %></option>
|
|
|
+ <% } %>
|
|
|
+ </select>
|
|
|
</div>
|
|
|
+ <select class="form-control" id="account_list">
|
|
|
+ <option value="0">选择审批人</option>
|
|
|
+ <% for (const account of accountList) { %>
|
|
|
+ <option value="<%= account.id %>"><%= account.name %><% if (account.role !== '') { %>(<%= account.role %>)<% } %><% if (account.company !== '') { %> -<%= account.company %><% } %></option>
|
|
|
+ <% } %>
|
|
|
+ </select>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div id="search_audit_list">
|
|
@@ -59,26 +66,14 @@
|
|
|
<div class="card-header">
|
|
|
审批流程
|
|
|
</div>
|
|
|
- <ul class="list-group list-group-flush">
|
|
|
- <% for (const audit of auditList) { %>
|
|
|
- <% if (audit.usite === 0) { %>
|
|
|
- <li class="list-group-item">
|
|
|
- <i class="fa fa-play-circle fa-rotate-90"></i>
|
|
|
- <%= audit.name %><small class="text-muted"><%= audit.jobs %></small>
|
|
|
- </li>
|
|
|
- <% } %>
|
|
|
- <% } %>
|
|
|
- </ul>
|
|
|
<ul class="list-group list-group-flush" id="auditList">
|
|
|
- <% for (const audit of auditList) { %>
|
|
|
+ <% for (const [index, audit] of auditList.entries()) { %>
|
|
|
<% if (audit.usite !== 0) { %>
|
|
|
<li class="list-group-item" data-auditmsg="<%= audit.uid + '/%/' + audit.name + '/%/' + audit.jobs + '/%/' + audit.company %>"
|
|
|
data-auditid="<%= audit.uid %>">
|
|
|
<a href="javascript:void(0)" class="text-danger pull-right remove_audit_btn">移除</a>
|
|
|
- <% if (audit.usite === auditList.length-1) { %><i class="fa fa-stop-circle"></i>
|
|
|
- <% } else { %><i class="fa fa-chevron-circle-down"></i>
|
|
|
- <% } %>
|
|
|
- <%= audit.name %><small class="text-muted"><%= audit.jobs %></small>
|
|
|
+ <span><%= index %></span> <%= audit.name %> <small class="text-muted"><%= audit.jobs %></small>
|
|
|
+ <p class="m-0 ml-2"><small class="text-muted"><%= audit.company %></small></p>
|
|
|
</li>
|
|
|
<% } %>
|
|
|
<% } %>
|
|
@@ -126,11 +121,6 @@
|
|
|
<tr><th>项目节编号</th><th>名称</th><th>部位明细</th><th>选择</th></tr>
|
|
|
</thead>
|
|
|
<tbody id="code-list" data-index="">
|
|
|
- <!--<tr><td colspan="3">自行编辑变更详情</td><td><input type="checkbox"></td></tr>-->
|
|
|
- <!--<tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td>0#桥台1#桩</td><td><input type="checkbox"></td></tr>-->
|
|
|
- <!--<tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td>0#桥台2#桩</td><td><input type="checkbox"></td></tr>-->
|
|
|
- <!--<tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td>0#桥台3#桩</td><td><input type="checkbox"></td></tr>-->
|
|
|
- <!--<tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td>0#桥台4#桩</td><td><input type="checkbox"></td></tr>-->
|
|
|
</tbody>
|
|
|
</table>
|
|
|
</div>
|
|
@@ -145,6 +135,106 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+
|
|
|
+<% if (auditStatus === 2) { %>
|
|
|
+ <!--重新上报-->
|
|
|
+ <div class="modal fade" id="sub-sp2" data-backdrop="static">
|
|
|
+ <div class="modal-dialog modal-lg" role="document">
|
|
|
+ <div class="modal-content">
|
|
|
+ <div class="modal-header">
|
|
|
+ <h5 class="modal-title">重新上报</h5>
|
|
|
+ </div>
|
|
|
+ <div class="modal-body">
|
|
|
+ <div class="row">
|
|
|
+ <div class="col-4">
|
|
|
+ <a href="#sub-ap" data-toggle="modal" data-category="" data-target="#sub-ap" id="hideSp">修改审批流程</a>
|
|
|
+ <div class="card mt-3">
|
|
|
+ <ul class="list-group list-group-flush">
|
|
|
+ <% for (const audit of auditList) { %>
|
|
|
+ <% if (audit.usite === 0) { %>
|
|
|
+ <li class="list-group-item">
|
|
|
+ <i class="fa fa-play-circle fa-rotate-90"></i>
|
|
|
+ <%= audit.name %> <small class="text-muted"><%= audit.jobs %></small>
|
|
|
+ </li>
|
|
|
+ <% } %>
|
|
|
+ <% } %>
|
|
|
+ </ul>
|
|
|
+ <ul class="list-group list-group-flush" id="shenpi-audit-list">
|
|
|
+ <% for (const [index,a] of auditList.entries()) { %>
|
|
|
+ <% if (a.usite !== 0 ) { %>
|
|
|
+ <li class="list-group-item" data-auditid="<%= a.uid %>">
|
|
|
+ <% if (index+1 !== auditList.length) { %>
|
|
|
+ <i class="fa fa-chevron-circle-down"></i>
|
|
|
+ <% } else if (index+1 === auditList.length) { %>
|
|
|
+ <i class="fa fa-stop-circle"></i>
|
|
|
+ <% } %>
|
|
|
+ <%= a.name %> <small class="text-muted"><%= a.jobs %></small>
|
|
|
+ </li>
|
|
|
+ <% }%>
|
|
|
+ <% } %>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="col-8 modal-height-500" style="overflow: auto">
|
|
|
+ <% for (const time in auditList3) { %>
|
|
|
+ <% if (auditList3[time].length > 0) { %>
|
|
|
+ <div class="card mt-3">
|
|
|
+ <ul class="list-group list-group-flush">
|
|
|
+ <% for (const [aindex,al] of auditList3[time].entries()) { %>
|
|
|
+ <li class="list-group-item">
|
|
|
+ <% if (al.usite === 0 && al.status === 2) { %>
|
|
|
+ <span class="pull-right">重新上报中</span>
|
|
|
+ <% } else if (al.usite === 0 && al.status === 3) { %>
|
|
|
+ <span class="text-success pull-right">上报</span>
|
|
|
+ <% } else if (al.usite !== 0 && al.status === 2) { %>
|
|
|
+ <span class="pull-right">审批中</span>
|
|
|
+ <% } else if (al.usite !== 0 && al.status === 3) { %>
|
|
|
+ <span class="text-success pull-right">审批通过</span>
|
|
|
+ <% } else if (al.usite !== 0 && al.status === 4) { %>
|
|
|
+ <span class="text-danger pull-right">审批终止</span>
|
|
|
+ <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
|
|
|
+ <span class="text-warning pull-right">审批退回 </span>
|
|
|
+ <% } %>
|
|
|
+ <h5 class="card-title">
|
|
|
+ <% if (al.usite === 0 && al.status === 2 ) { %>
|
|
|
+ <i class="fa fa-play-circle fa-rotate-90"></i>
|
|
|
+ <% } else if (al.usite === 0 && al.status === 3 ) { %>
|
|
|
+ <i class="fa fa-play-circle fa-rotate-90 text-success"></i>
|
|
|
+ <% } else if (al.status === 1 || al.status === 2) { %>
|
|
|
+ <i class="fa <% if (aindex+1 === auditList3[time].length) { %>fa-stop-circle<% } else { %>fa-chevron-circle-down<% } %> "></i>
|
|
|
+ <% } else if (al.status === 3) { %>
|
|
|
+ <i class="fa <% if (aindex+1 === auditList3[time].length) { %>fa-stop-circle<% } else { %>fa-chevron-circle-down<% } %> text-success"></i>
|
|
|
+ <% } else if (al.status === 4) { %>
|
|
|
+ <i class="fa <% if (aindex+1 === auditList3[time].length) { %>fa-stop-circle<% } else { %>fa-chevron-circle-down<% } %> text-danger"></i>
|
|
|
+ <% } else if (al.status === 5 || al.status === 6) { %>
|
|
|
+ <i class="fa <% if (aindex+1 === auditList3[time].length) { %>fa-stop-circle<% } else { %>fa-chevron-circle-down<% } %> text-warning"></i>
|
|
|
+ <% } %>
|
|
|
+ <%= al.name %> <small class="text-muted"><%= al.jobs %></small>
|
|
|
+ </h5>
|
|
|
+ <% if (al.sdesc !== '' && al.sdesc !== null) { %>
|
|
|
+ <p class="card-text mb-1"><%= al.sdesc %></p>
|
|
|
+ <% } %>
|
|
|
+ <% if (al.sin_time !== null) { %>
|
|
|
+ <p class="card-text"><small class="text-muted"><%= moment(al.sin_time).format('YYYY-MM-DD') %></small></p>
|
|
|
+ <% } %>
|
|
|
+ </li>
|
|
|
+ <% } %>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ <% } %>
|
|
|
+ <% } %>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="modal-footer">
|
|
|
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
|
|
|
+ <button type="button" data-sumbit="sumbit_change" data-category="up_change" class="btn btn-primary up-change">确认上报</button>
|
|
|
+ <button type="button" data-sumbit="sumbit_change" data-category="save_change" class="btn btn-success save-change">保存修改</button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+<% } %>
|
|
|
<% } %>
|
|
|
|
|
|
<% if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7) { %>
|
|
@@ -183,8 +273,10 @@
|
|
|
<li class="list-group-item">
|
|
|
<% if (al.usite === 0 && al.status === 2) { %>
|
|
|
<span class="pull-right">重新上报中</span>
|
|
|
- <% } else if (al.usite === 0 && al.status === 3) { %>
|
|
|
+ <% } else if (al.usite === 0 && al.status === 3 && a.times === 1) { %>
|
|
|
<span class="text-success pull-right">上报</span>
|
|
|
+ <% } else if (al.usite === 0 && al.status === 3 && a.times !== 1) { %>
|
|
|
+ <span class="text-success pull-right">重新上报</span>
|
|
|
<% } else if (al.usite !== 0 && al.status === 2) { %>
|
|
|
<span class="pull-right">审批中</span>
|
|
|
<% } else if (al.usite !== 0 && al.status === 3) { %>
|
|
@@ -210,9 +302,12 @@
|
|
|
<% } %>
|
|
|
<%= al.name %> <small class="text-muted"><%= al.jobs %></small>
|
|
|
</h5>
|
|
|
- <% if (al.sin_time !== null || (al.sdesc !== '' && al.sdesc !== null)) { %>
|
|
|
- <p class="card-text"><%= al.sdesc %> <%= moment(al.sin_time).format('YYYY-MM-DD') %></p>
|
|
|
- <% } %>
|
|
|
+ <% if (al.sdesc !== '' && al.sdesc !== null) { %>
|
|
|
+ <p class="card-text mb-1"><%= al.sdesc %></p>
|
|
|
+ <% } %>
|
|
|
+ <% if (al.sin_time !== null) { %>
|
|
|
+ <p class="card-text"><small class="text-muted"><%= moment(al.sin_time).format('YYYY-MM-DD') %></small></p>
|
|
|
+ <% } %>
|
|
|
</li>
|
|
|
<% } %>
|
|
|
</ul>
|
|
@@ -243,8 +338,10 @@
|
|
|
<ul class="list-group list-group-flush">
|
|
|
<% for (const [index,a] of auditList.entries()) { %>
|
|
|
<li class="list-group-item">
|
|
|
- <% if (a.status === 3 && a.usort === 0) { %>
|
|
|
+ <% if (a.status === 3 && a.usort === 0 && a.times === 1) { %>
|
|
|
<span class="text-success pull-right">上报</span>
|
|
|
+ <% } else if (a.status === 3 && a.usort === 0 && a.times !== 1) { %>
|
|
|
+ <span class="text-success pull-right">重新上报</span>
|
|
|
<% } else if (a.status === 3 && a.usort !== 0) { %>
|
|
|
<span class="text-success pull-right">审批通过</span>
|
|
|
<% } else if (a.status === 2) { %>
|
|
@@ -309,8 +406,10 @@
|
|
|
<ul class="list-group list-group-flush">
|
|
|
<% for (const [index,a] of auditList.entries()) { %>
|
|
|
<li class="list-group-item">
|
|
|
- <% if (a.status === 3 && a.usort === 0) { %>
|
|
|
+ <% if (a.status === 3 && a.usort === 0 && a.times === 1) { %>
|
|
|
<span class="text-success pull-right">上报</span>
|
|
|
+ <% } else if (a.status === 3 && a.usort === 0 && a.times !== 1) { %>
|
|
|
+ <span class="text-success pull-right">重新上报</span>
|
|
|
<% } else if (a.status === 3 && a.usort !== 0) { %>
|
|
|
<span class="text-success pull-right">审批通过</span>
|
|
|
<% } else if (a.status === 2) { %>
|