修改海运缺陷单

src/views/ecw/box/ladingBill/index.vue

@@ -30,14 +30,14 @@
             {{scope.row.isCargoControl ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('计划箱数')" align="center" prop="loadNum">
+        <el-table-column :label="$t('计划箱数')" align="center" prop="num">
           <template slot-scope="scope">
-            {{ scope.row.loadNum }}{{$t('箱')}}
+            {{ scope.row.num }}{{$t('箱')}}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('实装箱数')" align="center" prop="num">
+        <el-table-column :label="$t('实装箱数')" align="center" prop="loadNum">
           <template slot-scope="scope">
-            {{ scope.row.num }}{{$t('箱')}}
+            {{ scope.row.loadNum }}{{$t('箱')}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('提货点')" align="center" prop="destWarehouse" />

src/views/ecw/box/query.vue

@@ -154,7 +154,7 @@
               </el-table-column>
               <el-table-column prop="billAbnId" :label="$t('异常')" align="center">
                 <template slot-scope="scope">
-                  <dict-tag :type="DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION" :value="scope.row.opStep" />
+                  <dict-tag :type="DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION" :value="scope.row.billAbnId" />
                 </template>
               </el-table-column>
               <el-table-column prop="abnDetail" :label="$t('异常描述')" align="center" width="700"></el-table-column>
@@ -605,13 +605,11 @@ export default {
     getBoxSum() {
       return (boxStatistics) => {
         if (boxStatistics) {
-          return this.$t("{num}箱 {volum}m³", {
+          return this.$t("{num}箱 {volume}m³ {weight}kg", {
             num: boxStatistics.num ?? 0,
-            volume: boxStatistics.weight ?? 0,
+            volume: boxStatistics.volume ?? 0,
+            weight: boxStatistics.weight ?? 0,
           });
-          /* `${boxStatistics.num ?? 0}箱 ${boxStatistics.volume ?? 0}m3 ${
-            boxStatistics.weight ?? 0
-          }kg`; */
         }
         return;
       };

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -153,8 +153,9 @@
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('备案')" align="center" prop="productRecord" width="100">
-                      <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.productRecord" />
+                      <template slot-scope="{row}">
+                        <template v-if="row.brandName">{{row.brandName}}</template>
+                        <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
                       </template>
                     </el-table-column>
                     <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">