From e3a9ecb73cafe109db288fecbc9a33d4b8e2b9f4 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 10 Apr 2026 09:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8A=A5=E5=85=B3=E5=8D=95?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E5=93=81=E7=89=8C=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98brand?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/createDeclaration.vue |  8 +++++++
 src/views/modules/ecss/declaration.vue       | 23 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/views/modules/ecss/createDeclaration.vue b/src/views/modules/ecss/createDeclaration.vue
index 458aee3..4837c84 100644
--- a/src/views/modules/ecss/createDeclaration.vue
+++ b/src/views/modules/ecss/createDeclaration.vue
@@ -385,6 +385,14 @@
           label="HS Code"
           min-width="80">
         </el-table-column>
+        <el-table-column
+          v-if="currentRow.buNo !== '01-Label' && currentRow.buNo !== '03-RFID'"
+          prop="brand"
+          header-align="center"
+          align="left"
+          label="品牌"
+          min-width="100">
+        </el-table-column>
         <el-table-column
           prop="qty"
           header-align="center"
diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 83d337d..784f73e 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -113,6 +113,7 @@
           style="width: 100%;">
           <el-table-column
             v-for="(item,index) in columnList2" :key="index"
+            v-if="shouldShowDetailColumn(item)"
             :sortable="item.columnSortable"
             :prop="item.columnProp"
             :header-align="item.headerAlign"
@@ -1716,6 +1717,24 @@
             fixed: '',
             columnWidth: 100
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 801006,
+            serialNumber: '801006Table2HsCodeDesc',
+            tableId: "801006Table2",
+            tableName: "报关单子记录",
+            columnProp: "brand",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "品牌",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 801006,
@@ -1869,6 +1888,10 @@
       })
     },
     methods: {
+      shouldShowDetailColumn(item) {
+        const isLabelOrRfid = this.currentRow && (this.currentRow.buNo === '01-Label' || this.currentRow.buNo === '03-RFID')
+        return !(item.columnProp === 'brand' && isLabelOrRfid)
+      },
       // 每页数
       sizeChangeHandle (val) {
         this.pageSize = val