fix: 修复预付款新建期进不去详情页的bug

app/controller/advance_controller.js

@@ -274,7 +274,6 @@ module.exports = app => {
          */
         async start(ctx) {
             const data = JSON.parse(ctx.request.body.data);
-            console.log('data', data);
             try {
                 // 检查权限等
                 if (!ctx.advance) {

app/public/js/advance.js

@@ -14,24 +14,24 @@ $(document).ready(function () {
         $('#erro').modal('show');
     }
 
-    $('#advance_add').click(function() {
-        postData(`${window.location.pathname}/${type}/create`, {}, res => {
-            const html = `<tr>
-                <td><a href="/tender/${res.tid}/advance/${res.id}/detail" data-id="${res.id}">第${res.order}期</a></td>
-                <td>${res.pay_ratio || 0}%</td>
-                <td class="text-right">${formatMoney((res.cur_amount || 0), ',', decimal)}</td>
-                <td class="text-right">${formatMoney((res.prev_amount || 0), ',', decimal)}</td>
-                <td class="text-right">${formatMoney((res.prev_total_amount || 0),',', decimal)}</td>
-                <td><a class="btn btn-sm" href="#file" data-toggle="modal" data-target="#file"><i class="fa fa-paperclip "></i> 3</a></td>
-                <td>${auditConst.statusString[res.status]}</td>
-                <td><a href="/tender/${res.tid}/advance/${res.id}/detail" class="btn btn-primary btn-sm">编辑</a></td>
-                </tr>`
-            $('#advanceList').prepend(html)
-            $('#advance_add').remove()
-            window.location.href = `${window.location.pathname}/${res.id}/detail`
-        })
-        return false
-    })
+    // $('#advance_add').click(function() {
+    //     postData(`${window.location.pathname}/${type}/create`, {}, res => {
+    //         const html = `<tr>
+    //             <td><a href="/tender/${res.tid}/advance/${res.id}/detail" data-id="${res.id}">第${res.order}期</a></td>
+    //             <td>${res.pay_ratio || 0}%</td>
+    //             <td class="text-right">${formatMoney((res.cur_amount || 0), ',', decimal)}</td>
+    //             <td class="text-right">${formatMoney((res.prev_amount || 0), ',', decimal)}</td>
+    //             <td class="text-right">${formatMoney((res.prev_total_amount || 0),',', decimal)}</td>
+    //             <td><a class="btn btn-sm" href="#file" data-toggle="modal" data-target="#file"><i class="fa fa-paperclip "></i> 3</a></td>
+    //             <td>${auditConst.statusString[res.status]}</td>
+    //             <td><a href="/tender/${res.tid}/advance/${res.id}/detail" class="btn btn-primary btn-sm">编辑</a></td>
+    //             </tr>`
+    //         $('#advanceList').prepend(html)
+    //         $('#advance_add').remove()
+    //         window.location.href = `${window.location.pathname}/${res.id}/detail`
+    //     })
+    //     return false
+    // })
 
     $('#advanceList').on('click', `a[href="#file"]`, function() {
         const { fileList = [] } = advanceList.find(item => item.id === parseInt($(this).data('id')))

app/service/advance.js

@@ -37,7 +37,7 @@ module.exports = app => {
             for (const item of advance) {
                 item.pay_ratio = this.ctx.helper.mul(this.ctx.helper.div(item.cur_amount, advancePayTotal), 100, 2) || 0;
                 if (item.status === auditConst.status.uncheck || item.status === auditConst.status.checkNo) {
-                    const s1 = parseFloat(item.cur_amount.toFixed(decimal)).toString().split('.')[1];
+                    const s1 = item.cur_amount && parseFloat(item.cur_amount.toFixed(decimal)).toString().split('.')[1];
                     const s2 = parseFloat(item.prev_amount.toFixed(decimal)).toString().split('.')[1];
                     const s3 = parseFloat(item.prev_total_amount.toFixed(decimal)).toString().split('.')[1];
                     item.cur_amount = this.ctx.helper.formatMoney(item.cur_amount, ',', s1 && s1.length || 0);

app/view/advance/index.ejs

@@ -22,7 +22,7 @@
                         <div class="progress-bar bg-success" style="width: <%- progress.p_ratio%>%;" data-placement="bottom"
                             data-toggle="tooltip" data-original-title="截止上期金额：￥<%- ctx.helper.formatMoney(progress.p_amount, ',', parseFloat(progress.p_amount.toFixed(decimal)).toString().split('.')[1] && parseFloat(progress.p_amount.toFixed(decimal)).toString().split('.')[1].length || 0) %>"><%- progress.p_ratio.toFixed() %>%</div>
                         <div class="progress-bar bg-info" style="width:<%- progress.c_ratio%>%;" data-placement="bottom"
-                            data-toggle="tooltip" data-original-title="本期金额：￥<%- ctx.helper.formatMoney(progress.c_amount, ',', parseFloat(progress.c_amount.toFixed(decimal)).toString().split('.')[1] && parseFloat(progress.c_amount.toFixed(decimal)).toString().split('.')[1].length || 0) %>"><%- progress.c_ratio.toFixed() %>%</div>
+                            data-toggle="tooltip" data-original-title="本期金额：￥<%- ctx.helper.formatMoney(progress.c_amount, ',', progress.c_amount && parseFloat(progress.c_amount.toFixed(decimal)).toString().split('.')[1] && parseFloat(progress.c_amount.toFixed(decimal)).toString().split('.')[1].length || 0) %>"><%- progress.c_ratio.toFixed() %>%</div>
                         <div class="progress-bar bg-gray" style="width:<%- progress.s_ratio%>%;" data-placement="bottom"
                             data-toggle="tooltip" data-original-title="未完成：￥<%- ctx.helper.formatMoney(progress.s_amount, ',', parseFloat(progress.s_amount.toFixed(decimal)).toString().split('.')[1] && parseFloat(progress.s_amount.toFixed(decimal)).toString().split('.')[1].length || 0) %>"><%- progress.s_ratio.toFixed() %>%</div>
                     </div>