lex-xin 5 年之前
父节点
当前提交
f89198332d

+ 246 - 0
src/views/afterSchoolManager/afterSchoolList.vue

@@ -0,0 +1,246 @@
+<!--  -->
+<template>
+  <div class="">
+    <!-- <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-item>
+          <el-select placeholder="老师姓名" v-model="searchForm.teacherId" clearable filterable>
+            <el-option
+              v-for="(item,index) in teacherList"
+              :label="item.realName"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-date-picker
+            v-model.trim="searchForm.timer"
+            style="width:410px;"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+
+        <!-- <el-form-item>
+          <el-select placeholder="是否提交" v-model="searchForm.hasReport" clearable>
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="是否回复" v-model="searchForm.hasReport" 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" type="primary">重置</el-button>
+        </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="createTime" label="布置时间"></el-table-column>
+          <el-table-column align="center" prop="title" label="训练标题"></el-table-column>
+          <el-table-column align="center" prop="expireDate" label="截止时间"></el-table-column>
+          <el-table-column align="center" prop="teacherName" label="老师姓名">
+            <template slot-scope="scope">
+              <div v-if="scope.row.teacher">
+                {{scope.row.teacher.username}}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text" v-permission="'afterSchollList/look'" @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"
+        />
+      </div>
+    </div>
+    <el-dialog title="课外训练详情" :visible.sync="afterSchoolVisible" width="600px">
+      <el-form :model="visibleForm">
+        <el-form-item label="布置时间">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="老师姓名">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="学生姓名">
+          <el-popover
+            placement="top-start"
+            width="400"
+            trigger="hover"
+            :content="visibleForm.createTime"
+          >
+            <p class="schoolCell" slot="reference">{{visibleForm.createTime}}</p>
+          </el-popover>
+        </el-form-item>
+        <el-form-item label="截止时间">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="训练标题">
+          <p class="schoolCell">{{visibleForm.createTime}}</p>
+        </el-form-item>
+        <el-form-item label="训练内容">
+          <el-input
+            disabled
+            type="textarea"
+            rows="5"
+            v-model="visibleForm.createTime"
+            style="width:400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="学生上传">
+          <el-input disabled v-model="visibleForm.createTime" style="width:400px"></el-input>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import pagination from "@/components/Pagination/index";
+import { queryPageList } from "@/api/afterSchool";
+import { getTeacher } from "@/api/buildTeam";
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        search: null,
+        timer: [],
+        teacherId:null,
+      },
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      teacherList: [],
+      tableList: [],
+      visibleForm: {
+        createTime:
+          "啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦"
+      },
+      afterSchoolVisible: false
+    };
+  },
+  //生命周期 - 创建完成(可以访问当前this实例)
+  created() {},
+  //生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {
+    getTeacher().then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    });
+    this.init();
+  },
+  activated() {
+    this.init();
+  },
+  methods: {
+    init() {
+      var now = new Date();
+      var startDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      //  + " 00:00:00"  + " 23:59:59"
+      var endDate = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 10);
+      this.searchForm.timer = [];
+      this.searchForm.timer.push(startDate);
+      this.searchForm.timer.push(endDate);
+      this.getList();
+    },
+    getList() {
+      // assignStartTime  assignEndTime page search teacherId title
+      let obj = {};
+      if (this.searchForm.timer&&this.searchForm.timer.length > 0) {
+        obj.assignStartTime = this.searchForm.timer[0];
+        obj.assignEndTime = this.searchForm.timer[1];
+      }
+      obj.page = this.rules.page;
+         obj.rows= this.rules.limit,
+      this.searchForm.teacherId?obj.teacherId = this.searchForm.teacherId:null;
+      this.searchForm.search?obj.title = this.searchForm.search:null;
+      queryPageList(obj).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data.rows;
+          this.rules.total = res.data.total;
+        }
+      });
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {},
+    lookDetail(row) {
+      // this.afterSchoolVisible = true;
+      // console.log(row.id);
+      // this.$router.push({path:'/business/afterWorkList',query:{extracurricularExercisesId:row.id}})
+      // this.extracurricularExercisesId
+      // getExtracurricularExercisesId
+      this.$emit('getExtracurricularExercisesId',row.id)
+    }
+  }
+};
+</script>
+<style lang='scss' scoped>
+.schoolCell {
+  width: 400px;
+  color: #333;
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  height: 40px;
+  line-height: 40px;
+  outline: 0;
+  padding: 0 15px;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+  display: inline-block;
+  box-sizing: border-box;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+/deep/.el-textarea.is-disabled .el-textarea__inner {
+  color: #333;
+}
+</style>

+ 336 - 0
src/views/afterSchoolManager/afterWorkList.vue

@@ -0,0 +1,336 @@
+<!--  -->
+<template>
+  <div class="">
+    <!-- <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-item>
+          <el-select placeholder="老师姓名" v-model="searchForm.teacherId" clearable filterable>
+            <el-option
+              v-for="(item,index) in teacherList"
+              :label="item.realName"
+              :value="item.id"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </el-form-item>-->
+        <el-form-item>
+          <el-date-picker
+            v-model.trim="searchForm.timer"
+            style="width:410px;"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+
+        <!-- <el-form-item>
+          <el-select placeholder="是否提交" v-model="searchForm.hasReport" clearable>
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select placeholder="是否回复" v-model="searchForm.hasReport" 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" type="primary">重置</el-button>
+        </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="createTime" label="布置时间"></el-table-column>
+          <el-table-column align="center" prop="title" label="训练标题">
+            <template slot-scope="scope">
+              <div>
+                <div
+                  v-if="scope.row.extracurricularExercises"
+                >{{scope.row.extracurricularExercises.title}}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="createTime" label="学生姓名">
+            <template slot-scope="scope">
+              <div>
+                <div v-if="scope.row.user">{{scope.row.user.username}}</div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="提交状态">
+            <template slot-scope="scope">
+              <div>{{scope.row.status?'是':'否'}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="isReplied" label="是否提交">
+            <template slot-scope="scope">
+              <div>{{scope.row.isReplied?'是':'否'}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="isView" label="是否回复">
+            <template slot-scope="scope">
+              <div>{{scope.row.isView?'是':'否'}}</div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" prop="teacherName" label="老师姓名">
+            <template slot-scope="scope">
+              <div v-if="scope.row.extracurricularExercises&&scope.row.extracurricularExercises.teacher">{{scope.row.extracurricularExercises.teacher.username}}</div>
+            </template>
+          </el-table-column>-->
+          <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text" v-permission="'afterWorkList/look'" @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"
+        />
+      </div>
+    </div>
+    <el-dialog title="课外训练详情" :visible.sync="afterSchoolVisible" width="600px">
+      <el-form :model="visibleForm">
+        <!-- <el-form-item label="结束时间">
+          <p class="schoolCell">{{visibleForm.expiryDate}}</p>
+        </el-form-item>-->
+        <el-form-item label="老师姓名">
+          <p class="schoolCell">{{visibleForm.teacherName}}</p>
+        </el-form-item>
+        <el-form-item label="学生姓名">
+          <el-popover
+            placement="top-start"
+            width="400"
+            trigger="hover"
+            :content="visibleForm.studentName"
+          >
+            <p class="schoolCell" slot="reference">{{visibleForm.studentName}}</p>
+          </el-popover>
+        </el-form-item>
+        <el-form-item label="截止时间">
+          <p class="schoolCell">{{visibleForm.expiryDate}}</p>
+        </el-form-item>
+        <el-form-item label="训练标题">
+          <p class="schoolCell">{{visibleForm.title}}</p>
+        </el-form-item>
+        <el-form-item label="训练内容">
+          <el-input
+            disabled
+            type="textarea"
+            rows="5"
+            v-model="visibleForm.content"
+            style="width:400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="学生上传" v-for="(item,index) in visibleForm.attachments" :key="index">
+          <p class="schoolCell" @click="lookWork(item)">点击播放</p>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+    <el-dialog title="查看作业" width="680px" append-to-body :visible.sync="workVisible">
+      <!-- activeUrl -->
+      <video
+        style="width:640px;"
+        :src="activeSrc"
+        ref="dialogVideo"
+        controls="controls"
+      >您的浏览器不支持视频播放</video>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import pagination from "@/components/Pagination/index";
+import {
+  extracurricularExercisesReply,
+  findStudentExtraExerciseDetail
+} from "@/api/afterSchool";
+import { getTeacher } from "@/api/buildTeam";
+export default {
+  props:['id'],
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        search: null,
+        timer: [],
+        teacherId: null,
+        hasReport: null,
+        isView: null
+      },
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      teacherList: [],
+      tableList: [],
+      visibleForm: {
+        expiryDate: "啦啦啦啦",
+        teacherName: "",
+        title: "",
+        studentName: "",
+        content: "",
+        attachments: []
+      },
+      afterSchoolVisible: false,
+      workVisible: false,
+      activeSrc: "",
+      Fsearch:null,
+      Frules:null,
+      extracurricularExercisesId:null
+    };
+  },
+  //生命周期 - 创建完成(可以访问当前this实例)
+  created() {},
+  //生命周期 - 挂载完成(可以访问DOM元素)
+  mounted() {
+    getTeacher().then(res => {
+      if (res.code == 200) {
+        this.teacherList = res.data;
+      }
+    });
+    this.init();
+  },
+  activated() {
+    this.init();
+  },
+  methods: {
+    init() {
+      //   var now = new Date();
+      //   var startDate = new Date(
+      //     Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      //   )
+      //     .toISOString()
+      //     .slice(0, 10);
+      //   //  + " 00:00:00"  + " 23:59:59"
+      //   var endDate = new Date(
+      //     Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      //   )
+      //     .toISOString()
+      //     .slice(0, 10);
+      //   this.searchForm.timer = [];
+      //   this.searchForm.timer.push(startDate);
+      //   this.searchForm.timer.push(endDate);
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
+    this.extracurricularExercisesId = this.id;
+      this.getList();
+    },
+    getList() {
+      // assignStartTime  assignEndTime page search teacherId title
+      let obj = {};
+      if (this.searchForm.timer && this.searchForm.timer.length > 0) {
+        obj.submitStartTime = this.searchForm.timer[0];
+        obj.submitEndTime = this.searchForm.timer[1];
+      }
+      obj.page = this.rules.page;
+      (obj.rows = this.rules.limit),
+        this.searchForm.teacherId
+          ? (obj.teacherId = this.searchForm.teacherId)
+          : null;
+      this.searchForm.search ? (obj.search = this.searchForm.search) : null;
+      this.id
+        ? (obj.extracurricularExercisesId = this.extracurricularExercisesId)
+        : null;
+      extracurricularExercisesReply(obj).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data.rows;
+          this.rules.total = res.data.total;
+        }
+      });
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {
+      this.searchForm = {
+        search: null,
+        timer: [],
+        teacherId: null,
+        hasReport: null,
+        isView: null,
+
+      };
+      this.extracurricularExercisesId = null;
+      this.getList();
+    },
+    lookDetail(row) {
+      //   this.afterSchoolVisible = true;
+      //   console.log(row)
+      findStudentExtraExerciseDetail({
+        studentExerciseId: row.extracurricularExercisesId
+      }).then(res => {
+        if (res.code == 200) {
+          this.visibleForm = {
+            expiryDate: res.data.expiryDate,
+            teacherName: res.data.teacherName,
+            title: row.extracurricularExercises.title,
+            studentName: res.data.studentName,
+            content: res.data.content,
+            attachments: res.data.attachments.split(",")
+          };
+          //   console.log(this.visibleForm)
+          this.afterSchoolVisible = true;
+        }
+      });
+    },
+    lookWork(src) {
+      this.activeSrc = src;
+      this.workVisible = true;
+    }
+  }
+};
+</script>
+<style lang='scss' scoped>
+.schoolCell {
+  width: 400px;
+  color: #333;
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  height: 40px;
+  line-height: 40px;
+  outline: 0;
+  padding: 0 15px;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+  display: inline-block;
+  box-sizing: border-box;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+/deep/.el-textarea.is-disabled .el-textarea__inner {
+  color: #333;
+}
+</style>

+ 1 - 1
src/views/businessManager/orderManager/incomeOut.vue

@@ -7,7 +7,7 @@
       <div
       <div
         class="newBand"
         class="newBand"
         @click="onOrderExport"
         @click="onOrderExport"
-        v-permission="{child: 'export/tenantPaymentOrder', parent: '/income'}"
+        v-permission="{child: 'export/tenantPaymentOrder', parent: '/incomeOut'}"
       >报表导出</div>
       >报表导出</div>
       <!-- 搜索类型 -->
       <!-- 搜索类型 -->
       <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
       <el-form :inline="true" class="searchForm" v-model.trim="searchForm">

+ 3 - 1
src/views/categroyManager/generalSettings/errorManager.vue

@@ -2,7 +2,7 @@
   <div class='m-container'>
   <div class='m-container'>
     <!-- <h2>错误类型管理</h2> -->
     <!-- <h2>错误类型管理</h2> -->
     <div class="m-core">
     <div class="m-core">
-      <div class='newBand'
+      <div class='newBand' v-permission="'hotWordLabelManage/add'"
            @click="openTypes('create')">添加</div>
            @click="openTypes('create')">添加</div>
       <!-- 列表 -->
       <!-- 列表 -->
       <div class="tableWrap">
       <div class="tableWrap">
@@ -20,8 +20,10 @@
                            label="操作">
                            label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-button @click="openTypes('update', scope.row)"
               <el-button @click="openTypes('update', scope.row)"
+                         v-permission="'hotWordLabelManage/update'"
                          type="text">修改</el-button>
                          type="text">修改</el-button>
               <el-button @click="onTypesDel(scope.row)"
               <el-button @click="onTypesDel(scope.row)"
+                         v-permission="'hotWordLabelManage/del'"
                          type="text">删除</el-button>
                          type="text">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>

+ 1 - 0
src/views/categroyManager/generalSettings/overallManager.vue

@@ -13,6 +13,7 @@
                       v-if="config.description[1]">{{ config.description[1] }}</template>
                       v-if="config.description[1]">{{ config.description[1] }}</template>
           </el-input>
           </el-input>
           <el-button @click="onSave(config, index)"
           <el-button @click="onSave(config, index)"
+                     v-permission="'sysConfig/update'"
                      type="primary">保存</el-button>
                      type="primary">保存</el-button>
         </el-col>
         </el-col>
       </el-row>
       </el-row>

+ 1 - 0
src/views/categroyManager/generalSettings/overallManagerTwo.vue

@@ -13,6 +13,7 @@
                       v-if="config.description[1]">{{ config.description[1] }}</template>
                       v-if="config.description[1]">{{ config.description[1] }}</template>
           </el-input>
           </el-input>
           <el-button @click="onSave(config, index)"
           <el-button @click="onSave(config, index)"
+                     v-permission="'sysConfig/update'"
                      type="primary">保存</el-button>
                      type="primary">保存</el-button>
         </el-col>
         </el-col>
       </el-row>
       </el-row>

+ 6 - 5
src/views/categroyManager/generalSettings/vipParameterManager.vue

@@ -6,7 +6,7 @@
     <div class="m-core">
     <div class="m-core">
       <div class="listWrap">
       <div class="listWrap">
         <div class="left">
         <div class="left">
-          <div class="newBand"
+          <div class="newBand" v-permission="'vipGroupCategory/add'"
                @click="addGroupCategory">新建</div>
                @click="addGroupCategory">新建</div>
           <el-table :data='leftList'
           <el-table :data='leftList'
                     :header-cell-style="{background:'#EDEEF0',color:'#444'}">
                     :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -26,10 +26,11 @@
                              width="180">
                              width="180">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div>
                 <div>
-                  <el-button type="text"
+                  <el-button type="text" v-permission="'vipGroupCategory/update'"
                              @click="resetGroupCategory(scope.row)">修改</el-button>
                              @click="resetGroupCategory(scope.row)">修改</el-button>
                   <el-popover placement="top"
                   <el-popover placement="top"
                               width="160"
                               width="160"
+                              v-permission="'vipGroupCategory/delete'"
                               :ref="scope.row.id">
                               :ref="scope.row.id">
                     <p>您确定删除该课程形态吗?</p>
                     <p>您确定删除该课程形态吗?</p>
                     <div style="text-align: right; margin: 0">
                     <div style="text-align: right; margin: 0">
@@ -50,7 +51,7 @@
           </el-table>
           </el-table>
         </div>
         </div>
         <div class="right">
         <div class="right">
-          <div class="newBand"
+          <div class="newBand" v-permission="'vipGroupDefaultClassesCycle/add'"
                @click="addVipTimer">新建</div>
                @click="addVipTimer">新建</div>
           <el-table :data='rightList'
           <el-table :data='rightList'
                     :header-cell-style="{background:'#EDEEF0',color:'#444'}">
                     :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -66,10 +67,11 @@
                              width="180">
                              width="180">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div>
                 <div>
-                  <el-button type="text"
+                  <el-button type="text" v-permission="'vipGroupDefaultClassesCycle/update'"
                              @click="resetTimerList(scope.row)">修改</el-button>
                              @click="resetTimerList(scope.row)">修改</el-button>
                   <el-popover placement="top"
                   <el-popover placement="top"
                               width="160"
                               width="160"
+                              v-permission="'vipGroupDefaultClassesCycle/delete'"
                               :ref="scope.row.id">
                               :ref="scope.row.id">
                     <p>您确定删除该周期循环吗?</p>
                     <p>您确定删除该周期循环吗?</p>
                     <div style="text-align: right; margin: 0">
                     <div style="text-align: right; margin: 0">
@@ -249,7 +251,6 @@ export default {
     },
     },
     // 新增分类
     // 新增分类
     addGroupCategory () {
     addGroupCategory () {
-
       this.vipStatus = true;
       this.vipStatus = true;
       this.vipStatusFrom.isAdd = true;
       this.vipStatusFrom.isAdd = true;
       this.vipStatusFrom.id = '';
       this.vipStatusFrom.id = '';

+ 3 - 2
src/views/categroyManager/insideSetting/chargeProfitManager.vue

@@ -5,6 +5,7 @@
     </h2>
     </h2>
     <div class="m-core">
     <div class="m-core">
       <div @click="chargeOperation('create')"
       <div @click="chargeOperation('create')"
+           v-permission="'paymentConfig/add'"
            class='newBand'>添加</div>
            class='newBand'>添加</div>
       <!-- <el-form :inline="true"
       <!-- <el-form :inline="true"
                class="searchForm"
                class="searchForm"
@@ -56,9 +57,9 @@
                            width="250px"
                            width="250px"
                            label="操作">
                            label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
-              <el-button @click="chargeOperation('update', scope.row)"
+              <el-button @click="chargeOperation('update', scope.row)" v-permission="'paymentConfig/update'"
                          type="text">修改</el-button>
                          type="text">修改</el-button>
-              <el-button @click="chargeDel(scope.row)"
+              <el-button @click="chargeDel(scope.row)" v-permission="'paymentConfig/del'"
                          type="text">删除</el-button>
                          type="text">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>

+ 3 - 1
src/views/categroyManager/specialSetup/chargesList.vue

@@ -2,7 +2,7 @@
   <div class='m-container'>
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
     <!-- <h2>收费类型设置</h2> -->
     <div class="m-core">
     <div class="m-core">
-      <div @click="onChargeOperation('create')"
+      <div @click="onChargeOperation('create')" v-permission="'chargeTypeOrganizationFee/add'"
            class='newBand'>添加</div>
            class='newBand'>添加</div>
       <div class="tableWrap">
       <div class="tableWrap">
         <el-table :data="dataList"
         <el-table :data="dataList"
@@ -20,8 +20,10 @@
                            label="操作">
                            label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-button @click="onChargeOperation('update', scope.row)"
               <el-button @click="onChargeOperation('update', scope.row)"
+                         v-permission="'chargeTypeOrganizationFee/update'"
                          type="text">修改</el-button>
                          type="text">修改</el-button>
               <el-button @click="onChargeDelete(scope.row)"
               <el-button @click="onChargeDelete(scope.row)"
+                         v-permission="'chargeTypeOrganizationFee/delete'"
                          type="text">删除</el-button>
                          type="text">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>

+ 3 - 1
src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -2,7 +2,7 @@
   <div class='m-container'>
   <div class='m-container'>
     <!-- <h2>作业模板管理</h2> -->
     <!-- <h2>作业模板管理</h2> -->
     <div class="m-core">
     <div class="m-core">
-      <div class='newBand'
+      <div class='newBand' v-permission="'courseHomeworkTemplate/add'"
            @click="openJob('create')">添加</div>
            @click="openJob('create')">添加</div>
       <!-- 列表 -->
       <!-- 列表 -->
       <div class="tableWrap">
       <div class="tableWrap">
@@ -30,8 +30,10 @@
                            label="操作">
                            label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <el-button @click="openJob('update', scope.row)"
               <el-button @click="openJob('update', scope.row)"
+                          v-permission="'courseHomeworkTemplate/update'"
                          type="text">修改</el-button>
                          type="text">修改</el-button>
               <el-button @click="onJobDel(scope.row)"
               <el-button @click="onJobDel(scope.row)"
+                         v-permission="'courseHomeworkTemplate/del'"
                          type="text">删除</el-button>
                          type="text">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>

+ 3 - 1
src/views/categroyManager/specialSetup/musicalManager.vue

@@ -9,6 +9,7 @@
           一级分类
           一级分类
           <el-popover placement="right"
           <el-popover placement="right"
                       width="300"
                       width="300"
+                      v-permission="'subject/upset'"
                       trigger="click">
                       trigger="click">
             <el-input v-model.trim="oneTypeName"
             <el-input v-model.trim="oneTypeName"
                       size="medium"
                       size="medium"
@@ -34,7 +35,7 @@
       <el-row v-for="(item, index) in subjectList"
       <el-row v-for="(item, index) in subjectList"
               :key="item.id">
               :key="item.id">
         <el-col :span="6">
         <el-col :span="6">
-          <el-button @click="subjectDelete(item)"
+          <el-button @click="subjectDelete(item)" v-permission="'subject/upset'"
                      icon="el-icon-delete"
                      icon="el-icon-delete"
                      circle></el-button>
                      circle></el-button>
           <span class="one_name">{{ item.name }}</span>
           <span class="one_name">{{ item.name }}</span>
@@ -62,6 +63,7 @@
                        type="primary"
                        type="primary"
                        size="mini"
                        size="mini"
                        round
                        round
+                       v-permission="'subject/upset'"
                        icon="el-icon-plus"
                        icon="el-icon-plus"
                        @click="item.inputStatus = true">添加</el-button>
                        @click="item.inputStatus = true">添加</el-button>
             <el-button v-if="item.inputStatus"
             <el-button v-if="item.inputStatus"

+ 3 - 3
src/views/categroyManager/specialSetup/typesManager.vue

@@ -2,7 +2,7 @@
   <div class='m-container'>
   <div class='m-container'>
     <!-- <h2>收费类型设置</h2> -->
     <!-- <h2>收费类型设置</h2> -->
     <div class="m-core">
     <div class="m-core">
-      <div class='newBand'
+      <div class='newBand' v-permission="'chargeType/upSet'"
            @click="openTypes('create')">添加</div>
            @click="openTypes('create')">添加</div>
       <!-- 列表 -->
       <!-- 列表 -->
       <div class="tableWrap">
       <div class="tableWrap">
@@ -21,9 +21,9 @@
           <el-table-column align='center'
           <el-table-column align='center'
                            label="操作">
                            label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
-              <el-button @click="openTypes('update', scope.row)"
+              <el-button @click="openTypes('update', scope.row)" v-permission="'chargeType/upSet'"
                          type="text">修改</el-button>
                          type="text">修改</el-button>
-              <el-button @click="onTypesDel(scope.row)"
+              <el-button @click="onTypesDel(scope.row)" v-permission="'chargeType/del'"
                          type="text">删除</el-button>
                          type="text">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>

+ 1 - 1
src/views/categroyManager/vipChargeSeting.vue

@@ -54,7 +54,7 @@
                            width="180">
                            width="180">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <div>
               <div>
-                <el-button type="text"
+                <el-button type="text" v-permission="'vipGroupDefaultClassesUnitPrice/add'"
                            @click="saveSeting(scope.row)">保存</el-button>
                            @click="saveSeting(scope.row)">保存</el-button>
               </div>
               </div>
             </template>
             </template>

+ 1 - 1
src/views/editionManager/editionList.vue

@@ -41,7 +41,7 @@
           <el-table-column align="center" label="操作">
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <div>
               <div>
-                <el-button v-permission="'appVersionInfo/update'" type="text"@click="resetEdit(scope.row)">修改</el-button>
+                <el-button v-permission="'appVersionInfo/update'" type="text" @click="resetEdit(scope.row)">修改</el-button>
               </div>
               </div>
             </template>
             </template>
           </el-table-column>
           </el-table-column>

+ 1 - 1
src/views/sporadicManager/sporadicList.vue

@@ -120,7 +120,7 @@
                            label="操作">
                            label="操作">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <div>
               <div>
-                <el-button type="text"
+                <el-button type="text" v-permission="'sporadicChargeInfo/look'"
                            @click="lookVisible(scope.row)">查看</el-button>
                            @click="lookVisible(scope.row)">查看</el-button>
                 <el-button type="text"
                 <el-button type="text"
                            v-permission="'sporadicChargeInfo/delete'"
                            v-permission="'sporadicChargeInfo/delete'"

+ 1 - 1
src/views/teamDetail/teamCourseList.vue

@@ -147,7 +147,7 @@
           <el-table-column align="center" label="详情"  fixed="right">
           <el-table-column align="center" label="详情"  fixed="right">
             <template slot-scope="scope">
             <template slot-scope="scope">
               <div>
               <div>
-                <el-button type="text" @click="lookDetail(scope.row)">详情</el-button>
+                <el-button type="text" v-permission="'teamCourseList/details'" @click="lookDetail(scope.row)">详情</el-button>
               </div>
               </div>
             </template>
             </template>
           </el-table-column>
           </el-table-column>