Browse Source

fix: 预付款详情页input比例输入框增加最大限制值

lanjianrong 4 years ago
parent
commit
2766ee48c6
2 changed files with 68 additions and 10 deletions
  1. 7 0
      app/service/advance.js
  2. 61 10
      app/view/advance/detail.ejs

+ 7 - 0
app/service/advance.js

@@ -23,8 +23,15 @@ module.exports = app => {
                 value: type,
                 operate: '=',
             });
+            if (this.ctx.session.sessionUser.accountId !== this.ctx.tender.data.user_id) {
+                this.sqlBuilder.setAndWhere('status', {
+                    value: auditConst.status.uncheck,
+                    operate: '!=',
+                });
+            }
             this.sqlBuilder.orderBy = [['order', 'desc']];
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
+            console.log(sql);
             const advance = await this.db.query(sql, sqlParam);
             for (const item of advance) {
                 item.curAuditor = await this.ctx.service.advanceAudit.getAuditorByStatus(item.id, item.status, item.times);

+ 61 - 10
app/view/advance/detail.ejs

@@ -23,7 +23,7 @@
                             <tr>
                                 <th colspan="4" class="text-center">
                                     签约<%- advance.type === auditConst.type.start ? '开工' : '材料' %>预付款:<%- ctx.helper.formatMoney(advancePayTotal) %>
-                                        
+                                    元
                                 </th>
                             </tr>
                         </thead>
@@ -33,8 +33,8 @@
                                 <th width="150">支付比例</th>
                                 <td class="text-right">
                                     <div class="input-group input-group-sm">
-                                        <input type="number" class="pay-input form-control nospin text-right" max="<%- max_pr %>"
-                                            min="1" placeholder="请填写支付比例,将自动计算本期金额" data-type="0"
+                                        <input type="number" class="pay-input form-control nospin text-right"
+                                            max="<%- max_pr %>" min="1" placeholder="请填写支付比例,将自动计算本期金额" data-type="0"
                                             value="<%- advance.cur_amount && ctx.helper.mul(ctx.helper.div(advance.cur_amount, advancePayTotal), 100, 2) || 0 %>">
                                         <div class="input-group-append"><span class="input-group-text">%</span></div>
                                     </div>
@@ -75,8 +75,7 @@
                                 <th>备注</th>
                                 <td colspan="3">
                                     <textarea id="ad-remark" class="form-control form-control-sm"
-                                        <%- isEdited && ctx.session.sessionUser.accountId === ctx.advance.uid ? '' : 'disabled' %>
-                                        ></textarea>
+                                        <%- isEdited && ctx.session.sessionUser.accountId === ctx.advance.uid ? '' : 'disabled' %>></textarea>
                                 </td>
                             </tr>
                         </tbody>
@@ -124,6 +123,54 @@
                                     </div>
                                 </td>
                                 <td width="70%">
+                                    <!-- <div class="dropdown">
+                                        <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button"
+                                            id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true"
+                                            aria-expanded="false">
+                                            添加审批流程
+                                        </button>
+                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"
+                                            style="width:220px">
+                                            <div class="mb-2 p-2"><input class="form-control form-control-sm"
+                                                    placeholder="姓名/手机 检索"></div>
+                                            <dl class="list-unstyled book-list">
+                                                <dt><a href=""><i class="fa fa-minus-square-o"></i></a> 建设单位</dt>
+                                                <dd class="border-bottom p-2 mb-0">
+                                                    <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span
+                                                            class="ml-auto">15800000003</span></p>
+                                                    <span class="text-muted">职称</span>
+                                                </dd>
+                                                <dd class="border-bottom p-2 mb-0">
+                                                    <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span
+                                                            class="ml-auto">15800000003</span></p>
+                                                    <span class="text-muted">职称</span>
+                                                </dd>
+                                                <dd class="border-bottom p-2 mb-0">
+                                                    <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span
+                                                            class="ml-auto">15800000003</span></p>
+                                                    <span class="text-muted">职称</span>
+                                                </dd>
+                                                <dd class="border-bottom p-2 mb-0">
+                                                    <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span
+                                                            class="ml-auto">15800000003</span></p>
+                                                    <span class="text-muted">职称</span>
+                                                </dd>
+                                                <dt><a href=""><i class="fa fa-minus-square-o"></i></a> 监理单位</dt>
+                                                <dd class="border-bottom p-2 mb-0">
+                                                    <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span
+                                                            class="ml-auto">15800000003</span></p>
+                                                    <span class="text-muted">职称</span>
+                                                </dd>
+                                                <dd class="border-bottom p-2 mb-0">
+                                                    <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span
+                                                            class="ml-auto">15800000003</span></p>
+                                                    <span class="text-muted">职称</span>
+                                                </dd>
+                                                <dt><a href=""><i class="fa fa-plus-square"></i></a> 施工单位</dt>
+                                                <dt><a href=""><i class="fa fa-plus-square"></i></a> 设计单位</dt>
+                                            </dl>
+                                        </div>
+                                    </div> -->
                                     <div class="form-group">
                                         <label>选择审批人</label>
                                         <div class="input-group">
@@ -197,7 +244,8 @@
                                             <li class="list-group-item" data-auditorId="<%- item.audit_id %>">
                                                 <i class="fa fa-chevron-circle-down"></i> <%- item.name %>
                                                 <small class="text-muted"><%- item.role %></small>
-                                                <span class="pull-right"><%= ctx.helper.transFormToChinese(idx) %>审</span>
+                                                <span
+                                                    class="pull-right"><%= ctx.helper.transFormToChinese(idx) %>审</span>
                                             </li>
                                             <% } %>
                                             <% }) %>
@@ -207,7 +255,9 @@
                                 <td width="70%">
                                     <% auditHistory.forEach((auditors, idx) => { %>
                                     <div class="<%- idx < auditHistory.length - 1 ? 'fold-card' : '' %>">
-                                        <div class="text-center text-muted" <%- idx === auditHistory.length - 1 ? `id="end-target"` : "" %> ><%- idx === auditHistory.length - 1 ? 1 : idx+1 %>#</div>
+                                        <div class="text-center text-muted"
+                                            <%- idx === auditHistory.length - 1 ? `id="end-target"` : "" %>>
+                                            <%- idx === auditHistory.length - 1 ? 1 : idx+1 %>#</div>
                                         <ul class="timeline-list list-unstyled mt-2">
                                             <% auditors.forEach((auditor, index) => { %>
                                             <% if (index === 0) { %>
@@ -238,7 +288,7 @@
                                                     <%- ctx.helper.formatDate(auditor.end_time) %>
                                                 </div>
                                                 <% if(index < auditors.length - 1) { %>
-                                                    <div class="timeline-item-tail"></div>
+                                                <div class="timeline-item-tail"></div>
                                                 <% } %>
                                                 <% if(auditor.status === auditConst.status.checked) { %>
                                                 <div class="timeline-item-icon bg-success text-light">
@@ -282,7 +332,7 @@
                                                     <%- ctx.helper.formatDate(auditor.end_time) %>
                                                 </div>
                                                 <% if(index < auditors.length - 1) { %>
-                                                    <div class="timeline-item-tail"></div>
+                                                <div class="timeline-item-tail"></div>
                                                 <% } %>
                                                 <% if(auditor.status === auditConst.status.checked) { %>
                                                 <div class="timeline-item-icon bg-success text-light">
@@ -331,7 +381,8 @@
                                     </div>
                                     <!-- 展开/收起历史流程 -->
                                     <% if(idx === auditHistory.length - 1 && auditHistory.length !== 1) { %>
-                                        <div class="text-right"><a href="javascript: void(0);" id="fold-btn"  data-target="show" data-idx="<%- idx + 1 %>">展开历史审批流程</a></div>
+                                    <div class="text-right"><a href="javascript: void(0);" id="fold-btn"
+                                            data-target="show" data-idx="<%- idx + 1 %>">展开历史审批流程</a></div>
                                     <% } %>
                                     <% }) %>
                                 </td>