6

src/views/ecw/box/batchMarkup.vue

@@ -224,12 +224,12 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('始发仓/渠道-目的仓')" align="center" width="200">
-        <template v-slot="scope"> {{ scope.row.destAdjustToStartWarehouseName }}-{{ scope.row.destAdjustToDestWarehouseName }} </template>
+        <template v-slot="scope"> {{ scope.row.startWarehouseName }}/ <template v-if="scope.row.channelName">{{ scope.row.channelName }}-</template>{{ scope.row.dstWarehouseName }} </template>
       </el-table-column>
       <el-table-column :label="$t('额外费用')" width="200">
         <template slot-scope="{ row }">
-          <div v-for="(item, feeIndex) in row.costVO.feeDtoList" :key="feeIndex">
-            <div v-if="item.amount && item.feeType !== 1 && item.feeType !== 2"><dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />: {{ currencyMapF[item.currencyId] }}{{ item.amount }}</div>
+          <div v-for="(item, feeIndex) in row.extraCosts" :key="feeIndex">
+            <dict-tag :type="DICT_TYPE.FEE_TYPE" :value="item.feeType" />: {{ currencyMapF[item.currencyId] }}{{ item.totalAmount }}
           </div>
         </template>
       </el-table-column>

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

@@ -83,12 +83,12 @@
       </el-table-column>
       <el-table-column :label="$t('发货人')" width="100" align="center">
         <template slot-scope="{ row }">
-          <router-link :to="'/customer/query/' + row.consignorVO.customerId"> {{ row.consignorVO.customerNumber }}</router-link>
+          <router-link :to="'/customer/query/' + row.consignorVO.customerId" v-if="row.consignorVO"> {{ 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.consigneeVO.customerId">{{ row.consigneeVO.customerNumber }}</router-link>
+          <router-link :to="'/customer/query/' + row.consigneeVO.customerId" v-if="row.consigneeVO">{{ row.consigneeVO.customerNumber }}</router-link>
         </template>
       </el-table-column>
       <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">
@@ -124,9 +124,9 @@
         </template>
       </el-table-column>
       <el-table-column prop="rucangTime" :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="loadTime" :label="$t('装柜时间')" align="center" width="150"></el-table-column>
+      <el-table-column prop="daogangTime" :label="$t('到港时间')" align="center" width="150"></el-table-column>
+      <el-table-column prop="qingguanTime" :label="$t('清关时间')" align="center" width="150"></el-table-column>
       <el-table-column prop="unloadTime" :label="$t('到仓时间')" align="center" width="150"></el-table-column>
 
       <el-table-column type="expand" :label="$t('更多')">