Merge branch 'master' into release-3.2.0-241012-base

src/modules/createmodel/alipay/components/ResultTable.vue

@@ -278,7 +278,7 @@ export default {
                 return this.$store.state.fileStore.fileobj.filename.indexOf('五联单-对手透视') != -1
             }
         },
-        // 五联单-对手透视
+        // 数据分析-对手透视 || 账户透视
         isOpponentPerspectiveAndAccount:{
             get(){
                 return this.$store.state.fileStore.fileobj.filename.indexOf('数据分析-对手透视') != -1 || this.$store.state.fileStore.fileobj.filename.indexOf('数据分析-账户透视') != -1
@@ -624,6 +624,16 @@ export default {
                     payload.deleteName = 1
                 }
             }
+            if (this.isOpponentPerspectiveAndAccount) {
+                payload.orders = []
+                this.sortList.forEach((item)=>{
+                    payload.orders.push({
+                        field:item.label,
+                        fieldAlias:item.key,
+                        mode:item.rule
+                    })
+                })
+            }
             this.$store
                 .dispatch("view_data_by_query", this.setModelId(payload))
                 .then(data => {