update: dist

src/components/dm-new-member-group/table.vue

@@ -170,13 +170,21 @@ export default {
       this.totalCount = 0;
       let url = `${this.baseUrl}/gic-member-tag-web/member-tag-group/findList.json?requestProject=${this.projectName}&fixedType=${this.fixedType}&creatorId=${this.creatorId}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}&effectiveStatus=${this.effectiveStatus}`;
       if (this.activeName == '2') {
-        url = `${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeGroupList?requestProject=${this.projectName}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}`;
+        url = `${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeGroupListNew?requestProject=${this.projectName}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}`;
       }
       this.axios
         .get(url)
         .then(res => {
           if (res.data.errorCode == 1) {
-            this.tableData = res.data.result.result;
+            if (this.activeName == '2') {
+              this.tableData = res.data.result.result.map(item => item.itemList);
+              console.log(this.tableData);
+              this.tableData = this.tableData.flat();
+              console.log(this.tableData);
+            } else {
+              this.tableData = res.data.result.result;
+            }
+
             this.totalCount = res.data.result.totalCount;
             return;
           }

src/components/dm-new-rule/ruleFilter.vue

@@ -35,7 +35,7 @@
                   </div>
                 </div>
                 <div v-if="item.templateCode == 'com020' && templateCode == 'com020'" class="leftContent">
-                  <dm-store-selector v-if="item.templateCode == 'com020'" ref="storeSelector" scenes="auth" scenesVal="marketing" @store-change="val => storeChange(val, item.esScreeningWidgetChainId)" :uuid.sync="item.value"></dm-store-selector>
+                  <dm-store-selector @saving="val => (saving = val)" v-if="item.templateCode == 'com020' && storeSelectorKey" ref="storeSelector" scenes="auth" scenesVal="marketing" @store-change="val => storeChange(val, item.esScreeningWidgetChainId)" :uuid.sync="item.value"></dm-store-selector>
                 </div>
               </div>
               <div v-else>
@@ -79,7 +79,9 @@ export default {
       echoData: [],
       loading: false,
       tabPaneLoading: false,
-      selectDataLoading: false
+      selectDataLoading: false,
+      saving: false,
+      storeSelectorKey: true
     };
   },
   props: {
@@ -219,7 +221,6 @@ export default {
     storeChange(uuid, esScreeningWidgetChainId) {
       const obj = this.conditionTypeList.find(item => item.esScreeningWidgetChainId == esScreeningWidgetChainId);
       const res = this.$refs.storeSelector[0].getList();
-      console.log(res);
       if (res && res.length && res[0] == 1) return;
       const str = res.map(item => (item.name ? item.name : item.id)).join('，');
       obj.value = uuid;
@@ -236,6 +237,7 @@ export default {
       const { data, bool } = transform(this.conditionTypeList, this.sceneCode);
       console.log(data);
       console.log(bool);
+      if (this.saving) return;
       if (!bool) {
         this.$message.warning('请选择条件');
         return;