From 75b73096b17be343f49070715e63ce5b946a7abb Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 13 Aug 2021 13:28:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 89 ++++++++++---------
 .../foreignStandardsAndRegulations/index.vue  |  2 +-
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 7eace579f..fcddc5ce9 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -3014,52 +3014,59 @@ export default {
     },
     // 表格排序
     sortChange (sortObj) {
+      console.log(sortObj.column.order+"======"+sortObj.column.property)
       console.log(sortObj, '升降序')
       if (sortObj.column.order !== 'normal') {
-        switch (sortObj.prop) {
+        this.nowOrder = ''
+        this.orderBy = ''
+        switch (sortObj.column.property) {
           case 'issueTime' :
             // 后台联调
-              if(sortObj.order === null) {
-                this.nowOrderBy = ''
-              } else {
-                this.nowOrderBy = '1'
-              }
-            break;
-          case 'xcxssrq' :
-            // 后台联调
-            if(sortObj.order === null) {
-              this.nowOrderBy = ''
-            } else {
-              this.nowOrderBy = '2'
+            this.orderBy = 1;
+            this.nowOrder = sortObj.column.order
+            if (this.nowOrder === 'ascending') {
+              this.nowOrder = 2
+            } else if (this.nowOrder === 'descending') {
+              this.nowOrder = 1
             }
-            break;
-          case 'zccssrq' :
-            // 后台联调
-            if(sortObj.order === null) {
-              this.nowOrderBy = ''
-            } else {
-              this.nowOrderBy = '3'
+            break
+          case 'XCXSSRQ' :
+            this.orderBy = 2;
+            this.nowOrder = sortObj.column.order
+            if (this.nowOrder === 'ascending') {
+              this.nowOrder = 2
+            } else if (this.nowOrder === 'descending') {
+              this.nowOrder = 1
             }
-            break;
-            case 'textStatus' :
-            // 后台联调
-              if(sortObj.order === null) {
-                this.nowOrderBy = ''
-              } else {
-                this.nowOrderBy = '4'
-              }
-            break;
-        }
-        switch (sortObj.order) {
-          case 'ascending' :
-            this.nowOrder = '2'
-          break;
-          case 'descending' :
-            this.nowOrder = '1'
-          break;
-            default:
-            this.nowOrder = ''
-          break;
+            break
+          case 'ZCCSSRQ' :
+            this.orderBy = 3;
+            this.nowOrder = sortObj.column.order
+            if (this.nowOrder === 'ascending') {
+              this.nowOrder = 2
+            } else if (this.nowOrder === 'descending') {
+              this.nowOrder = 1
+            }
+            break
+          case 'textStatus' :
+            this.orderBy = 5;
+            this.nowOrder = sortObj.column.order
+            if (this.nowOrder === 'ascending') {
+              this.nowOrder = 2
+            } else if (this.nowOrder === 'descending') {
+              this.nowOrder = 1
+            }
+            break
+          case 'SSRQ' :
+            this.orderBy = 6;
+            this.nowOrder = sortObj.column.order
+            if (this.nowOrder === 'ascending') {
+              this.nowOrder = 2
+            } else if (this.nowOrder === 'descending') {
+              this.nowOrder = 1
+            }
+            break
+
         }
       }
       this.getDomesticStandardTable(this.tableFlag)
@@ -3492,8 +3499,8 @@ export default {
       }
 
       // 排序
+      formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
       formData.nowOrder = this.nowOrder
-      formData.nowOrderBy = this.nowOrderBy
       // formData.orderBy = this.orderBy
         console.log(this.selectSarMenu.id)
       // 处理我的收藏和个性化标签传参
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index b8055e223..80470a2e3 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -3093,7 +3093,7 @@ export default {
       },
     // 表格排序
     sortChange (sortObj) {
-      console.log(sortObj.column+"======"+sortObj.column.property+"======"+sortObj.column.order);
+
       if (sortObj.column.order !== 'normal') {
         this.nowOrder = ''
         this.orderBy = ''