合并分支 'crs' 到 'master'

src/components/reportAssess/reportAssess.vue

@@ -888,7 +888,8 @@ export default {
                 query: {
                     username: this.$route.query.username,
                     id: this.$route.query.id,
-                    popp: this.popp.basic
+                    popp: this.popp.basic,
+                    agree: this.isAgree
                 }
             });
             window.open(href, '_blank');

src/tools/htmlToPdf.js

 // 导出页面为PDF格式
-import Vue from 'vue'
-let v = new Vue();
 import html2Canvas from 'html2canvas'
 import JsPDF from 'jspdf'
-export default {
+import {
+    Loading
+} from 'element-ui'
+let loading;
+export default{
     install (Vue, options) {
         Vue.prototype.getPdf = function () {
+            loading = Loading.service({
+                lock: true,
+                text: '正在下载pdf...',
+                background: 'rgba(0,0,0,.5)'
+            });
             let title = this.htmlTitle
-            v.$message.info('正在生成pdf文件！请稍等')
             html2Canvas(document.querySelector('#pdfDom'), {
                 allowTaint: true
             }).then(function (canvas) {
@@ -32,6 +38,7 @@ export default {
                         }
                     }
                 }
+                loading.close();
                 PDF.save(title + '.pdf')
             })
         }