修复bug

app/public/js/change_information_show.js

@@ -143,4 +143,62 @@ $(document).ready(() => {
         }
         changeSpreadObj.showHideAudit($(this).is(':checked'));
     });
+
+    // 重新审批获取手机验证码
+    // 获取验证码
+    let isPosting = false;
+    $("#get-code").click(function() {
+        if (isPosting) {
+            return false;
+        }
+        const btn = $(this);
+
+        $.ajax({
+            url: '/profile/code?_csrf=' + csrf,
+            type: 'post',
+            data: { mobile: authMobile, type: 'shenpi' },
+            dataTye: 'json',
+            error: function() {
+                isPosting = false;
+            },
+            beforeSend: function() {
+                isPosting = true;
+            },
+            success: function(response) {
+                isPosting = false;
+                if (response.err === 0) {
+                    codeSuccess(btn);
+                    $("input[name='code']").removeAttr('readonly');
+                    $("#re-shenpi-btn").removeAttr('disabled');
+                } else {
+                    toast(response.msg, 'error');
+                }
+            }
+        });
+    });
 });
+/**
+ * 获取成功后的操作
+ *
+ * @param {Object} btn - 点击的按钮
+ * @return {void}
+ */
+function codeSuccess(btn) {
+    let counter = 60;
+    btn.addClass('disabled').text('重新获取 ' + counter + 'S');
+    btn.parent().siblings('input').removeAttr('readonly').attr('placeholder', '输入短信中的6位验证码');
+    const bindBtn = $("#bind-btn");
+    bindBtn.removeClass('btn-secondary disabled').addClass('btn-primary');
+
+    const countDown = setInterval(function() {
+        const countString = counter - 1 <= 0 ? '' : ' ' + (counter - 1) + 'S';
+        // 倒数结束后
+        if (countString === '') {
+            clearInterval(countDown);
+            btn.removeClass('disabled');
+        }
+        const text = '重新获取' + countString;
+        btn.text(text);
+        counter -= 1;
+    }, 1000);
+}

app/service/change.js

@@ -402,7 +402,6 @@ module.exports = app => {
                         uSite++;
                         uSort++;
                         insertCA.push(caArray);
-                        console.log(change_status, index);
 
                         // 添加短信通知-需要审批提醒功能
                         if (change_status && index === 0) {
@@ -548,8 +547,8 @@ module.exports = app => {
             try {
                 // 获取所有审核人列表
                 const auditors = await this.ctx.service.changeAudit.getAllAuditors(changeData.tid);
-                console.log('auditors', auditors);
-                console.log('postData', postData);
+                // console.log('auditors', auditors);
+                // console.log('postData', postData);
                 // 添加到消息推送表
                 const noticeContent = await this.getNoticeContent(pid, changeData.tid, changeData.cid, this.ctx.session.sessionUser.accountId);
                 const records = [];

app/view/change/information.ejs

@@ -359,15 +359,15 @@
     </div>
 </div>
 <script>
-    let table = '';
     const totalPriceUnit = '<%- tpUnit %>';
     const unitPriceUnit = '<%- upUnit %>';
     const accountId = parseInt('<%- ctx.session.sessionUser.accountId %>');
     const ledgeStatus = '<%- tender.ledger_status %>';
     const ledgerConsts = JSON.parse('<%- JSON.stringify(ledgerConsts) %>');
     const auditStatus = parseInt('<%- auditStatus %>');
-    const auditList = JSON.parse('<%- JSON.stringify(auditList) %>');
+    const auditList = JSON.parse(unescape('<%- escape(JSON.stringify(auditList)) %>'));
     const precision = JSON.parse('<%- JSON.stringify(precision) %>');
+    const whiteList = JSON.parse('<%- JSON.stringify(whiteList) %>');
     let attData = JSON.parse(unescape('<%- escape(JSON.stringify(attList)) %>'));
     autoFlashHeight();
     $('a[href="#sub-ap"').click(function() {
@@ -380,20 +380,16 @@
     const changeSpread = SpreadJsObj.createNewSpread($('#change-spread')[0]);
     const changeSpreadSheet = changeSpread.getActiveSheet();
     let changeList = JSON.parse(unescape('<%- escape(JSON.stringify(changeList)) %>'));
-    console.log(changeList);
     const style1 = new GC.Spread.Sheets.Style();
     style1.locked = true;
 </script>
-<script>
-    const whiteList = JSON.parse('<%- JSON.stringify(whiteList) %>');
-</script>
 <% if (auditStatus === 1 || auditStatus === 2) { %>
 <script>
     let changeUnits = JSON.parse('<%- JSON.stringify(changeUnits) %>');
     changeUnits = _.map(changeUnits, 'unit');
     changeUnits.push('');
-    const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup) %>');
-    const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
+    const accountGroup = JSON.parse(unescape('<%- escape(JSON.stringify(accountGroup)) %>'));
+    const accountList = JSON.parse(unescape('<%- escape(JSON.stringify(accountList)) %>'));
     const shenpi_status = <%- ctx.tender.info.shenpi.change %>;
     const shenpiConst = JSON.parse('<%- JSON.stringify(shenpiConst) %>');
     const changesUid = <%- change.uid %>;
@@ -423,17 +419,16 @@
 <script src="/public/js/change_audit.js"></script>
 <% } else if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7) { %>
 <script>
-    const auditList2 = JSON.parse('<%- JSON.stringify(auditList2) %>');
+    const auditList2 = JSON.parse(unescape('<%- escape(JSON.stringify(auditList2)) %>'));
     const aidList = _.map(auditList2, 'uid');
     aidList.splice(0, 1);
 </script>
 <script src="/public/js/change_information_show.js"></script>
 <% } else if (auditStatus === 6) { %>
 <script>
-    const auditList2 = JSON.parse('<%- JSON.stringify(auditList2) %>');
+    const auditList2 = JSON.parse(unescape('<%- escape(JSON.stringify(auditList2)) %>'));
     const aidList = _.map(auditList2, 'uid');
     aidList.splice(0, 1);
 </script>
 <script src="/public/js/change_information_approval.js"></script>
 <% } %>
-<!--<script src="/public/js/change_detail.js"></script>-->

app/view/change/information_modal.ejs

@@ -1002,22 +1002,23 @@
                 <h5 class="modal-title">拷贝其他变更令数据</h5>
             </div>
             <div class="modal-body">
-            <div class="alert alert-warning p-2">选择需要拷贝的变更令，确认后将为您自动生成变更信息</div>
-            <div style="height: 300px; overflow: scroll; overflow-x: hidden;">
-                <table class="table table-bordered" >
-                    <thead>
+                <div class="alert alert-warning p-2">选择需要拷贝的变更令，确认后将为您自动生成变更信息</div>
+                <div style="height: 300px; overflow: scroll; overflow-x: hidden;">
+                    <table class="table table-bordered" >
+                        <thead>
                         <tr align="center"><th>申请编号/变更令号</th><th>工程名称</th><th>变更类别</th><th>变更金额</th><th>审批状态</th><th>选择</th></tr>
-                    </thead>
-                    <tbody >
+                        </thead>
+                        <tbody >
                         <% othersChange.forEach(change => { %>
                             <tr><td><%- change.code%></td><td><%- change.name%></td><td><%- change.class%></td><td align="right"><%- change.total_price %></td><td><span class="<%- auditConst.auditStatusClass[change.status]%>"><%- auditConst.auditStatusString[change.status]%></span></td><td align="center"><input type="checkbox" data-id="<%- change.cid %>"></td></tr>
                         <% }); %>
-                    </tbody>
-                </table>
+                        </tbody>
+                    </table>
+                </div>
             </div>
             <div class="modal-footer">
-            <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
-            <button type="button" class="btn btn-sm btn-primary" id="bg-copy">确认拷贝</button>
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-sm btn-primary" id="bg-copy">确认拷贝</button>
             </div>
         </div>
     </div>

app/view/dashboard/index.ejs

@@ -112,7 +112,7 @@
                                                 <div class="row">
                                                     <div class="col-auto"><span class="badge badge-danger">变更审批</span></div>
                                                     <div class="col-6"><a href="/tender/<%- change.tid %>"><%- change.name %></a> 变更令 <%- change.ccode %></div>
-                                                    <div class="col-3 ml-auto text-right pl-0"><a href="/tender/<%- change.tid %>/change/<%- change.cid %>/info" class="btn btn-sm btn-outline-primary"><% if (change.cstatus === acChange.status.checking) { %>审批<% } else if (change.cstatus === acChange.status.backnew) { %>重新审批<% } else { %>重新上报<% } %></a></div>
+                                                    <div class="col-3 ml-auto text-right pl-0"><a href="/tender/<%- change.tid %>/change/<%- change.cid %>/information" class="btn btn-sm btn-outline-primary"><% if (change.cstatus === acChange.status.checking) { %>审批<% } else if (change.cstatus === acChange.status.backnew) { %>重新审批<% } else { %>重新上报<% } %></a></div>
                                                 </div>
                                                 <p class="mt-1 mb-0"><%- change.caname %><small class="ml-1 text-muted"><%- (role ? '- ' + role : '') %></small>
                                                     <span class="pull-right text-muted"><%- (change.sin_time ? ctx.moment(change.sin_time).format('YYYY-MM-DD HH:mm:ss') : '') %></span>
@@ -262,7 +262,7 @@
                                                         <div class="col-auto"><span class="badge badge-danger">变更审批</span></div>
                                                         <div class="col-6">
                                                             <a href="/tender/<%- notice.tid %>"><%- notice.name %></a>
-                                                            <a href="/tender/<%- notice.tid %>/change/<%- notice.cid %>/info"><%- notice.c_code %> </a>
+                                                            <a href="/tender/<%- notice.tid %>/change/<%- notice.cid %>/information"><%- notice.c_code %> </a>
                                                             <%- acChange.statusString[notice.status]%>
                                                         </div>
                                                     </div>

app/view/tender/shenpi.ejs

@@ -145,13 +145,15 @@
     const sp_type = JSON.parse('<%- JSON.stringify(shenpi.sp_type) %>');
     const sp_status = JSON.parse('<%- JSON.stringify(shenpi.sp_status) %>');
     const sp_status_list = JSON.parse('<%- JSON.stringify(shenpi.sp_status_list) %>');
-    const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup) %>');
-    const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
+    const accountGroup = JSON.parse(unescape('<%- escape(JSON.stringify(accountGroup)) %>'));
+    const accountList = JSON.parse(unescape('<%- escape(JSON.stringify(accountList)) %>'));
     const cur_uid = parseInt('<%- ctx.tender.data.user_id %>');
     const cur_tenderid = parseInt('<%- ctx.tender.id %>');
     const tenders = JSON.parse(unescape('<%- escape(JSON.stringify(tenderList)) %>'));
     const category = JSON.parse(unescape('<%- escape(JSON.stringify(categoryData)) %>'));
 </script>
+<script src="/public/js/decimal.min.js"></script>
+<script src="/public/js/zh_calc.js"></script>
 <script src="/public/js/shenpi.js"></script>
 <script src="/public/js/tender_showhide.js"></script>
 <script>