Merge branch 'LAO_MO' into online

src/router/index.js

@@ -136,8 +136,10 @@ export const asyncRoutes = {
   journal: () => import('@/views/workBenchManager/journal/index'),
   // 课酬确认
   classFeesIsOk: () => import('@/views/workBenchManager/classFeesIsOk'),
-  // 申述处理
+  // 课酬申诉
   requestProcessing: () => import('@/views/workBenchManager/requestProcessing'),
+  // 课时申诉
+  payAppeal: () => import('@/views/workBenchManager/payAppeal'),
   // 乐团管理
   teamDetail: () => import('@/views/teamDetail/teamList'),
   teamBuild: () => import('@/views/teamBuild/index'),
@@ -298,6 +300,7 @@ export const asyncRoutes = {
   // 学生缴费金额设置
   studentPayBase: () => import('@/views/resetTeaming/components/studentPayBase'),
   // 考情列表
-  recodeList: () => import('@/views/recodeManager/recodeList')
+  recodeList: () => import('@/views/recodeManager/recodeList'),
+
 }
 export default router

src/templateList.vue

@@ -82,8 +82,6 @@ export default {
   },
   methods: {
     init () {
-      this.isInit = true;
-      this.isInit = false;
     },
     getList () { }
   }

src/views/operateManager/operateStudent.vue

@@ -76,6 +76,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
+          <el-select placeholder="有乐团网管课"
+                     v-model="searchForm.hasMusicNetWork"
+                     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"
@@ -132,6 +142,13 @@
               <div>{{scope.row.buyPracticeTimes?'是':'否'}}</div>
             </template>
           </el-table-column>
+          <el-table-column align="center"
+                           prop="buyPracticeTimes"
+                           label="有乐团网管课">
+            <template slot-scope="scope">
+              <div>{{scope.row.musicNetWorkTimes?'是':'否'}}</div>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination :total="rules.total"
                     :page.sync="rules.page"
@@ -161,7 +178,8 @@ export default {
         hasBuyPractice: null,
         hasFreePractice: null,
         hasVip: null,
-        operatingTag: null
+        operatingTag: null,
+        hasMusicNetWork: null
       },
       teacherList: [],
       tableList: [],
@@ -303,7 +321,8 @@ export default {
         hasVip: this.searchForm.hasVip || null,
         operatingTag: this.searchForm.operatingTag || null,
         page: this.rules.page,
-        rows: this.rules.limit
+        rows: this.rules.limit,
+        hasMusicNetWork: this.searchForm.hasMusicNetWork || null
       };
       return obj;
     }

src/views/operateManager/serverIndexList.vue

@@ -215,12 +215,12 @@
               <div>{{scope.row.existPracticeCourse+ '节'}}</div>
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center"
+          <el-table-column align="center"
                            label="作业提交时间">
             <template slot-scope="scope">
               <div>{{scope.row.lastSubmitTime}}</div>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column align="center"
                            label="操作">
             <!--  -->

src/views/workBenchManager/payAppeal.vue

@@ -0,0 +1,115 @@
+<!--  -->
+<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>
+      <div class="tableWrap">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="分部"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="课程编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="课程名称"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="课程时间"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="签到状态"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="签退状态"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="老师名称"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="状态"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="申诉处理者"></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>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
+
+export default {
+  components: { pagination },
+  data () {
+    return {
+      searchForm: {
+        search: null
+      },
+      teacherList: [],
+      tableList: [],
+      organList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created () { },
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted () {
+    getTeacher().then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    });
+    getEmployeeOrgan().then(res => {
+      if (res.code == 200) {
+        this.organList = res.data;
+      }
+    });
+    // 获取分部
+
+    this.init();
+
+
+  },
+  activated () {
+    this.init();
+  },
+  methods: {
+    init () {
+    },
+    getList () { }
+  }
+};
+</script>
+<style lang='scss' scoped>
+</style>

src/views/workBenchManager/requestProcessing.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>申述处理
+      <div class="squrt"></div>课酬申诉
     </h2>
     <div class="m-core">
       <el-form :inline="true"
@@ -98,7 +98,7 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="operatorRealName"
-                           label="申述处理者"></el-table-column>
+                           label="申诉处理者"></el-table-column>
           <!-- <el-table-column align="center" prop="reason" width="400" label="备注"></el-table-column> -->
           <el-table-column align="center"
                            prop="courseScheduleId"
@@ -120,7 +120,7 @@
                     @pagination="getList" />
       </div>
     </div>
-    <el-dialog title="申述处理"
+    <el-dialog title="课酬申诉"
                :visible.sync="dialogVisible"
                width="400px">
       <div>
@@ -295,7 +295,7 @@ export default {
                     nowTime.getHours() +
                     "" +
                     nowTime.getMinutes();
-                  let fname = ymd + "申述处理";
+                  let fname = ymd + "课酬申诉";
                   link.href = objectUrl;
                   link.setAttribute("download", fname);
                   document.body.appendChild(link);

vue.config.js

@@ -19,11 +19,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://testadm.dayaedu.com/' //test环境
 // let target = 'http://192.168.3.27:8000' // 箭河
-// let target = 'http://192.168.3.28:8000' //邹璇
+let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
-let target = 'http://admin.dayaedu.com' // 测试服
+// let target = 'http://admin.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.48:8080' // 乔
-// let target = 'http://195s22s709.imwork.net/' // 邹璇家
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**