修复决策大屏测试bug

app/controller/datacollect_controller.js

@@ -46,6 +46,9 @@ module.exports = app => {
          */
         async index(ctx) {
             try {
+                if (!ctx.session.sessionProject.showDataCollect) {
+                    throw '该功能已关闭或无法查看';
+                }
                 // 获取标段审批信息
                 const tenderidList = [];
                 const noticeList = await ctx.service.noticePush.getNoticeByDataCollect(ctx.session.sessionProject.id, tenderidList);

app/extend/helper.js

@@ -889,7 +889,8 @@ module.exports = {
         for (let i = 0; i < l.length; i++) {
             t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? dot : '');
         }
-        return t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+        const num = t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+        return num.replace('-,', '-');
     },
 
     transFormToChinese(num) {

app/public/js/advance.js

@@ -262,7 +262,8 @@ $(document).ready(function () {
         for (let i = 0; i < l.length; i++) {
             t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? dot : '');
         }
-        return t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+        const num = t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+        return num.replace('-,', '-');
     }
 
     function transFormToChinese(num) {

app/public/js/advance_audit.js

@@ -442,5 +442,6 @@ function formatMoney(s, dot = ',', decimal = 2) {
     for (let i = 0; i < l.length; i++) {
         t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? dot : '');
     }
-    return t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+    const num = t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+    return num.replace('-,', '-');
 }

app/public/js/setting_datacollect_tender.js

@@ -134,8 +134,12 @@ function getTenderTreeHtml () {
 }
 $(document).ready(function () {
     initTenderTree();
-    const html = getTenderTreeHtml();
-    $('#copyModalContent').html(html);
+    $('#tenderBtn').click(() => {
+        const html = getTenderTreeHtml();
+        $('#copyModalContent').html(html);
+        $('#sort input[value="'+ addDataCollect +'"]').prop('checked', true);
+        $('#sort').modal('show');
+    });
 
     $('#tender_dataCollect_btn').click(function () {
         // 获取是否新增展示到决策大屏
@@ -153,6 +157,7 @@ $(document).ready(function () {
         if (parseInt(add_datacollect) === addDataCollect) {
             is_collect_update = false;
         }
+        console.log(_.sortBy(dcTidList), _.sortBy(noTidList), is_list_update, is_collect_update);
         if (is_list_update || is_collect_update) {
             postData('/setting/datacollect/save', { type: 'tender', add_datacollect: parseInt(add_datacollect), tids: noTidList }, function (result) {
                 addDataCollect = result.addDataCollect;

app/service/change_audit.js

@@ -636,7 +636,7 @@ module.exports = app => {
         }
 
         async getNumByMonth(tid, startMonth, endMonth) {
-            const sql = 'SELECT COUNT(*) as num FROM ?? WHERE id in (SELECT b.id FROM (SELECT * FROM ?? WHERE tid = ? GROUP BY id ORDER BY usort DESC) as b GROUP BY b.cid) AND status = ? AND sin_time between ? and ?';
+            const sql = 'SELECT COUNT(*) as num FROM ?? WHERE id in (SELECT b.id FROM (SELECT * FROM ?? WHERE tid = ? AND usite != 0 GROUP BY id ORDER BY usort DESC) as b GROUP BY b.cid) AND status = ? AND sin_time between ? and ?';
             const sqlParam = [this.tableName, this.tableName, tid, auditConst.auditStatus.checked, startMonth, endMonth];
             const result = await this.db.queryOne(sql, sqlParam);
             return result ? result.num : 0;

app/service/material.js

@@ -359,7 +359,7 @@ module.exports = app => {
         }
 
         async getSumMaterial(tid) {
-            const sql = 'Select sum(m_tp + ex_tp) as tp From ' + this.tableName + ' where tid = ?';
+            const sql = 'Select sum(IFNULL(m_tp, 0) + IFNULL(ex_tp, 0)) as tp From ' + this.tableName + ' where tid = ?';
             const result = await this.db.queryOne(sql, [tid]);
             return result ? result.tp : 0;
         }

app/view/datacollect/index.ejs

@@ -1291,7 +1291,7 @@
                 html += '<tr>\n' +
                     '                                                    <td><span data-toggle="tooltip" data-placement="right" data-original-title="'+ t.name +'">'+ (t.name.length > 15 ? t.name.substring(0, 15) + '...' : t.name) +'</span></td>\n' +
                     '                                                    <td>第'+ (t.lastStage ? t.lastStage.order : 0) +'期</td>\n' +
-                    '                                                    <td>'+ (t.total_price ? total_price : 0) +'</td>\n' +
+                    '                                                    <td>'+ (t.total_price ? t.total_price : 0) +'</td>\n' +
                     '                                                    <td>'+ (t.gather_tp ? t.gather_tp : 0) +'</td>\n' +
                     '                                                    <td>'+ (t.end_gather_tp ? t.end_gather_tp : 0) +'</td>\n' +
                     '                                                    <td>'+ (t.yf_tp ? t.yf_tp : 0) +'</td>\n' +
@@ -1331,6 +1331,7 @@
                     }
                 }
             }
+            console.log(tenderList);
             $('.data_tender_num').text(tenderList.length);
             const rate = total_price ? ZhCalc.round(ZhCalc.div(total_stage_price, total_price) * 100, 2) : 0;
             $('.data_tender_rate').text(rate ? rate + '%' : '0%');
@@ -1592,7 +1593,8 @@
         for (let i = 0; i < l.length; i++) {
             t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? dot : '');
         }
-        return t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+        const num = t.split('').reverse().join('') + (decimal === 0 ? '' : '.' + r);
+        return num.replace('-,', '-');
     }
     // 计算显示滚动条长度
     function computedPosition(xArrayLength) {

app/view/setting/datacollect.ejs

@@ -4,7 +4,7 @@
         <div class="title-main">
             <h2>决策大屏
                 <a href="#power" data-toggle="modal" data-target="#power" class="btn btn-primary btn-sm pull-right">权限管理</a>
-                <a href="#sort" data-toggle="modal" data-target="#sort" class="btn btn-primary btn-sm pull-right mr-1">标段管理</a>
+                <a href="javascript:void(0);" id="tenderBtn" class="btn btn-primary btn-sm pull-right mr-1">标段管理</a>
             </h2>
         </div>
     </div>

app/view/setting/datacollect_modal.ejs

@@ -73,7 +73,7 @@
                                     <dt><a href="javascript: void(0);" class="acc-btn" data-groupid="<%- idx %>"
                                            data-type="hide"><i class="fa fa-plus-square"></i></a> <%- group.groupName %></dt>
                                     <div class="dd-content" data-toggleid="<%- idx %>">
-                                        <dd class="border-bottom p-2 mb-0" data-groupid="<%- idx %>><p class="mb-0 d-flex"><span class="text-primary">该单位下所有组员</span></p></dd>
+                                        <dd class="border-bottom p-2 mb-0" data-groupid="<%- idx %>"><p class="mb-0 d-flex"><span class="text-primary">该单位下所有组员</span></p></dd>
                                         <% group.groupList.forEach(item => { %>
                                             <% if (item.id !== ctx.session.sessionUser.accountId) { %>
                                                 <dd class="border-bottom p-2 mb-0 " data-id="<%- item.id %>">
@@ -134,7 +134,8 @@
                             if (!group) return
                             html += `<dt><a href="javascript: void(0);" class="acc-btn" data-groupid="${idx}" data-type="hide"><i class="fa fa-plus-square"></i>
                         </a> ${group.groupName}</dt>
-                        <div class="dd-content" data-toggleid="${idx}">`
+                        <div class="dd-content" data-toggleid="${idx}">
+                        <dd class="border-bottom p-2 mb-0" data-groupid="${idx}"><p class="mb-0 d-flex"><span class="text-primary">该单位下所有组员</span></p></dd>`
                             group.groupList.forEach(item => {
                                 if (item.id !== cur_uid) {
                                     html += `<dd class="border-bottom p-2 mb-0 " data-id="${item.id}" >