Merge branch 'test' into uat

@@ -199,6 +199,7 @@ export default {
             this.cleaerForm();
             this.$emit("dialogBeforeClose", { close: false, reload: true });
           } else if (res.code === 201) {
+            this.loading = false
             let arr = []
             res.data.forEach(item => {
               let obj = {
@@ -210,6 +211,7 @@ export default {
             this.$router.push({ name: 'UpDateResult', query: { data: arr, from: 'queryCargo' } })
             this.dialogBeforeClose()
           } else if (res.code === 203) {
+            this.loading = false
             this.reBatchMoveCargoToOtherFlight(res.msg, 'notInWhite')
           } else {
             this.msgWarning(res.msg)