批量加价 批量费用申请

src/views/ecw/order/feeApplicationBatch/index.vue

@@ -83,34 +83,29 @@
       </el-table-column>
       <el-table-column :label="$t('发货人')" width="100" align="center">
         <template slot-scope="{ row }">
-          <router-link :to="'/customer/query/' + row.consignorCustomerId"> {{ row.consignorCustomerNumber }}</router-link>
+          <router-link :to="'/customer/query/' + row.consignorVO.customerId"> {{ row.consignorVO.customerNumber }}</router-link>
         </template>
       </el-table-column>
       <el-table-column :label="$t('收货人')" width="100" align="center">
         <template slot-scope="{ row }">
-          <router-link :to="'/customer/query/' + row.consigneeCustomerId">{{ row.consigneeCustomerNumber }}</router-link>
+          <router-link :to="'/customer/query/' + row.consigneeVO.customerId">{{ row.consigneeVO.customerNumber }}</router-link>
         </template>
       </el-table-column>
       <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">
         <template slot-scope="{ row }">
-          {{ row.startWarehouseName }}
-          <span style="color: red" v-if="row.isExternalWarehouse">({{ $t("外部仓") }})</span>
+          {{ $l(row.initialLogisticsInfoDto, "startTitle") }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式') + '-' + $t('渠道') + '/' + $t('目的仓')" align="center" width="220">
         <template slot-scope="{ row }">
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" />
           <template v-if="row.channelName"> - {{ row.channelName }} </template>
-          / {{ row.dstWarehouseName }}
+          / {{ $l(row.initialLogisticsInfoDto, "destCountryTitle") }} - {{ $l(row.initialLogisticsInfoDto, "destCityTitle") }} -
+          {{ $l(row.initialLogisticsInfoDto, "destTitle") }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('收费数据')" width="200">
-        <template slot-scope="{ row }">
-          <el-tooltip v-if="row.orderType !== 1" effect="dark" :content="row.orderType == 3 ? `${row.vweight}kg` : `${row.wvolume}m³`" placement="top-start">
-            <span>{{ row.realityChargeNum }}{{ $t("箱") }},{{ row.realityChargeVolume }}m³,{{ row.realityChargeWeight }}kg</span>
-          </el-tooltip>
-          <template v-else>{{ row.realityChargeNum }}{{ $t("箱") }},{{ row.realityChargeVolume }}m³,{{ row.realityChargeWeight }}kg</template>
-        </template>
+        <template slot-scope="{ row }"> {{ row.sumNum }}{{ $t("箱") }} {{ row.vweight }}Kg {{ row.wvolume }}m³ {{ row.sumQuantity }}{{ $t("个") }} </template>
       </el-table-column>
       <el-table-column :label="$t('控货')" align="center" prop="transportId">
         <template slot-scope="{ row }">
@@ -118,13 +113,18 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('增值服务')" align="center" prop="status">
+      <el-table-column :label="$t('增值服务')" align="center">
         <template slot-scope="{ row }">
-          {{ getTypeText(row.type) }}
+          <el-tag v-if="row.type && row.type.indexOf('1') > -1">
+            {{ $t("集运") }}
+          </el-tag>
+          <el-tag v-if="row.type && row.type.indexOf('2') > -1">
+            {{ $t("海外仓") }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="lastInTime" :label="$t('最后入仓时间')" align="center" width="150"></el-table-column>
-      <el-table-column prop="zgDate" :label="$t('装柜时间')" align="center" width="150"></el-table-column>
+      <el-table-column prop="estLoadingTime" :label="$t('装柜时间')" align="center" width="150"></el-table-column>
       <el-table-column prop="dgDate" :label="$t('到港时间')" align="center" width="150"></el-table-column>
       <el-table-column prop="qgDate" :label="$t('清关时间')" align="center" width="150"></el-table-column>
       <el-table-column prop="unloadTime" :label="$t('到仓时间')" align="center" width="150"></el-table-column>
@@ -253,20 +253,6 @@ export default {
     }
   },
   computed: {
-    // 增值服务文本
-    getTypeText() {
-      return (type) => {
-        if (!type) return ""
-        const arr = []
-        if (type.indexOf("1") > -1) {
-          arr.push(this.$t("集运"))
-        }
-        if (type.indexOf("2") > -1) {
-          arr.push(this.$t("海外仓"))
-        }
-        return arr.join(",")
-      }
-    },
     orderIds() {
       return this.$route.query.orderIds || ""
     },