课表列表和报表中心服务指标导出

src/views/reportForm/index.vue

@@ -430,7 +430,7 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              @change="getWeekTime"
+
               :picker-options="{
                 firstDayOfWeek: 1,
               }"
@@ -622,7 +622,7 @@
           </div>
 
           <div class="m-wrap" v-permission="'export/EXPORT_STUDENT_SERVE_INFO'">
-            <div class="title">乐团学生指标导出出：</div>
+            <div class="title">乐团学生指标导出：</div>
             <select-all
               v-model.trim="studentServerOrganId"
               class="organSelect"
@@ -647,7 +647,7 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-              @change="getWeekTime"
+              @change="getStudentWeekTime"
               :picker-options="{
                 firstDayOfWeek: 1,
               }"
@@ -1557,10 +1557,16 @@ export default {
       if (val && val.length > 0) {
         let start = this.getNowDateAndMonday(val[0]);
         let end = this.getNowDateAndSunday(val[1]);
-        this.serviceTimer.splice(0, 1, start);
-        this.serviceTimer.splice(1, 1, end);
+        this.teamTimer.splice(0, 1, start);
+        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);
+    },
     // exportVipStudent() {
     //   let data = {
     //     organIdList: this.VipStudentOrganId.join(","),

src/views/teamDetail/teamCourseList.vue

@@ -127,6 +127,18 @@
                   >
 
                   <el-col :span="4">
+                    <el-form-item label="云教练课程:">
+                      {{ props.row.memberFlag ? "是" : "否" }}
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="是否点名:">
+                      {{ props.row.isCallNames ? "是" : "否" }}
+                    </el-form-item></el-col
+                  >
+                </el-row>
+                <el-row style="margin-left: 64px"  v-if="props.row.newCourseId">
+                  <el-col :span="4">
                     <el-form-item label="合并类型:">
                       <span>
                         <div>
@@ -152,10 +164,7 @@
                   </el-col>
                   <el-col
                     :span="4"
-                    v-if="
-                      props.row.newCourseId > 0 &&
-                      props.row.newCourseId != props.row.id
-                    "
+
                   >
                     <el-form-item label="主课编号:">
                       <el-button type="text" @click="common(props.row)">
@@ -163,23 +172,14 @@
                       </el-button>
                     </el-form-item></el-col
                   >
-                  <el-col :span="4" v-if="props.row.mergedCourseIds > 0">
+                  <el-col :span="4" >
                     <el-form-item label="被合并课编号:">
-                      <el-button type="text" @click="common1(props.row)">
-                        {{ props.row.mergedCourseIds }}
+
+                      <el-button type="text" @click="common1(item)" :key="index" v-for="(item,index) in props.row.mergedCourseIds.split(',')">
+                        {{item }}
                       </el-button>
                     </el-form-item></el-col
                   >
-                  <el-col :span="4">
-                    <el-form-item label="云教练课程:">
-                      {{ props.row.memberFlag ? "是" : "否" }}
-                    </el-form-item></el-col
-                  >
-                  <el-col :span="4">
-                    <el-form-item label="是否点名:">
-                      {{ props.row.isCallNames ? "是" : "否" }}
-                    </el-form-item></el-col
-                  >
                 </el-row>
               </el-form>
             </template>
@@ -1097,7 +1097,7 @@ export default {
       this.searchForm = {
         ...initSearch,
         timer: [],
-        courseIdSearch: row.mergedCourseIds,
+        courseIdSearch: row,
       };
       this.search();
     },