Merge branch 'master' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/cargoControl.vue

@@ -60,7 +60,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button>
+          :loading="exportLoading" v-hasPermi="['ecw:cargo:export:search']">{{$t('导出')}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -253,7 +253,7 @@ export default {
           this.list = response.data.list;
           this.total = response.data.total;
         })
-        
+
         this.loading = false;
       });
     },