提交

1

package.json

@@ -26,7 +26,6 @@
     "clipboard": "^2.0.10",
     "copy-to-clipboard": "^3.3.1",
     "dayjs": "^1.8.35",
-    "default-passive-events": "^1.0.10",
     "echarts": "^4.8.0",
     "element-ui": "^2.13.2",
     "html-to-image": "^1.9.0",

src/components/select-all/index.vue

@@ -111,7 +111,7 @@ export default {
     },
     setHeight() {
       setTimeout(() => {
-        this.btnheight = this.$refs?.select.$el.offsetHeight;
+        this.btnheight = this.$refs?.select?.$el.offsetHeight;
       }, 200);
     },
   },

src/views/returnVisitManager/components/returnVisitList.vue

@@ -222,7 +222,7 @@
             activeRow.feedbackTypeDesc | feedbackTypeDescFilter
           }}</descriptions-item>
           <descriptions-item label="问题状态:">{{
-            activeRow.probStatus?'已解决':'未解决'
+            activeRow.probStatus?'已解决':'待跟进'
           }}</descriptions-item>
           <descriptions-item label="回访情况:" :span="6">{{
             activeRow.overview

src/views/returnVisitManager/index.vue

@@ -23,20 +23,31 @@
 </template>
 
 <script>
+import { getEveryClass } from '@/api/buildTeam';
   import returnVisitList from './components/returnVisitList.vue'
   import waitVisit from './components/waitVisit.vue'
 export default {
   components: { returnVisitList,waitVisit },
   data() {
     return {
-      activeIndex: "1",
+      activeIndex: "2",
     };
   },
+  mounted(){
+
+    if(this.$route.query.activeIndex){
+      this.activeIndex = this.$route.query.activeIndex
+      console.log(this.$route.query, this.activeIndex)
+    }
+
+  },
   methods: {
     handleClick(evt) {
+      console.log(evt)
       // this.changeHash(evt.name);
     },
   },
+
 };
 </script>
 <style lang='scss' scoped>

src/views/stuRecodeManager/index.vue

@@ -548,7 +548,7 @@ export default {
     lookVisit(row) {
       this.$router.push({
         path: "/studentManager/returnVisitList",
-        query: { search: row.id },
+        query: { search: row.id,tabrouter:'2' },
       });
     },
   },

src/views/studentManager/memberList.vue

@@ -547,7 +547,7 @@ export default {
     lookVisit(row) {
       this.$router.push({
         path: "/studentManager/returnVisitList",
-        query: { search: row.userId, typeList: ["其它", "会员续费"] },
+        query: { search: row.userId,tabrouter:'2', typeList: ["其它", "会员续费"] },
       });
     },
   },

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -165,7 +165,8 @@ export default {
       this.detail = row;
     },
     lookVisit(row){
-      this.$router.push({path:'/studentManager/returnVisitList',query:{search:row.id}})
+      console.log({search:row.id,tabrouter:'2'})
+      this.$router.push({path:'/studentManager/returnVisitList',query:{search:row.id,tabrouter:'2'}}) 
     },
     getList() {
       findStudentAttendance({

src/views/teamDetail/teamCourseList.vue

@@ -1237,7 +1237,10 @@ export default {
             });
             this.isDetele = false;
           });
-          this.$refs.searchForm.save(this.searchForm);
+          if( this.$refs.searchForm){
+            this.$refs.searchForm.save(this.searchForm);
+          }
+
           //
           //  this.$router.push({ query: {} })
           // let arr = this.$helpers.lodash.differenceWith( this.tableList, this.deleteList,'id')