Prechádzať zdrojové kódy

feat(1): 修复对手透视排序后切换页码无数据回显的问题,调整切换菜单栏后重置排序列明和排序顺序

17602115550 8 mesiacov pred
rodič
commit
bce45b3671

+ 16 - 1
src/modules/createmodel/alipay/components/ResultTable.vue

@@ -290,6 +290,17 @@ export default {
                 return this.$store.state.fileStore.fileobj.filename.indexOf('数据分析-对手透视') != -1
                 return this.$store.state.fileStore.fileobj.filename.indexOf('数据分析-对手透视') != -1
             }
             }
         },
         },
+        getFileName:{
+            get(){
+                return this.$store.state.fileStore.fileobj.filename
+            }
+        },
+    },
+    watch: {
+        getFileName (val, oldVal) {
+            this.headerSortValue = ''
+            this.isAdesc = 'asc'
+        }
     },
     },
     created() {
     created() {
         this.$nextTick(() => {
         this.$nextTick(() => {
@@ -613,10 +624,14 @@ export default {
 
 
             payload.fileId = currentFile.id;
             payload.fileId = currentFile.id;
             payload.orders = upSearchSortParams.orders;
             payload.orders = upSearchSortParams.orders;
-            payload.values = upSearchSortParams.values;
+            payload.values = upSearchSortParams.values || [];
             payload.mode = upSearchSortParams.mode;
             payload.mode = upSearchSortParams.mode;
 
 
             this.beforePayload = payload;
             this.beforePayload = payload;
+            if(this.isAccountPerspective || this.isOpponentPerspective){
+                payload.values =  this.getSearchValuesList()
+                payload.mode = 'and'
+            }
             if(this.isOpponentPerspective){
             if(this.isOpponentPerspective){
                 if(this.isOpponentPerspectiveDeleteNameShow){
                 if(this.isOpponentPerspectiveDeleteNameShow){
                     payload.deleteName = this.relationSearchData.deleteName
                     payload.deleteName = this.relationSearchData.deleteName