几个bug

src/views/ecw/offer/detail.vue

@@ -226,8 +226,12 @@
                 <el-table-column label="">
                     <template slot-scope="scope">
                         {{scope.$index+1}}.
-                        <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="scope.row.type" />
-<!--                        {{$l(productNames[scope.row.prodId], 'title') || $t('未知')}} -->
+                        {{getProductName(scope.row.prodId)}}
+                    </template>
+                </el-table-column>
+                <el-table-column label="">
+                    <template slot-scope="{row}">
+                      <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" />
                     </template>
                 </el-table-column>
                 <el-table-column label="">
@@ -418,6 +422,15 @@
       };
     },
     computed:{
+      // 根据id获取商品名称（显示优惠列表的时候用）
+      getProductName(){
+        return prodId => {
+          if(!this.list) return this.$t('未知')
+          let row = this.list.offerProdRespVOList.find(item => item.prodId == prodId)
+          if(!row) return this.$t('未知')
+          return this.$l(row, 'prodTitle')
+        }
+      },
       currentcyMap(){
           let map = {}
           this.currencyList.forEach(item => {

src/views/ecw/offer/edit.vue

@@ -11,10 +11,10 @@
                 </el-radio-group>
             </el-form-item>
             <br/>
-            <el-form-item :label="$t('订单类型')">
+            <el-form-item :label="$t('订单类型')" v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
                 <el-checkbox-group v-model="form.type">
-                    <el-checkbox label="1">{{$t('集运服务')}}</el-checkbox>
-                    <el-checkbox label="2">{{$t('海外仓')}}</el-checkbox>
+                    <el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{$t('集运服务')}}</el-checkbox>
+                    <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1">{{$t('海外仓')}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
 
@@ -355,7 +355,7 @@
                 </el-table-column>
                 <el-table-column label="">
                     <template slot-scope="{row}">
-                        -{{row.reduceTotalAmount}}
+                        -{{row.reduceAmount}}
                         {{currencyMap[row.reduceCurrencyId]}}
                     </template>
                 </el-table-column>
@@ -678,6 +678,7 @@ export default {
                         titleEn: it.titleEn,
                         endTime: it.endTime,
                         reduceTotalAmount: it.reduceTotalAmount,
+                        reduceAmount: it.reduceAmount,
                         reduceCurrencyId: it.reduceCurrencyId
                     })
             }

src/views/ecw/order/edit.vue

@@ -5,10 +5,10 @@
         <el-card>
             <div slot="header" class="card-title">{{ editMode  ? $t('编辑订单') + '-' + form.orderNo  : $t('新建订单')}}</div>
             <!--默认显示类型(selectedRouter==null)，如果选择路线后没开通则隐藏-->
-            <el-form-item :label="$t('订单类型')" v-if="!selectedRouter || routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
+            <el-form-item :label="$t('订单类型')" v-if="routeOtherServices.indexOf('1') > -1 || routeOtherServices.indexOf('4') > -1">
                 <el-checkbox-group v-model="form.type" :disabled="inWarehouse">
-                    <el-checkbox label="1" v-if="!selectedRouter || routeOtherServices.indexOf('1') > -1">{{$t('集运服务')}}</el-checkbox>
-                    <el-checkbox label="2" v-if="!selectedRouter || routeOtherServices.indexOf('2') > -1">{{$t('海外仓')}}</el-checkbox>
+                    <el-checkbox label="1" v-if="routeOtherServices.indexOf('1') > -1">{{$t('集运服务')}}</el-checkbox>
+                    <el-checkbox label="2" v-if="routeOtherServices.indexOf('4') > -1">{{$t('海外仓')}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>