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

src/components/ChooseContactDialog/index.vue

@@ -17,7 +17,6 @@
                 <div class="line">
                     <div class="label">{{$t('姓名(英文)')}}：</div>
                     <div class="value">{{item.contactsNameEn}}</div>
-                    <el-tag v-if="item.isInOpenSea" type="danger" effect="dark">{{$t('公')}}</el-tag>
                 </div>
                 <div class="line">
                     <div class="label">{{$t('电话')}}：</div>

src/utils/dict.js

@@ -119,6 +119,7 @@ export const DICT_TYPE = {
   ECW_CUSTOMER_RESOURCE_TYPE: 'customer_resource_type', // 客户资源类型
   ECW_CUSTOMER_TRANSPORT_TYPE: 'customer_transport_type', // 客户出货渠道（跟运输方式相同，但是显示全部）
   ECW_ORDER_APPROVAL_TYPE: 'order_approval_type', // 订单相关审批类型
+  ECW_FEE_SOURCE: 'fee_source', // 费用来源
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/order/detail.vue

@@ -250,7 +250,11 @@
         </el-tab-pane>
         <el-tab-pane :label="$t('费用明细')" name="four">
           <el-table :data="feeList">
-            <el-table-column :label="$t('订单号')" prop="orderNo"></el-table-column>
+            <el-table-column :label="$t('订单号')" prop="orderNo">
+              <template slot-scope="{row}">
+                {{row.orderNo}}
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('运输方式')">
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
             </el-table-column>
@@ -269,6 +273,11 @@
                 {{$l(row, 'title')}}
               </template>
             </el-table-column>
+            <el-table-column :label="$t('费用来源')" prop="feeSource">
+              <template slot-scope="{row}">
+                <dict-tag :type="DICT_TYPE.ECW_FEE_SOURCE" :value="row.feeSource" />
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('箱数')" prop="num">
               <template slot-scope="{row}">
                 {{row.num || '-'}}