Merge branch 'online' into LAO_MO

dist/static/css/chunk-93b8c84c.5ea9ed75.css → dist/static/css/chunk-107f4b5d.f7c84e6b.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}.titleP[data-v-797a6d1a]{line-height:30px}
+.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}.titleP[data-v-5de5d52b]{line-height:30px}

dist/static/css/chunk-5bdaf900.c77e1c2a.css → dist/static/css/chunk-33ab15b4.485bd57e.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}.micon[data-v-4492435c]{position:absolute;top:3px;right:2px}
+.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}.micon[data-v-c556f9ec]{position:absolute;top:3px;right:2px}

dist/static/css/chunk-4a7d856c.f0ff2a7a.css

@@ -0,0 +1 @@
+.wrap[data-v-c506f63a]{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:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-c506f63a]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-c506f63a],.wrap .rightCell[data-v-c506f63a]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-c506f63a]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-c506f63a]{margin-right:30px}[data-v-c506f63a] .el-tag{cursor:pointer}

dist/static/css/chunk-b2592508.8f06b051.css → dist/static/css/chunk-6b3c8f63.33f00eb0.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}.wrap[data-v-5a208c76]{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:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-5a208c76]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-5a208c76],.wrap .rightCell[data-v-5a208c76]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-5a208c76]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-5a208c76]{margin-right:30px}[data-v-5a208c76] .el-tag{cursor:pointer}
+.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}.wrap[data-v-6d86b3da]{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:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-6d86b3da]{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.wrap .leftCell[data-v-6d86b3da],.wrap .rightCell[data-v-6d86b3da]{width:300px;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-align:center;-ms-flex-align:center;align-items:center;line-height:50px}.wrap .rightCell[data-v-6d86b3da]{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.wrap .rightCell p[data-v-6d86b3da]{margin-right:30px}[data-v-6d86b3da] .el-tag{cursor:pointer}

src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -71,7 +71,7 @@
                            @click="lookFee(scope)">退学</el-button>
               </el-popover> -->
               <el-button type="text"
-                         v-if="scope.row.studentStatus == 0"
+                         v-if="scope.row.studentStatus == 0 || scope.row.studentStatus == 3"
                          v-permission="'vipGroupManage/applyRefundForStudent'"
                          @click="lookFee(scope)">退学</el-button>
               <!--   v-permission="'vipGroupManage/applyRefundForStudent'" -->

src/views/workBenchManager/payAppeal.vue

@@ -116,7 +116,7 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text"
-                           v-permission="'teacherAttendance/agreeTeacherAttendanceComplaints'"
+                           v-if="permission('teacherAttendance/operation')"
                            @click="lookDetail(scope.row)">操作</el-button>
               </div>
             </template>
@@ -166,8 +166,8 @@
       </div>
       <div slot="footer"
            v-if="visibleForm.complaintsStatusEnum =='2'">
-        <el-button @click="subreset('DENIED')">拒绝</el-button>
-        <el-button type="primary"
+        <el-button v-permission="'teacherAttendance/agreeTeacherAttendanceComplaints'" @click="subreset('DENIED')">拒绝</el-button>
+        <el-button v-permission="'teacherAttendance/rejectTeacherAttendanceComplaints'" type="primary"
                    @click="subreset('AGREED')">同意</el-button>
       </div>
     </el-dialog>
@@ -180,6 +180,7 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getEmployeeOrgan } from "@/api/buildTeam";
+import { permission } from '@/utils/directivePage'
 import {
   queryTeacherAttendanceComplaints,
   agreeTeacherAttendanceComplaints,
@@ -240,6 +241,9 @@ export default {
     init () {
       this.getList()
     },
+    permission (str) {
+      return permission(str)
+    },
     getList () {
       let obj = {}
       Object.assign(obj, this.searchForm)