From 54ee11d44dd2d58a4b0799ebb3f15140af6c6521 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 29 Dec 2025 15:21:01 +0800
Subject: [PATCH] so

---
 src/views/modules/ecss/declaration.vue  |  9 ++++-----
 src/views/modules/ecss/ecssTemplate.vue | 12 ++++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/ecss/declaration.vue b/src/views/modules/ecss/declaration.vue
index cca9f1b..8590bed 100644
--- a/src/views/modules/ecss/declaration.vue
+++ b/src/views/modules/ecss/declaration.vue
@@ -247,11 +247,9 @@
               <el-checkbox v-model="exportPaking.upc">UPC</el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="8" 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-form-item :label="''" >
+            <el-checkbox v-model="exportPaking.so">SO</el-checkbox>
+          </el-form-item>
           <el-col :span="8">
             <el-form-item :label="'序号类型'" >
               <el-radio v-model="exportPaking.itemNo" label="Y">序号</el-radio>
@@ -2615,6 +2613,7 @@
           this.exportInvoice.goodsLabel=this.currentRow.goodsLabel?this.currentRow.goodsLabel:row.goodsLabel
           this.exportInvoice.fpremark = row.remark
           this.exportInvoice.showWeight = row.showWeight
+          this.exportPaking.so=row.so
         } else if (this.templateData.type=='箱单'){
           this.exportPaking.templateName=row.name
           this.exportPaking.upc=row.upc
diff --git a/src/views/modules/ecss/ecssTemplate.vue b/src/views/modules/ecss/ecssTemplate.vue
index ace881c..14a1e52 100644
--- a/src/views/modules/ecss/ecssTemplate.vue
+++ b/src/views/modules/ecss/ecssTemplate.vue
@@ -140,7 +140,7 @@
               <el-checkbox v-model="addModel.upc"><span :title="'是否需要显示UPC'">UPC</span></el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show="addModel.type=='箱单'">
+          <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
             <el-form-item :label="''" >
               <el-checkbox v-model="addModel.so"><span :title="'是否需要显示SO'">SO</span></el-checkbox>
             </el-form-item>
@@ -195,6 +195,11 @@
               <el-input  v-model="addModel.palletWeight"></el-input>
             </el-form-item>
           </el-col>
+          <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>
+          </el-col>
           <el-col :span="12" v-show="addModel.type=='箱单' || addModel.type=='发票'">
             <el-form-item :label="'RFID Base Material'" :title="'是否需要显示'">
               <el-checkbox v-model="addModel.material"></el-checkbox>
@@ -215,11 +220,6 @@
               <el-input :disabled="!addModel.packaging" v-model="addModel.kgs"></el-input>
             </el-form-item>
           </el-col>
-          <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>
-          </el-col>
           <el-col :span="12" v-show="addModel.type=='发票'">
             <el-form-item :label="' '" >
               <el-checkbox v-model="addModel.showWeight">显示毛净重</el-checkbox>