Browse Source

测试反馈问题

MaiXinRong 1 year ago
parent
commit
e38d31eda8

+ 4 - 4
app/public/js/file_detail.js

@@ -116,7 +116,7 @@ $(document).ready(function() {
             if (!filingObj.curFiling) return;
 
             filingObj.curTotalPage = Math.ceil(filingObj.curFiling.source_node.file_count / this.pageCount);
-            filingObj.curPage = Math.min(filingObj.curTotalPage, filingObj.curPage);
+            filingObj.curPage = Math.min(filingObj.curTotalPage, Math.max(filingObj.curPage, 1));
             $('#curPage').html(filingObj.curPage);
             $('#curTotalPage').html(filingObj.curTotalPage);
             if (filingObj.curTotalPage > 1) {
@@ -199,7 +199,7 @@ $(document).ready(function() {
             filingObj.filingTree.updateNode(filing);
             let parent = filing.getParentNode();
             while (!!parent) {
-                parent.source_node.total_file_count = parent.source_node.total_file_count + differ;
+                parent.source_node.total_file_count = parent.source_node.total_file_count ? parent.source_node.total_file_count + differ : differ;
                 parent.name = parent.source_node.name + (parent.source_node.total_file_count > 0 ? `(${parent.source_node.total_file_count})` : '');
                 filingObj.filingTree.updateNode(parent);
                 parent = parent.getParentNode();
@@ -228,8 +228,8 @@ $(document).ready(function() {
             postDataWithFile('file/upload', formData, function (data) {
                 filingObj.curFiling.source_node.files.unshift(...data.files);
                 filingObj.updateFilingFileCount(filingObj.curFiling, data.filing.file_count);
-                filingObj.refreshFilesTable();
                 filingObj.refreshPages();
+                filingObj.refreshFilesTable();
                 if (callback) callback();
             });
         }
@@ -248,8 +248,8 @@ $(document).ready(function() {
                 function(result) {
                     filingObj.curFiling.source_node.files.unshift(...result.files);
                     filingObj.updateFilingFileCount(filingObj.curFiling, result.filing.file_count);
-                    filingObj.refreshFilesTable();
                     filingObj.refreshPages();
+                    filingObj.refreshFilesTable();
                     if (callback) callback();
             });
 

+ 2 - 2
app/public/js/payment_safe.js

@@ -649,8 +649,8 @@ $(document).ready(function() {
             const html = [];
             if (curNode) {
                 const attIndex = this.billsIndexes[curNode.safe_id] || [];
-                const beginIndex = (this.allPageIndex - 1) * this.pageCount;
-                const endIndex = (this.allPageIndex) * this.pageCount - 1;
+                const beginIndex = (this.curPageIndex - 1) * this.pageCount;
+                const endIndex = (this.curPageIndex) * this.pageCount - 1;
                 for (const [i, ai] of attIndex.entries()) {
                     if (i < beginIndex) continue;
                     if (i > endIndex) continue;

+ 1 - 1
app/service/report_memory.js

@@ -1536,7 +1536,7 @@ module.exports = app => {
                 }
                 return sum;
             };
-            sortSumChildren(root, result, ['ContractPrice', 'ContractReturned', 'ContractPaid']);
+            sortSumChildren(root, result, ['ContractPrice', 'ContractReturned', 'ContractsPaid']);
             result.forEach(x => { delete x.children });
             return result;
         }

+ 0 - 2
app/view/file/file.ejs

@@ -35,9 +35,7 @@
                     <div class="d-flex flex-row">
                         <% if (canUpload) { %>
                         <div class="py-2 pr-2"><a href="#add-file" data-toggle="modal" data-target="#add-file">上传文件</a></div>
-                        <% if (ctx.app.config.is_debug) { %>
                         <div class="py-2 pr-2"><a href="#add-big-file" data-toggle="modal" data-target="#add-big-file">大文件上传</a></div>
-                        <% } %>
                         <div class="p-2" id="rela-file-btn"><a href="#rela-file" data-toggle="modal" data-target="#rela-file">导入文件</a></div>
                         <div class="p-2"><a href="javascript: void(0)" id="batch-del-file-btn">批量删除</a></div>
                         <% } %>