Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/shipment-details/shipmentList.vue

@@ -901,7 +901,8 @@ export default {
       if(yesA == 'yes'){
         this.loading = true
         exportXls(obj).then(res =>{
-        if(!res){
+          debugger
+        if(res.message){
           this.loading = false
           this.$message.error(res.message)
         }else{