소스 검색

修复bug

1
mo 2 년 전
부모
커밋
5cd5f65679
4개의 변경된 파일37개의 추가작업 그리고 13개의 파일을 삭제
  1. 2 3
      src/utils/request.js
  2. 1 1
      src/utils/request2.js
  3. 9 0
      src/views/accompaniment/index.vue
  4. 25 9
      src/views/returnVisitManager/returnVisitList.vue

+ 2 - 3
src/utils/request.js

@@ -102,7 +102,6 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   async res => {
     //res.code !==
-    console.log(res.data.code)
     await tryHideFullScreenLoading(store);
     if (res.data.code) {
       let data = JSON.parse(JSON.stringify(res.data));
@@ -113,8 +112,8 @@ service.interceptors.response.use(
         //   type: 'error',
         //   duration: 5 * 1000
         // })
-        console.log('进入403')
-        console.log('进入403token',getToken())
+        // console.log('进入403')
+        // console.log('进入403token',getToken())
         vue.$message.error(`登录过期,请重新登录!`);
         removeToken();
         console.log('清空之后的tocken',getToken())

+ 1 - 1
src/utils/request2.js

@@ -116,7 +116,7 @@ service.interceptors.response.use(
   async res => {
     //res.code !== 200
     await tryHideFullScreenLoading(store);
-    console.log(res.data.code)
+    // console.log(res.data.code)
     if (res.data.code) {
       let data = JSON.parse(JSON.stringify(res.data));
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;

+ 9 - 0
src/views/accompaniment/index.vue

@@ -21,6 +21,15 @@
         <el-form-item prop="search">
           <el-input
             v-model="searchForm.search"
+                 @submit="submit"
+        @reset="reset"
+             @keyup.enter.native="
+              (e) => {
+                e.target.blur();
+                $refs.searchForm.save();
+                submit()
+              }
+            "
             clearable
             placeholder="伴奏编号/伴奏名称"
           />

+ 25 - 9
src/views/returnVisitManager/returnVisitList.vue

@@ -10,11 +10,19 @@
         @submit="search"
         @reset="onReSet"
         :model="searchForm"
+        ref="searchForm"
       >
+        <!-- search(); -->
         <el-form-item>
           <el-input
             placeholder="老师/学生姓名/编号"
             v-model.trim="searchForm.search"
+            @keyup.enter.native="
+              (e) => {
+                e.target.blur();
+                $refs.searchForm.save();
+              }
+            "
           ></el-input>
         </el-form-item>
         <el-form-item>
@@ -142,7 +150,6 @@
     <el-dialog
       title="回访详情"
       width="700px"
-
       v-if="detailVisible"
       :visible.sync="detailVisible"
     >
@@ -219,18 +226,27 @@ export default {
     this.$store.dispatch("setBranchs");
 
     if (this.$route.query) {
-      this.searchForm.search = this.$route.query.teacher; // 兼容老功能
-      this.searchForm.search = this.$route.query.search;
+      // 兼容老功能
+      if (this.$route.query.search) {
+        this.searchForm.search = this.$route.query.teacher;
+        this.searchForm.search = this.$route.query.search;
+      }
+
       this.searchForm.timer = this.$route.query.timer;
     }
-    if(this.$route.query.typeList&&this.$route.query.typeList.length>0){
-       this.searchForm.typeList = this.$route.query.typeList
+    if (this.$route.query.typeList && this.$route.query.typeList.length > 0) {
+      this.searchForm.typeList = this.$route.query.typeList;
     }
     this.getList();
+    if (this.$route.query.search || this.$route.query.timer) {
+      // console.log( )
+      console.log('进来了')
+      resetQuery(this, { timer: undefined, search: undefined });
+    }
   },
-  activated() {
-    this.getList();
-  },
+  // activated() {
+  //   this.getList();
+  // },
   methods: {
     handleChange(val) {
       this.searchForm.type = val[0];
@@ -238,7 +254,7 @@ export default {
     },
     search() {
       // this.$router.replace({query:{...this.$route.query,timer:undefined,teacher:undefined}})
-      resetQuery(this, { timer: undefined, search: undefined });
+
       this.rules.page = 1;
       this.getList();
     },