班级列表、教师列表、用户列表 新增 “看课权限”是否可编辑的权限控制

用户详情 - 期数列表 隐藏 编辑按钮

src/App.vue

@@ -44,6 +44,7 @@
               j.router.meta.refund = !!find.refund;
               j.router.meta.distribution = !!find.distribution;
               j.router.meta.classManage = !!find.classManage;
+              j.router.meta.editWatch = !!find.editWatch;
               j.router.meta.classManageUnlimited = !!find.classManageUnlimited;
               j.router.meta.classTakeUnlimited = !!find.classTakeUnlimited;
               j.router.meta.exportFinish = !!find.exportFinish;
@@ -327,11 +328,14 @@
   }
 
   .tabs-refresh {
+    margin-top: 10px;
     &.el-tabs--card > .el-tabs__header {
       margin-bottom: 10px;
-      padding-left: 10px;
+      /*margin-top: 10px;*/
+      margin-left: 10px;
+      /*padding-left: 10px;*/
       /* background-color: #fff; */
-      padding-top: 10px;
+      /*padding-top: 10px;*/
       padding-bottom: 1px;
     }
 

src/components/system/role.vue

@@ -54,27 +54,31 @@
                 <el-checkbox
                   v-model="data.promoter"
                   v-if="data.cover ==='5-1' ">编辑推广人</el-checkbox>
+                <!--class user teacher-->
+                <el-checkbox
+                  v-model="data.editWatch"
+                  v-if="data.cover ==='2-3' || data.cover=== '3-1' || data.cover=== '3-2'">修改看课权限</el-checkbox>
                 <el-checkbox
                   v-model="data.refund"
-                  v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加观摩班用户</el-checkbox>
+                  v-if="data.cover ==='2-3' || data.cover=== '3-1' || data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加观摩班用户</el-checkbox>
                 <el-checkbox
                   v-model="data.classManage"
-                  v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加带班班用户</el-checkbox>
+                  v-if="data.cover ==='2-3' || data.cover=== '3-1' || data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加带班班用户</el-checkbox>
                 <el-checkbox
                   v-model="data.classManageUnlimited"
-                  v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加观摩班(无限制)</el-checkbox>
+                  v-if="data.cover ==='2-3' || data.cover=== '3-1' || data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加观摩班(无限制)</el-checkbox>
                 <el-checkbox
                   v-model="data.classTakeUnlimited"
-                  v-if="data.cover ==='2-3'|| data.cover=== '3-1'|| data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加带班班(无限制)</el-checkbox>
+                  v-if="data.cover ==='2-3' || data.cover=== '3-1' || data.cover=== '3-2' || data.cover=== '3-6' || data.cover=== '3-7' ">添加带班班(无限制)</el-checkbox>
                 <el-checkbox
                   v-model="data.distribution"
-                  v-if="data.cover ==='5-9'||data.cover ==='7-9'" @change="distribution">批量分配</el-checkbox>
+                  v-if="data.cover ==='5-9' || data.cover ==='7-9'" @change="distribution">批量分配</el-checkbox>
                 <el-checkbox
                   v-model="data.exportFinish"
                   v-if="data.cover === '2-3'">导出完课用户</el-checkbox>
                 <el-checkbox
                   v-model="data.import"
-                  v-if="data.cover ==='6-3'||data.cover ==='5-3'||data.cover ==='5-9'||data.cover ==='6-4'">导入</el-checkbox>
+                  v-if="data.cover ==='6-3' || data.cover ==='5-3' || data.cover ==='5-9' || data.cover ==='6-4'">导入</el-checkbox>
                 <el-checkbox
                   v-model="data.export"
                   v-if="exportMenuList.indexOf(data.cover) >-1">导出</el-checkbox>
@@ -166,6 +170,9 @@
                     j.classManage = false;
                     j.classTakeUnlimited = false;
                   }
+                  if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2') {
+                    j.editWatch = false;
+                  }
                   if (j.cover === "2-3") j.exportFinish = false;
                   if (j.cover === "5-1") j.promoter = false;
                 })
@@ -217,6 +224,9 @@
                     j.classManage = false;
                     j.classTakeUnlimited = false;
                   }
+                  if (j.cover === "2-3" || j.cover === "3-1" || j.cover === '3-2') {
+                    j.editWatch = false;
+                  }
                   if (j.cover === "2-3") j.exportFinish = false;
                   if (j.cover === "5-1") j.promoter = false;
                 })
@@ -249,6 +259,9 @@
                           x.classManageUnlimited = !!i.classManageUnlimited;
                           x.classTakeUnlimited = !!i.classTakeUnlimited;
                         }
+                        if (i.cover === "2-3" || i.cover === "3-1" || i.cover === '3-2') {
+                          x.editWatch = !!i.editWatch;
+                        }
                         if (i.cover === "6-3" || i.cover === "5-3" || i.cover === "5-9" || i.cover === "6-4") {
                           x.import = !!i.import;
                         }
@@ -319,6 +332,9 @@
               if (i.classManageUnlimited === false || i.classManageUnlimited === true) {
                 json.classManageUnlimited = i.classManageUnlimited
               }
+              if (i.editWatch === false || i.editWatch === true) {
+                json.editWatch = i.editWatch
+              }
               if (i.classTakeUnlimited === false || i.classTakeUnlimited === true) {
                 json.classTakeUnlimited = i.classTakeUnlimited
               }

src/components/team/hour.vue

@@ -2,7 +2,7 @@
   <div class="admin-refresh">
 
     <el-date-picker
-      style="margin: 10px 0 0 10px; width: 185px;" :clearable="false"
+      style="display: block; margin: 10px 0 10px 10px; width: 185px;" :clearable="false"
       v-model="search.start_at" value-format="yyyy-MM-dd"
       align="right" type="date" placeholder="选择日期"
       :picker-options="pickerOptions" @change="getData">

src/components/team/index.vue

@@ -2,7 +2,7 @@
   <div class="admin-refresh">
 
     <el-date-picker
-      style="margin: 10px 0 0 10px; width: 185px;" :clearable="false" @change="getData"
+      style="display: block; margin: 10px 0 10px 10px; width: 185px;" :clearable="false" @change="getData"
       v-model="search.start_at" value-format="yyyy-MM-dd"
       align="right" type="date" placeholder="选择日期"
       :picker-options="pickerOptions">

src/components/userDetail/index.vue

@@ -135,7 +135,7 @@
           <el-table-column label="操作" width="340px">
             <template slot-scope="scope">
               <el-button @click="showUser(scope.row)" size="mini" type="primary"> 班级成员</el-button>
-              <el-button size="mini" type="warning" v-if="!$store.state.readonly" @click="editPrivilege(scope.row)">编辑</el-button>
+              <!--<el-button size="mini" type="warning" v-if="!$store.state.readonly" @click="editPrivilege(scope.row)">编辑</el-button>-->
               <el-button size="mini" type="primary" @click="onGetUserDescList(scope.row)">备注</el-button>
               <el-button size="mini" type="primary" @click="showSourceByDate(scope.row)">看课情况</el-button>
             </template>

src/router/index.js

@@ -98,6 +98,7 @@ router.beforeEach((to,from,next)=> {
   store.state.classManage=to.meta.classManage;
   store.state.import=to.meta.import;
   store.dispatch('promoter',to.meta.promoter)
+  store.dispatch('editWatch',to.meta.editWatch)
   store.dispatch('classManageUnlimited',to.meta.classManageUnlimited)
   store.dispatch('classTakeUnlimited',to.meta.classTakeUnlimited)
   store.dispatch('exportFinish',to.meta.exportFinish)

src/store/actions.js

@@ -29,6 +29,9 @@ export default{
   classManage({commit},data){
     commit('classManage',data)
   },
+  editWatch({commit},data){
+    commit('editWatch',data)
+  },
   classManageUnlimited({commit},data){
     commit('classManageUnlimited',data)
   },

src/store/index.js

@@ -15,6 +15,7 @@ export default new vuex.Store({
     deletePermission:false,
     distribution:false,
     classManage:false,
+    editWatch:false,
     classManageUnlimited:false,
     classTakeUnlimited:false,
     exportFinish:false,

src/store/mutations.js

@@ -30,6 +30,9 @@ const mutations={
   classManage(state,data){
     state.classManage=data;
   },
+  editWatch(state,data){
+    state.editWatch=data;
+  },
   classManageUnlimited(state,data){
     state.classManageUnlimited=data;
   },

src/util/menuList.js

@@ -254,7 +254,8 @@ export default [
           name: 'user',
           component: e => require(['@/components/user'], e),
         }
-      }, {
+      },
+      /*{
         value: '用户详情',
         routerName: 'userDetail',
         path: '/userDetail',
@@ -265,7 +266,8 @@ export default [
           name: 'userDetail',
           component: e => require(['@/components/userDetail/index'], e),
         }
-      }, {
+      },*/
+      {
         value: '老系统用户列表',
         routerName: 'oldUser',
         path: '/oldUser',