浏览代码

03/14 16:26

111
261568008@qq.com 5 年之前
父节点
当前提交
9ca95676da

文件差异内容过多而无法显示
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-d5504200.98c2167f.css → dist/static/css/chunk-a39b2202.12de5753.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-15aa3806]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-15aa3806]{display:inline-block}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-60519d04]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-60519d04]{display:inline-block}

文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.bb005082.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-a39b2202.5c30d05b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-d5504200.609cc6fa.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-de5c2e9a.0a20f0e7.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/chunk-de5c2e9a.c42a11fc.js


+ 11 - 15
src/views/accompanyManager/accompanyList.vue

@@ -31,22 +31,18 @@
           </el-select>
         </el-form-item>
         <!-- statusList -->
-        <!-- <el-form-item prop="status">
+        <el-form-item prop="status">
           <el-select
             class="multiple"
-            v-model.trim="searchForm.status"
+            v-model.trim="searchForm.hasEducationalTeacherId"
             filterable
             clearable
-            placeholder="请选课程状态"
+            placeholder="是否有教务老师"
           >
-            <el-option
-              v-for="(item,index) in statusList"
-              :key="index"
-              :label="item.lable"
-              :value="item.value"
-            ></el-option>
+            <el-option label="是" value="true"></el-option>
+            <el-option  label="否" value="false"></el-option>
           </el-select>
-        </el-form-item>-->
+        </el-form-item>
 
         <el-form-item>
           <el-select v-model.trim="searchForm.teacherId" clearable filterable placeholder="指导老师">
@@ -74,8 +70,7 @@
           <el-table-column align="center" prop="name" label="课程组名称"></el-table-column>
           <el-table-column align="center" prop="organName" label="所属分部"></el-table-column>
           <!-- educationalTeacherId -->
-          <el-table-column align="center" prop="educationalTeacherName" label="教务老师">
-          </el-table-column>
+          <el-table-column align="center" prop="educationalTeacherName" label="教务老师"></el-table-column>
           <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
           <el-table-column align="center" prop="studentNum" label="班级人数"></el-table-column>
           <!-- <el-table-column align="center" label="课程单价">
@@ -250,7 +245,8 @@ export default {
         teacherId: this.searchForm.teacherId || null,
         organId: this.searchForm.organIdList || null,
         page: this.rules.page,
-        rows: this.rules.limit
+        rows: this.rules.limit,
+        hasEducationalTeacherId:this.searchForm.hasEducationalTeacherId || null
       };
       practiceGroupManage(obj).then(res => {
         if (res.code == 200) {
@@ -281,7 +277,7 @@ export default {
           this.$message.error("请输入退费金额");
           return;
         }
-      }else {
+      } else {
         this.closeForm.money = null;
       }
       // 请求数据
@@ -301,7 +297,7 @@ export default {
   watch: {
     closeVisible(val) {
       if (!val) {
-        console.log(val)
+        console.log(val);
         this.activeRow = null;
         (this.closeForm = {
           isBack: false,

+ 15 - 1
src/views/vipClass/vipList.vue

@@ -67,6 +67,18 @@
             ></el-option>
           </el-select>
         </el-form-item>
+              <el-form-item prop="status">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.hasEducationalTeacherId"
+            filterable
+            clearable
+            placeholder="是否有教务老师"
+          >
+            <el-option label="是" value="true"></el-option>
+            <el-option  label="否" value="false"></el-option>
+          </el-select>
+        </el-form-item>
 
         <el-form-item>
           <el-button @click="search" type="danger">搜索</el-button>
@@ -208,7 +220,8 @@ export default {
         activityId: null,
         search: null,
         orgin: null,
-        status: null
+        status: null,
+        hasEducationalTeacherId:null
       },
       teacherList: [],
       activeList: [],
@@ -290,6 +303,7 @@ export default {
         let params = this.searchForm;
         params.page = this.rules.page;
         params.rows = this.rules.limit;
+        params.hasEducationalTeacherId = this.searchForm.hasEducationalTeacherId || null
         params.organId = this.searchForm.orgin || null;
         params.status = this.searchForm.status || null;
         getVipList(params).then(res => {

部分文件因为文件数量过多而无法显示