Merge branch 'ap' into dev

src/views/promotion/display_schedule_dashboard/tabs/display.vue

@@ -57,7 +57,10 @@
     }
     isLoading.value = false
   }
-  getTableList()
+
+  const { proxy } = getCurrentInstance()
+  const isDaQuZQ = proxy.checkPermi(['promotion:dashboard:list-show'])
+  getTableList(isDaQuZQ ? '大区战区-分析' : '城市经理-分析')
 </script>
 
 <style lang="scss">

src/views/promotion/display_schedule_dashboard/tabs/schedule.vue

@@ -90,6 +90,7 @@
     }
     isLoading.value = false
   }
-  getTableList()
+  const isDaQuZQ = proxy.checkPermi(['promotion:dashboard:list-show'])
+  getTableList(isDaQuZQ ? '大区战区-分析' : '城市经理-分析')
 
 </script>

src/views/promotion/display_schedule_dashboard/tabs/schedule_dis.vue

@@ -86,6 +86,8 @@
     }
     isLoading.value = false
   }
-  getTableList()
+  const { proxy } = getCurrentInstance()
+  const isDaQuZQ = proxy.checkPermi(['promotion:dashboard:list-show'])
+  getTableList(isDaQuZQ ? '大区战区-分析' : '城市经理-分析')
 
 </script>
\ No newline at end of file

src/views/promotion/display_schedule_dashboard/tabs/six_little_diamonds.vue

@@ -86,7 +86,8 @@
     }
     isLoading.value = false
   }
-  getTableList()
+  const isDaQuZQ = proxy.checkPermi(['promotion:dashboard:list-show'])
+  getTableList(isDaQuZQ ? '大区战区-分析' : '城市经理-分析')
 </script>
 
 <style scoped></style>
\ No newline at end of file

src/views/promotion/display_schedule_dashboard/tabs/snack.vue

@@ -82,7 +82,9 @@
     }
     isLoading.value = false
   }
-  getTableList()
+  const { proxy } = getCurrentInstance()
+  const isDaQuZQ = proxy.checkPermi(['promotion:dashboard:list-show'])
+  getTableList(isDaQuZQ ? '大区战区-分析' : '城市经理-分析')
 </script>
 
 <style scoped

src/views/promotion/display_schedule_dashboard/tabs/three_two_seconds.vue

@@ -88,7 +88,8 @@
     }
     isLoading.value = false
   }
-  getTableList()
+  const isDaQuZQ = proxy.checkPermi(['promotion:dashboard:list-show'])
+  getTableList(isDaQuZQ ? '大区战区-分析' : '城市经理-分析')
 
 </script>