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

src/views/ecw/order/transferWarehousing.vue

@@ -18,9 +18,11 @@
       </el-table-column>
       <el-table-column :label="$t('填单货物属性')">
         <template v-slot="{row}">
-          <div>{{$t('品牌')}}：{{(brandList.find(item => item.id == row.brand) || {}).titleZh}} <span v-if="!row.brand">
-            {{$t('无')}}
-          </span> </div>
+          <div>{{$t('品牌')}}：
+            <span v-if="row.brandType === 0">{{$t('无')}}</span>
+            <span v-if="row.brandType === 1">{{$t('有')}}</span>
+            <span v-if="row.brandType === 2">{{$t('中性')}}</span>
+          </div>
           <div>{{$t('箱数')}}：{{row.num}}</div>
           <div>{{$t('体积')}}：{{ row.volume }}m³</div>
           <div>{{$t('重量')}}：{{row.weight}}Kg</div>

src/views/system/download/index.vue

@@ -87,7 +87,7 @@ export default {
               return downloadFileResponse(res.data)
           }).then(res => {
               console.log({res})
-              this.$download.download0(res.data, row.name + row.fileSuffix, res.headers['content-type'])
+              this.$download.download0(res.data, row.name + '.' + row.fileSuffix, res.headers['content-type'])
           }).finally(() => {
               // 刷新列表状态
               this.getList()