Merge branch 'master' of http://gogs.jkcredit.com:3000/xusonglin/manage_invoice_ui

src/config/globle.js

@@ -1,3 +1,4 @@
-window.hostUrl = `http://invoice.jkcredit.com:80/`;
-//window.hostUrl = `http://127.0.0.1:18081/`;
+window.hostUrl = `http://127.0.0.1:18081/`;
+//window.hostUrl = `http://192.168.50.4:18081/`;
+//window.hostUrl = `http://invoice.jkcredit.com:80/`;
 window.tableHeight = (document.body.clientHeight * 0.6 - 20)

src/views/platform/waybill/waybillFile.vue

@@ -52,8 +52,16 @@
           </el-table-column>
            <el-table-column
             prop="wayBillNum"
+            label="运单号"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="fileName"
             label="文件名称"
             show-overflow-tooltip>
+             <template slot-scope="scope">
+               <el-link style="cursor:pointer;color: blue;" @click="downloadFile(scope.row.wayBillNum)">{{scope.row.fileName}}</el-link>
+            </template>
           </el-table-column>
           <el-table-column
             label="创建时间"
@@ -180,6 +188,9 @@ export default{
     handleEditDialogClose() {
       this.addList = false
     },
+    downloadFile(num){
+      window.location.href = window.hostUrl+'noCar/downloadWayBillFile?wayBillNum='+num
+    },
     twoLoadData() {
       this.currenttwo = 1
       this.pagesizetwo = 8