From 299c8fe28409454861fd99bfec92097e6e159f75 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Tue, 13 May 2025 16:22:31 +0800
Subject: [PATCH] =?UTF-8?q?RFID=E5=92=8CRF=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=93=81=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/declaration.vue  | 23 ++++++++-------
 src/views/modules/ecss/ecssTemplate.vue | 38 +++++++++++++------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index 7892df9..a42f0b4 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -522,13 +522,23 @@
               <el-input v-model="exportPaking.templateName" disabled ></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-show="currentRow.buNo==='03-RFID'">
+            <el-form-item :label="''" >
+              <el-checkbox v-model="exportPaking.upc">UPC</el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="currentRow.buNo==='03-RFID'">
+            <el-form-item :label="''" >
+              <el-checkbox v-model="exportPaking.so">SO</el-checkbox>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item :label="'序号类型'" >
               <el-radio v-model="exportPaking.itemNo" label="Y">序号</el-radio>
               <el-radio v-model="exportPaking.itemNo" label="N">栈板号</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-show="currentRow.buNo==='04-MHM'">
             <el-form-item :label="'品名类型'" >
               <el-radio v-model="exportPaking.hsCodeDescType" label="Y">中文</el-radio>
               <el-radio v-model="exportPaking.hsCodeDescType" label="N">英文</el-radio>
@@ -544,16 +554,7 @@
               <el-checkbox v-model="exportPaking.goodsLabel">货物明细</el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show="currentRow.buNo==='03-RFID'">
-            <el-form-item :label="''" >
-              <el-checkbox v-model="exportPaking.upc">UPC</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="currentRow.buNo==='03-RFID'">
-            <el-form-item :label="''" >
-              <el-checkbox v-model="exportPaking.so">SO</el-checkbox>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="12">
             <el-form-item :label="'Shipping Mark'" >
               <el-input v-model="exportPaking.shippingMark"></el-input>
diff --git a/src/views/modules/ecss/ecssTemplate.vue b/src/views/modules/ecss/ecssTemplate.vue
index f84d171..245ecfb 100644
--- a/src/views/modules/ecss/ecssTemplate.vue
+++ b/src/views/modules/ecss/ecssTemplate.vue
@@ -123,18 +123,6 @@
               <el-checkbox v-model="addModel.contractFlag">合同</el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="'品名类型'" >
-              <el-radio v-model="addModel.hsCodeDescType" label="Y">中文</el-radio>
-              <el-radio v-model="addModel.hsCodeDescType" label="N">英文</el-radio>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="addModel.type=='箱单'">
-            <el-form-item :label="'序号类型'" >
-              <el-radio v-model="addModel.itemNo" label="Y">序号</el-radio>
-              <el-radio v-model="addModel.itemNo" label="N">栈板号</el-radio>
-            </el-form-item>
-          </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单'">
             <el-form-item :label="''" >
               <el-checkbox v-model="addModel.upc">UPC</el-checkbox>
@@ -145,11 +133,6 @@
               <el-checkbox v-model="addModel.so">SO</el-checkbox>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12" v-show="addModel.type=='箱单'">
-            <el-form-item :label="''" >
-              <el-checkbox v-model="addModel.boxChange">显示箱数零头</el-checkbox>
-            </el-form-item>
-          </el-col>-->
           <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
             <el-form-item :label="''" >
               <el-checkbox v-model="addModel.goodsLabel">货物明细</el-checkbox>
@@ -160,6 +143,25 @@
               <el-checkbox v-model="addModel.fscWeight">是否维护纯FSC纸重量损耗</el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-show="addModel.type=='发票' || (addModel.type=='箱单' && addModel.buNo==='04-MHM')">
+            <el-form-item :label="'品名类型'" >
+              <el-radio v-model="addModel.hsCodeDescType" label="Y">中文</el-radio>
+              <el-radio v-model="addModel.hsCodeDescType" label="N">英文</el-radio>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="addModel.type=='箱单'">
+            <el-form-item :label="'序号类型'" >
+              <el-radio v-model="addModel.itemNo" label="Y">序号</el-radio>
+              <el-radio v-model="addModel.itemNo" label="N">栈板号</el-radio>
+            </el-form-item>
+          </el-col>
+
+<!--          <el-col :span="12" v-show="addModel.type=='箱单'">
+            <el-form-item :label="''" >
+              <el-checkbox v-model="addModel.boxChange">显示箱数零头</el-checkbox>
+            </el-form-item>
+          </el-col>-->
+
 
           <el-col :span="12" v-show="addModel.type=='箱单'">
             <el-form-item :label="'Shipping Mark'" >
@@ -171,7 +173,7 @@
               <el-input  v-model="addModel.palletWeight"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-show="addModel.type=='箱单' || addModel.type=='发票'">
+          <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
             <el-form-item :label="'制造地'" >
               <el-input  v-model="addModel.origin"></el-input>
             </el-form-item>