ソースを参照

变更模块报表404问题

Tony Kang 11 ヶ月 前
コミット
493de4e4fc

+ 6 - 0
app/controller/report_controller.js

@@ -473,6 +473,8 @@ module.exports = app => {
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     customSelects,
                     rptCustomType: reportConst.rptCustomType,
+                    advanceList: JSON.stringify([]),
+                    materialAdjList: JSON.stringify(materialList),
                     materialList,
                     stages: stageList,
                     dataSelects,
@@ -619,6 +621,8 @@ module.exports = app => {
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     customSelects,
                     rptCustomType: reportConst.rptCustomType,
+                    advanceList: JSON.stringify([]),
+                    materialAdjList: JSON.stringify(materialList),
                     materialList,
                     stages: stageList,
                     dataSelects,
@@ -805,6 +809,8 @@ module.exports = app => {
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.report.main),
                     customSelects,
                     rptCustomType: reportConst.rptCustomType,
+                    advanceList: JSON.stringify([]),
+                    materialAdjList: JSON.stringify(materialList),
                     materialList,
                     stages: stageList,
                     dataSelects,

+ 1 - 0
app/public/report/js/rpt_jspdf.js

@@ -405,6 +405,7 @@ const JpcJsPDFHelper = {
                         }
                     }
                     // 但有了_splitValues()处理后,这个加额外空格好像没必要了,但是不加又不好(比如'年 月 日'这种文字) ------------
+                    // 2024-07-12 现在PDF控件又正常了,无需额外处理
                     // for (let j = spaceIdxArr.length - 1; j >= 0; j--) {
                     //     values[i] = values[i].slice(0, spaceIdxArr[j]) + ' ' + values[i].slice(spaceIdxArr[j]);
                     // }

+ 2 - 0
app/view/report/index.ejs

@@ -19,6 +19,7 @@
                 <% include ../stage/stage_sub_mini_menu.ejs %>
             <% } %>
             <div>
+                <% if(stg_id === -1) { %>
                 <div class="d-inline-block">
                     <div class="dropdown">
                         <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="allBizDropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -44,6 +45,7 @@
                         </div>
                     </div>
                 </div>
+                <% } %>
                 <% if (false || ![-100, -200, -300, -301, -302, -303].includes(stg_id)) { %>
                 <div class="d-inline-block" id="divSelectableBizs_up">
                     <div class="dropdown" id="divSelectableStages">