소스 검색

Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

hanchaobo 2 년 전
부모
커밋
ca9043d7bf
5개의 변경된 파일24개의 추가작업 그리고 17개의 파일을 삭제
  1. 5
    5
      src/App.vue
  2. 2
    1
      src/layout/components/Navbar.vue
  3. 2
    1
      src/permission.js
  4. 13
    9
      src/views/caseManagement/components/addCase.vue
  5. 2
    1
      src/views/caseManagement/components/mediation.vue

+ 5
- 5
src/App.vue 파일 보기

3
     <router-view />
3
     <router-view />
4
     <theme-picker />
4
     <theme-picker />
5
     <div class="onlyoffice">
5
     <div class="onlyoffice">
6
-      <div id="placeholder" v-show="flag"></div>
6
+      <div id="placeholder"></div>
7
     </div>
7
     </div>
8
   </div>
8
   </div>
9
 </template>
9
 </template>
66
         },
66
         },
67
         "title": "调解申请书模板.docx",
67
         "title": "调解申请书模板.docx",
68
         "fileType": "docx",
68
         "fileType": "docx",
69
-        "key": "835cc5e86a7544759fdee69d3adb150c",
70
-        "url": "http://121.40.189.20:9090/download/835cc5e86a7544759fdee69d3adb150c",
69
+        "key": "6ae50056ac5e4e3ba09be430d444699c",
70
+        "url": "http://121.40.189.20:9090/download/6ae50056ac5e4e3ba09be430d444699c",
71
         "info": {
71
         "info": {
72
           "sharingSettings": [
72
           "sharingSettings": [
73
             {
73
             {
101
 }
101
 }
102
 
102
 
103
 .onlyoffice {
103
 .onlyoffice {
104
-  width: 0px;
105
-  height: 0px;
104
+  width: 0;
105
+  height: 0;
106
 }
106
 }
107
 </style>
107
 </style>

+ 2
- 1
src/layout/components/Navbar.vue 파일 보기

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

+ 2
- 1
src/permission.js 파일 보기

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

+ 13
- 9
src/views/caseManagement/components/addCase.vue 파일 보기

109
           <el-col :span="24" v-if="modelFlag&&mediationApplication">
109
           <el-col :span="24" v-if="modelFlag&&mediationApplication">
110
             <el-form-item label="调解申请书:">
110
             <el-form-item label="调解申请书:">
111
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 3">
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
                   {{ item.annexName }}
113
                   {{ item.annexName }}
114
                 </div>
114
                 </div>
115
               </div>
115
               </div>
118
           <el-col :span="24" v-if="modelFlag && showmediate">
118
           <el-col :span="24" v-if="modelFlag && showmediate">
119
             <el-form-item label="调解书:">
119
             <el-form-item label="调解书:">
120
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 7">
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
                   {{ item.annexName }}
122
                   {{ item.annexName }}
123
                 </div>
123
                 </div>
124
               </div>
124
               </div>
214
     ]">
214
     ]">
215
               <el-select v-model="formData.affiliate.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;"
215
               <el-select v-model="formData.affiliate.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;"
216
                 disabled>
216
                 disabled>
217
-                <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel" :value="Number(item.dictValue)">
217
+                <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel"
218
+                  :value="Number(item.dictValue)">
218
 
219
 
219
                 </el-option>
220
                 </el-option>
220
               </el-select>
221
               </el-select>
659
   },
660
   },
660
   methods: {
661
   methods: {
661
     /** 获取证件类型 */
662
     /** 获取证件类型 */
662
-    getIdTypeFn(){
663
-      getIdType().then(res=>{
663
+    getIdTypeFn() {
664
+      getIdType().then(res => {
664
         this.idTypeList = res.data;
665
         this.idTypeList = res.data;
665
       })
666
       })
666
     },
667
     },
725
       });
726
       });
726
     },
727
     },
727
     /** 查看证据 */
728
     /** 查看证据 */
728
-    fileDetil(val) {
729
-      // window.open(this.fileURL + val);
730
-      this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
729
+    fileDetil(val, flag) {
730
+      if (flag == 1) {
731
+        window.open(this.fileURL + val);
732
+      } else if (flag == 2) {
733
+        this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
734
+      }
731
     },
735
     },
732
     /** 查看证据 */
736
     /** 查看证据 */
733
     toPreview(val) {
737
     toPreview(val) {
758
       return this.$confirm(`确定移除 ${file.name}?`);
762
       return this.$confirm(`确定移除 ${file.name}?`);
759
     },
763
     },
760
     handleRemove(file, fileList) {
764
     handleRemove(file, fileList) {
761
-      let newcaseAttachList = this.formData.caseAttachList.filter(item => 
765
+      let newcaseAttachList = this.formData.caseAttachList.filter(item =>
762
         item.annexId !== file.response.annexId
766
         item.annexId !== file.response.annexId
763
       )
767
       )
764
       this.formData.caseAttachList = newcaseAttachList
768
       this.formData.caseAttachList = newcaseAttachList

+ 2
- 1
src/views/caseManagement/components/mediation.vue 파일 보기

233
         if(res.data.mediaResult){
233
         if(res.data.mediaResult){
234
            this.formData = res.data;
234
            this.formData = res.data;
235
         }else{
235
         }else{
236
-          this.$nextTick(this.filedata,"mediaResult",1)
236
+          this.formData = res.data;
237
+          this.formData.mediaResult = 1;
237
         }
238
         }
238
        
239
        
239
         console.log(this.formData)
240
         console.log(this.formData)