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

src/App.vue

@@ -3,7 +3,7 @@
     <router-view />
     <theme-picker />
     <div class="onlyoffice">
-      <div id="placeholder" v-show="flag"></div>
+      <div id="placeholder"></div>
     </div>
   </div>
 </template>
@@ -66,8 +66,8 @@ export default {
         },
         "title": "调解申请书模板.docx",
         "fileType": "docx",
-        "key": "835cc5e86a7544759fdee69d3adb150c",
-        "url": "http://121.40.189.20:9090/download/835cc5e86a7544759fdee69d3adb150c",
+        "key": "6ae50056ac5e4e3ba09be430d444699c",
+        "url": "http://121.40.189.20:9090/download/6ae50056ac5e4e3ba09be430d444699c",
         "info": {
           "sharingSettings": [
             {
@@ -101,7 +101,7 @@ export default {
 }
 
 .onlyoffice {
-  width: 0px;
-  height: 0px;
+  width: 0;
+  height: 0;
 }
 </style>

src/layout/components/Navbar.vue

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

src/permission.js

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

src/views/caseManagement/components/addCase.vue

@@ -109,7 +109,7 @@
           <el-col :span="24" v-if="modelFlag&&mediationApplication">
             <el-form-item label="调解申请书:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 3">
-                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath)">
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
                   {{ item.annexName }}
                 </div>
               </div>
@@ -118,7 +118,7 @@
           <el-col :span="24" v-if="modelFlag && showmediate">
             <el-form-item label="调解书:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 7">
-                <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId)">
+                <div style="color: blue; cursor: pointer" @click="fileDetil(item.onlyOfficeFileId, 2)">
                   {{ item.annexName }}
                 </div>
               </div>
@@ -214,7 +214,8 @@
     ]">
               <el-select v-model="formData.affiliate.idType" placeholder="证件类型" auto-complete="off" style="width: 100%;"
                 disabled>
-                <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel" :value="Number(item.dictValue)">
+                <el-option v-for="item in idTypeList" :key="Number(item.dictValue)" :label="item.dictLabel"
+                  :value="Number(item.dictValue)">
 
                 </el-option>
               </el-select>
@@ -659,8 +660,8 @@ export default {
   },
   methods: {
     /** 获取证件类型 */
-    getIdTypeFn(){
-      getIdType().then(res=>{
+    getIdTypeFn() {
+      getIdType().then(res => {
         this.idTypeList = res.data;
       })
     },
@@ -725,9 +726,12 @@ export default {
       });
     },
     /** 查看证据 */
-    fileDetil(val) {
-      // window.open(this.fileURL + val);
-      this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
+    fileDetil(val, flag) {
+      if (flag == 1) {
+        window.open(this.fileURL + val);
+      } else if (flag == 2) {
+        this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
+      }
     },
     /** 查看证据 */
     toPreview(val) {
@@ -758,7 +762,7 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove(file, fileList) {
-      let newcaseAttachList = this.formData.caseAttachList.filter(item => 
+      let newcaseAttachList = this.formData.caseAttachList.filter(item =>
         item.annexId !== file.response.annexId
       )
       this.formData.caseAttachList = newcaseAttachList

src/views/caseManagement/components/mediation.vue

@@ -233,7 +233,8 @@ export default {
         if(res.data.mediaResult){
            this.formData = res.data;
         }else{
-          this.$nextTick(this.filedata,"mediaResult",1)
+          this.formData = res.data;
+          this.formData.mediaResult = 1;
         }
        
         console.log(this.formData)