PP前端更新

src/components/SheetView/index.vue

@@ -55,9 +55,9 @@
     },
 
     created(){
-      setTimeout(()=>{
-        this.removeActAddress();
-      },500)
+      // setTimeout(()=>{
+      //   this.removeActAddress();
+      // },500)
     },
     methods: {
       readExcel(event) {
@@ -75,7 +75,7 @@
             setTimeout(()=>{
               this.formatExcel();
             },500)
-            const ws1 = wb.Sheets['权属信息'];
+            const ws1 = wb.Sheets['权属信息（不动产权证）'];
             this.certificatesData = XLSX.utils.sheet_to_html(ws1) + viewTableCss;
             setTimeout(()=>{
               this.formatCertificateDate();
@@ -114,8 +114,14 @@
 
       formatExcel(){
         const trs = document.querySelectorAll(".targetTable tr")
-        console.log(trs)
+        trs[0].remove();
+        trs[1].remove();
         const td0 = trs[2].childNodes
+        for (let i = 0 ; i<trs.length; i++){
+            if (trs[i].childNodes[0].textContent===''){
+              trs[i].remove();
+            }
+        }
         for (let i =td0.length-1;i>0;i--){
           if (td0[i].textContent===''){
             for (var j = 0 ; j<trs.length;j++){
@@ -130,6 +136,11 @@
         for (let i =0;i<2;i++){
           trs[i].remove();
         }
+        for (let i = 0 ; i<trs.length; i++){
+            if (trs[i].childNodes[0].textContent===''){
+              trs[i].remove();
+            }
+        }
       }
     },
   };

src/views/house/workbench/components/timeline.vue

@@ -14,7 +14,7 @@
               <h4>合并文档</h4>
               <p v-if="finalDoc.docUrl" >更新时间：{{ finalDoc.updateTime}}</p>
               <el-button type="text" @click="mergeDoc()">合并</el-button>
-              <el-button type="text" v-if="finalDoc.docUrl">下载完整报告</el-button>
+              <el-button type="text" v-if="finalDoc.docUrl" @click="downloadFinalReport(finalDoc.docUrl)">下载完整报告</el-button>
             </el-card>
           </el-timeline-item>
         </el-timeline>
@@ -104,7 +104,12 @@ export default {
               plain: true
             })
             loading.close();
-          }
+            houseGuaranty.getFinalyDoc(this.documentId).then(res=>{
+              if (res.code === 200){
+                  this.finalDoc = res.data;
+              }
+            })
+        }
         })
       },
 
@@ -116,7 +121,10 @@ export default {
               }
             })
           }
-      }
+      },
+      downloadFinalReport(url) {
+           window.open('http://mbs.scdayou.com/dfs/productivity-platform/'+url,'_blank');
+        },
 
     }
  }