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

src/api/ecw/orderException.js

@@ -114,7 +114,7 @@ export function exportExcel(params) {
   return request({
     url: '/ecw/order-exception/export-excel',
     method: 'get',
-    timeout: 3*60*1000,
+    timeout: 30*60*1000,
     params,
     // timeout: 3*60*1000,
     responseType: 'arraybuffer'

src/views/ecw/order/components/DeclarationDocuments.vue

@@ -73,6 +73,7 @@ export default {
     beforeUploadimg1(file) {
       if (this.fileList.length >= 10) {
         this.$message.error(this.$t('您最多上传10个附件'))
+        return
       }
       console.log(file)
       var type = file.name.split('.')

src/views/ecw/order/special/Discounts.vue

@@ -185,6 +185,7 @@ export default {
               v.num = item.num
               v.volume = item.volume
               v.weight = item.weight
+              v.brandName = item.brandName
               v.warehouseInInfoVO = item.warehouseInInfoVO
             }
           })
@@ -201,6 +202,7 @@ export default {
                 v.num = item.num
                 v.volume = item.volume
                 v.weight = item.weight
+                v.brandName = item.brandName
                 v.warehouseInInfoVO = item.warehouseInInfoVO
               }
               list.push(v)