新增筛选条件

1

src/views/afterSchoolManager/afterSchoolList.vue

@@ -43,6 +43,17 @@
           </el-select>
         </el-form-item>
         <el-form-item>
+          <el-select
+            v-model.trim="searchForm.cloudHomeworkFlag"
+            class="organSelect"
+            filterable
+            placeholder="是否团练宝布置"
+          >
+            <el-option label="是" :value="true"></el-option>
+            <el-option label="否" :value="false"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-date-picker
             v-model.trim="searchForm.listTimer"
             style="width: 410px"
@@ -79,30 +90,22 @@
               {{ scope.row.createTime | dateForMinFormat }}
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="title"
-            label="训练标题"
-          >
-           <template slot-scope="scope">
-              <copy-text >
+          <el-table-column align="center" prop="title" label="训练标题">
+            <template slot-scope="scope">
+              <copy-text>
                 {{ scope.row.title }}
               </copy-text>
             </template>
           </el-table-column>
 
-          <el-table-column
-            align="center"
-            prop="organName"
-            label="老师分部"
-          >
-              <template slot-scope="scope">
-              <copy-text >
+          <el-table-column align="center" prop="organName" label="老师分部">
+            <template slot-scope="scope">
+              <copy-text>
                 {{ scope.row.organName }}
               </copy-text>
             </template>
           </el-table-column>
-                   <el-table-column
+          <el-table-column
             align="center"
             prop="actualTeacherName"
             label="是否团练宝布置"
@@ -122,20 +125,18 @@
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
               <div>
-                <auth auths='afterSchollList/look'>
-                <el-button
-                  type="text"
-                  @click="lookDetail(scope.row)"
-                  >查看</el-button
-                >
+                <auth auths="afterSchollList/look">
+                  <el-button type="text" @click="lookDetail(scope.row)"
+                    >查看</el-button
+                  >
                 </auth>
               </div>
             </template>
           </el-table-column>
         </el-table>
         <pagination
-        sync
-         :saveKey="'afterSchoolList'"
+          sync
+          :saveKey="'afterSchoolList'"
           :total.sync="rules.total"
           :page.sync="rules.page"
           :limit.sync="rules.limit"
@@ -199,6 +200,7 @@ export default {
         listTimer: [],
         teacherId: null,
         organIdList: null,
+        cloudHomeworkFlag:null
       },
       rules: {
         // 分页规则
@@ -215,9 +217,9 @@ export default {
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {
-     if (this.searchForm.listTimer && this.searchForm.listTimer.length <= 0) {
-       this.getNow()
-      }
+    if (this.searchForm.listTimer && this.searchForm.listTimer.length <= 0) {
+      this.getNow();
+    }
   },
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
@@ -226,24 +228,23 @@ export default {
     this.init();
   },
   methods: {
-    getNow(){
-       let now = new Date();
-        let startDate = new Date(
-          Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-        )
-          .toISOString()
-          .slice(0, 10);
-        let endDate = new Date(
-          Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-        )
-          .toISOString()
-          .slice(0, 10);
-        this.searchForm.listTimer = [];
-        this.searchForm.listTimer.push(startDate);
-        this.searchForm.listTimer.push(endDate);
+    getNow() {
+      let now = new Date();
+      let startDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      let endDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      this.searchForm.listTimer = [];
+      this.searchForm.listTimer.push(startDate);
+      this.searchForm.listTimer.push(endDate);
     },
     init() {
-
       this.getList();
     },
     getList() {
@@ -264,6 +265,8 @@ export default {
       this.searchForm.organIdList
         ? (obj.organIdList = this.searchForm.organIdList)
         : null;
+
+        obj.cloudHomeworkFlag = this.searchForm.cloudHomeworkFlag
       queryPageList(obj).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
@@ -281,8 +284,9 @@ export default {
         listTimer: [],
         teacherId: null,
         organIdList: null,
+        cloudHomeworkFlag:null
       };
-      this.getNow()
+      this.getNow();
       this.search();
     },
     lookDetail(row) {

src/views/afterSchoolManager/afterWorkList.vue

@@ -5,183 +5,229 @@
       <div class="squrt"></div>课外训练
     </h2>-->
     <div>
-      <save-form :inline="true"
-               :model="searchForm"
-               @submit="search"
-               :saveKey="formSaveKey"
-               @reset="onReSet"
-               v-if="show">
+      <save-form
+        :inline="true"
+        :model="searchForm"
+        @submit="search"
+        :saveKey="formSaveKey"
+        @reset="onReSet"
+        v-if="show"
+      >
         <el-form-item>
-          <el-input v-model.trim="searchForm.search"
-                    @keyup.enter.native="search" clearable
-                    placeholder="请输入标题 学生姓名"></el-input>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="search"
+            clearable
+            placeholder="请输入标题 学生姓名"
+          ></el-input>
         </el-form-item>
         <el-form-item prop="organId">
-          <el-select class="multiple"
-                     v-model.trim="searchForm.organIdList"
-                     filterable
-                     clearable
-                     placeholder="请选择分部">
-            <el-option v-for="(item,index) in selects.branchs"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.organIdList"
+            filterable
+            clearable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchForm.cloudHomeworkFlag"
+            class="organSelect"
+            filterable
+            placeholder="是否团练宝布置"
+          >
+            <el-option label="是" :value="true"></el-option>
+            <el-option label="否" :value="false"></el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item>
-          <el-select placeholder="是否提交"
-                     v-model="searchForm.status"
-                     clearable>
-            <el-option label="是"
-                       value="1"></el-option>
-            <el-option label="否"
-                       value="0"></el-option>
+          <el-select
+            placeholder="是否提交"
+            v-model="searchForm.status"
+            clearable
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="是否评价"
-                     v-model="searchForm.isReplied"
-                     clearable>
-            <el-option label="是"
-                       value="1"></el-option>
-            <el-option label="否"
-                       value="0"></el-option>
+          <el-select
+            placeholder="是否评价"
+            v-model="searchForm.isReplied"
+            clearable
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="及时评价"
-                     v-model="searchForm.isRepliedTimely"
-                     clearable>
-            <el-option label="是"
-                       value="1"></el-option>
-            <el-option label="否"
-                       value="0"></el-option>
+          <el-select
+            placeholder="及时评价"
+            v-model="searchForm.isRepliedTimely"
+            clearable
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="是否有vip"
-                     v-model="searchForm.existVipCourse"
-                     clearable>
-            <el-option label="是"
-                       value="1"></el-option>
-            <el-option label="否"
-                       value="0"></el-option>
+          <el-select
+            placeholder="是否有vip"
+            v-model="searchForm.existVipCourse"
+            clearable
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-date-picker v-model.trim="searchForm.timer"
-                          style="width:400px;"
-                          type="daterange"
-                          value-format="yyyy-MM-dd"
-                          range-separator="至"
-                          start-placeholder="布置开始日期"
-                          end-placeholder="布置结束日期"
-                          :picker-options="{
-        firstDayOfWeek: 1
-    }"></el-date-picker>
+          <el-date-picker
+            v-model.trim="searchForm.timer"
+            style="width: 400px"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="布置开始日期"
+            end-placeholder="布置结束日期"
+            :picker-options="{
+              firstDayOfWeek: 1,
+            }"
+          ></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-date-picker v-model.trim="searchForm.expireDate"
-                          style="width:400px;"
-                          type="daterange"
-                          value-format="yyyy-MM-dd"
-                          range-separator="至"
-                          start-placeholder="截止开始日期"
-                          end-placeholder="截止结束日期"
-                          :picker-options="{
-        firstDayOfWeek: 1
-    }"></el-date-picker>
+          <el-date-picker
+            v-model.trim="searchForm.expireDate"
+            style="width: 400px"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="截止开始日期"
+            end-placeholder="截止结束日期"
+            :picker-options="{
+              firstDayOfWeek: 1,
+            }"
+          ></el-date-picker>
         </el-form-item>
 
         <el-form-item>
           <el-button type="danger" native-type="submit">搜索</el-button>
           <el-button type="primary" native-type="reset">重置</el-button>
-          <el-button @click="onExport"
-                     type="primary"
-                     v-permission="'export/extraExercisesReplys'">导出</el-button>
+          <el-button
+            @click="onExport"
+            type="primary"
+            v-permission="'export/extraExercisesReplys'"
+            >导出</el-button
+          >
         </el-form-item>
       </save-form>
       <div class="tableWrap">
-        <el-table style="width: 100%"
-                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-                  :data="tableList">
-          <el-table-column align="center"
-                           prop="createTime"
-                           label="布置时间"
-                           width="150">
-            <template slot-scope="scope">{{scope.row.createTime | dateForMinFormat}}</template>
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="createTime"
+            label="布置时间"
+            width="150"
+          >
+            <template slot-scope="scope">{{
+              scope.row.createTime | dateForMinFormat
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="expireDate"
-                           label="截止时间"
-                           width="150">
-            <template slot-scope="scope">{{scope.row.expireDate | dateForMinFormat}}</template>
+          <el-table-column
+            align="center"
+            prop="expireDate"
+            label="截止时间"
+            width="150"
+          >
+            <template slot-scope="scope">{{
+              scope.row.expireDate | dateForMinFormat
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="title"
-                           label="训练标题">
+          <el-table-column align="center" prop="title" label="训练标题">
             <template slot-scope="scope">
               <div>
-                <div v-if="scope.row.extracurricularExercises">{{scope.row.extracurricularExercises.title}}</div>
+                <div v-if="scope.row.extracurricularExercises">
+                  {{ scope.row.extracurricularExercises.title }}
+                </div>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="teacherName"
-                           label="老师"></el-table-column>
-          <el-table-column align="center"
-                           prop="organName"
-                           label="学员分部"></el-table-column>
-          <el-table-column align="center"
-                           prop="createTime"
-                           label="学生姓名">
+          <el-table-column
+            align="center"
+            prop="teacherName"
+            label="老师"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="organName"
+            label="学员分部"
+          ></el-table-column>
+          <el-table-column align="center" prop="createTime" label="学生姓名">
             <template slot-scope="scope">
               <div>
-                <div v-if="scope.row.user">{{scope.row.user.username}}</div>
+                <div v-if="scope.row.user">{{ scope.row.user.username }}</div>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="userId"
-                           label="学生编号"></el-table-column>
-          <el-table-column align="center"
-                           label="提交训练">
+          <el-table-column
+            align="center"
+            prop="userId"
+            label="学生编号"
+          ></el-table-column>
+          <el-table-column align="center" label="提交训练">
             <template slot-scope="scope">
-              <div>{{scope.row.status?'是':'否'}}</div>
+              <div>{{ scope.row.status ? "是" : "否" }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="createTime"
-                           label="提交时间"
-                           width="150">
-            <template slot-scope="scope">{{scope.row.submitTime | dateForMinFormat}}</template>
+          <el-table-column
+            align="center"
+            prop="createTime"
+            label="提交时间"
+            width="150"
+          >
+            <template slot-scope="scope">{{
+              scope.row.submitTime | dateForMinFormat
+            }}</template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="isReplied"
-                           label="是否评价">
+          <el-table-column align="center" prop="isReplied" label="是否评价">
             <template slot-scope="scope">
-              <div>{{scope.row.isReplied?'是':'否'}}</div>
+              <div>{{ scope.row.isReplied ? "是" : "否" }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           label="是否有vip"
-                           width="100"
-                           fixed="right">
+          <el-table-column
+            align="center"
+            label="是否有vip"
+            width="100"
+            fixed="right"
+          >
             <template slot-scope="scope">
-              <div>{{scope.row.existVipCourse?'是':'否'}}</div>
+              <div>{{ scope.row.existVipCourse ? "是" : "否" }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="isRepliedTimely"
-                           label="及时评价"
-                           width="100"
-                           fixed="right">
+          <el-table-column
+            align="center"
+            prop="isRepliedTimely"
+            label="及时评价"
+            width="100"
+            fixed="right"
+          >
             <template slot-scope="scope">
-              <div>{{scope.row.isRepliedTimely?'是':'否'}}</div>
+              <div>{{ scope.row.isRepliedTimely ? "是" : "否" }}</div>
             </template>
           </el-table-column>
-                   <el-table-column
+          <el-table-column
             align="center"
             prop="actualTeacherName"
             label="是否团练宝布置"
@@ -197,31 +243,35 @@
               <div v-if="scope.row.extracurricularExercises&&scope.row.extracurricularExercises.teacher">{{scope.row.extracurricularExercises.teacher.username}}</div>
             </template>
           </el-table-column>-->
-          <el-table-column align="center"
-                           label="操作"
-                           fixed="right">
+          <el-table-column align="center" label="操作" fixed="right">
             <template slot-scope="scope">
               <div>
-                <el-button type="text"
-                           v-permission="'afterWorkList/look'"
-                           @click="lookDetail(scope.row)">查看</el-button>
+                <el-button
+                  type="text"
+                  v-permission="'afterWorkList/look'"
+                  @click="lookDetail(scope.row)"
+                  >查看</el-button
+                >
               </div>
             </template>
           </el-table-column>
         </el-table>
         <pagination
-         :saveKey="formSaveKey"
-         sync
-        :total.sync="rules.total"
-                    :page.sync="rules.page"
-                    :limit.sync="rules.limit"
-                    :page-sizes="rules.page_size"
-                    @pagination="getList" />
+          :saveKey="formSaveKey"
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
       </div>
     </div>
-    <el-dialog title="课外训练详情"
-               :visible.sync="afterSchoolVisible"
-               width="600px">
+    <el-dialog
+      title="课外训练详情"
+      :visible.sync="afterSchoolVisible"
+      width="600px"
+    >
       <el-form :model="visibleForm" label-width="100px">
         <el-form-item label="老师姓名">
           <el-input v-model="visibleForm.teacherName" disabled></el-input>
@@ -236,28 +286,39 @@
           <el-input v-model="visibleForm.title" disabled></el-input>
         </el-form-item>
         <el-form-item label="训练内容">
-          <el-input type="textarea" rows="5" v-model="visibleForm.content" disabled></el-input>
+          <el-input
+            type="textarea"
+            rows="5"
+            v-model="visibleForm.content"
+            disabled
+          ></el-input>
         </el-form-item>
 
-        <el-form-item label="学生上传"
-                      v-for="(item,index) in visibleForm.attachments"
-                      :key="index">
+        <el-form-item
+          label="学生上传"
+          v-for="(item, index) in visibleForm.attachments"
+          :key="index"
+        >
           <!-- <el-button type="primary" v-if="item" @click="lookWork(item)">点击播放</el-button> -->
-          <p class="schoolCell"
-             v-if="item"
-             @click="lookWork(item)">点击播放</p>
+          <p class="schoolCell" v-if="item" @click="lookWork(item)">点击播放</p>
         </el-form-item>
       </el-form>
     </el-dialog>
-    <el-dialog title="查看训练"
-               width="680px"
-               append-to-body
-               :visible.sync="workVisible">
+    <el-dialog
+      title="查看训练"
+      width="680px"
+      append-to-body
+      :visible.sync="workVisible"
+    >
       <!-- activeUrl -->
-      <video style="width:640px;"
-             :src="activeSrc"
-             ref="dialogVideo"
-             controls="controls">您的浏览器不支持视频播放</video>
+      <video
+        style="width: 640px"
+        :src="activeSrc"
+        ref="dialogVideo"
+        controls="controls"
+      >
+        您的浏览器不支持视频播放
+      </video>
     </el-dialog>
   </div>
 </template>
@@ -266,19 +327,19 @@
 import pagination from "@/components/Pagination/index";
 import {
   extracurricularExercisesReply,
-  findStudentExtraExerciseDetail
+  findStudentExtraExerciseDetail,
 } from "@/api/afterSchool";
 import { getEmployeeOrgan } from "@/api/buildTeam";
-import { Export } from '@/utils/downLoadFile'
+import { Export } from "@/utils/downLoadFile";
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 export default {
   props: ["id", "saveKey"],
   components: { pagination },
-  data () {
-    const that = this
+  data() {
+    const that = this;
     return {
-      formSaveKey: that.saveKey || 'afterWorkList',
+      formSaveKey: that.saveKey || "afterWorkList",
       searchForm: {
         search: null,
         timer: [],
@@ -288,14 +349,15 @@ export default {
         isView: null,
         organIdList: null,
         expireDate: [],
-        existVipCourse: null
+        existVipCourse: null,
+        cloudHomeworkFlag: null,
       },
       rules: {
         // 分页规则
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       teacherList: [],
       tableList: [],
@@ -306,26 +368,26 @@ export default {
         title: "",
         studentName: "",
         content: "",
-        attachments: []
+        attachments: [],
       },
       afterSchoolVisible: false,
       workVisible: false,
       activeSrc: "",
       extracurricularExercisesId: null,
-      show: true
+      show: true,
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created () { },
+  created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted () {
-    this.$store.dispatch('setBranchs')
+  mounted() {
+    this.$store.dispatch("setBranchs");
     this.init();
   },
   methods: {
-    init () {
-
-      this.extracurricularExercisesId = this.$route.query.extracurricularExercisesId;
+    init() {
+      this.extracurricularExercisesId =
+        this.$route.query.extracurricularExercisesId;
       if (this.extracurricularExercisesId) {
         this.show = false;
       }
@@ -333,37 +395,41 @@ export default {
       if (this.$route.query.startTime && this.$route.query.endTime) {
         this.searchForm.timer = [
           this.$route.query.startTime,
-          this.$route.query.endTime
+          this.$route.query.endTime,
         ];
       }
       //  (this.$route.query)
       this.getList();
     },
-    getList () {
+    getList() {
       // assignStartTime  assignEndTime page search teacherId title
       let obj = this.getDate();
-      extracurricularExercisesReply(obj).then(res => {
+      extracurricularExercisesReply(obj).then((res) => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;
         }
       });
     },
-    search () {
+    search() {
       this.rules.page = 1;
       this.getList();
     },
     // 导出
-    async onExport () {
+    async onExport() {
       let obj = this.getDate();
-      await Export(this, {
-        url: '/api-web/export/extraExercisesReplys',
-        fileName: '课外训练(学员).xls',
-        method: 'get',
-        params: obj
-      }, '您确定导出列表?')
+      await Export(
+        this,
+        {
+          url: "/api-web/export/extraExercisesReplys",
+          fileName: "课外训练(学员).xls",
+          method: "get",
+          params: obj,
+        },
+        "您确定导出列表?"
+      );
     },
-    getDate () {
+    getDate() {
       let obj = {};
       if (this.searchForm.timer && this.searchForm.timer.length > 0) {
         obj.submitStartTime = this.searchForm.timer[0];
@@ -381,13 +447,15 @@ export default {
           : null;
       this.searchForm.search ? (obj.search = this.searchForm.search) : null;
       this.searchForm.status ? (obj.status = this.searchForm.status) : null;
-      this.searchForm.isReplied ? (obj.isReplied = this.searchForm.isReplied) : null;
+      this.searchForm.isReplied
+        ? (obj.isReplied = this.searchForm.isReplied)
+        : null;
       this.searchForm.isRepliedTimely
         ? (obj.isRepliedTimely = this.searchForm.isRepliedTimely)
         : null;
       this.searchForm.isView ? (obj.isView = this.searchForm.isView) : null;
       this.extracurricularExercisesId &&
-        this.extracurricularExercisesId != "yes"
+      this.extracurricularExercisesId != "yes"
         ? (obj.extracurricularExercisesId = this.extracurricularExercisesId)
         : null;
       this.searchForm.organIdList
@@ -396,9 +464,10 @@ export default {
       this.searchForm.existVipCourse
         ? (obj.existVipCourse = this.searchForm.existVipCourse)
         : null;
+        obj.cloudHomeworkFlag=this.searchForm.cloudHomeworkFlag
       return obj;
     },
-    onReSet () {
+    onReSet() {
       this.searchForm = {
         search: null,
         timer: [],
@@ -408,17 +477,18 @@ export default {
         isView: null,
         organId: null,
         expireDate: [],
-        existVipCourse: null
+        existVipCourse: null,
+        cloudHomeworkFlag: null,
       };
       this.extracurricularExercisesId = null;
       this.getList();
     },
-    lookDetail (row) {
+    lookDetail(row) {
       //   this.afterSchoolVisible = true;
       //    (row)
       findStudentExtraExerciseDetail({
-        studentExerciseId: row.id
-      }).then(res => {
+        studentExerciseId: row.id,
+      }).then((res) => {
         if (res.code == 200) {
           this.visibleForm = {
             expiryDate: res.data.expiryDate,
@@ -426,25 +496,25 @@ export default {
             title: row.extracurricularExercises.title,
             studentName: res.data.studentName,
             content: res.data.content,
-            attachments: res.data.attachments.split(",")
+            attachments: res.data.attachments.split(","),
           };
           //    (this.visibleForm)
           this.afterSchoolVisible = true;
         }
       });
     },
-    lookWork (src) {
+    lookWork(src) {
       this.activeSrc = src;
       this.workVisible = true;
-    }
+    },
   },
   watch: {
-    workVisible (val) {
+    workVisible(val) {
       if (!val) {
         this.activeSrc = "";
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>

src/views/attendanceManager/attendanceList/index.vue

@@ -41,7 +41,7 @@
           <el-select
             v-model.trim="searchForm.groupType"
             class="organSelect"
-            style="margin-left: 15px; width: 100%"
+
             filterable
             placeholder="请选择课程类型"
           >
@@ -54,6 +54,18 @@
           </el-select>
         </el-form-item>
         <el-form-item>
+          <el-select
+            v-model.trim="searchForm.cloudHomeworkFlag"
+            class="organSelect"
+
+            filterable
+            placeholder="是否团练宝布置"
+          >
+            <el-option label="是" :value="true"></el-option>
+            <el-option label="否" :value="false"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-date-picker
             v-model.trim="searchForm.courseTimer"
             style="width: 420px"
@@ -265,6 +277,7 @@ export default {
         organId: null,
         groupType: "MUSIC",
         courseTimer: [],
+        cloudHomeworkFlag:''
       };
       // this.courseTimer = [];
       this.search();

src/views/studentManager/studentList.vue

@@ -17,10 +17,12 @@
           <el-input
             clearable
             placeholder="学生姓名或电话"
-            @keydown.enter.native="(e)=>{
-              e.target.blur()
-              onSearch()
-            }"
+            @keydown.enter.native="
+              (e) => {
+                e.target.blur();
+                onSearch();
+              }
+            "
             v-model.trim="searchForm.search"
           ></el-input>
         </el-form-item>
@@ -700,41 +702,42 @@
             ></el-option>
           </el-select>
         </el-form-item>
-                <el-form-item label="学员年级" prop="currentGradeNum">
+          <el-form-item prop="school" label="所属学校">
           <el-select
-            class="multiple"
-            v-model.trim="studentForm.currentGradeNum"
-            clearable
+            v-model.trim="studentForm.school"
             filterable
+            clearable
             :disabled="!studentForm.organId"
+            class="multiple"
           >
             <el-option
-              v-for="(item, index) in studentGradeList"
-              :label="item"
-              :value="Number(index)"
+              v-for="(item, index) in cooperationList"
               :key="index"
+              :label="item.name"
+              :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="学员班级" prop="currentClass">
-          <el-input v-model.trim="studentForm.currentClass"></el-input>
-        </el-form-item>
-        <el-form-item prop="school" label="所属学校">
+        <el-form-item label="学员年级" prop="currentGradeNum">
           <el-select
-            v-model.trim="studentForm.school"
-            filterable
+            class="multiple"
+            v-model.trim="studentForm.currentGradeNum"
             clearable
+            filterable
             :disabled="!studentForm.organId"
-            class="multiple"
           >
             <el-option
-              v-for="(item, index) in cooperationList"
+              v-for="(item, index) in studentGradeList"
+              :label="item"
+              :value="Number(index)"
               :key="index"
-              :label="item.name"
-              :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="学员班级" prop="currentClass">
+          <el-input v-model.trim="studentForm.currentClass"></el-input>
+        </el-form-item>
+
 
         <el-form-item label="指导老师" prop="teacherId">
           <el-select
@@ -1052,7 +1055,7 @@ export default {
       protocolVersions: [],
       cooperationList: [],
       tenantId: null,
-      studentGradeList:[]
+      studentGradeList: [],
     };
   },
   mounted() {
@@ -1355,19 +1358,16 @@ export default {
           }
         });
 
-
         // 获取 学生年级
-
-
       } catch (e) {}
     },
 
-    async getStudentGradeList(organId){
-      try{
-          const res = await getGradeList({ id: organId })
-          this.studentGradeList = res.data
-      }catch(e){
-        console.log(e)
+    async getStudentGradeList(organId) {
+      try {
+        const res = await getGradeList({ id: organId });
+        this.studentGradeList = res.data;
+      } catch (e) {
+        console.log(e);
       }
     },
     async addStudent() {
@@ -1493,7 +1493,7 @@ export default {
             this.cooperationList = res.data;
           }
         });
-        this.getStudentGradeList(val)
+        this.getStudentGradeList(val);
       } else {
         this.maskTeacherList = [];
       }