导出完成 差权限

1

src/components/Export-chiose/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button @click="startExport" type="primary">{{ name }}</el-button>
+    <el-button @click="exportDataStart" type="primary">{{ name }}</el-button>
     <el-dialog
       title="请选择导出字段"
       :visible.sync="chioseVisiable"

src/views/liveClassManager/newLiveClass.vue

@@ -540,7 +540,8 @@ export default {
           params: {
             rows: 9999,
             search: query,
-            lockFlag:0
+            lockFlag:0,
+            demissionFlag:false
           },
           url,
         };

src/views/reportForm/index.vue

@@ -207,7 +207,7 @@
             $helpers.permission('export/exercisesSituation') ||
             $helpers.permission('export/exportIndexErrData') ||
             $helpers.permission('export/exportMusicGroupCourseList') ||
-             $helpers.permission('export/EXPORT_INDEX_HISTORY_ERR_DATA') ||
+            $helpers.permission('export/EXPORT_INDEX_HISTORY_ERR_DATA') ||
             $helpers.permission('export/EXPORT_STUDENT_SUBCOURSE')
           "
         >
@@ -431,7 +431,6 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-
               :picker-options="{
                 firstDayOfWeek: 1,
               }"
@@ -663,6 +662,50 @@
               :isDownList="true"
             />
           </div>
+
+          <!--  -->
+          <div class="m-wrap" v-permission="'export/EXPORT_STUDENT_SERVE_INFO'">
+            <div class="title">训练统计导出：</div>
+            <select-all
+              v-model.trim="trainingOrganId"
+              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="trainingTimer"
+              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_TRAINING_STATISTICS"
+              :exportData="exporTtraining"
+              fileName="训练统计导出"
+              errorMsg="请选择分部"
+              :isDownList="true"
+            />
+          </div>
+          <!--  -->
         </el-collapse-item>
         <el-collapse-item
           name="3"
@@ -906,7 +949,9 @@ export default {
       teamTimer: [],
       activeOrganId: [],
       studentServerOrganId: [],
-      studentServerTimer:[]
+      studentServerTimer: [],
+      trainingOrganId: [],
+      trainingTimer: [],
     };
   },
   mounted() {
@@ -1563,11 +1608,11 @@ export default {
         this.teamTimer.splice(1, 1, end);
       }
     },
-    getStudentWeekTime(val){
-        let start = this.getNowDateAndMonday(val[0]);
-        let end = this.getNowDateAndSunday(val[1]);
-        this.studentServerTimer.splice(0, 1, start);
-        this.studentServerTimer.splice(1, 1, end);
+    getStudentWeekTime(val) {
+      let start = this.getNowDateAndMonday(val[0]);
+      let end = this.getNowDateAndSunday(val[1]);
+      this.studentServerTimer.splice(0, 1, start);
+      this.studentServerTimer.splice(1, 1, end);
     },
     // exportVipStudent() {
     //   let data = {
@@ -1692,11 +1737,11 @@ export default {
         monday = null;
         sunday = null;
       }
-      console.log( {
+      console.log({
         startTime: monday,
         endTime: sunday,
         organId: this.studentServerOrganId.join(","),
-      })
+      });
       return {
         startTime: monday,
         endTime: sunday,
@@ -1722,7 +1767,7 @@ export default {
     exportAbnormal() {
       console.log(this.Abnormal);
       return {
-        organIds:this.Abnormal.organIds.join(',')
+        organIds: this.Abnormal.organIds.join(","),
       };
     },
     exportSalar() {
@@ -1750,6 +1795,22 @@ export default {
         organId: this.AccountOrganId.join(","),
       };
     },
+
+    exporTtraining() {
+      let endTime, startTime;
+      if (this.trainingTimer && this.trainingTimer.length > 1) {
+        startTime = this.trainingTimer[0];
+        endTime = this.trainingTimer[1];
+      } else {
+        startTime = null;
+        endTime = null;
+      }
+      return {
+        startTime: startTime,
+        endTime: endTime,
+        organId: this.trainingOrganId.join(","),
+      };
+    },
     exportDetailAccount() {
       let endTime, startTime;
       if (this.AccountDetailTimer && this.AccountDetailTimer.length > 1) {