Merge branch 'uat' into dev

app/public/js/material.js

@@ -591,7 +591,6 @@ $(document).ready(() => {
         },
     };
     materialMonthSpread.getActiveSheet().frozenColumnCount(4);
-    console.log(materialMonthSpread.getActiveSheet().options);
     materialMonthSpread.getActiveSheet().options.frozenlineColor = '#f1f1f1';
     SpreadJsObj.initSpreadSettingEvents(materialMonthSpreadSetting, materialMonthCol);
     SpreadJsObj.initSheet(materialMonthSpread.getActiveSheet(), materialMonthSpreadSetting);
@@ -1022,4 +1021,26 @@ $(document).ready(() => {
             materialMonthSpread.refresh();
         }
     });
+
+    // 展开收起附件
+    $('a', '.right-nav').bind('click', function () {
+        //const main = $('#main-view'), tool = $('#tools-view');
+        const tab = $(this), tabPanel = $(tab.attr('content'));
+        if (!tab.hasClass('active')) {
+            $('a', '.side-menu').removeClass('active');
+            $('.tab-content .tab-select-show').removeClass('active');
+            tab.addClass('active');
+            tabPanel.addClass('active');
+            showSideTools(tab.hasClass('active'));
+            if (tab.attr('content') === '#month-tab') {
+                materialMonthSpread.refresh();
+            }
+        } else {
+            tab.removeClass('active');
+            tabPanel.removeClass('active');
+            showSideTools(tab.hasClass('active'));
+        }
+        materialSpread.refresh();
+        materialMonthSpread.refresh();
+    });
 });

app/service/material_audit.js

@@ -669,11 +669,11 @@ module.exports = app => {
          */
         async getAuditMaterial(auditorId) {
             const sql = 'SELECT ma.`aid`, ma.`times`, ma.`order`, ma.`begin_time`, ma.`end_time`, ma.`tid`, ma.`mid`,' +
-                        '    m.`order` As `morder`, m.`status` As `mstatus`,' +
-                        '    t.`name`, t.`project_id`, t.`type`, t.`user_id` ' +
-                        '  FROM ?? AS ma, ?? AS m, ?? As t ' +
-                        '  WHERE ((ma.`aid` = ? and ma.`status` = ?) OR (m.`user_id` = ? and ma.`status` = ? and m.`status` = ? and ma.`times` = (m.`times`-1)))' +
-                        '    and ma.`mid` = m.`id` and ma.`tid` = t.`id` ORDER BY ma.`begin_time` DESC';
+                '    m.`order` As `morder`, m.`status` As `mstatus`,' +
+                '    t.`name`, t.`project_id`, t.`type`, t.`user_id` ' +
+                '  FROM ?? AS ma, ?? AS m, ?? As t ' +
+                '  WHERE ((ma.`aid` = ? and ma.`status` = ?) OR (m.`user_id` = ? and ma.`status` = ? and m.`status` = ? and ma.`times` = (m.`times`-1)))' +
+                '    and ma.`mid` = m.`id` and ma.`tid` = t.`id` ORDER BY ma.`begin_time` DESC';
             const sqlParam = [this.tableName, this.ctx.service.material.tableName, this.ctx.service.tender.tableName, auditorId, auditConst.status.checking, auditorId, auditConst.status.checkNo, auditConst.status.checkNo];
             return await this.db.query(sql, sqlParam);
         }

app/view/material/info.ejs

@@ -23,11 +23,11 @@
             </div>
         </div>
     </div>
-    <div class="content-wrap">
-        <div class="c-header p-0 col-12">
+    <div class="content-wrap pr-46">
+        <div class="c-header p-0">
         </div>
         <div class="row w-100 sub-content">
-            <div id="main-view" class="c-body" style="width: 66.7%">
+            <div id="left-view" class="c-body" style="width: 100%">
                 <!--上部分-->
                 <div class="sjs-height-1" id="material-spread">
                 </div>
@@ -60,8 +60,8 @@
                     </div>
                 </div>
             </div>
-            <div id="month-view" class="c-body" style="width: 33.3%">
-                <div class="resize-x" id="right-spr" r-Type="width" div1="#main-view" div2="#month-view" title="调整大小" a-type="percent"><!--调整左右高度条--></div>
+            <div id="right-view" class="c-body" style="display:none;width: 33%">
+                <div class="resize-x" id="right-spr" r-Type="width" div1="#left-view" div2="#right-view" title="调整大小" a-type="percent"><!--调整左右高度条--></div>
                 <div class="tab-content" style="width: 100%">
                     <div id="qianyue" class="tab-pane active">
                         <% if ((material.status === auditConst.status.uncheck || material.status === auditConst.status.checkNo) && ctx.session.sessionUser.accountId === material.user_id) {%>
@@ -78,6 +78,14 @@
                 </div>
             </div>
         </div>
+        <div class="side-menu">
+            <!--右侧菜单-->
+            <ul class="nav flex-column right-nav">
+                <li class="nav-item">
+                    <a class="nav-link" content="#month-tab" href="javascript: void(0);">月信息价</a>
+                </li>
+            </ul>
+        </div>
     </div>
 </div>
 <div style="display: none">

config/web.js

@@ -478,6 +478,7 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/material.js',
+                    '/public/js/shares/cs_tools.js',
                     '/public/js/material_audit.js',
                     '/public/js/datepicker/datepicker.min.js',
                     '/public/js/datepicker/datepicker.zh.js',