lex-xin 3 years ago
parent
commit
af38be0886
2 changed files with 22 additions and 32 deletions
  1. 8 1
      src/views/contentManager/contentOperation.vue
  2. 14 31
      src/views/reportForm/index.vue

+ 8 - 1
src/views/contentManager/contentOperation.vue

@@ -521,7 +521,7 @@ export default {
       let type = Number(this.type)
       let corp = {}
       switch(type) {
-        case 1: case 7:
+        case 1:
           corp = {
             enlarge: 2,
             autoCropWidth: 316,
@@ -556,6 +556,13 @@ export default {
             autoCropHeight: 134
           }
           break;
+        case 7:
+          corp = {
+            enlarge: 2,
+            autoCropWidth: 167,
+            autoCropHeight: 100
+          }
+          break;
       }
       const { cropperOptions } = this
       this.cropperOptions = Object.assign({}, cropperOptions, corp)

+ 14 - 31
src/views/reportForm/index.vue

@@ -10,7 +10,7 @@
           <template slot="title">
             <p class="wrapTitle">教务信息</p>
           </template>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/musicGroupRegister'">
             <div class="title">乐团招生汇总:</div>
             <select-all
               v-model.trim="organIdList"
@@ -32,7 +32,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportMusicGroup"
-              v-permission="'export/musicGroupRegister'"
               >导出</el-button
             >
             <el-tooltip placement="top" popper-class="mTooltip">
@@ -46,7 +45,7 @@
               ></i>
             </el-tooltip>
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/musicGroupNormalStudentNum'">
             <div class="title">乐团在读人数:</div>
             <select-all
               v-model.trim="musicTeamNum"
@@ -68,7 +67,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportMusicTeamNum"
-              v-permission="'export/musicGroupNormalStudentNum'"
               >导出</el-button
             >
             <el-tooltip placement="top" popper-class="mTooltip">
@@ -76,11 +74,10 @@
               <i
                 class="el-icon-question micon el-tooltip"
                 style="font-size: 18px; color: #f56c6c"
-                v-permission="'export/teacherDefaultSalary'"
               ></i>
             </el-tooltip>
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/exportStudentAttendances'">
             <div class="title">学生考勤:</div>
             <select-all
               v-model.trim="attendanceOrganId"
@@ -128,11 +125,10 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportAttendance"
-              v-permission="'export/exportStudentAttendances'"
               >导出</el-button
             >
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/cloudStudyStudentTrainData'">
             <div class="title">团练宝学员统计:</div>
             <el-select
               v-model.trim="trainOrganId"
@@ -153,7 +149,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportTrain"
-              v-permission="'export/cloudStudyStudentTrainData'"
               >导出</el-button
             >
           </div>
@@ -162,7 +157,7 @@
           <template slot="title">
             <p class="wrapTitle">运营数据</p>
           </template>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/teacherDefaultSalary'">
             <div class="title">老师默认课酬:</div>
             <select-all
               v-model.trim="teacherDefaultSalaryOrganId"
@@ -185,7 +180,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportDefaultSalary"
-              v-permission="'export/teacherDefaultSalary'"
               >导出</el-button
             >
             <el-tooltip placement="top" popper-class="mTooltip">
@@ -197,7 +191,7 @@
               ></i>
             </el-tooltip>
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/studentOrder'">
             <div class="title">回款统计:</div>
             <select-all
               v-model.trim="studentOrganId"
@@ -226,7 +220,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportStudent"
-              v-permission="'export/studentOrder'"
               >导出</el-button
             >
             <el-tooltip placement="top" popper-class="mTooltip">
@@ -238,7 +231,7 @@
               ></i>
             </el-tooltip>
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'studentInstrument/export'">
             <div class="title">乐保订单导出:</div>
             <el-date-picker
               v-model="leBaoTimer"
@@ -254,7 +247,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportLeBao"
-              v-permission="'studentInstrument/export'"
               >导出</el-button
             >
             <!-- <el-tooltip placement="top"
@@ -267,7 +259,7 @@
                v-permission="'export/studentOrder'"></i>
           </el-tooltip> -->
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/studentVipPractice'">
             <div class="title">VIP网管课耗导出:</div>
             <select-all
               v-model.trim="vipOrganId"
@@ -288,11 +280,10 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportVip"
-              v-permission="'export/studentVipPractice'"
               >导出</el-button
             >
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/exercisesSituation'">
             <div class="title">服务指标明细导出:</div>
             <select-all
               v-model.trim="serviceOrganId"
@@ -327,11 +318,10 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportDetailService"
-              v-permission="'export/exercisesSituation'"
               >导出</el-button
             >
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/exportIndexErrData'">
             <div class="title">异常处理数据导出:</div>
             <el-select
               clearable
@@ -350,7 +340,6 @@
             <el-button
               type="primary"
               style="margin-left: 10px"
-              v-permission="'export/exportIndexErrData'"
               @click="exportAbnormal"
               >导出</el-button
             >
@@ -360,7 +349,7 @@
           <template slot="title">
             <p class="wrapTitle">财务数据</p>
           </template>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/teacherSalary'">
             <div class="title">课酬导出:</div>
             <el-date-picker
               v-model="mouth"
@@ -383,7 +372,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportSalar"
-              v-permission="'export/teacherSalary'"
               >导出</el-button
             >
             <el-tooltip placement="top" popper-class="mTooltip">
@@ -395,7 +383,7 @@
               ></i>
             </el-tooltip>
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/userCoursesAccount/4388'">
             <div class="title">课程余额明细:</div>
             <select-all
               v-model.trim="AccountOrganId"
@@ -429,11 +417,10 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportAccount"
-              v-permission="'export/userCoursesAccount/4388'"
               >导出</el-button
             >
           </div>
-          <div class="m-wrap">
+          <div class="m-wrap" v-permission="'export/userCashAccountDetail/4389'">
             <div class="title">账户余额明细:</div>
             <select-all
               v-model.trim="AccountDetailOrganId"
@@ -467,7 +454,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportDetailAccount"
-              v-permission="'export/userCashAccountDetail/4389'"
               >导出</el-button
             >
           </div>
@@ -476,7 +462,7 @@
           <template slot="title">
             <p class="wrapTitle">其他数据</p>
           </template>
-          <div class="m-wrap">
+          <div class="m-wrap" v-if="$helpers.permission('questionnaireUserResult/export/report')">
             <div class="title">问卷调查:</div>
             <el-select
               v-model.trim="questionActiveType"
@@ -495,9 +481,6 @@
               style="margin-left: 10px"
               type="primary"
               @click="exportQuestion"
-              v-if="
-                $helpers.permission('questionnaireUserResult/export/report')
-              "
               >导出</el-button
             >
           </div>