From cad7c5e19526f7777f25f576f2a220cd45349b32 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 9 Jun 2026 11:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8A=A0brand=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/hsCode.vue          |  2 +-
 src/views/modules/ecss/orderProperties.vue | 24 +++++++++++++++++++---
 src/views/modules/ecss/partHsCode.vue      |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/ecss/hsCode.vue b/src/views/modules/ecss/hsCode.vue
index 4dbe592..82a4d7e 100644
--- a/src/views/modules/ecss/hsCode.vue
+++ b/src/views/modules/ecss/hsCode.vue
@@ -76,7 +76,7 @@
     </el-pagination>
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"   type="border-card" @tab-click="tabClick" >
       <el-tab-pane label="基本信息" name="attribute">
-   <order-attribute ref="dialogAttribute" :site="currentRow.site" :buNo="currentRow.buNo" :order-no="currentRow.hsCodeDesc" :code-no="currentRow.codeNo" :function-type="'ECSS'"></order-attribute>
+   <order-attribute ref="dialogAttribute" :site="currentRow.site" :buNo="currentRow.buNo" :order-no="currentRow.hsCodeDesc" :code-no="currentRow.codeNo" :brand="currentRow.brand" :function-type="'ECSS'"></order-attribute>
       </el-tab-pane>
     </el-tabs>
 
diff --git a/src/views/modules/ecss/orderProperties.vue b/src/views/modules/ecss/orderProperties.vue
index e9e00f2..dddd471 100644
--- a/src/views/modules/ecss/orderProperties.vue
+++ b/src/views/modules/ecss/orderProperties.vue
@@ -2,10 +2,10 @@
   <div>
     <div style="margin-top: 5px">
       <template >
-        <el-button type="primary" @click="clickSaveBtn" v-if="orderNo" :disabled="disabled">新增</el-button>
+        <el-button type="primary" @click="clickSaveBtn" v-if="codeNo" :disabled="disabled">新增</el-button>
       </template>
       <template >
-        <el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
+        <el-button type="primary" :loading="loading" v-if="codeNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
       </template>
     </div>
     <div class="rq " v-if="attributeDialog">
@@ -118,6 +118,9 @@
       codeNo:{
         type:String,
       },
+      brand:{
+        type:String,
+      },
       functionType:{
         type:String,
       },
@@ -285,6 +288,11 @@
           this.getProperties();
         }
       },
+      brand(newValue,oldValue){
+        if (this.orderNo){
+          this.getProperties();
+        }
+      },
     },
     methods:{
 
@@ -294,6 +302,7 @@
           buNo:this.buNo,
           partNo: this.orderNo,
           codeNo: this.codeNo,
+          brand: this.brand,
           recordType: this.functionType,
         }
         getPropertiesListByPartAndCodeNo(params).then(({data})=>{
@@ -351,8 +360,10 @@
         let i = 0;
         let arr = params.searchTableList.map(item=>{
           item.partNo = this.orderNo;
-          item.site = this.$store.state.user.site;
+          item.site = this.site;
+          item.buNo = this.buNo;
           item.codeNo = this.codeNo;
+          item.brand = this.brand;
           item.recordType = this.functionType;
           return item
         })
@@ -373,6 +384,12 @@
       },
       removeTestPropertiesItem(params){
         for (let i = 0; i <params.dataTableList.length ; i++) {
+          params.dataTableList[i].partNo = this.orderNo
+          params.dataTableList[i].site = this.site
+          params.dataTableList[i].buNo = this.buNo
+          params.dataTableList[i].codeNo = this.codeNo
+          params.dataTableList[i].brand = this.brand
+          params.dataTableList[i].recordType = this.functionType
           params.dataTableList[i].propertiesItemNo= params.dataTableList[i].itemNo
           params.dataTableList[i].itemNo=999
         }
@@ -401,6 +418,7 @@
           list :this.dataList,
           codeNo: this.codeNo,
           buNo:this.buNo,
+          brand:this.brand,
         }
         searchPropertiesItemList(inData).then(({data}) => {
           if (data && data.code === 0){
diff --git a/src/views/modules/ecss/partHsCode.vue b/src/views/modules/ecss/partHsCode.vue
index db86106..1dc8b75 100644
--- a/src/views/modules/ecss/partHsCode.vue
+++ b/src/views/modules/ecss/partHsCode.vue
@@ -109,7 +109,7 @@
 
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"   type="border-card" @tab-click="tabClick" >
       <el-tab-pane label="基本信息" name="attribute">
-        <order-attribute ref="dialogAttribute" :site="currentRow.site" :buNo="currentRow.buNo" :order-no="currentRow.partNo" :code-no="'BG001'" :function-type="'ECSSPART'"></order-attribute>
+        <order-attribute ref="dialogAttribute" :site="currentRow.site" :buNo="currentRow.buNo" :order-no="currentRow.partNo" :code-no="'BG001'" :brand="currentRow.brand" :function-type="'ECSSPART'"></order-attribute>
       </el-tab-pane>
     </el-tabs>