下班前提交

1

src/views/main/cloudDate/organDate.vue

@@ -197,7 +197,7 @@ export default {
   },
   data() {
     return {
-      tableList: [{}],
+      tableList: [],
       // rules: {
       //   // 分页规则
       //   limit: 10, // 限制显示条数
@@ -213,8 +213,12 @@ export default {
   methods: {
     async getList() {
       try {
+        const arr = [36,39,41,42,43,44,45,46,47,48,49,50,52,54,55,56]
         const res = await organStudentOverView();
-        this.tableList = res.data;
+        this.tableList = res.data.filter(item => {
+          return arr.indexOf(item.organId) == -1
+        });
+        // console.log(this.tableList)
       } catch (e) {
         console.log(e);
       }

src/views/main/cloudDate/organRanking.vue

@@ -161,6 +161,7 @@
 <script>
 import headers from "./modals/headers.vue";
 import pagination from "@/components/Pagination/index";
+import dayjs from 'dayjs';
 export default {
   components: {
     headers,
@@ -179,7 +180,10 @@ export default {
       date: "",
     };
   },
-  mounted() {},
+  mounted() {
+    this.date = dayjs(new Date()).subtract(1, 'day').format('YYYY-MM-DD')
+
+  },
   methods: {
     getList() {},
     bigin() {

src/views/teamDetail/components/studentList.vue

@@ -131,6 +131,18 @@
           <el-option label="是" value="1"></el-option>
         </el-select>
       </el-form-item>
+             <el-form-item prop="hasMember">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.hasMember"
+            clearable
+            placeholder="是否是会员"
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+            <el-option label="未生效" value="2"></el-option>
+          </el-select>
+        </el-form-item>
       <el-form-item prop="isActive">
         <el-select
           v-model.trim="searchForm.isActive"
@@ -1366,6 +1378,7 @@ export default {
         oweFlag: this.searchForm.oweFlag || null,
         comeOnPackage: this.searchForm.comeOnPackage,
         carePackage: this.searchForm.carePackage,
+        hasMember:this.searchForm.hasMember
       };
       return getTeamStudentList(obj).then((res) => {
         if (res.code == 200) {