1.课表列表 2.回访

1

src/views/main/constant.js

@@ -235,9 +235,10 @@ export const errorType = {
     query: {
       searchType: 'ERR_ATTENDANCE',
       ...dates,
-      start: '2021-02-01',
+      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: '课程异常',
     isError: true,
@@ -247,7 +248,7 @@ export const errorType = {
     query: {
       searchType: 'NO_ATTENDANCE',
       ...dates,
-      start: '2021-02-01',
+      start: dayjs().subtract(1, 'month').set('date', 1).format('YYYY-MM-DD'),
     },
   },
   TEACHER_LEAVE: {

src/views/smallStudentManager/components/visiList.vue

@@ -66,6 +66,22 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
+        <el-date-picker
+          key="visiList1"
+          v-model.trim="searchForm.lastTimer"
+          style="width: 420px"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="最后回访开始日期"
+          end-placeholder="最后回访结束日期"
+          :picker-options="{
+            firstDayOfWeek: 1,
+          }"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
         <el-button type="danger" @click="search">搜索</el-button>
         <el-button type="primary" @click="onReSet">重置</el-button>
       </el-form-item>
@@ -103,9 +119,8 @@
           </template>
         </el-table-column>
         <el-table-column align="center" prop="overview" label="学员情况">
-
           <template slot-scope="scope">
-             <overflow-text :text="scope.row.overview"></overflow-text>
+            <overflow-text :text="scope.row.overview"></overflow-text>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="type" label="回访结果">
@@ -177,6 +192,7 @@ export default {
         visiterType: "",
         feedbackType: "",
         timer: [],
+        lastTimer:[],
       },
       rules: {
         // 分页规则
@@ -225,13 +241,14 @@ export default {
     },
     getList() {
       // cleanDeep
-      let { timer, ...rest } = this.searchForm;
+      let { timer,lastTimer, ...rest } = this.searchForm;
       let params = {
         studentId: this.studentId,
         ...rest,
         page: this.rules.page,
         rows: this.rules.limit,
         ...getTimes(timer, ["startTime", "endTime"]),
+        ...getTimes(lastTimer, ["lastVisitStartTime", "lastVisitEndTime"]),
         purpose: this.useVisitType[1] ? this.useVisitType[1] : null,
         type: this.useVisitType[0] ? this.useVisitType[0] : null,
       };

src/views/teamDetail/teamCourseList.vue

@@ -150,6 +150,14 @@
                           <p v-if="props.row.newCourseId == 0">无</p>
                         </div>
                       </span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="4"  v-if="
+                              props.row.newCourseId > 0 &&
+                              props.row.newCourseId != props.row.id
+                            ">
+                    <el-form-item label="主课编号:">
+                      {{ props.row.newCourseId}}
                     </el-form-item></el-col
                   >
                   <el-col :span="4">
@@ -178,7 +186,10 @@
             label="乐团/课程组编号"
           >
             <template slot-scope="scope">
-              <div style="color: var(--color-primary)" @click="gotoCourse(scope.row)">
+              <div
+                style="color: var(--color-primary)"
+                @click="gotoCourse(scope.row)"
+              >
                 <copy-text>{{ scope.row.musicGroupId }}</copy-text>
               </div>
             </template>
@@ -336,10 +347,13 @@
                   >删除</el-button
                 > -->
                 <!-- <auth auths="/teamCourseListDetail"> -->
-                  <!--    v-if="permission('teamCourseList/details')" -->
-                  <el-button v-if='"/teamCourseListDetail"' type="text" @click="lookDetail(scope.row)"
-                    >详情</el-button
-                  >
+                <!--    v-if="permission('teamCourseList/details')" -->
+                <el-button
+                  v-if="'/teamCourseListDetail'"
+                  type="text"
+                  @click="lookDetail(scope.row)"
+                  >详情</el-button
+                >
                 <!-- </auth>  v-if="
                               props.row.newCourseId > 0 &&
                               props.row.newCourseId != props.row.id
@@ -348,8 +362,11 @@
                   type="text"
                   v-if="
                     permission('courseSchedule/classStartDateAdjust?hight') &&
-                    (!scope.row.isLock && !(scope.row.newCourseId > 0&&
-                              scope.row.newCourseId != scope.row.id))
+                    !scope.row.isLock &&
+                    !(
+                      scope.row.newCourseId > 0 &&
+                      scope.row.newCourseId != scope.row.id
+                    )
                   "
                   @click="resetClass(scope.row)"
                   >调整</el-button
@@ -561,7 +578,10 @@
         <el-tab-pane
           label="训练"
           name="third"
-          v-if="permission('/teamCourseListDetailWorkList')&&maskForm.status=='OVER'"
+          v-if="
+            permission('/teamCourseListDetailWorkList') &&
+            maskForm.status == 'OVER'
+          "
         >
           <div v-if="activeName == 'third'">
             <studentWork :courseScheduleId="maskForm.id"></studentWork>
@@ -1120,7 +1140,7 @@ export default {
         method: "get",
         headers: {
           Authorization: getToken(),
-          tenantId: getTenantId()
+          tenantId: getTenantId(),
         },
         params: cleanDeep(this.getSearchForm()),
         url,
@@ -1137,12 +1157,12 @@ export default {
             .then((res) => {
               if (res.data.code == 200) {
                 this.$message.success(res.data.msg);
-              } else if(res.data.code == 403) {
-                this.$message.error(`登录过期，请重新登录！`)
+              } else if (res.data.code == 403) {
+                this.$message.error(`登录过期，请重新登录！`);
                 setTimeout(() => {
-                  this.$store.dispatch('user/resetToken').then(() => {
-                    location.reload()
-                  })
+                  this.$store.dispatch("user/resetToken").then(() => {
+                    location.reload();
+                  });
                 }, 1000);
               } else {
                 this.$message.error(res.data.msg);
@@ -1398,7 +1418,7 @@ export default {
         UNDERWAY: "courseYellow",
         OVER: "courseRed",
       };
-      return obj[str]
+      return obj[str];
     },
   },
   filters: {
@@ -1421,9 +1441,15 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.courseRed{color: #808080;}
-.courseYellow{color:#FF802C}
-.coruseGreen{color:#01C1B5}
+.courseRed {
+  color: #808080;
+}
+.courseYellow {
+  color: #ff802c;
+}
+.coruseGreen {
+  color: #01c1b5;
+}
 .visible {
   visibility: hidden;
 }