hanchaobo 2 лет назад
Родитель
Сommit
1504603ca6
3 измененных файлов: 17 добавлений и 11 удалений
  1. 2
    1
      src/layout/components/Navbar.vue
  2. 2
    1
      src/permission.js
  3. 13
    9
      src/views/caseManagement/components/addCase.vue

+ 2
- 1
src/layout/components/Navbar.vue Просмотреть файл

@@ -97,7 +97,8 @@ export default {
97 97
         type: 'warning'
98 98
       }).then(() => {
99 99
         this.$store.dispatch('LogOut').then(() => {
100
-          location.href = '/index';
100
+          // location.href = '/index';
101
+          this.$router.push({ path: '/Login' })
101 102
         })
102 103
       }).catch(() => {});
103 104
     }

+ 2
- 1
src/permission.js Просмотреть файл

@@ -45,7 +45,8 @@ router.beforeEach((to, from, next) => {
45 45
       // 在免登录白名单,直接进入
46 46
       next()
47 47
     } else {
48
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
48
+      // next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
49
+      next(`/login`)
49 50
       NProgress.done()
50 51
     }
51 52
   }

+ 13
- 9
src/views/caseManagement/components/addCase.vue Просмотреть файл

@@ -109,7 +109,7 @@
109 109
           <el-col :span="24" v-if="modelFlag">
110 110
             <el-form-item label="调解申请书:">
111 111
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 3">
112
-                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
112
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
113 113
                   {{ item.annexName }}
114 114
                 </div>
115 115
               </div>
@@ -118,7 +118,7 @@
118 118
           <el-col :span="24" v-if="modelFlag && showmediate">
119 119
             <el-form-item label="调解书:">
120 120
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 7">
121
-                <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId)">
121
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId, 2)">
122 122
                   {{ item.annexName }}
123 123
                 </div>
124 124
               </div>
@@ -205,7 +205,8 @@
205 205
     ]">
206 206
               <el-select v-model="formData.affiliate.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;"
207 207
                 disabled>
208
-                <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel" :value="Number(item.dictValue)">
208
+                <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel"
209
+                  :value="Number(item.dictValue)">
209 210
 
210 211
                 </el-option>
211 212
               </el-select>
@@ -647,8 +648,8 @@ export default {
647 648
   },
648 649
   methods: {
649 650
     /** 获取证件类型 */
650
-    getIdTypeFn(){
651
-      getIdType().then(res=>{
651
+    getIdTypeFn() {
652
+      getIdType().then(res => {
652 653
         this.idTypeList = res.data;
653 654
       })
654 655
     },
@@ -711,9 +712,12 @@ export default {
711 712
       });
712 713
     },
713 714
     /** 查看证据 */
714
-    fileDetil(val) {
715
-      // window.open(this.fileURL + val);
716
-      this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
715
+    fileDetil(val, flag) {
716
+      if (flag == 1) {
717
+        window.open(this.fileURL + val);
718
+      } else if (flag == 2) {
719
+        this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
720
+      }
717 721
     },
718 722
     /** 查看证据 */
719 723
     toPreview(val) {
@@ -744,7 +748,7 @@ export default {
744 748
       return this.$confirm(`确定移除 ${file.name}?`);
745 749
     },
746 750
     handleRemove(file, fileList) {
747
-      let newcaseAttachList = this.formData.caseAttachList.filter(item => 
751
+      let newcaseAttachList = this.formData.caseAttachList.filter(item =>
748 752
         item.annexId !== file.response.annexId
749 753
       )
750 754
       this.formData.caseAttachList = newcaseAttachList