Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZHY2.0

src/views/securityCheck/views/cargoStatisticsHome.vue

@@ -473,10 +473,20 @@ export default {
     echar(data) {
       if (data) {
         if (data.namefa == "申报件数") {
-          data.namefa = "";
+          if(data.namech==""){
+            this.queryData.riskRating = "";
+            this.queryData.openResult = "";
+          }
+          else{
+            this.queryData.riskRating = data.namech;
+          this.queryData.openResult = "";
+          }
+        }
+        else{
+          this.queryData.riskRating = data.namefa;
+          this.queryData.openResult = data.namech;
         }
-        this.queryData.riskRating = data.namefa;
-        this.queryData.openResult = data.namech;
+        
       }
       this.$router.push({
         path: "/waybillTable",

src/views/securityCheck/views/waybillTable.vue

@@ -125,6 +125,7 @@ export default {
         },
       ],
       FormData: {
+        waybillNo:"",//运单号
         destination: "", // 目的站
         agentCode: "", // 代理人ID
         agentLevel: "", // 代理人信用等级 A\B\C\D
@@ -141,8 +142,9 @@ export default {
   },
   created(){
     let queryData = this.$route.query;
-    const { destination, agentCode,agentLevel,riskRating,startTime,endTime,openResult,riskClassification } = queryData;
+    const {waybillNo, destination, agentCode,agentLevel,riskRating,startTime,endTime,openResult,riskClassification } = queryData;
     this.FormData = {
+      waybillNo:waybillNo,
       destination:destination,
       agentCode:agentCode,
       agentLevel:agentLevel,
@@ -165,7 +167,8 @@ export default {
   },
   methods: {
     searchHandler(arr) {
-      console.log(arr);
+      this.FormData.waybillNo = arr[0]
+      this.getData()
     },
     setTableHeight() {
       const topBarHeight = 80;