Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/box/query.vue

@@ -110,7 +110,7 @@
               <div class="status-line"></div>
               <div class="status-number">{{logList.length - index}}</div>
               <div class="status-info">
-                <div>{{$l(item, 'title')}}</div>
+                <div>{{$l(item, 'title')}} <el-button v-if="item.approvalId>0" type="text" @click="handleApproval(item.bpmProcessId)">{{$t('查看审批')}}</el-button></div>
                 <div>
                   <p>{{formatDate(item.createTime)}}</p>
                   <p>{{item.operator}}</p>
@@ -574,6 +574,9 @@ export default {
         );
       }
     },
+    handleApproval(id) {
+      this.$router.push({path: '/bpm/process-instance/detail', query: {id: id}})
+    }
   },
   computed: {
     visitedViews() {
@@ -636,7 +639,7 @@ export default {
       } else {
         return getTotlContent(secStatistics);
       }
-    },
+    }
   },
 };
 </script>

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -203,7 +203,6 @@ export default {
     };
   },
   created() {
-    this.queryAllData();
     this.getCountry()
   },
   methods: {
@@ -218,6 +217,7 @@ export default {
       if(warehouse){
         this.$set(this.queryParams,'destCountryId', warehouse.guojia)
       }
+      this.queryAllData();
     },
     /* 查询已预装 */
     getSecGoods() {