From ca5a20d199dafa36f69a436e097233cc672bd231 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 10 Jun 2026 16:21:06 +0800
Subject: [PATCH] bu

---
 src/views/modules/ecss/hsCode.vue     | 23 +++++++++++++----
 src/views/modules/ecss/partHsCode.vue | 36 +++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/ecss/hsCode.vue b/src/views/modules/ecss/hsCode.vue
index 82a4d7e..6cdfb4f 100644
--- a/src/views/modules/ecss/hsCode.vue
+++ b/src/views/modules/ecss/hsCode.vue
@@ -123,7 +123,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="'品牌'" >
-              <el-input v-model="addModel.brand" :disabled="addModel.addFlag!==0" ></el-input>
+              <el-input v-model="addModel.brand"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -194,7 +194,8 @@
           codeNo:'',
           unit:'',
           remark:'',
-          brand:'无'
+          brand:'无',
+          oldBrand:''
         },
         addDisabledFlag:true,
         activeName:'attribute',
@@ -523,7 +524,8 @@
           codeNo:'',
           unit:'',
           remark:'',
-          brand:''
+          brand:'',
+          oldBrand:''
         }
         this.addModelFlag=true
       },
@@ -551,6 +553,7 @@
       },
       updateModelOpen(row){
         this.addDisabledFlag=false
+        let currentBrand = row.brand || '无'
         this.addModel={
           addFlag:1,
           site:row.site,
@@ -561,7 +564,8 @@
           codeNo:row.codeNo,
           unit:row.unit,
           remark:row.remark,
-          brand:row.brand || '无'
+          brand:currentBrand,
+          oldBrand:currentBrand
         }
         this.addModelFlag=true
       },
@@ -610,12 +614,21 @@
           })
           return false
         }
-        if(this.addModel.brand==null||this.addModel.brand===''){
+        const brand = this.addModel.brand == null ? '' : String(this.addModel.brand).trim()
+        if(brand===''){
           this.$alert('请输入品牌！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
+        this.addModel.brand = brand
+        if (this.addModel.addFlag === 0) {
+          this.addModel.oldBrand = ''
+        } else {
+          this.addModel.oldBrand = this.addModel.oldBrand
+            ? String(this.addModel.oldBrand).trim()
+            : this.addModel.brand
+        }
         if(!this.isCodeNoOptionalBu(this.addModel.buNo) && (this.addModel.codeNo==null||this.addModel.codeNo==='')){
           this.$alert('请选择属性模板！', '错误', {
             confirmButtonText: '确定'
diff --git a/src/views/modules/ecss/partHsCode.vue b/src/views/modules/ecss/partHsCode.vue
index 1dc8b75..e6b6dd3 100644
--- a/src/views/modules/ecss/partHsCode.vue
+++ b/src/views/modules/ecss/partHsCode.vue
@@ -136,11 +136,16 @@
               <el-input v-model="hsCodeModelData.hsCodeDesc" disabled ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item :label="'HS Code'" >
               <el-input v-model="hsCodeModelData.hsCode" disabled ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'品牌'">
+              <el-input v-model="hsCodeModelData.brand" disabled ></el-input>
+            </el-form-item>
+          </el-col>
 <!--          <el-col :span="12">
             <el-form-item >
               <template #label>
@@ -181,6 +186,15 @@
               <el-input v-model="packageVolume" disabled ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if="isMhmBu(hsCodeModelData.buNo)">
+            <el-form-item :label="'单位'">
+              <el-input
+                v-model="hsCodeModelData.ecssUmid"
+                clearable
+                placeholder="请输入单位">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -224,6 +238,12 @@
           align="center"
           label="HS Code">
         </el-table-column>
+        <el-table-column
+          prop="brand"
+          header-align="center"
+          align="center"
+          label="品牌">
+        </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button @click="hsCodeFlag = false">关闭</el-button>
@@ -756,10 +776,12 @@
           partDesc: '',
           hsCode:'',
           hsCodeDesc:'',
+          brand:'',
           packageNo:'',
           length: '',
           width: '',
-          height: ''
+          height: '',
+          ecssUmid: ''
         },
         currentRow:{
           site:'',
@@ -810,6 +832,7 @@
       hsCodeRowDblclick (row) {
         this.hsCodeModelData.hsCodeDesc = row.hsCodeDesc
         this.hsCodeModelData.hsCode = row.HsCode
+        this.hsCodeModelData.brand = row.brand || row.Brand || ''
         this.hsCodeFlag = false
       },
 
@@ -950,8 +973,17 @@
         this.hsCodeModelData.length = row.boxLength/100
         this.hsCodeModelData.width = row.boxWidth/100
         this.hsCodeModelData.height = row.boxHeight/100
+        this.hsCodeModelData.brand = row.brand || row.Brand || ''
+        this.hsCodeModelData.ecssUmid = row.ecssUmid || ''
         this.hsCodeModelFlag=true
       },
+      /**
+       * 是否天线BU（04-MHM）
+       */
+      isMhmBu(buNo) {
+        const currentBuNo = (buNo || '').toString().toUpperCase()
+        return currentBuNo === '04-MHM' || currentBuNo === '04'
+      },
       changeData(row){
         this.currentRow = JSON.parse(JSON.stringify(row));
         this.refreshCurrentTabTable ();