diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue
index 991a3c10..e77e071c 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue
@@ -665,7 +665,7 @@
-
+
@@ -1535,8 +1535,11 @@ export default {
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode});
- if(!billRes || billRes.code != 200 || !billRes.rows || billRes.rows.length < 1){
- this.$modal.msgError((response && response.msg || '无此运单数据') + ": " + billcode)
+ if(!billRes || billRes.code != 200){
+ this.$modal.msgError(billRes && billRes.msg)
+ return;
+ }else if(!billRes.rows || billRes.rows.length < 1){
+ this.$modal.msgError(('无此运单数据') + ": " + billcode)
return;
}
let item = billRes.rows[0];
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
index 53f63fe1..1a65f13f 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
@@ -494,7 +494,7 @@
-
+
@@ -1361,11 +1361,13 @@ export default {
bcList.forEach(async (billcode) => {
billcode = billcode.trim();
-
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode});
- if(!billRes || billRes.code != 200 || !billRes.rows || billRes.rows.length < 1){
- this.$modal.msgError((response && response.msg || '无此运单数据') + ": " + billcode)
+ if(!billRes || billRes.code != 200){
+ this.$modal.msgError(billRes && billRes.msg)
+ return;
+ }else if(!billRes.rows || billRes.rows.length < 1){
+ this.$modal.msgError(('无此运单数据') + ": " + billcode)
return;
}
let item = billRes.rows[0];
diff --git a/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
index fe35923d..eb3924e9 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
@@ -440,7 +440,7 @@
-
+
@@ -1307,11 +1307,13 @@ export default {
bcList.forEach(async (billcode) => {
billcode = billcode.trim();
-
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode});
- if(!billRes || billRes.code != 200 || !billRes.rows || billRes.rows.length < 1){
- this.$modal.msgError((response && response.msg || '无此运单数据') + ": " + billcode)
+ if(!billRes || billRes.code != 200){
+ this.$modal.msgError(billRes && billRes.msg)
+ return;
+ }else if(!billRes.rows || billRes.rows.length < 1){
+ this.$modal.msgError(('无此运单数据') + ": " + billcode)
return;
}
let item = billRes.rows[0];