From 4606faae3f71143eb74186368cbbf78931b8032e Mon Sep 17 00:00:00 2001
From: huhaiqing <huhaiqing110@gmai.com>
Date: Fri, 16 Dec 2022 16:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=93=81=E7=89=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ecw/box/query.vue                   | 10 +++---
 .../nodePage/cabinet/startPacking.vue         |  5 ++-
 .../shippingSea/nodePage/cusDeclaration.vue   | 32 ++++++++-----------
 .../box/shippingSea/nodePage/preinstall.vue   |  7 ++--
 .../box/shippingSea/nodePage/tally/index.vue  |  5 +--
 .../nodePage/unloading/startUnloading.vue     | 15 ++++++---
 6 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/views/ecw/box/query.vue b/src/views/ecw/box/query.vue
index d5b38606..9911cd49 100644
--- a/src/views/ecw/box/query.vue
+++ b/src/views/ecw/box/query.vue
@@ -74,7 +74,7 @@
                   <a href="javascript:void(0)" @click="jumpOrderDetail(scope.row)">{{ scope.row.orderNo }}</a>
                 </template>
               </el-table-column>
-              <el-table-column prop="goodsList" :label="$t('货物信息')" width="250px" align="center">
+              <el-table-column prop="goodsList" :label="$t('货物信息')" width="230px" align="center">
                 <template v-slot="{row}">
                   <section>
                     <div v-for="(item, index) in row.goodsList" :key="index">
@@ -98,7 +98,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="customsFee" :label="$t('报关费用')" align="center"></el-table-column>
-              <el-table-column prop="" :label="$t('操作')" align="center">
+              <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
                 </template>
@@ -363,17 +363,17 @@ export default {
     getErrorType() {
       for (const [key, value] of Object.entries(this.shipmentObj)) {
         // 报关异常 customsInfo
-        if (key === "customsInfo" && value.hasAbnormal) {
+        if (key === "customsInfo" && value && value.hasAbnormal) {
           this.$set(this.errorInfo, "errorType", "customs");
           this.$set(this.dialogConfig, "title", this.$t("更新报关异常状态"));
         }
         // 起运异常 shippingInfo
-        if (key === "shippingInfo" && value.hasAbnormal) {
+        if (key === "shippingInfo" && value && value.hasAbnormal) {
           this.$set(this.errorInfo, "errorType", "shipping");
           this.$set(this.dialogConfig, "title", this.$t("更新起运异常状态"));
         }
         // 到港异常 arrivalInfo
-        if (key === "arrivalInfo" && value.hasAbnormal) {
+        if (key === "arrivalInfo" && value && value.hasAbnormal) {
           this.$set(this.errorInfo, "errorType", "arrival");
           this.$set(this.dialogConfig, "title", this.$t("更新到港异常状态"));
         }
diff --git a/src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue b/src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
index e70df757..549b5bbe 100644
--- a/src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
@@ -53,9 +53,8 @@
                   <section class="table-goodList">
                     <div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
                       <p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
-                      <p>{{$t('品牌')}}：【
-                        <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.productRecord" />
-                        】
+                      <p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
+                        <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
                       </p>
                       <p>{{$t('其他')}}：{{getTotlContent(item)}}</p>
                     </div>
diff --git a/src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue b/src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
index a514bbd9..cc449432 100644
--- a/src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
@@ -24,7 +24,7 @@
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CUSTOMS_TYPE)" :key="type.value" :label="type.label" :value="type.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('正常报关订单')">
+      <el-form-item :label="$t('正常报关订单')" v-show="isShowNormal">
         <div v-for="item in normalOrderList" :key="item.orderId">
           <a href="javascript:void(0)" @click="jumpOrderDetail(item)">{{ item.orderNo }}</a>
         </div>
@@ -231,6 +231,7 @@ export default {
       )[0].value,
       isDownload: false,
       normalOrderList: [],
+      isShowNormal: false,
     };
   },
   created() {
@@ -260,7 +261,6 @@ export default {
     ]);
 
     this.cusDeclarationObj = oldData;
-    // this.getCustomsOrderList(oldData.dcCustomsType);
   },
   methods: {
     getCustomsOrderList(dcCustomsType) {
@@ -269,6 +269,11 @@ export default {
         customsTypes: dcCustomsType === "3" ? "2,3" : dcCustomsType,
       }).then((res) => {
         this.normalOrderList = res.data ?? [];
+        if (dcCustomsType === "1") {
+          this.isShowNormal = false;
+        } else {
+          this.isShowNormal = true;
+        }
       });
     },
     regCloseDialog(type) {
@@ -520,12 +525,9 @@ export default {
     },
     /* 判断查验选择是否禁用 */
     disabledRadio(item) {
-      const {
-        checkExamineStatus,
-        checkDealStatus,
-        customsInfo,
-      } = this.shipmentObj;
-      const { dcCheckStatus } = customsInfo ?? {};       // 部分退场状态并且审核通过，退场不可选择
+      const { checkExamineStatus, checkDealStatus, customsInfo } =
+        this.shipmentObj;
+      const { dcCheckStatus } = customsInfo ?? {}; // 部分退场状态并且审核通过，退场不可选择
       if (
         checkExamineStatus === 2 &&
         dcCheckStatus === 2 &&
@@ -604,11 +606,8 @@ export default {
   computed: {
     /* 获取报关审核退场状态文字 */
     getCheckExamineStatus() {
-      const {
-        checkExamineStatus,
-        checkDealStatus,
-        customsInfo,
-      } = this.shipmentObj;
+      const { checkExamineStatus, checkDealStatus, customsInfo } =
+        this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {};
       if (checkExamineStatus === 1) {
         return dcCheckStatus === 1
@@ -625,11 +624,8 @@ export default {
     /* 判断是否已处理 */
     isCheckDeal() {
       return (type) => {
-        const {
-          checkExamineStatus,
-          checkDealStatus,
-          customsInfo,
-        } = this.shipmentObj;
+        const { checkExamineStatus, checkDealStatus, customsInfo } =
+          this.shipmentObj;
         const { dcCheckStatus } = customsInfo ?? {};
 
         // 状态
diff --git a/src/views/ecw/box/shippingSea/nodePage/preinstall.vue b/src/views/ecw/box/shippingSea/nodePage/preinstall.vue
index 3008fef3..01caaeb4 100644
--- a/src/views/ecw/box/shippingSea/nodePage/preinstall.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/preinstall.vue
@@ -236,9 +236,10 @@
               <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
                 <el-table-column type="index" align="center" :label="$t('序号')" width="50" />
                 <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
-                <el-table-column :label="$t('备案')" align="center" prop="brandType">
-                  <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
+                <el-table-column :label="$t('备案')" align="center" prop="feeType">
+                  <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" prop="num" />
diff --git a/src/views/ecw/box/shippingSea/nodePage/tally/index.vue b/src/views/ecw/box/shippingSea/nodePage/tally/index.vue
index 25cd5585..caff88d7 100644
--- a/src/views/ecw/box/shippingSea/nodePage/tally/index.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/tally/index.vue
@@ -41,8 +41,9 @@
               <el-table-column :label="$t('商品信息')" width="250px" align="center" prop="prodTitleZh">
               </el-table-column>
               <el-table-column :label="$t('备案')" align="center" prop="feeType">
-                <template v-slot="{row}">
-                  <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
+                <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" prop="customsType">
diff --git a/src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue b/src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
index ff3fa0c4..0679ba75 100644
--- a/src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
+++ b/src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
@@ -34,11 +34,14 @@
             {{ scope.row.orderNo }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('商品信息')" align="center" prop="goodsList">
+        <el-table-column :label="$t('商品信息')" align="center" prop="goodsList" width="200px">
           <template slot-scope="scope">
             <section class="table-goodList">
               <div v-for="(item, index) in scope.row.goodsList" :key="index" class="goodList-div">
-                <p>{{index+1}}：{{$l(item, 'prodTitle')}}</p>
+                <p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
+                <p>{{$t('品牌')}}：【<template v-if="item.brandName">{{item.brandName}}</template>
+                  <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="item.feeType" />】
+                </p>
               </div>
             </section>
           </template>
@@ -392,15 +395,17 @@ export default {
   .table-area {
     .table-goodList {
       .goodList-div {
+        border-bottom: 1px solid #e6ebf5;
         > p {
           text-align: left;
-        }
-        > p:last-child {
           > span {
-            margin-right: 5px;
+            margin-right: 0px;
           }
         }
       }
+      > div:last-child {
+        border-bottom: none;
+      }
     }
   }
 }
-- 
2.22.0