Browse Source

12/15 17:17

回访记录优化
mo 4 years ago
parent
commit
82a2722ece

+ 4 - 1
src/router/notKeepAliveList.js

@@ -3,7 +3,7 @@ export default [
   '/contentManager/accompaniment', // 教学伴奏
   '/orderList/orderAudit', // 订单管理 订单审核
   '/business/teamCourseList', // 课表列表
-  '/business/auditList', // 审核列表
+  '/business/auditList', // 费用审核列表
   '/orderList/financeManager', // 财务管理
   '/vipClassSet/vipParameterManager', // VIP参数设置
   '/vipClassSet/branchActive', // VIP分部活动列表
@@ -22,4 +22,7 @@ export default [
   '/business/studentList', // 学员管理
   '/business/studentDetail', // 学员管理详情
   // '/operateManager/HumanResources'
+  '/business/attendanceList',
+  '/business/returnVisitList',
+
 ]

+ 162 - 126
src/views/attendanceManager/attendanceList/index.vue

@@ -2,117 +2,155 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>作业列表
+      <div class="squrt"></div>
+      作业列表
     </h2>
     <div class="m-core">
-      <el-form :inline="true"
-               :model="searchForm">
+      <save-form
+        :inline="true"
+        :model="searchForm"
+        @submit="search"
+        @reset="onReSet"
+      >
         <el-form-item>
-          <el-input v-model.trim="searchForm.search"
-                    @keyup.enter.native="search"
-                    placeholder='课程编号、名称、乐团名称'></el-input>
+          <el-input
+            v-model.trim="searchForm.search"
+            @keyup.enter.native="search"
+            placeholder="课程编号、名称、乐团名称"
+          ></el-input>
         </el-form-item>
         <el-form-item prop="organId">
-          <el-select class="multiple"
-                     filterable
-                     v-model.trim="searchForm.organId"
-                     clearable
-                     placeholder="请选择分部">
-            <el-option v-for="(item,index) in organList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+          <el-select
+            class="multiple"
+            filterable
+            v-model.trim="searchForm.organId"
+            clearable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in organList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model.trim="searchForm.groupType"
-                     class="organSelect"
-                     style=" margin-left: 15px; width:100%"
-                     filterable
-                     placeholder="请选择课程类型">
-            <el-option v-for="(item,index) in courseListType"
-                       :key="index"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+          <el-select
+            v-model.trim="searchForm.groupType"
+            class="organSelect"
+            style="margin-left: 15px; width: 100%"
+            filterable
+            placeholder="请选择课程类型"
+          >
+            <el-option
+              v-for="(item, index) in courseListType"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-date-picker v-model.trim="courseTimer"
-                          style="width:420px;"
-                          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="courseTimer"
+            style="width: 420px"
+            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 @click="search"
-                     type="danger">搜索</el-button>
-          <el-button @click="onReSet"
-                     type="primary">重置</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </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="courseScheduleId"
-                           label="课程编号"></el-table-column>
-          <el-table-column align="center"
-                           prop="courseScheduleName"
-                           label="课程名称"></el-table-column>
-          <el-table-column align="center"
-                           prop="organName"
-                           label="分部"></el-table-column>
-          <el-table-column align="center"
-                           prop="groupName"
-                           label="课程组名称"></el-table-column>
-          <el-table-column align="center"
-                           label="布置时间">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="courseScheduleId"
+            label="课程编号"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="courseScheduleName"
+            label="课程名称"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="organName"
+            label="分部"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="groupName"
+            label="课程组名称"
+          ></el-table-column>
+          <el-table-column align="center" label="布置时间">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.createTime ? scope.row.createTime.substr(0, 16): '' }}
+                {{
+                  scope.row.createTime ? scope.row.createTime.substr(0, 16) : ""
+                }}
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center"
-                           prop="actualTeacherName"
-                           label="布置老师"></el-table-column>
-          <el-table-column align="center"
-                           prop="expectNum"
-                           label="应交人数"></el-table-column>
-          <el-table-column align="center"
-                           prop="completedNum"
-                           label="已交人数"></el-table-column>
-          <el-table-column align="center"
-                           prop="repliedNum"
-                           label="已回复数"></el-table-column>
-          <el-table-column align="center"
-                           prop="studentId"
-                           label="操作">
+          <el-table-column
+            align="center"
+            prop="actualTeacherName"
+            label="布置老师"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="expectNum"
+            label="应交人数"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="completedNum"
+            label="已交人数"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="repliedNum"
+            label="已回复数"
+          ></el-table-column>
+          <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text"
-                           v-permission="'studentManage/findStudentCourseHomeworks'"
-                           @click="lookDetail(scope.row)">查看</el-button>
+                <el-button
+                  type="text"
+                  v-permission="'studentManage/findStudentCourseHomeworks'"
+                  @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" />
-        <el-dialog title="作业详情"
-                   :visible.sync="classVisible"
-                   width="1000px">
-          <studentWork v-if="activeRow"
-                       :courseScheduleId="activeRow.courseScheduleId"></studentWork>
+        <pagination
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+        <el-dialog title="作业详情" :visible.sync="classVisible" width="1000px">
+          <studentWork
+            v-if="activeRow"
+            :courseScheduleId="activeRow.courseScheduleId"
+          ></studentWork>
         </el-dialog>
       </div>
     </div>
@@ -124,19 +162,19 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
-import { courseListType } from '@/utils/searchArray'
+import { courseListType } from "@/utils/searchArray";
 import { getEmployeeOrgan } from "@/api/buildTeam";
 import studentWork from "@/views/teamDetail/componentCourse/studentWork";
-import { getHomePageList } from "./api.js"
+import { getHomePageList } from "./api.js";
 export default {
   components: { pagination, studentWork },
-  data () {
+  data() {
     return {
       courseListType,
       searchForm: {
         search: null,
         organId: null,
-        groupType: 'MUSIC'
+        groupType: "MUSIC",
       },
       courseTimer: [],
       teacherList: [],
@@ -147,17 +185,17 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       activeRow: null,
-      classVisible: false
+      classVisible: false,
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created () { },
+  created() {},
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted () {
-    getEmployeeOrgan().then(res => {
+  mounted() {
+    getEmployeeOrgan().then((res) => {
       if (res.code == 200) {
         this.organList = res.data;
       }
@@ -165,56 +203,54 @@ export default {
     // 获取分部
 
     this.init();
-
-
   },
-  activated () {
+  activated() {
     this.init();
   },
   methods: {
-    init () {
-      this.getList()
+    init() {
+      this.getList();
     },
-    getList () {
+    getList() {
       let date = this.searchForm;
       let classStartDate, classEndDate;
       if (this.courseTimer?.length > 0) {
-        classStartDate = this.courseTimer[0]
-        classEndDate = this.courseTimer[1]
+        classStartDate = this.courseTimer[0];
+        classEndDate = this.courseTimer[1];
       } else {
-        classStartDate = null
-        classEndDate = null
+        classStartDate = null;
+        classEndDate = null;
       }
-      date.classStartDate = classStartDate
-      date.classEndDate = classEndDate
-      date.page = this.rules.page
-      date.rows = this.rules.limit
-      getHomePageList(date).then(res => {
+      date.classStartDate = classStartDate;
+      date.classEndDate = classEndDate;
+      date.page = this.rules.page;
+      date.rows = this.rules.limit;
+      getHomePageList(date).then((res) => {
         if (res.code == 200) {
-          this.tableList = res.data.rows
-          this.rules.total = res.data.total
+          this.tableList = res.data.rows;
+          this.rules.total = res.data.total;
         }
-      })
+      });
     },
-    search () {
-      this.rules.page = 1
-      this.getList()
+    search() {
+      this.rules.page = 1;
+      this.getList();
     },
-    onReSet () {
+    onReSet() {
       this.searchForm = {
         search: null,
         organId: null,
-        groupType: 'MUSIC'
-      }
-      this.courseTimer = []
-      this.search()
+        groupType: "MUSIC",
+      };
+      this.courseTimer = [];
+      this.search();
     },
-    lookDetail (row) {
-      this.activeRow = row
-      this.classVisible = true
-    }
-  }
+    lookDetail(row) {
+      this.activeRow = row;
+      this.classVisible = true;
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>
-</style>
+</style>

+ 9 - 5
src/views/returnVisitManager/returnVisitList.vue

@@ -5,7 +5,9 @@
       回访记录
     </h2>
     <div class="m-core">
-      <el-form :inline="true"
+      <save-form :inline="true"
+      @submit='search'
+      @reset="onReSet"
                :model="searchForm">
         <el-form-item>
           <el-input placeholder="请输入老师姓名"
@@ -58,11 +60,11 @@
         </el-form-item>
         <el-form-item>
           <el-button type="danger"
-                     @click="search">搜索</el-button>
-          <el-button @click="onReSet"
+                    native-type="submit">搜索</el-button>
+          <el-button native-type="reset"
                      type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div class="tableWrap">
         <el-table :data='tableList'
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -119,7 +121,9 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
+        <pagination
+        sync
+        :total.sync="rules.total"
                     :page.sync="rules.page"
                     :limit.sync="rules.limit"
                     :page-sizes="rules.page_size"