Merge branch 'dev1.0' of http://222.90.211.174:3000/suf/factoring-trade-c-front-end into dev1.0

babel.config.js

@@ -11,5 +11,5 @@ module.exports = {
       'plugins': ['dynamic-import-node']
       // '@vue/babel-plugin-jsx'
     }
-  },
+  }
 }

src/utils/index.js

@@ -221,8 +221,8 @@ export function exportFile(res, name) {
   var newName = ''
   var filename = res.headers
   filename = filename['content-disposition']
-  filename = filename.split(';')[1].split('filename=')[1].split('.')
-  newName = decodeURI(filename[0]) + '.' + filename[1]
+  filename = filename.split(';')[1].split('filename=')[1]
+  newName = decodeURI(filename)
   link.setAttribute(
     'download',
     name || newName

src/utils/perview/vendors/pdf/PdfView.vue

@@ -12,7 +12,7 @@
         v-for="page in pdf_pages"
         :id="'the_canvas' + page"
         :key="page"
-      ></canvas>
+      />
     </div>
   </div>
 </template>
@@ -30,7 +30,7 @@ export default {
   },
   data() {
     return {
-      pdf_scale: 1.0, // pdf放大系数
+      pdf_scale: 1.4, // pdf放大系数
       pdf_pages: [],
       pdf_div_width: '',
       currentPage: 1
@@ -44,9 +44,9 @@ export default {
       // 放大
       let max = 0
       if (window.screen.width > 1440) {
-        max = 1.4
+        max = 2.0
       } else {
-        max = 1.2
+        max = 1.6
       }
       if (this.pdf_scale >= max) {
         return

src/utils/perview/vendors/xlsx/Table.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div>
-      <hot-table ref="table" :settings="hotSettings"></hot-table>
+      <hot-table ref="table" :settings="hotSettings" />
     </div>
     <div class="btn-group">
       <button

src/views/login/index.vue

@@ -98,9 +98,8 @@ export default {
     }
   }
   .login-container-box {
-    height: 85%;
+    height: 600px;
     width: 1000px;
-    min-height: 540px;
     background: #fff;
     border-radius: 20px;
     display: flex;

src/views/myFinancing/financingMain.vue

@@ -32,7 +32,7 @@
       :columns="columns"
       :data="tableData"
       :count="count"
-      parentComponent="FinancingMain"
+      parent-component="FinancingMain"
     />
   </div>
 </template>
@@ -132,7 +132,7 @@ export default {
               {
                 msg: '还款计划',
                 icon: 'iconfont icon-a-Group1087',
-                power: 'projectNumber:empty',
+                power: '',
                 rowPower: [],
                 category: 'play'
               }

src/views/myFinancing/repaymentPlay/index.vue

@@ -35,7 +35,20 @@
       </cy-info-title>
       <cy-info-title type="collapse" name="收放款计划（融资款）" style="margin-top: 20px;">
         <collect-discharge-play type="financing" />
+        <div style="display: flex;">
+          <el-form-item label="IRR" prop="name">
+            <el-input v-model="ruleForm.name" placeholder="请输入IRR" />
+          </el-form-item>
+          <el-form-item label="授信-预期IRR" prop="name">
+            <el-input v-model="ruleForm.name" placeholder="请输入授信-预期IRR" />
+          </el-form-item>
+          <el-form-item label="额度支用-预期IRR" prop="name">
+            <el-input v-model="ruleForm.name" placeholder="请输入额度支用-预期IRR" />
+          </el-form-item>
+        </div>
+
       </cy-info-title>
+
       <cy-info-title type="collapse" name="收放款计划（应收账款）" style="margin-top: 20px;">
         <collect-discharge-play type="receivable" />
       </cy-info-title>

src/views/perview/index.vue

@@ -42,10 +42,8 @@ export default {
       this.loading = true
       try {
         const [file] = e.target.files
-        console.log(file, 777)
         const arrayBuffer = await readBuffer(file)
         this.loading = false
-        console.log(arrayBuffer, 999)
         this.last = await this.displayResult(arrayBuffer, file)
       } catch (e) {
         console.error(e)