Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/FinancialDocuments.vue

@@ -618,6 +618,7 @@
     overflow-y: auto;
     position: fixed;
     background: #f9f9f9;
+    top:220px;
     bottom: 0;
   }
   .page_fnDm .btmTitle {
@@ -2377,12 +2378,17 @@
       },
             //导入数据
             importInfo() {
+              console.log("我是导入信息",this.importData);
         this.importInfoAndExport();
       },
       //导入数据
       importInfoAndExport() {
         var that = this;
-        this.Confirm(this.$t('objFill.shifoudaorucsj'), function () {
+        this.$confirm(this.$t('objFill.shifoudaorucsj'), '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           that.tabLoading = true;
           let qMsg = {
             msg: that.importData,
@@ -2404,6 +2410,8 @@
             },
             err => {}
           );
+        }).catch(() => {
+                 
         });
       },
       beforeAvatarUpload(file) {