前端代码合并提交

src/views/noCar/waybillFile.vue

@@ -40,7 +40,7 @@
             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>
+               <el-link style="cursor:pointer;color: blue;" @click="downloadFile(scope.row.batchNum,scope.row.wayBillNum)">{{scope.row.fileName}}</el-link>
             </template>
           </el-table-column>
           <el-table-column
@@ -167,8 +167,8 @@ export default{
     handleEditDialogClose() {
       this.addList = false
     },
-    downloadFile(num){
-      window.location.href = window.hostUrl+'noCar/downloadWayBillFile?wayBillNum='+num
+    downloadFile(batchNum, num){
+      window.location.href = window.hostUrl+'noCar/downloadWayBillFile?wayBillNum='+num+'&batchNum='+batchNum
     },
     twoLoadData() {
       this.currenttwo = 1