Explorar o código

修改排序遗留问题

chenrui %!s(int64=2) %!d(string=hai) anos
pai
achega
35274350db
Modificáronse 1 ficheiros con 16 adicións e 13 borrados
  1. 16 13
      src/views/numsGoodsShelves/vinAnalysis/spList.vue

+ 16 - 13
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -145,28 +145,31 @@ export default {
         this.disabled = true
         const newParameter = parameter
         if (newParameter.sortField && newParameter.sortField == 'inStockCount') { // 有货
-          if (newParameter.sortOrder != 'ascend') { // 降序
-            newParameter.orderBy = 'xvfp.in_stock_count desc,xp.code asc'
+          if (newParameter.sortOrder) {
+            if (newParameter.sortOrder != 'ascend') { // 降序
+              newParameter.orderBy = 'xvfp.in_stock_count desc,xp.code asc'
+            } else {
+              newParameter.orderBy = 'xvfp.in_stock_count asc,xp.code asc'
+            }
+            this.order_by = newParameter.orderBy
           } else {
-            newParameter.orderBy = 'xvfp.in_stock_count asc,xp.code asc'
+            this.order_by = ''
           }
-          this.order_by = newParameter.orderBy
-        } else {
-          this.order_by = ''
         }
         if (newParameter.sortField && newParameter.sortField == 'notStockCount') { // 无货
-          if (newParameter.sortOrder != 'ascend') { // 降序
-            newParameter.orderBy = 'xvfp.not_stock_count desc,xp.code asc'
+          if (newParameter.sortOrder) {
+            if (newParameter.sortOrder != 'ascend') { // 降序
+              newParameter.orderBy = 'xvfp.not_stock_count desc,xp.code asc'
+            } else {
+              newParameter.orderBy = 'xvfp.not_stock_count asc,xp.code asc'
+            }
+            this.order_by = newParameter.orderBy
           } else {
-            newParameter.orderBy = 'xvfp.not_stock_count asc,xp.code asc'
+            this.order_by = ''
           }
-          this.order_by = newParameter.orderBy
-        } else {
-          this.order_by = ''
         }
 
         const params = Object.assign(newParameter, this.queryParam, { orderBy: this.order_by })
-
         delete params.time
         return reportPage(params).then(res => {
           let data