调差记忆展开收起和通知小数位bug

app/lib/wechat.js

@@ -152,10 +152,10 @@ class WX {
                                 value: moment(new Date(data.begin_time)).format('YYYY-MM-DD'),
                             },
                             keyword4: {
-                                value: data.m_tp,
+                                value: data.m_tp ? data.m_tp.toString() : null,
                             },
                             keyword5: {
-                                value: data.hs_m_tp,
+                                value: data.hs_m_tp ? data.hs_m_tp.toString() : null,
                             },
                             remark: {
                                 value: remark + '，请登录PC端系统。',
@@ -165,8 +165,8 @@ class WX {
                     default:break;
                 }
                 if (msgData !== '' && templateId) {
-                    // console.log(openid, templateId, url, msgData);
-                    await this.ctx.app.wechat.api.sendTemplate(openid, templateId, url, '', msgData);
+                    console.log(openid, templateId, url, msgData);
+                    // await this.ctx.app.wechat.api.sendTemplate(openid, templateId, url, '', msgData);
                 }
             }
             flag = true;

app/public/js/material.js

@@ -1022,7 +1022,7 @@ $(document).ready(() => {
         }
     });
 
-    // 展开收起附件
+    // 展开收起月信息价并浏览器记住本期展开收起
     $('a', '.right-nav').bind('click', function () {
         //const main = $('#main-view'), tool = $('#tools-view');
         const tab = $(this), tabPanel = $(tab.attr('content'));
@@ -1033,9 +1033,11 @@ $(document).ready(() => {
             tabPanel.addClass('active');
             showSideTools(tab.hasClass('active'));
             if (tab.attr('content') === '#month-tab') {
+                setLocalCache('material_month_' + materialID, 1);
                 materialMonthSpread.refresh();
             }
         } else {
+            removeLocalCache('material_month_' + materialID);
             tab.removeClass('active');
             tabPanel.removeClass('active');
             showSideTools(tab.hasClass('active'));
@@ -1043,4 +1045,15 @@ $(document).ready(() => {
         materialSpread.refresh();
         materialMonthSpread.refresh();
     });
+    // 根据浏览器记录展开收起
+    if (parseInt(getLocalCache('material_month_' + materialID)) === 1) {
+        const tab = $('.right-nav a[content="#month-tab"]'), tabPanel = $(tab.attr('content'));
+        $('a', '.side-menu').removeClass('active');
+        $('.tab-content .tab-select-show').removeClass('active');
+        tab.addClass('active');
+        tabPanel.addClass('active');
+        showSideTools(tab.hasClass('active'));
+        materialSpread.refresh();
+        materialMonthSpread.refresh();
+    }
 });

app/view/material/info.ejs

@@ -50,7 +50,7 @@
                         </div>
                     </div>
                     <div class="sp-wrap">
-                        <div class="col-8 p-0">
+                        <div class="col-4 p-0">
                             <table class="table table-sm table-bordered">
                                 <tr><th></th><th>本期金额</th><th>截止本期金额</th></tr>
                                 <tr id="tp_set"><td>材料价差费用</td><td><%= material.m_tp !== null ? ctx.helper.round(material.m_tp, 2) : null %></td><td><%= material.m_tp !== null || material.pre_tp !== null ? ctx.helper.round(ctx.helper.add(material.pre_tp, material.m_tp), 2) : null %></td></tr>