From 541c8d8fbe25ce8a92bd77dca16392ce8728c6ca Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Wed, 31 Jul 2024 16:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E8=BF=90=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=8B=A5=E8=BF=90=E5=8D=95=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue |  9 ++++++---
 .../emis/emisTmsSiteBatch/panel/BigBatchPanel.vue      | 10 ++++++----
 src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue | 10 ++++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

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 @@
     </el-dialog>
 
     <el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
-        <el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
+        <el-form ref="formBatch" size="mini" label-width="60px">
          <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('运单号')" prop="formBatchBillList">
@@ -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 @@
     </el-dialog>
 
     <el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
-        <el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
+        <el-form ref="formBatch"  size="mini" label-width="60px">
          <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('运单号')" prop="formBatchBillList">
@@ -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 @@
     </el-dialog>
 
     <el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
-        <el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
+        <el-form ref="formBatch"  size="mini" label-width="60px">
          <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('运单号')" prop="formBatchBillList">
@@ -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];