提交一下

1

src/views/main/constant.js

@@ -59,6 +59,7 @@ export const descs = {
   OTHER_AMOUNT: "其他收入金额总和",
   RENEW_AMOUNT: "乐团续费、临时加课、合班缴费金额总和",
   VIP_AMOUNT: "VIP课购买、续费、复学、课程组新增学员收入金额总和",
+  CURRENT_COURSE_ERROR:"剩余课时（未开始+排课资格）大于4的学员，本月排课节数少于4节",
   "vipStudentNum":'待激活及生效中的会员人数(去重)',
   "eVipStudentNum":'如果是试用会员又是付费会员，则不算试用会员数',
   "cloudStudyLivelyStudentNum":'过去四周内有三周及以上每周训练时长超过60分钟为活跃学员',
@@ -300,6 +301,18 @@ export const errorType = {
       start: dayjs().subtract(1, 'month').set('date', 1).format('YYYY-MM-DD'),
     },
   },
+  CURRENT_COURSE_ERROR:{
+    name: '当月排课异常',
+    isError: true,
+    always: true,
+    url: '/teamCourseList',
+    permission: '/teamCourseList',
+    query: {
+      searchType: 'CURRENT_COURSE_ERROR',
+      ...dates,
+      start: dayjs().subtract(1, 'month').set('date', 1).format('YYYY-MM-DD'),
+    },
+  },
   //   start: '2021-02-01',  start: '2021-02-01',
   TEACHER_NOT_A_CLASS: {
     name: '课程异常',

src/views/reportForm/index.vue

@@ -768,6 +768,49 @@
               ></i>
             </el-tooltip> -->
           </div>
+          <div
+            class="m-wrap"
+            v-permission="'export/EXPORT_CLOUD_TEACHER_SUM'"
+          >
+            <div class="title">云教练统计导出：</div>
+            <select-all
+              v-model.trim="yunOrganId"
+              class="organSelect"
+              style="width: 100%"
+              filterable
+              multiple
+              placeholder="请选择分部"
+              clearable
+            >
+              <el-option
+                v-for="(item, index) in selects.branchs"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </select-all>
+            <el-date-picker
+              v-model.trim="yunTimer"
+              style="width: 360px; margin-left: 15px"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="{
+                firstDayOfWeek: 1,
+              }"
+            ></el-date-picker>
+            <!-- @change="getStudentWeekTime" -->
+            <ExportChiose
+              style="margin-left: 10px"
+              ExportEnum="EXPORT_CLOUD_TEACHER_SUM"
+              :exportData="exporyun"
+              fileName="云教练统计导出"
+              errorMsg="请选择分部"
+              :isDownList="true"
+            />
+          </div>
         </el-collapse-item>
         <el-collapse-item
           name="3"
@@ -1063,6 +1106,8 @@ export default {
       visitmouth: "",
       operatingMouth: "",
       cloudTimer: [],
+      yunOrganId:[],
+      yunTimer:[]
     };
   },
   mounted() {
@@ -1935,6 +1980,21 @@ export default {
         organId: this.trainingOrganId.join(","),
       };
     },
+    exporyun(){
+      let endTime, startTime;
+      if (this.yunTimer && this.yunTimer.length > 1) {
+        startTime = this.yunTimer[0];
+        endTime = this.yunTimer[1];
+      } else {
+        startTime = null;
+        endTime = null;
+      }
+      return {
+        startDate: startTime,
+        endDate: endTime,
+        organId: this.yunOrganId.join(","),
+      };
+    },
     exportDetailAccount() {
       let endTime, startTime;
       if (this.AccountDetailTimer && this.AccountDetailTimer.length > 1) {

src/views/smallCourseConsumption/components/actualList.vue

@@ -21,7 +21,7 @@
       </el-form-item>
     </save-form>
     <ExportChiose
-          v-permission="'export/orderList'"
+          v-permission="'export/EXPORT_COURSE_CONSUMER'"
           style="margin-bottom: 20px;margin-right:10px;"
           name="实际课耗导出"
           ExportEnum="EXPORT_COURSE_CONSUMER"

src/views/smallCourseConsumption/components/preList.vue

@@ -29,7 +29,7 @@
       </el-form-item>
     </save-form>
     <ExportChiose
-          v-permission="'export/orderList'"
+          v-permission="'export/EXPORT_PRE_COURSE_CONSUMER'"
           style="margin-bottom: 20px;margin-right:10px;"
           name="预计课耗导出"
           ExportEnum="EXPORT_PRE_COURSE_CONSUMER"

src/views/smallCourseConsumption/components/statisticsList.vue

@@ -29,7 +29,7 @@
       </el-form-item>
     </save-form>
     <ExportChiose
-          v-permission="'export/orderList'"
+          v-permission="'export/EXPORT_COURSE_CONSUMER_SUM'"
           style="margin-bottom: 20px;margin-right:10px;"
           name="课耗统计导出"
           ExportEnum="EXPORT_COURSE_CONSUMER_SUM"

src/views/smallCourseConsumption/modals/actualDetail.vue

@@ -23,7 +23,7 @@
           >重置</el-button
         >
         <ExportChiose
-          v-permission="'export/orderList'"
+          v-permission="'export/EXPORT_COURSE_CONSUMER_DETAIL'"
           style="margin-bottom: 20px;margin-right:10px; margin-left:10px;display:inline-block"
           name="导出"
           ExportEnum="EXPORT_COURSE_CONSUMER_DETAIL"

src/views/smallCourseConsumption/modals/preDetail.vue

@@ -23,7 +23,7 @@
           >重置</el-button
         >
         <ExportChiose
-          v-permission="'export/orderList'"
+          v-permission="'export/EXPORT_PRE_COURSE_CONSUMER_DETAIL'"
           style="margin-bottom: 20px;margin-right:10px; margin-left:10px;display:inline-block"
           name="导出"
           ExportEnum="EXPORT_PRE_COURSE_CONSUMER_DETAIL"