From acff17fb3150edaa62b8417993d755d35868dcdf Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 5 Jun 2026 16:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=AF=BC=E5=87=BA=E6=8A=A5?=
 =?UTF-8?q?=E5=85=B3=E8=A6=81=E7=B4=A0=E5=A2=9E=E5=8A=A0=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=EF=BC=9A=E5=9E=8B=E5=8F=B7+=E6=96=99=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E5=9E=8B=E5=8F=B7+=E7=94=A8=E6=88=B7=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/declaration.vue | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 22378e3..922718c 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -158,32 +158,43 @@
         <el-row :gutter="20" style="margin-top: 5px">
           <div class="custom-divider"><span class="text" style="left: 22%">报关要素</span></div>
           <!--          报关要素-->
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item :label="'品牌'" >
               <el-radio v-model="brandType" label="境外品牌（其他）">境外品牌（其他）</el-radio>
               <el-radio v-model="brandType" label="无品牌">无品牌</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item :label="'品名类型'" >
               <el-radio v-model="hsCodeDescType" label="Y">中文</el-radio>
               <el-radio style="margin-left: 50px;" v-model="hsCodeDescType" label="N">英文</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item :label="'托/箱'" >
               <el-radio v-model="packageUnit" label="托">托</el-radio>
               <el-radio v-model="packageUnit" label="箱">箱</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item :label="'重量'" >
               <el-radio v-model="declarationWeight" label="不显示">不显示</el-radio>
               <el-radio v-model="declarationWeight" label="显示">显示</el-radio>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item :label="'型号'" >
+              <el-radio v-model="modelContent" label="不显示">料号</el-radio>
+              <el-radio v-model="modelContent" label="显示">自定义</el-radio>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="" v-show="modelContent==='显示'">
+            <el-form-item :label="'型号内容'" >
+              <el-input type="textarea" :rows="2" v-model="modelContentStr"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="20" :style="modelContent==='显示'?'margin-top: 20px':'margin-top: 2px'">
           <div class="custom-divider">
             <span class="text">
               发票
@@ -1168,6 +1179,8 @@
         hsCodeDescType:'Y',
         packageUnit: '托',
         declarationWeight: '不显示',
+        modelContent : '不显示',
+        modelContentStr:'',
         exportParam: {},
         pageIndex: 1,
         pageSize: 100,
@@ -2598,6 +2611,7 @@
         exportParam.hsCodeDescType=this.hsCodeDescType
         exportParam.packageUnit=this.packageUnit
         exportParam.declarationWeight = this.declarationWeight
+        exportParam.modelContentStr = this.modelContentStr
         if (this.propertiesList.length>0) {
           this.currentRow.brand='品牌'
           exportParam.brand = '品牌'
@@ -2664,6 +2678,8 @@
 
         // 报关要素
         this.brandType='境外品牌（其他）'
+        this.modelContent= '不显示'
+        this.modelContentStr=''
         if (this.currentRow.buNo==='02-Hardtag' || this.currentRow.buNo==='04-MHM') {
           this.currentRow.brand='品牌'
           getPropertiesListByDeclaration(this.currentRow).then(({data}) => {
@@ -2837,6 +2853,7 @@
         exportParam.hsCodeDescType=this.hsCodeDescType
         exportParam.packageUnit=this.packageUnit
         exportParam.declarationWeight = this.declarationWeight
+        exportParam.modelContentStr = this.modelContentStr
         if (this.propertiesList.length>0) {
           this.currentRow.brand='品牌'
           exportParam.brand = '品牌'