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

src/views/ecw/box/components/batchMakeUpDetail.vue

@@ -26,7 +26,7 @@
       </div>
     </div>
 
-    <el-table :data="loadDetail.sectionOrderList" border class="mt-10">
+    <el-table :data="orders" border class="mt-10">
       <el-table-column prop="orderNo" :label="$t('订单号')" align="center">
         <template v-slot="{row}">
           <el-button type="text" @click="jumpOrderDetail(row)">{{row.orderNo}}</el-button>
@@ -152,6 +152,10 @@ export default {
     },
   },
   computed: {
+    orders() {
+      if (!this.loadDetail) return [];
+      return this.loadDetail.sectionOrderList?.filter(item => this.details.orderIds?.indexOf(item.orderId) > -1)
+    },
     /* 渠道 */
     getShipChannelName() {
       return (shippingChannelId) => {

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

@@ -58,6 +58,11 @@
               </image-display>
             </template>
           </el-table-column>
+          <el-table-column :label="$t('备注')" prop="remark" >
+            <template slot-scope="{row}">
+              {{row.remark}}
+            </template>
+          </el-table-column>
         </el-table>
     </el-dialog>
 </template>

src/views/ecw/order/detail.vue

@@ -192,6 +192,12 @@
         <el-descriptions-item :label="$t('特殊要求备注')">
           {{order.packageRemarks}}
         </el-descriptions-item>
+        <el-descriptions-item :label="$t('目的港清关')">
+          {{['',  $t('我司承接'), $t('客户自清')][order.portDestCustomsClear] || ''}}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('发货方式')">
+          {{['',  $t('多票'), $t('单票')][order.deliveryWay] || ''}}
+        </el-descriptions-item>
       </el-descriptions>
     </el-card>
     <el-card class="card">