修复海运缺陷单

src/views/ecw/box/indexSea.vue

@@ -3,9 +3,9 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="运输方式" prop="transportType">
-        <el-select v-model="queryParams.transportType" placeholder="请选择运输方式" clearable size="small">
-          <el-option v-for="dict in transportTypes" :key="dict.value" :label="dict.label" :value="dict.value" />
+      <el-form-item :label="$t('运输方式')" prop="transportType">
+        <el-select v-model="queryParams.transportType" :placeholder="$t('请选择运输方式')" clearable size="small">
+          <el-option v-for="dict in transportTypes" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value" />
         </el-select>
       </el-form-item>
 
@@ -165,7 +165,7 @@
         <div class="notice-dialog">
           <div class="notice-title">您有{{noticeList.length}}个待处理出货操作，请尽快前往处理：</div>
           <el-table :data="noticeList" height="500px" border>
-            <el-table-column label="自编号" align="center" prop="selfNo" />
+            <el-table-column :label="$t('自编号')" align="center" prop="selfNo" />
             <el-table-column label="类型" align="center">
               <template slot-scope="scope">
                 <dict-tag :type="DICT_TYPE.BOX_SHIPPING_NOTICE_TYPE" :value="String(scope.row.noticeType)" />

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

@@ -25,6 +25,9 @@
         </el-select>
       </el-form-item>
       <el-form-item label="正常报关订单">
+        <div v-for="item in shipmentObj.normalOrderList" :key="item.orderId">
+          <a href="javascript:void(0)" @click="jumpOrderDetail(item)">{{ item.orderNo }}</a>
+        </div>
       </el-form-item>
       <el-form-item label="报关公司名称">
         <supplierSelect v-model="cusDeclarationObj.dcCompanyId" :companyType="'2'" placeholder="请选择报关公司名称" :allSupplier="this.$attrs.allSupplier" />
@@ -206,6 +209,13 @@ export default {
       ...this.shipmentObj[voName],
       documentInfo: this.shipmentObj.documentInfo?.split(",") ?? [],
     };
+
+    if (!this.shipmentObj[voName]) {
+      oldData.dcCustomsType = oldData.dcCustomsType
+        ? oldData.dcCustomsType
+        : this.getDcCustomsType(oldData.documentInfo);
+    }
+
     oldData = formatDateStr(oldData, [
       "dcCutOffTime",
       "dcCheckTime",
@@ -219,6 +229,22 @@ export default {
     this.cusDeclarationObj = oldData;
   },
   methods: {
+    /* 跳转订单详情 */
+    jumpOrderDetail(row) {
+      this.$router.push({
+        path: "/order/detail",
+        query: { orderId: row.orderId },
+      });
+    },
+    getDcCustomsType(documentInfo = []) {
+      const newList = Array.from(new Set(documentInfo));
+      if (newList.length > 1) {
+        return "3";
+      }
+      if (newList.length === 1) {
+        return newList[0] === "1" ? "1" : "2";
+      }
+    },
     getButtonLabel(documentInfo = []) {
       const newList = Array.from(new Set(documentInfo));
       return newList.length >= 2 ? "混合报关" : "VGM声明";

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

@@ -20,7 +20,7 @@
               {{importCityName(shipmentObj.destWarehouseId)}}
             </el-descriptions-item>
             <el-descriptions-item label="状态">
-              {{statusLabel}}
+              {{shipmentObj.shipmentStatusText}}
             </el-descriptions-item>
           </el-descriptions>
         </el-card>
@@ -117,7 +117,7 @@ export default {
   watch: {
     /* 监听发货对象 */
     shipmentObj(val) {
-      this.statusLabel = getStatusName(getSeaStatus(val));
+      // this.statusLabel = getStatusName(getSeaStatus(val));
     },
   },
 };