Merge branch 'online' into LAO_MO

dist/static/css/chunk-0558a7bf.5a7d32ef.css → dist/static/css/chunk-63a9c1b3.63b04780.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}.inputStyle[data-v-5d2b2f36]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-7d789d15]{width:100px;text-align:center}.work[data-v-7d789d15]{margin-bottom:30px;font-size:16px}.visible[data-v-39fdcb15]{visibility:hidden}.cl-container .topFrom[data-v-39fdcb15]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-39fdcb15]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-39fdcb15]{list-style:none}.cl-container .searchForm[data-v-39fdcb15]{margin:0 30px}.btnWraps[data-v-39fdcb15]{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:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-39fdcb15]{margin-right:20px}.inputStyle[data-v-39fdcb15]{width:180px}.red[data-v-39fdcb15]{color:red}.exportBtn[data-v-39fdcb15]{background:#13817a}
+.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}.inputStyle[data-v-5d2b2f36]{width:100px;text-align:center}.title[data-v-0eb05fc4]{margin-bottom:20px}.amap-demo[data-v-0eb05fc4]{height:300px}.inputStyle[data-v-7d789d15]{width:100px;text-align:center}.work[data-v-7d789d15]{margin-bottom:30px;font-size:16px}.visible[data-v-0f5ba924]{visibility:hidden}.cl-container .topFrom[data-v-0f5ba924]{margin:20px 30px 0}.cl-container .topFrom .classlist[data-v-0f5ba924]{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:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li[data-v-0f5ba924]{list-style:none}.cl-container .searchForm[data-v-0f5ba924]{margin:0 30px}.btnWraps[data-v-0f5ba924]{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:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div[data-v-0f5ba924]{margin-right:20px}.inputStyle[data-v-0f5ba924]{width:180px}.red[data-v-0f5ba924]{color:red}.exportBtn[data-v-0f5ba924]{background:#13817a}

dist/static/css/chunk-f5536f90.5a5a6545.css → dist/static/css/chunk-77d97730.52d59aff.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}.titlewrap[data-v-316aa50a]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-316aa50a],.wrap[data-v-316aa50a]{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:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-316aa50a]{margin-right:20px}
+.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}.titlewrap[data-v-43d9c028]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.titlewrap[data-v-43d9c028],.wrap[data-v-43d9c028]{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:start;-ms-flex-pack:start;justify-content:flex-start}.wrap div[data-v-43d9c028]{margin-right:20px}

src/utils/directivePage.js

@@ -2,6 +2,7 @@
 export function permission(value, parent) {
     let permission = window.localStorage.getItem('permission')
     permission = permission.split(',')
+    parent = parent ? parent : null
     // if(parent) {
     //     if(permission.includes(value) && permission.includes(parent)) {
     //         return true
@@ -15,8 +16,7 @@ export function permission(value, parent) {
     //         return false
     //     }
     // }
-
-    if(permission.includes(value)) {
+    if(permission.includes(value) && !parent) {
         return true
     } else if(permission.includes(value) && permission.includes(parent)) {
         return true

src/views/accompanyManager/accompanyList.vue

@@ -169,14 +169,13 @@
                 <el-button type="text" @click="lookCrouse(scope.row)">查看</el-button>
                 <el-button
                   type="text"
-                  v-if="scope.row.groupStatus == 'NORMAL'"
+                  v-if="scope.row.groupStatus == 'NORMAL' && permission('practiceGroupManage/cancelGroup')"
                   @click="closeCrouse(scope.row)"
-                  v-permission="'practiceGroupManage/cancelGroup'"
                 >关闭</el-button>
                 <el-button
                   type="text"
+                  v-if="permission('practiceGroupManage/updateMemo')"
                   @click="resetMemo(scope.row)"
-                  v-permission="'practiceGroupManage/updateMemo'"
                 >修改备注</el-button>
               </div>
             </template>
@@ -223,6 +222,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import { permission } from "@/utils/directivePage";
 import { commGroupStatus, practiceGroupType } from "@/utils/searchArray";
 import {
   getTeacher,
@@ -305,6 +305,9 @@ export default {
       });
       this.getList();
     },
+    permission(str, parent) {
+      return permission(str, parent);
+    },
     search() {
       this.rules.page = 1;
       this.getList();

src/views/accompanyManager/accompanys.vue

@@ -27,6 +27,10 @@
         v-permission="'courseSchedule/batchUpdateCourseSchedule'"
         @click="adjustment"
       >批量调整</div>
+      <!-- <div class="newBand"
+        v-permission="'courseSchedule/updateCoursesExpireDate'"
+        @click="onCourseExpireDate"
+      >有效期调整</div> -->
     </div>
     
     <div class="tableWrap">
@@ -104,6 +108,8 @@
                 v-show="scope.row.status == 'NOT_START'&&courseType!='TRIAL'"
                 @click="resetTeacher(scope.row)"
               >更换老师</el-button>
+              <!-- <el-button v-if="scope.row.status == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance', '/teamCourseList')" type="text" @click="onMarkAttendance(scope.row)"
+              >补考勤</el-button> -->
               <el-button
                 type="text"
                 v-permission="'accompanys/cleanAttendance'"
@@ -122,6 +128,22 @@
         @pagination="getList"
       />
     </div>
+    <el-dialog title="补考勤" width="400px" :visible.sync="markAttendance.status">
+      <el-form>
+        <el-form-item label="签到状态">{{ markAttendance.dataInfo.isSignIn | attendanceType }}</el-form-item>
+        <el-form-item label="签到时间">{{ markAttendance.dataInfo.signInTime}}</el-form-item>
+        <el-form-item label="签退状态">{{ markAttendance.dataInfo.isSignOut | attendanceOutType }}</el-form-item>
+        <el-form-item label="签退时间">{{ markAttendance.dataInfo.signOutTime}}</el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="markAttendance.status = false">取 消</el-button>
+        <el-button
+          type="primary"
+          :disabled="markAttendance.dataInfo.isSignIn == 1 && markAttendance.dataInfo.isSignOut == 1 ? true : false"
+          @click="batchAdjustmentTime"
+        >确定补卡</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="课程调整" width="400px" :before-close="handleClose" :visible.sync="courseVisible">
       <el-form
         :model="maskForm"
@@ -341,6 +363,7 @@
 </template>
 <script>
 import pagination from "@/components/Pagination/index";
+import { permission } from "@/utils/directivePage";
 import {
   findPracticeGroupCourseSchedules,
   practiceCourseAdjus,
@@ -352,7 +375,8 @@ import {
   batchAddCourses,
   getPracticeApplySubjects,
   batchUpdateCourseSchedule,
-  findEducationUsers
+  findEducationUsers,
+  updateTeacherAttendance
 } from "@/api/buildTeam";
 import {
   vipCourseAdjust,
@@ -453,7 +477,13 @@ export default {
       ],
       activeList: [],
       educationList: [],
-      timers: null
+      timers: null,
+      courseExpireDate: null, // 结束时间
+      markAttendance: {
+        // 考勤状态
+        status: false,
+        dataInfo: {}
+      },
     };
   },
   mounted() {
@@ -467,7 +497,6 @@ export default {
       this.practiceId = this.$route.query.id;
       this.userId = this.$route.query.userId;
       this.courseType = this.$route.query.type;
-      console.log( this.courseType)
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules;
       }
@@ -510,10 +539,39 @@ export default {
               this.courseData[0].coursesStartDate.substring(0, 10) +
               "至" +
               this.courseData[0].coursesExpireDate.substring(0, 10);
+            this.courseExpireDate = this.courseData[0].coursesExpireDate.substring(0, 10);
           }
         }
       });
     },
+    permission(str, parent) {
+      return permission(str, parent);
+    },
+    onMarkAttendance(item) {
+      // 补考勤
+      this.markAttendance = {
+        status: true,
+        dataInfo: item
+      };
+    },
+    batchAdjustmentTime() {
+      let tempData = this.markAttendance.dataInfo;
+      let params = {
+        teacherId: tempData.actualTeacherId,
+        courseScheduleId: tempData.id,
+        signInStatus: 1,
+        signOutStatus: 1
+      };
+      updateTeacherAttendance(params).then(res => {
+        if (res.code == 200) {
+          this.$message.success("补卡成功");
+          this.markAttendance.status = false;
+          this.getList();
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
     getList() {
       findPracticeGroupCourseSchedules({ practiceId: this.practiceId }).then(
         res => {
@@ -658,6 +716,10 @@ export default {
         return true;
       }
     },
+    onCourseExpireDate() {
+      // 修改课程有效期
+
+    },
     adjustment() {
       this.adjustmentName = "批量调整";
       this.isaddCourse = false;

src/views/businessManager/orderManager/financeManager.vue

@@ -96,9 +96,10 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -180,8 +181,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0 //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     };
   },
   mounted() {
@@ -304,12 +307,10 @@ export default {
         if (res.code == 200) {
           this.tableList = result.rows;
           this.pageInfo.total = result.total;
-          this.totalExpectAmount = result.totalExpectAmount
-            ? result.totalExpectAmount
-            : 0;
-          this.totalActualAmount = result.totalActualAmount
-            ? result.totalActualAmount
-            : 0;
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
+          this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       });
     },

src/views/businessManager/orderManager/income.vue

@@ -94,10 +94,23 @@
         </el-form-item>
       </el-form>
       <!-- 列表 -->
+      <!-- totalUserBalance: 20452784.02
+      totalExpectAmount: 0
+      totalActualAmount: 0
+      totalAdvanceAmount: 0
+      totalRevenueAmount: 0 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-        应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
+        <!-- 应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
         现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-        余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 -->
+        <!-- 营收金额=2-3
+        实收金额=应收总额（包含余额支付）
+        预收金额=充值总额（发生消费，记负数）
+        预收余额=充值总余额 -->
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -181,8 +194,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0 //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     };
   },
   mounted() {
@@ -318,12 +333,10 @@ export default {
         if (res.code == 200) {
           this.tableList = result.rows;
           this.pageInfo.total = result.total;
-          this.totalExpectAmount = result.totalExpectAmount
-            ? result.totalExpectAmount
-            : 0;
-          this.totalActualAmount = result.totalActualAmount
-            ? result.totalActualAmount
-            : 0;
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
+          this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       });
     },

src/views/businessManager/orderManager/incomeOne.vue

@@ -84,9 +84,10 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-          应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data='tableList'
@@ -212,8 +213,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0, //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     }
   },
   mounted () {
@@ -330,8 +333,10 @@ this.orderDate.push(endDate)
         if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
-          this.totalExpectAmount = result.totalExpectAmount ? result.totalExpectAmount : 0
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
           this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       })
     },

src/views/businessManager/orderManager/incomeTwo.vue

@@ -84,9 +84,10 @@
       </el-form>
       <!-- 列表 -->
       <div style="font-size: 14px; color: #F85043; padding-bottom: 10px;">
-          应收总金额：{{ totalExpectAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          现金实收总额：{{ totalActualAmount }}元 &nbsp;&nbsp;&nbsp;&nbsp;
-          余额实收总额：{{ Number((totalExpectAmount - totalActualAmount).toFixed(2)) }}元 
+        营收金额：{{ totalRevenueAmount }}元<i style="width: 10px; display: inline-block"></i>
+        实收金额：{{ totalActualAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收金额：{{ totalAdvanceAmount }}元<i style="width: 10px; display: inline-block"></i>
+        预收余额：{{ totalUserBalance }}元
       </div>
       <div class="tableWrap">
         <el-table :data='tableList'
@@ -201,8 +202,10 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      totalExpectAmount: 0, //应收总金额
-      totalActualAmount: 0, //实收总金额
+      totalUserBalance: 0,
+      totalActualAmount: 0,
+      totalAdvanceAmount: 0,
+      totalRevenueAmount: 0,
     }
   },
   mounted () {
@@ -306,8 +309,10 @@ this.orderDate.push(endDate)
         if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
-          this.totalExpectAmount = result.totalExpectAmount ? result.totalExpectAmount : 0
+          this.totalUserBalance = result.totalUserBalance ? result.totalUserBalance : 0
           this.totalActualAmount = result.totalActualAmount ? result.totalActualAmount : 0
+          this.totalAdvanceAmount = result.totalAdvanceAmount ? result.totalAdvanceAmount : 0
+          this.totalRevenueAmount = result.totalRevenueAmount ? result.totalRevenueAmount : 0
         }
       })
     },

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -139,7 +139,9 @@
               value-format="yyyy-MM-dd"
               placeholder="选择日期"
             ></el-date-picker>
+            <div style="display: inline; color: red; padding-left: 10px;">说明：本次调整只对生效日期之后（包含当天）且未结算的课程生效；</div>
           </el-form-item>
+          
         </el-form>
 
         <div

src/views/teamDetail/components/courseList.vue

@@ -109,8 +109,9 @@
         <el-table-column align="center" width="280px" label="操作" fixed="right">
           <template slot-scope="scope">
             <div>
+              <!-- {child: 'teacherAttendance/updateTeacherAttendance', parent: '/teamDetails/courseList'} -->
               <el-button
-                v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance')"
+                v-if="scope.row.courseScheduleStatus == 'OVER' && !scope.row.settlementTime && permission('teacherAttendance/updateTeacherAttendance', '/teamDetails/courseList')"
                 type="text"
                 @click="onMarkAttendance(scope.row)"
               >补考勤</el-button>
@@ -482,7 +483,6 @@ export default {
     },
     onMarkAttendance(item) {
       // 补考勤
-      console.log(item);
       this.markAttendance = {
         status: true,
         dataInfo: item
@@ -531,8 +531,8 @@ export default {
         }
       });
     },
-    permission(str) {
-      return permission(str);
+    permission(str, parent) {
+      return permission(str, parent);
     },
     search() {
       this.rules.page = 1;

src/views/teamDetail/teamCourseList.vue

@@ -147,10 +147,10 @@
             <template slot-scope="scope">{{ scope.row.isCallNames ? '是' : '否' }}</template>
           </el-table-column>
           <el-table-column align="center" prop="teacherName" label="指导老师" fixed="right"></el-table-column>
-          <el-table-column align="center" label="详情" fixed="right">
+          <el-table-column align="center" label="详情" fixed="right" width="120px">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" v-permission="'teamCourseList/details'" @click="lookDetail(scope.row)">详情</el-button>
+                <el-button type="text" v-if="permission('teamCourseList/details')" @click="lookDetail(scope.row)">详情</el-button>
               </div>
             </template>
           </el-table-column>
@@ -168,8 +168,7 @@
       title="课表详情"
       :visible.sync="classVisible"
       :before-close="closeClassVisible"
-      width="1000px"
-    >
+      width="1000px">
       <el-form :model="maskForm" :inline="true">
         <el-form-item label="老师姓名">
           <!-- <el-input v-model.trim="maskForm.teacherName"
@@ -279,6 +278,7 @@ import studentRollCall from "./componentCourse/studentRollCall";
 import gpsLoction from "./componentCourse/gpsLocation";
 import studentWork from "./componentCourse/studentWork";
 import courseEvaluate from "./componentCourse/courseEvaluate";
+import { permission } from "@/utils/directivePage";
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 import load from "@/utils/loading";
@@ -359,6 +359,10 @@ export default {
         }
       });
     },
+    permission(str, parent) {
+      return permission(str, parent);
+    },
+    
     search() {
       this.rules.page = 1;
       this.getList();