From e2044cd86045d18a04d705945586821c7049793f Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Tue, 30 Jul 2024 16:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=84=E4=BB=B6=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E9=A1=B5=E5=8F=AA?=
 =?UTF-8?q?=E8=AF=BB=E4=B8=80=E5=BC=A0=E5=9B=BE=E7=89=87=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uploadThePictureOfTheSendWaybillShipment.vue           | 7 +++----
 .../emisWaybill/uploadThePictureOfTheWaybillSigning.vue    | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
index 43eaff51..8a5fdb44 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
@@ -50,8 +50,8 @@
 
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
-      <el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="100" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
+      <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
       <el-table-column :label="$t('大小')" align="center" prop="volumeWeight" min-width="100">
         <template slot-scope="scope">
             <span>{{ scope.row.fileSiez + "KB" }}</span>
@@ -130,7 +130,7 @@ export default {
       let scList = item.trim().split(/[；\;\,\，\n]/)||[];
       this.form.picUrl =[];
       for(let s = 0; s<scList.length; s++){
-        let billCode = this.extractSubstring(item);
+        let billCode = this.extractSubstring(scList[s]);
         if(this.dataMap[billCode]) return;
         let response = await getWaybillDetail(billCode)
         if(!response || response.code != 200){
@@ -163,7 +163,6 @@ export default {
     },
     /** 上传按钮操作 */
     handleScanUpload(){
-
       if(!this.selection){
         this.$modal.msgError("请先上传图片！");
         return;
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
index 77c9c297..275355ed 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
@@ -51,8 +51,8 @@
 
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
-      <el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="100" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
+      <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
       <el-table-column :label="$t('大小')" align="center" prop="volumeWeight" min-width="100">
         <template slot-scope="scope">
             <span>{{ scope.row.fileSiez + "KB" }}</span>