Browse Source

fix: 预付款高度异常的bug

LanJamRom 5 years ago
parent
commit
eb187544cb
3 changed files with 100 additions and 99 deletions
  1. 1 0
      app/public/js/advance_audit.js
  2. 1 1
      app/view/advance/detail.ejs
  3. 98 98
      config/web.js

+ 1 - 0
app/public/js/advance_audit.js

@@ -9,6 +9,7 @@
  */
 
 $(document).ready(function () {
+    autoFlashHeight()
     let oldVal = null
     let timer = null
     handleFileList(fileList)

+ 1 - 1
app/view/advance/detail.ejs

@@ -14,7 +14,7 @@
     </div>
     <div class="content-wrap">
         <div class="c-body">
-            <div class="sjs-height-0" style="height: 942px;">
+            <div class="sjs-height-0">
                 <div class="col-xl-8 mx-auto">
                     <h4 class="mt-3 text-center mb-3">第<%- advance.order %>期
                         <%- advance.type === auditConst.type.start ? '开工' : '材料' %>预付款</h4>

+ 98 - 98
config/web.js

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';
 
 /**
  * 前端所需js
@@ -49,7 +49,7 @@ const JsFiles = {
         '/public/js/lz-string/lz-string.js',
         '/public/js/number-precision.js',
         '/public/js/toastr.min.js',
-        '/public/js/global.js'
+        '/public/js/global.js',
     ],
     controller: {
         tender: {
@@ -60,9 +60,9 @@ const JsFiles = {
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
                     '/public/js/tender_showhide.js',
-                    '/public/js/tender_list.js'
+                    '/public/js/tender_list.js',
                 ],
-                mergeFile: 'tender_list'
+                mergeFile: 'tender_list',
             },
             info: {
                 files: ['/public/js/ztree/jquery.ztree.core.js', '/public/js/ztree/jquery.ztree.exedit.js', '/public/js/decimal.min.js'],
@@ -71,9 +71,9 @@ const JsFiles = {
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
                     '/public/js/tender_showhide.js',
-                    '/public/js/tender_list_info.js'
+                    '/public/js/tender_list_info.js',
                 ],
-                mergeFile: 'tender_list_info'
+                mergeFile: 'tender_list_info',
             },
             progress: {
                 files: ['/public/js/ztree/jquery.ztree.core.js', '/public/js/ztree/jquery.ztree.exedit.js', '/public/js/decimal.min.js'],
@@ -82,9 +82,9 @@ const JsFiles = {
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
                     '/public/js/tender_showhide.js',
-                    '/public/js/tender_list_progress.js'
+                    '/public/js/tender_list_progress.js',
                 ],
-                mergeFile: 'tender_list_progress'
+                mergeFile: 'tender_list_progress',
             },
             manage: {
                 files: ['/public/js/ztree/jquery.ztree.core.js', '/public/js/ztree/jquery.ztree.exedit.js', '/public/js/moment/moment.min.js', '/public/js/decimal.min.js'],
@@ -93,19 +93,19 @@ const JsFiles = {
                     '/public/js/PinYinOrder.bundle.js',
                     '/public/js/shares/tender_list_order.js',
                     '/public/js/tender_showhide.js',
-                    '/public/js/tender_list_manage.js'
+                    '/public/js/tender_list_manage.js',
                 ],
-                mergeFile: 'tender_list_manage'
+                mergeFile: 'tender_list_manage',
             },
             tenderInfo: {
                 files: ['/public/js/echarts/echarts.min.js', '/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
                 mergeFiles: [
                     '/public/js/spreadjs_rela/spreadjs_zh.js',
-                    '/public/js/zh_calc.js'
+                    '/public/js/zh_calc.js',
                     // "/public/js/tender.js",
                 ],
-                mergeFile: 'tender'
-            }
+                mergeFile: 'tender',
+            },
         },
         ledger: {
             explode: {
@@ -117,7 +117,7 @@ const JsFiles = {
                     '/public/js/decimal.min.js',
                     '/public/js/math.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -130,9 +130,9 @@ const JsFiles = {
                     '/public/js/path_tree.js',
                     '/public/js/ledger_tree_col.js',
                     '/public/js/std_lib.js',
-                    '/public/js/ledger.js'
+                    '/public/js/ledger.js',
                 ],
-                mergeFile: 'explode'
+                mergeFile: 'explode',
             },
             audit: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
@@ -144,9 +144,9 @@ const JsFiles = {
                     '/public/js/shares/cs_tools.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/ledger_audit.js'
+                    '/public/js/ledger_audit.js',
                 ],
-                mergeFile: 'ledger_audit'
+                mergeFile: 'ledger_audit',
             },
             bwtz: {
                 files: [
@@ -154,7 +154,7 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -165,9 +165,9 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/shares/bills_pos_convert.js',
-                    '/public/js/ledger_bwtz.js'
+                    '/public/js/ledger_bwtz.js',
                 ],
-                mergeFile: 'ledger_bwtz'
+                mergeFile: 'ledger_bwtz',
             },
             gather: {
                 files: [
@@ -175,7 +175,7 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -185,9 +185,9 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/gcl_gather.js',
-                    '/public/js/ledger_gather.js'
+                    '/public/js/ledger_gather.js',
                 ],
-                mergeFile: 'ledger_gather'
+                mergeFile: 'ledger_gather',
             },
             revise: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
@@ -199,10 +199,10 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/std_lib.js',
-                    '/public/js/revise.js'
+                    '/public/js/revise.js',
                 ],
-                mergeFile: 'revise'
-            }
+                mergeFile: 'revise',
+            },
         },
         revise: {
             info: {
@@ -211,7 +211,7 @@ const JsFiles = {
                     '/public/js/js-xlsx/xlsx.utils.js',
                     '/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js',
                     '/public/js/decimal.min.js',
-                    '/public/js/math.min.js'
+                    '/public/js/math.min.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -223,9 +223,9 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/std_lib.js',
-                    '/public/js/revise.js'
+                    '/public/js/revise.js',
                 ],
-                mergeFile: 'revise'
+                mergeFile: 'revise',
             },
             history: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
@@ -237,10 +237,10 @@ const JsFiles = {
                     '/public/js/shares/cs_tools.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/revise_history.js'
+                    '/public/js/revise_history.js',
                 ],
-                mergeFile: 'revise_history'
-            }
+                mergeFile: 'revise_history',
+            },
         },
         stage: {
             // 本期计量台账
@@ -250,7 +250,7 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/math.min.js',
-                    '/public/js/file-saver/FileSaver.js'
+                    '/public/js/file-saver/FileSaver.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -265,16 +265,16 @@ const JsFiles = {
                     '/public/js/path_tree.js',
                     '/public/js/stage_im.js',
                     '/public/js/stage.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'stage'
+                mergeFile: 'stage',
             },
             detail: {
                 files: [
                     '/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/html2canvas/html2canvas.min.js',
-                    '/public/js/html2canvas/canvas2image.js'
+                    '/public/js/html2canvas/canvas2image.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -284,9 +284,9 @@ const JsFiles = {
                     '/public/js/shares/cs_tools.js',
                     '/public/js/stage_im.js',
                     '/public/js/stage_detail.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'stage_detail'
+                mergeFile: 'stage_detail',
             },
             pay: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/math.min.js'],
@@ -296,9 +296,9 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/shares/cs_tools.js',
                     '/public/js/stage_pay.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'stage_pay'
+                mergeFile: 'stage_pay',
             },
             bwtz: {
                 files: [
@@ -306,7 +306,7 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -318,9 +318,9 @@ const JsFiles = {
                     '/public/js/path_tree.js',
                     '/public/js/shares/bills_pos_convert.js',
                     '/public/js/stage_bwtz.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'stage_bwtz'
+                mergeFile: 'stage_bwtz',
             },
             change: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
@@ -332,9 +332,9 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/stage_change.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'stage_change'
+                mergeFile: 'stage_change',
             },
             gather: {
                 files: [
@@ -342,7 +342,7 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -354,9 +354,9 @@ const JsFiles = {
                     '/public/js/path_tree.js',
                     '/public/js/gcl_gather.js',
                     '/public/js/stage_gather.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'stage_gather'
+                mergeFile: 'stage_gather',
             },
             compare: {
                 files: [
@@ -364,7 +364,7 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -375,15 +375,15 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/stage_compare.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'stage_compare'
+                mergeFile: 'stage_compare',
             },
             manager: {
                 files: ['/public/js/decimal.min.js'],
                 mergeFiles: ['/public/js/sub_menu.js', '/public/js/div_resizer.js', '/public/js/shares/cs_tools.js', '/public/js/zh_calc.js', '/public/js/stage_audit.js'],
-                mergeFile: 'stage_manager'
-            }
+                mergeFile: 'stage_manager',
+            },
         },
         stageExtra: {
             jgcl: {
@@ -392,16 +392,16 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
                     '/public/js/spreadjs_rela/spreadjs_zh.js',
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
-                    '/public/js/se_jgcl.js'
+                    '/public/js/se_jgcl.js',
                 ],
-                mergeFile: 'se_jgcl'
+                mergeFile: 'se_jgcl',
             },
             bonus: {
                 files: [
@@ -411,16 +411,16 @@ const JsFiles = {
                     '/public/js/datepicker/datepicker.min.js',
                     '/public/js/datepicker/datepicker.zh.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
                     '/public/js/spreadjs_rela/spreadjs_zh.js',
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
-                    '/public/js/se_bonus.js'
+                    '/public/js/se_bonus.js',
                 ],
-                mergeFile: 'se_bonus'
+                mergeFile: 'se_bonus',
             },
             other: {
                 files: [
@@ -430,7 +430,7 @@ const JsFiles = {
                     '/public/js/datepicker/datepicker.min.js',
                     '/public/js/datepicker/datepicker.zh.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -439,10 +439,10 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/se_other.js'
+                    '/public/js/se_other.js',
                 ],
-                mergeFile: 'se_other'
-            }
+                mergeFile: 'se_other',
+            },
         },
         measure: {
             compare: {
@@ -451,7 +451,7 @@ const JsFiles = {
                     '/public/js/spreadjs/sheets/v11/interop/gc.spread.excelio.11.2.2.min.js',
                     '/public/js/decimal.min.js',
                     '/public/js/file-saver/FileSaver.js',
-                    '/public/js/shares/export_excel.js'
+                    '/public/js/shares/export_excel.js',
                 ],
                 mergeFiles: [
                     '/public/js/sub_menu.js',
@@ -460,10 +460,10 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/measure_compare.js'
+                    '/public/js/measure_compare.js',
                 ],
-                mergeFile: 'measure_compare'
-            }
+                mergeFile: 'measure_compare',
+            },
         },
         material: {
             info: {
@@ -475,9 +475,9 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/material.js',
-                    '/public/js/material_audit.js'
+                    '/public/js/material_audit.js',
                 ],
-                mergeFile: 'material'
+                mergeFile: 'material',
             },
             list: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js', '/public/js/toastr.min.js'],
@@ -489,15 +489,15 @@ const JsFiles = {
                     '/public/js/path_tree.js',
                     '/public/js/gcl_gather.js',
                     '/public/js/material_list.js',
-                    '/public/js/material_audit.js'
+                    '/public/js/material_audit.js',
                 ],
-                mergeFile: 'material_list'
+                mergeFile: 'material_list',
             },
             file: {
                 files: ['/public/js/toastr.min.js'],
                 mergeFiles: ['/public/js/sub_menu.js', '/public/js/material_file.js', '/public/js/material_audit.js'],
-                mergeFile: 'material_file'
-            }
+                mergeFile: 'material_file',
+            },
         },
         compare: {
             tz: {
@@ -509,9 +509,9 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/compare_tz.js'
+                    '/public/js/compare_tz.js',
                 ],
-                mergeFile: 'compare_tz'
+                mergeFile: 'compare_tz',
             },
             stage: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
@@ -522,10 +522,10 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/compare_stage.js'
+                    '/public/js/compare_stage.js',
                 ],
-                mergeFile: 'compare_stage'
-            }
+                mergeFile: 'compare_stage',
+            },
         },
         gather: {
             tz: {
@@ -537,9 +537,9 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/gather_tz.js'
+                    '/public/js/gather_tz.js',
                 ],
-                mergeFile: 'gather_tz'
+                mergeFile: 'gather_tz',
             },
             stage: {
                 files: ['/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js', '/public/js/decimal.min.js'],
@@ -550,10 +550,10 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/gather_stage.js'
+                    '/public/js/gather_stage.js',
                 ],
-                mergeFile: 'gather_stage'
-            }
+                mergeFile: 'gather_stage',
+            },
         },
         tools: {
             checkTz: {
@@ -565,10 +565,10 @@ const JsFiles = {
                     '/public/js/shares/sjs_setting.js',
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
-                    '/public/js/spss_check_tz.js'
+                    '/public/js/spss_check_tz.js',
                 ],
-                mergeFile: 'spss_check_tz'
-            }
+                mergeFile: 'spss_check_tz',
+            },
         },
         report: {
             main: {
@@ -579,24 +579,24 @@ const JsFiles = {
                     '/public/js/spreadjs_rela/spreadjs_zh.js',
                     '/public/js/shares/tenders2tree.js',
                     '/public/report/js/rpt_custom.js',
-                    '/public/js/stage_audit.js'
+                    '/public/js/stage_audit.js',
                 ],
-                mergeFile: 'report_main'
-            }
+                mergeFile: 'report_main',
+            },
         },
         advance: {
             main: {
                 files: ['/public/js/decimal.min.js'],
                 mergeFiles: ['/public/js/zh_calc.js', '/public/js/advance.js'],
-                mergeFile: 'advance'
+                mergeFile: 'advance',
             },
             info: {
-                files: ['/public/js/decimal.min.js'],
+                files: ['/public/js/decimal.min.js', '/public/js/global.js'],
                 mergeFiles: ['/public/js/zh_calc.js', '/public/js/advance_audit.js'],
-                mergeFile: 'advance_audit'
-            }
-        }
-    }
-}
+                mergeFile: 'advance_audit',
+            },
+        },
+    },
+};
 
-module.exports = JsFiles
+module.exports = JsFiles;