Merge branch 'fix：会员分组导出添加未脱敏的选项' into dev

src/view/memberGroup/memberGroupDetail.vue

@@ -290,14 +290,25 @@
     <!-- 自定义字段列表 -->
     <userDefined :fieldsData="memberFields" :selectedData="selectedUserDefined" :showUserDefined="showUserDefined" @hideUserDefined="hideUserDefined" @confirmUserDefined="confirmUserDefined"> </userDefined>
     <el-dialog :visible.sync="downMemberListPop.show" title="导出数据" width="500px">
-      <div class="down-member-list-wrapper">
-        <img src="../../assets/data1.svg" alt="">
-        <p class="title">脱敏数据</p>
-        <p class="info">将敏感信息实现隐私保护</p>
-        <a href="/gic-web/#/reportCenter" v-if="downMemberListPop.toReport">
-          <el-button type="primary">去报告中心</el-button>
-        </a>
-        <el-button v-else type="primary" class="is-plain" :loading="downMemberListPop.loading" @click="createMemberExcel">生成报告</el-button>
+      <div style="display: flex;justify-content: center">
+        <div class="down-member-list-wrapper">
+          <img src="../../assets/data1.svg" alt="">
+          <p class="title">脱敏数据</p>
+          <p class="info">将敏感信息实现隐私保护</p>
+          <a href="/gic-web/#/reportCenter" v-if="downMemberListPop.toReport1">
+            <el-button type="primary">去报告中心</el-button>
+          </a>
+          <el-button v-else type="primary" class="is-plain" :loading="downMemberListPop.loading1" @click="createMemberExcel(1)">生成报告</el-button>
+        </div>
+        <div class="down-member-list-wrapper">
+          <img src="../../assets/data2.svg" alt="">
+          <p class="title">完整数据</p>
+          <p class="info">未进行敏感数据隐私保护</p>
+          <a href="/gic-web/#/reportCenter" v-if="downMemberListPop.toReport2">
+            <el-button type="warning">去报告中心</el-button>
+          </a>
+          <el-button v-else type="warning" class="is-plain" :loading="downMemberListPop.loading2" @click="createMemberExcel(2)">生成报告</el-button>
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -321,9 +332,11 @@ export default {
       selectedFields: [], // 已选的自定义字段对象集合
       downMemberListPop: {
         show: false,
-        loading: false,
+        loading1: false,
+        loading2: false,
         // 去报告中心
-        toReport: false,
+        toReport1: false,
+        toReport2: false,
         canDown: false
       },
 
@@ -422,24 +435,35 @@ export default {
         }
       })
     },
-    createMemberExcel() {
-      this.downMemberListPop.loading = true;
+    createMemberExcel(type) {
       let memberTagGroupId = this.$route.query.memberTagGroupId;
       let params = {
         memberTagGroupId,
-        dataType: 1
+        dataType: type
+      }
+      if (type === 1) {
+        this.downMemberListPop.loading1 = true;
+      } else {
+        this.downMemberListPop.loading2 = true;
       }
       getRequest('/member-tag-member/memberExportExcel', params).then(res => {
         if (res.data.errorCode === 1) {
           this.$message.success('您下载的数据已为您打包好，请点击下面按钮去报告中心');
-          this.downMemberListPop.loading = false;
-          this.downMemberListPop.toReport = true;
+          if (type === 1) {
+            this.downMemberListPop.loading1 = false;
+            this.downMemberListPop.toReport1 = true;
+          } else {
+            this.downMemberListPop.loading2 = false;
+            this.downMemberListPop.toReport2 = true;
+          }
         } else {
-          this.downMemberListPop.loading = false;
+          this.downMemberListPop.loading1 = false;
+          this.downMemberListPop.loading2 = false;
           this.$message.error(res.data.message);
         }
       }).catch(_ => {
-        this.downMemberListPop.loading = false;
+        this.downMemberListPop.loading1 = false;
+        this.downMemberListPop.loading2 = false;
       })
     },
     /**
@@ -746,7 +770,7 @@ export default {
   }
 }
 .down-member-list-wrapper {
-  padding-bottom: 30px;
+  padding: 0 20px 30px;
   text-align: center;
   img {
     width: 110px;