Merge remote-tracking branch 'origin/dev' into dev

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -1495,6 +1495,7 @@
           <p>离港日:{{ estimatedTime.fEtd }}</p>
           <p>运单号:{{ form.fMblno }}</p>
           <p>运输条款:{{ form.fServiceitems | fServiceitemsNameFormat(transport) }}</p>
+          <p>箱型箱量:{{goodsList&&goodsList.length>0?goodsList[0].cntrName+"*"+goodsList[0].fCntrcount:'—'}}</p>
           <p>业务号:{{ form.fBillno }}</p>
         </div>
         <table border="1" style="border-collapse: collapse;width: 100%;text-align: center">
@@ -1554,10 +1555,10 @@
           </tr>
           <tr class="listTd">
             <td rowspan="2" colspan="2">箱号</td>
-            <td rowspan="2" colspan="2">封号</td>
+            <td rowspan="2" colspan="2">铅封号</td>
             <td rowspan="2">批号</td>
             <td rowspan="2">货名</td>
-            <td rowspan="2">件数</td>
+            <td rowspan="2">箱型</td>
             <td rowspan="2">价值</td>
             <td rowspan="2">托运人确定重量(吨)</td>
             <td rowspan="2">计算重量(吨)</td>