Merge branch '01/21VipReset' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 01/21VipReset

src/views/main/abnormal/index.vue

@@ -43,7 +43,7 @@
       v-else
       v-for="(item, index) in activeList"
       :key="index"
-      :disabled="!item[0].result.length && !item[0].always" type="text"
+      :disabled="item[0].result && !item[0].result.length && !item[0].always" type="text"
     >
       <title-item
         :type="item[0].isError ? 'error' : 'warning'"

src/views/main/constant.js

@@ -1,3 +1,5 @@
+import dayjs from 'dayjs'
+
 export const descs = {
   SCHOOL: '截止到当日，【进行中】乐团的【合作单位】总数', // 合作单位
   MUSIC_GROUP_NUM: '截止到当日，【进行中】乐团总数', // 乐团数量
@@ -62,13 +64,25 @@ export const errorType = {
     name: '学员考情异常旷课',
     isError: true,
     url: '/operateManager/stuRecodeManager',
-    resultKey: 'ids',
+    always: true,
+    query: {
+      visitFlag: '0',
+      status: 'TRUANT',
+      start: '2020-12-01',
+      end: dayjs().format('YYYY-MM-DD'),
+    }
   },
   COURSE_LEAVE_STUDENT_NUM: {
     name: '学员请假',
     isError: true,
     url: '/operateManager/stuRecodeManager',
-    resultKey: 'ids',
+    always: true,
+    query: {
+      visitFlag: 0,
+      status: 'LEAVE',
+      start: '2020-12-01',
+      end: dayjs().format('YYYY-MM-DD'),
+    }
   },
   TEACHER_EXCEPTION_ATTENDANCE: {
     name: '老师考勤异常',

src/views/stuRecodeManager/index.vue

@@ -89,6 +89,16 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="visitFlag">
+          <el-select
+            v-model.trim="searchForm.visitFlag"
+            placeholder="请选择是否回访"
+            clearable
+          >
+            <el-option label="否" value="0"></el-option>
+            <el-option label="是" value="1"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="status">
           <el-select
             v-model.trim="searchForm.status"
@@ -268,6 +278,11 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" label="是否回访">
+            <template slot-scope="scope">
+              <div>{{ scope.row.visitFlag | yesOrNo }}</div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="考勤状态">
             <template slot-scope="scope">
               <div>
@@ -334,13 +349,14 @@ export default {
       detail: null,
       searchForm: {
         studentID: "",
-        groupType: "",
+        groupType: "MUSIC",
         musicGroupId: "",
         courseScheduleId: "",
         status: "",
         teacherId: "",
         courseScheduleType: "",
         organId: "",
+        visitFlag: '',
         dates: [],
       },
 
@@ -363,11 +379,17 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    if (this.searchForm.dates?.length < 1 && !this.$route.query.ids) {
-        this.searchForm.dates = [new Date(),new Date()]
+    const { query } = this.$route
+    if (this.searchForm.dates?.length < 1) {
+        const start = query.start || new Date()
+        const end = query.end || new Date()
+        this.searchForm.dates = [start, end]
     }
-    if (!this.$route.query.ids) {
-      this.$set(this.searchForm, 'groupType', 'MUSIC')
+    if (query.visitFlag == 1 || query.visitFlag == 0) {
+      this.searchForm.visitFlag = String(query.visitFlag)
+    }
+    if (query.status) {
+      this.searchForm.status = query.status
     }
     this.init();
   },
@@ -427,12 +449,25 @@ export default {
         }
       });
     },
+    clearSearchUrl() {
+      const { query } = this.$route
+      if (query.status || (query.visitFlag == 0 || query.visitFlag == 1) || query.start || query.end) {
+        this.$router.replace({
+          status: undefined,
+          visitFlag: undefined,
+          start: undefined,
+          end: undefined,
+        })
+      }
+    },
     search() {
       this.rules.page = 1;
+      this.clearSearchUrl()
       this.getList();
     },
     onReSet() {
       this.$refs["searchForm"].resetFields();
+      this.clearSearchUrl()
       this.search();
     },
   },