Merge branch '20221111' into 11/24SAAS

src/views/activityScheduling/2021double11List.vue

@@ -346,7 +346,7 @@ export default {
       if (this.year === "2022") {
         this.$router.push({
           path: "/operateManager/2021doubleDetail",
-          query: { organId: row.organId, organName: row.organName },
+          query: { organId: row.organId, organName: row.organName, year: "2022" },
         });
       } else {
         this.$router.push({

src/views/activityScheduling/2021doubleDetail.vue

@@ -109,6 +109,7 @@
             label="购买课程"
           ></el-table-column>
           <el-table-column
+          v-if="!$route.query.year"
             align="center"
             prop="giveMember"
             label="是否赠送会员"
@@ -208,6 +209,7 @@ export default {
         const res = await getDoubleElevenDetail({
           organId: this.organId,
           ...params,
+          year: this.$route.query.year,
           page: this.rules.page,
           rows: this.rules.limit,
         });
@@ -228,7 +230,12 @@ export default {
     },
     onCancel() {
       this.$store.dispatch("delVisitedViews", this.$route);
-      this.$router.push("/2021double11List");
+      this.$router.push({
+        path: "/2021double11List",
+        query: {
+          year: this.$route.query.year
+        }
+      });
     },
     async onExport() {
         let { getTime, ...rest } = this.searchForm;
@@ -246,7 +253,7 @@ export default {
         this,
         {
           url: "/api-web/export/doubleEleven2021OrderDetail",
-          fileName: "2021双十一活动.xls",
+          fileName: this.$route.query.year === "" ? "2022双十一活动.xls" : "2021双十一活动.xls",
           method: "post",
           params: qs.stringify(cleanDeep(obj)),
         },

src/views/activityScheduling/api.js

@@ -62,7 +62,7 @@ export function getDoubleElevenList2022 (data) {
 // 2022 双十一分部详情列表
 export function getDoubleElevenDetail2022 (data) {
   return request({
-      url: '/api-web/vipGroupActivity/doubleEleven2022OrderDetail',
+      url: '/api-web/activity/organDoubleEleven2022Statis',
       method: 'get',
       params: data
   })