From dfb9194b13caf24a6ed4dd970f21a13403465321 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 2 Apr 2024 08:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/repleinsh/coms/comRepleishDetailCard.vue | 2 +-
 src/pages/repleinsh/job/repleinshDetail.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/repleinsh/coms/comRepleishDetailCard.vue b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
index 6fdcc65f..6019b9bb 100644
--- a/src/pages/repleinsh/coms/comRepleishDetailCard.vue
+++ b/src/pages/repleinsh/coms/comRepleishDetailCard.vue
@@ -31,7 +31,7 @@
 											<uni-swipe-action ref="swipeAction">
 												<uni-swipe-action-item @click="swipeClick($event,batch,record,index)"
 													:right-options="scanOptions">
-													<view class="card_view">
+													<view class="card_view" v-if="record.parentPackingNumber">
 														<text class="card_packing_code card_content ">外包装</text>
 														<text class="card_content ">{{record.parentPackingNumber}}</text>
 													</view>
diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue
index 166cad28..eb45a03c 100644
--- a/src/pages/repleinsh/job/repleinshDetail.vue
+++ b/src/pages/repleinsh/job/repleinshDetail.vue
@@ -312,7 +312,7 @@
 												.toLocationCode;
 											record.supplierCode = r.supplierCode;
 											
-											if(r.parentPackingNumber!='')
+											if(r.parentPackingNumber!=''&&r.parentPackingNumber!=null)
 											{
 												record.fromPackingNumber = r.parentPackingNumber;
 												record.toPackingNumber = r