费用报表等bug修复

src/components/UserSelector/index.vue

@@ -5,7 +5,7 @@
         :clearable="clearable"
         remote
         reserve-keyword
-        placeholder="请选择"
+        :placeholder="placeholder ? placeholder : $t('请选择')"
         :loading="loading">
         <el-option
         v-for="(item, index) in list"
@@ -22,6 +22,7 @@ export default {
     props:{
         value: [String, Number],
         clearable: Boolean,
+        placeholder: String,
         manage:{
           type:Boolean,
           default:false

src/i18n/languages/en_US.json

@@ -4042,5 +4042,8 @@
     "是否支持控货": "Does it support controlling goods",
     "默认送货上门": "Default door-to-door delivery",
     "广州市捷道国际货运代理有限公司": "E&C LOGISTICS LIMITED",
-    "报关退税，请备齐资料。":"Customs refund, prepare necessary documents."
+    "报关退税，请备齐资料。":"Customs refund, prepare necessary documents.",
+    "订单号、唛头、提单号": "order number、marks、B/L NO",
+    "发货人名称、手机号": "sender name or mobile",
+    "收货人名称、手机号": "Receiver Name or Mobile"
 }

src/views/ecw/financial/selfNoReport.vue

@@ -13,7 +13,7 @@
             <el-input v-model="queryParams.selfNo" clearable></el-input>
           </el-form-item>
           <el-form-item :label="$t('始发仓')">
-            <el-select v-model="queryParams.startWarehouseIdList" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.startWarehouseIdList" :placeholder="$t('请选择')" clearable>
               <el-option
                 v-for="item in exportWarehouseList"
                 :key="item.id"
@@ -23,7 +23,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('目的国')">
-            <el-select v-model="queryParams.destCountryId" placeholder="请选择" clearable filterable >
+            <el-select v-model="queryParams.destCountryId" :placeholder="$t('请选择')" clearable filterable >
               <el-option
                 v-for="item in countryList"
                 :key="item.id"
@@ -33,7 +33,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('目的仓')">
-            <el-select v-model="queryParams.destWarehouseId" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择')" clearable>
               <el-option
                 v-for="item in importWarehouseList"
                 :key="item.id"

src/views/ecw/financial/selfNoReportDetail.vue

@@ -10,13 +10,13 @@
         class="card"
       >
           <el-form-item :label="$t('编号')">
-            <el-input v-model="queryParams.numberKey" clearable placeholder="订单号、唛头、提单号"></el-input>
+            <el-input v-model="queryParams.numberKey" clearable :placeholder="$t('订单号、唛头、提单号')"></el-input>
           </el-form-item>
           <el-form-item :label="$t('发货人')">
-            <el-input v-model="queryParams.consignorKey" placeholder="发货人名称、手机号"></el-input>
+            <el-input v-model="queryParams.consignorKey" :placeholder="$t('发货人名称、手机号')"></el-input>
           </el-form-item>
           <el-form-item :label="$t('收货人')">
-            <el-input v-model="queryParams.consigneeKey" placeholder="收货人名称、手机号"></el-input>
+            <el-input v-model="queryParams.consigneeKey" :placeholder="$t('收货人名称、手机号')"></el-input>
           </el-form-item>
 
           <el-form-item>
@@ -33,7 +33,7 @@
             <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
           </el-form-item>-->
           <el-form-item :label="$t('始发仓')">
-            <el-select v-model="queryParams.startWarehouseId" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择')" clearable>
               <el-option
                 v-for="item in exportWarehouseList"
                 :key="item.id"
@@ -43,7 +43,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('目的仓')">
-            <el-select v-model="queryParams.dstWarehouseId" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.dstWarehouseId" :placeholder="$t('请选择')" clearable>
               <el-option
                 v-for="item in importWarehouseList"
                 :key="item.id"
@@ -53,7 +53,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('客户经理')" >
-            <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
+            <user-selector manage v-model="queryParams.salesmanId" clearable @change="handleQuery" :placeholder="$t('请选择')"/>
           </el-form-item>
           <el-form-item :label="$t('订单状态')" prop="status">
             <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"

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

@@ -196,9 +196,9 @@
           <template slot-scope="{row}">
             <price
               :charging="row.charging == 1"
-              :freight="row.discountFreightTotalPrice"
+              :freight="row.totalDiscountFreightPrice"
               :freight-currency="row.seaFreightCurrency"
-              :clearance="row.discountClearanceFeeTotalPrice"
+              :clearance="row.totalDiscountClearanceFeePrice"
               :clearance-currency="row.clearanceFreightCurrency"
               :currency-map="currencyMap"
             ></price>
@@ -372,7 +372,7 @@
     </el-card>
     <el-card class="mt-10">
       <span slot="header">{{$t('特价折扣')}}</span>
-      <el-table :data="[]">
+      <el-table :data="orderSpecialApplyVOList">
         <el-table-column :label="$t('商品类型')" prop="prodType"></el-table-column>
         <el-table-column :label="$t('商品名称')" prop="prodTitleEn"></el-table-column>
         <el-table-column :label="$t('英文名称')" prop="prodTitleEn"></el-table-column>
@@ -404,7 +404,7 @@
             {{row.clearanceFreight}}{{currencyMap[row.clearanceFreightCurrency]}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('申请人')">TODO</el-table-column>
+        <el-table-column :label="$t('申请人')" prop="creatorName"></el-table-column>
         <el-table-column :label="$t('申请时间')">
           <template slot-scope="{row}">
             {{row.createTime|parseTime}}
@@ -463,6 +463,10 @@ export default  {
     // 优惠活动
     couponInfoVOList(){
       return this.orderDetailSummary?.couponInfoVOList || []
+    },
+    // 特价折扣
+    orderSpecialApplyVOList(){
+      return this.orderDetailSummary?.orderSpecialApplyVOList || []
     }
   },
   mounted() {
@@ -501,13 +505,13 @@ export default  {
     getFeeApplicationSummaries(){
       if(!this.feeApplicationList) return []
       let arr = []
-      arr[3] = this.$t('合计')
+      arr[2] = this.$t('合计')
       // 应收金额
-      arr[4] = this.calcTotalByCurrency(this.feeApplicationList, 'receivableTotalAmount', 'currencyId')
+      arr[3] = this.calcTotalByCurrency(this.feeApplicationList, 'receivableTotalAmount', 'currencyId')
       // 收款优惠金额
-      arr[5] = this.calcTotalByCurrency(this.feeApplicationList, 'discountTotal', 'currencyId')
+      arr[4] = this.calcTotalByCurrency(this.feeApplicationList, 'discountTotal', 'currencyId')
       // 实收金额
-      arr[6] = this.calcTotalByCurrency(this.feeApplicationList, 'realityTotalAmount', 'currencyId')
+      arr[5] = this.calcTotalByCurrency(this.feeApplicationList, 'realityTotalAmount', 'currencyId')
       return arr
     },
     // 运费&清关费汇总