zhaoke 2 years ago
parent
commit
90905cc435
2 changed files with 3 additions and 2 deletions
  1. 2 1
      src/utils/validate.js
  2. 1 1
      src/views/newQuery/index.vue

+ 2 - 1
src/utils/validate.js

@@ -326,8 +326,9 @@ export function formatOrder (arr, key = 'orderNumber') {
       n2.push(p)
     }
   }
+  const newN1 = n1.sort((a, b) => a[key] - b[key])
   const newN2 = n2.sort((a, b) => a.index - b.index)
-  return [...n1, ...newN2]
+  return [...newN1, ...newN2]
 }
 
 export const Format = (fmt, date) => {

+ 1 - 1
src/views/newQuery/index.vue

@@ -32,7 +32,7 @@
         <Search :dataQuery="dataQuery" @getColData="getColData" ref="searchTable" />
       </div>
       <div :style="{height:tableHeight}" class="newQuery-table">
-        <Table style="height:100%" ref="queryTable" :tableTag="tableTag" />
+        <Table :pageSize="999" style="height:100%" ref="queryTable" :tableTag="tableTag" />
       </div>
     </div>
     <Dialog width="520px" :flag="diaFlag">