Przeglądaj źródła

03/27 13:54

111
Xiao_Mo 5 lat temu
rodzic
commit
ea423f3648

Plik diff jest za duży
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-61759ed2.a8e5e87d.css

@@ -0,0 +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}.schoolCell[data-v-25b4e691]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-25b4e691] .el-textarea.is-disabled .el-textarea__inner{color:#333}

Plik diff jest za duży
+ 0 - 0
dist/static/js/app.d319b78d.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-61759ed2.0c29eee5.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-de5c2e9a.5b8eab24.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/chunk-de5c2e9a.ad572707.js


+ 12 - 0
src/api/afterSchool.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+import qs from 'qs'
+let api = '/api-web'
+
+// 分页查询活动列表
+export function queryPageList(data) {
+    return request({
+      url: api + '/extracurricularExercises/queryPageList',
+      method: 'get',
+      params: data
+    })
+  }

+ 3 - 1
src/router/index.js

@@ -266,6 +266,8 @@ export const asyncRoutes = {
   // 帮助内容
   helpContent: () => import('@/views/helpCenter/helpContent'),
   // 对外订单
-  incomeOut: () => import('@/views/businessManager/orderManager/incomeOut')
+  incomeOut: () => import('@/views/businessManager/orderManager/incomeOut'),
+  // 课外作业
+  afterSchoolList:()=>import('@/views/afterSchoolManager/afterSchoolList')
 }
 export default router

+ 4 - 2
src/views/accompanyManager/accompanyList.vue

@@ -58,6 +58,7 @@
           <el-select v-model.trim="searchForm.firstOrRenew" clearable filterable 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>
@@ -118,7 +119,8 @@
           <el-table-column align="center" label="是否续费">
             <template slot-scope="scope">
               <div>
-                <p>{{scope.row.beRenewGroupId>0?'续费':'首充'}}</p>
+                <p  v-if="scope.row.buyMonths == 0">免费</p>
+                <p v-if="scope.row.buyMonths > 0">{{scope.row.beRenewGroupId>0?'续费':'首充'}}</p>
               </div>
             </template>
           </el-table-column>
@@ -262,7 +264,7 @@ export default {
         page: this.rules.page,
         rows: this.rules.limit,
         hasEducationalTeacherId: this.searchForm.hasEducationalTeacherId || null,
-        firstOrRenew:this.searchForm.firstOrRenew || null
+        type:this.searchForm.firstOrRenew || null
       };
       practiceGroupManage(obj).then(res => {
         if (res.code == 200) {

+ 209 - 0
src/views/afterSchoolManager/afterSchoolList.vue

@@ -0,0 +1,209 @@
+<!--  -->
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>课外训练
+    </h2>
+    <div class="m-core">
+      <el-form :inline="true" :model="searchForm">
+        <el-form-item>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="search"
+            placeholder="请输入标题"
+          ></el-input>
+        </el-form-item>
+            <el-form-item>
+          <el-select placeholder="老师姓名" v-model="searchForm.teacherId" clearable filterable>
+            <el-option
+              v-for="(item,index) in teacherList"
+              :label="item.realName"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model.trim="searchForm.timer"
+            style="width:410px;"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+    
+        <!-- <el-form-item>
+          <el-select placeholder="是否提交" v-model="searchForm.hasReport" 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.hasReport" clearable>
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="danger" @click="search">搜索</el-button>
+          <el-button @click="onReSet" type="primary">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+          :data="tableList"
+        >
+          <el-table-column align="center" label="布置时间"></el-table-column>
+          <el-table-column align="center" label="训练标题"></el-table-column>
+          <el-table-column align="center" label="截止时间"></el-table-column>
+          <el-table-column align="center" label="老师姓名"></el-table-column>
+          <el-table-column align="center" label="是否提交"></el-table-column>
+          <el-table-column align="center" label="是否回复"></el-table-column>
+          <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text" @click="lookDetail(scope.row)">查看</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          :total="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-form :model="visibleForm">
+        <el-form-item label="布置时间">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="老师姓名">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="学生姓名">
+          <el-popover
+            placement="top-start"
+            width="400"
+            trigger="hover"
+            :content="visibleForm.createTime"
+          >
+            <p class="schoolCell" slot="reference" >{{visibleForm.createTime}}</p>
+          </el-popover>
+        </el-form-item>
+        <el-form-item label="截止时间">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="训练标题">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="训练内容">
+          <el-input
+            disabled
+            type="textarea"
+            rows="5"
+            v-model="visibleForm.createTime"
+            style="width:400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="学生上传">
+          <el-input disabled v-model="visibleForm.createTime" style="width:400px"></el-input>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import pagination from "@/components/Pagination/index";
+import { queryPageList } from '@/api/afterSchool'
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        search: null,
+        timer: []
+      },
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      teacherList: [],
+      tableList: [{}],
+      visibleForm: {
+        createTime:
+          "啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦"
+      },
+      afterSchoolVisible: false
+    };
+  },
+  //生命周期 - 创建完成(可以访问当前this实例)
+  created() {},
+  //生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {
+   this.init()
+  },
+  activated(){
+    this.init()
+  },
+  methods: {
+    init(){
+       var now = new Date();
+    var startDate = new Date(
+      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    )
+      .toISOString()
+      .slice(0, 10);
+    //  + " 00:00:00"  + " 23:59:59"
+    var endDate = new Date(
+      Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+    )
+      .toISOString()
+      .slice(0, 10);
+    this.searchForm.timer = [];
+    this.searchForm.timer.push(startDate);
+    this.searchForm.timer.push(endDate);
+    },
+    getList() {},
+    search() {},
+    onReSet() {},
+    lookDetail(row) {
+      this.afterSchoolVisible = true;
+    }
+  }
+};
+</script>
+<style lang='scss' scoped>
+.schoolCell {
+  width: 400px;
+  color: #333;
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  height: 40px;
+  line-height: 40px;
+  outline: 0;
+  padding: 0 15px;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+  display: inline-block;
+  box-sizing: border-box;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+/deep/.el-textarea.is-disabled .el-textarea__inner {
+  color: #333;
+}
+</style>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików