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

src/views/ecw/order/detail.vue

@@ -743,7 +743,7 @@ export default {
         coupons: row.couponInfoVOList,
         airClearanceSource: row.airClearanceSource == 1 ? this.$t('商品') : this.$t('渠道'), // 空运清关费来源：1 商品 2 渠道
         airClearanceInfo: JSON.parse(row.airClearanceInfo), //空运清关费来源数据详情,
-        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.channelName
+        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.order?.channelName
       }
 
     },

src/views/system/download/index.vue

@@ -31,6 +31,11 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
       </el-table-column>
+      <!--<el-table-column :label="$t('结果')" align="center" prop="createTime"  width="150">
+        <template slot-scope="scope">
+          {{scope.row.result}}
+        </template>
+      </el-table-column>-->
       <el-table-column :label="$t('下载状态')" align="center" prop="createBy"  width="150">
           <template v-slot:default="{row}">
               <!--status ==2 表示已处理，配合downNum来判断是否已下载-->