From 043def371f4d007c46300517793dd310b1a1f01d Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Sat, 1 Jun 2024 19:50:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E7=9A=84scanDate=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue  | 6 ++++--
 src/views/emis/emisTmsScanRecord/scanRecord.vue             | 3 ++-
 src/views/emis/emisTmsScanRecord/signAndRecord.vue          | 3 ++-
 .../emis/emisTmsScanRecord/transmitReceiveScanning.vue      | 5 +++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
index 45e10c11..7e3a2c54 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
@@ -433,7 +433,8 @@ export default {
           scanArrivalData.push(
             {
               billCode:item.billCode,
-              scanWeight:item.scanWeight
+              scanWeight:item.scanWeight,
+              scanDate:item.scanDate || new Date(),
             }
           );
         }else if(item.scanType=="40") {
@@ -441,7 +442,8 @@ export default {
             {
               billCode:item.billCode,
               scanWeight:item.scanWeight,
-              dispatchOrSendManCode:item.dispatchOrSendManCode
+              dispatchOrSendManCode:item.dispatchOrSendManCode,
+              scanDate:item.scanDate || new Date(),
             }
           );
         }
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index 324db6c6..c76377d8 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -371,7 +371,8 @@ export default {
           {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
-            dispatchOrSendManCode:item.dispatchOrSendManCode
+            dispatchOrSendManCode:item.dispatchOrSendManCode,
+            scanDate:item.scanDate || new Date()
           }
         );
       });
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
index 4fd0a9ef..e688a902 100644
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@@ -499,7 +499,8 @@ export default {
             customerCode:item.customerCode,
             customerName:item.customerName,
             // dispatchOrSendManCode:item.dispatchOrSendManCode,
-            scanDate:item.scanDate
+            // scanDate:item.scanDate
+            scanDate:item.scanDate || new Date()
           }
         );
       });
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index ec18ac82..1a37264e 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -501,7 +501,8 @@ export default {
             {
               billCode:item.billCode,
               scanWeight:item.scanWeight,
-              dispatchOrSendManCode:item.dispatchOrSendManCode
+              dispatchOrSendManCode:item.dispatchOrSendManCode,
+              scanDate:item.scanDate || new Date()
             }
           );
         }else if(item.scanType=="20") {
@@ -513,7 +514,7 @@ export default {
               billCode:item.billCode,
               scanWeight:item.scanWeight,
               preOrNextStationCode:item.preOrNextStationCode,
-              scanDate:item.scanDate
+              scanDate:item.scanDate || new Date()
             }
           );
         }

From d3a90abaa6f8af3642b0c3345983b9453c761bb5 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Sat, 1 Jun 2024 20:48:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=8C=85?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsPack/packageManagement.vue    | 73 ++++++++++++-------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 67dca799..3127d8e1 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -136,13 +136,22 @@
       -->
 
       <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="100" />
-      <el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100" />
+      <el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作网点')" align="center" prop="sendStiteCode" min-width="100" />
-      <el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100" />
+      <el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('操作员')" align="center" prop="opMan" min-width="100" />
       <el-table-column :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
       <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
       <el-table-column :label="$t('实际重量')" align="center" prop="totalWeight" min-width="100" />
+      <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
       <el-table-column :label="$t('创建时间')" align="center" prop="packDate" min-width="100" />
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -235,12 +244,12 @@
             </el-col>
             <el-col :span="24">
               <el-form-item style="font-weight:600;">
-                <span>{{$t('总件数') + ': ' + (coData.parcelQty || 0)}}</span>
+                <span>{{$t('总件数') + ': ' + (coData.totalParcelQty || 0)}}</span>
               </el-form-item>
               <!-- <el-form-item>
                 <span slot="label">
                   <span style="font-weight:600">{{$t('总件数') + ': '}}</span>
-                  <span style="font-weight:600">{{coData.parcelQty || 0}}</span>
+                  <span style="font-weight:600">{{coData.totalParcelQty || 0}}</span>
                 </span>
               </el-form-item> -->
             </el-col>
@@ -480,8 +489,7 @@ import { parseTime } from "@/utils/custom";
 export default {
   name: "PackageManagement",
   components: { CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
-  dicts: [
-  ],
+  dicts: ['emis_pack_status'],
   data() {
     return {
       // 遮罩层
@@ -625,7 +633,7 @@ export default {
       console.log("date picker---->", value)
       this.wayBillData.dateTimeRange=value;
     },
-    handleAddCoPack(){
+    async handleAddCoPack(){
       if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
         this.$modal.msgError("请先选择必填项")
         return;
@@ -651,12 +659,13 @@ export default {
         opMan: this.$store.getters.empCode
       }
       if(this.coPackType == "add"){// 新增
-        addEmisTmsPack(coPackItem).then(response => {
+        let response = await addEmisTmsPack(coPackItem);
+        // addEmisTmsPack(coPackItem).then(response => {
           if(!response || response.code != 200){
             this.$modal.msgError(response && response.msg || '新增合包失败')
             return;
           }
-        })
+        // })
         for(let i = 0; i< this.emisCoPackDetail.length;i++){
           let packDetail = {
             packNo:this.coData.packNo,
@@ -668,12 +677,13 @@ export default {
             createBy: this.$store.getters.empCode,
             createTime: parseTime(new Date())
           };
-          addEmisTmsPackDtl(packDetail).then(response => {
+          let response = await addEmisTmsPackDtl(packDetail);
+          // addEmisTmsPackDtl(packDetail).then(response => {
             if(!response || response.code != 200){
               this.$modal.msgError(response && response.msg || '合包明细新增失败')
               return;
             }
-          })
+          // })
         }
       }else if(this.coPackType == "edit"){// 修改
         //第一步：处理合包信息的更新；
@@ -682,7 +692,7 @@ export default {
           || this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode
           || this.tempCoPackInfo.blUnpack != this.blUnpack
           || this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty
-          || this.tempCoPackInfo.parcelQty != this.coData.parcelQty
+          || this.tempCoPackInfo.totalParcelQty != this.coData.totalParcelQty
           || this.tempCoPackInfo.totalWeight != this.coData.totalWeight
           || this.tempCoPackInfo.totalVolume != this.coData.totalVolume
         ){
@@ -691,15 +701,16 @@ export default {
           this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
           this.tempCoPackInfo.blUnpack = this.blUnpack;
           this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
-          this.tempCoPackInfo.parcelQty = this.coData.parcelQty;
+          this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
           this.tempCoPackInfo.totalWeight = this.coData.totalWeight;
           this.tempCoPackInfo.totalVolume = this.coData.totalVolume;
-          updateEmisTmsPack(this.tempCoPackInfo).then(res => {
+          let res = await updateEmisTmsPack(this.tempCoPackInfo);
+          // updateEmisTmsPack(this.tempCoPackInfo).then(res => {
             if(!res || res.code != 200){
               this.$modal.msgError(res && res.msg || '未知错误')
               return;
             }
-          });
+          // });
         }
         //第二步：处理运单列表的数据
         let tempDelList = [];
@@ -715,14 +726,18 @@ export default {
             return true;
           }
         })
-        tempDelList.forEach(item =>{
-          delEmisTmsPackDtl(item.id).then(res => {
+        // tempDelList.forEach(item =>{
+        for(let tdl = 0; tdl < tempDelList.length; tdl++){
+          let item = tempDelList[tdl];
+          let res = await delEmisTmsPackDtl(item.id);
+          // delEmisTmsPackDtl(item.id).then(res => {
             if(!res || res.code != 200){
               this.$modal.msgError(res && res.msg || '未知错误')
               return;
             }
-          })
-        })
+          // })
+        }
+        // })
         //2.2：计算要新增的运单
         tempAddList = this.emisCoPackDetail.filter(item => {
           let ls = this.tempExistCoPackWayBillList.filter(cd => {
@@ -734,7 +749,9 @@ export default {
             return true;
           }
         })
-        tempAddList.forEach(item =>{
+        // tempAddList.forEach(item =>{
+        for(let tal = 0; tal < tempAddList.length; tal++){
+          let item = tempAddList[tal];
           let packDetail = {
             packNo:this.coData.packNo,
             billCode: item.billCode,
@@ -745,13 +762,15 @@ export default {
             createBy: this.$store.getters.empCode,
             createTime: parseTime(new Date())
           };
-          addEmisTmsPackDtl(packDetail).then(response => {
+          let response = await addEmisTmsPackDtl(packDetail);
+          // addEmisTmsPackDtl(packDetail).then(response => {
             if(!response || response.code != 200){
               this.$modal.msgError(response && response.msg || '合包明细新增失败')
               return;
             }
-          })
-        })
+          // })
+        }
+        // })
       }
       this.openForm= false;
       this.titleForm = "";
@@ -844,12 +863,12 @@ export default {
       this.coMultiple = !selection.length
     },
     computeTotal(){
-      let parcelQty=0;
+      let totalParcelQty=0;
       let totalWeight=0;
       let totalVolume=0;
       this.emisCoPackDetail.forEach(item =>{
-        parcelQty +=item.parcelQty;
-        totalWeight +=item.totalWeight;
+        totalParcelQty +=item.parcelQty;
+        totalWeight +=item.billWeight;
         totalVolume +=item.totalVolume;
         item.destCountry = this.coData.destCountry;
         item.sendStiteCode = this.coData.sendStiteCode;
@@ -857,7 +876,7 @@ export default {
         item.blUnpack = this.blUnpack;
       })
       this.coData.totalWaybillQty=this.emisCoPackDetail.length;
-      this.coData.parcelQty=parcelQty;
+      this.coData.totalParcelQty=totalParcelQty;
       this.coData.totalWeight=totalWeight;
       this.coData.totalVolume=totalVolume;
     },

From 18b68a70fb09ae547a5806b884ca392c4b45ba4c Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Sat, 1 Jun 2024 22:24:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=A1=E5=87=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsPack/packageManagement.vue    |  22 ++--
 .../emis/emisTmsScanRecord/signAndRecord.vue  |  28 ++---
 .../signatureAbnormalComparison.vue           |  10 +-
 .../signatureRecordQuery.vue                  | 101 ++++++++++++------
 4 files changed, 105 insertions(+), 56 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 3127d8e1..5abaa4fc 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -215,7 +215,8 @@
                 <span slot="label">
                   <span style="color: red">{{ $t('下一网点') }}</span>
                 </span>
-                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.nextSiteCode" ></EmisSiteSimplePicker>
+                <!-- <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.nextSiteCode" ></EmisSiteSimplePicker> -->
+                <EmisGetNextSitePicker :placeholder="$t('请选择')" v-model="coData.nextSiteCode" ></EmisGetNextSitePicker>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -329,9 +330,13 @@
         <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
         <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
         <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
-        <el-table-column :label="$t('扫描状态')" align="center" prop="packStatus" min-width="100" />
-        <el-table-column :label="$t('扫描时间')" align="center" prop="packStatus" min-width="100" />
-        <el-table-column :label="$t('状态')" align="center" prop="waybillStatus" min-width="100" />
+        <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.waybillStatus == "1" ? "是" : "否" }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('扫描时间')" align="center" prop="xxx" min-width="100" />
+        <el-table-column :label="$t('状态')" align="center" prop="xxx" min-width="100" />
         <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteCode" min-width="100" />
         <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteCode" min-width="100" />
         <el-table-column :label="$t('国家')" align="center" prop="destinationCounty" min-width="100" />
@@ -340,7 +345,8 @@
         <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
         <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
         <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-        <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
+        <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+        <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
         <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
         <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
         <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="100" />
@@ -456,7 +462,8 @@
         <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
         <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
         <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-        <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
+        <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+        <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
         <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
         <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
         <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="100" />
@@ -482,13 +489,14 @@ import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import { parseTime } from "@/utils/custom";
 
 export default {
   name: "PackageManagement",
-  components: { CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
+  components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
   dicts: ['emis_pack_status'],
   data() {
     return {
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
index e688a902..975e6f81 100644
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@@ -52,8 +52,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="寄件网点" prop="registerSiteCode" label-width="80px">
-            <el-input v-model="record.registerSiteCode" placeholder="" disabled >
+          <el-form-item label="寄件网点" prop="sendSiteName" label-width="80px">
+            <el-input v-model="record.sendSiteName" placeholder="" disabled >
             </el-input>
           </el-form-item>
         </el-col>
@@ -71,14 +71,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="派件网点" prop="dispatchSiteCode" label-width="80px">
-            <el-input v-model="record.dispatchSiteCode" placeholder="" disabled >
+          <el-form-item label="派件网点" prop="dispatchSiteName" label-width="80px">
+            <el-input v-model="record.dispatchSiteName" placeholder="" disabled >
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="客户名称" prop="customerName" label-width="80px">
-            <el-input v-model="record.customerName" placeholder="" disabled >
+          <el-form-item label="客户名称" prop="custName" label-width="80px">
+            <el-input v-model="record.custName" placeholder="" disabled >
             </el-input>
           </el-form-item>
         </el-col>
@@ -128,7 +128,7 @@
     <el-table ref="multipleTable" border stripe v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
-      <el-table-column :label="$t('派件员')" align="center" prop="empCode" min-width="100" />
+      <el-table-column :label="$t('派件员')" align="center" prop="dispatchManName" min-width="100" />
       <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
       <el-table-column :label="$t('签收网点')" align="center" prop="signSiteCode" min-width="100" />
       <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
@@ -141,16 +141,16 @@
             <span>{{ parseTime(scope.row.registerDate) }}</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('寄件网点')" align="center" prop="registerSiteCode" min-width="100" />
-      <el-table-column :label="$t('到付转月结用户编号')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('到付转月结用户名称')" align="center" prop="customerName" min-width="100" />
+      <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="100" />
+      <!-- <el-table-column :label="$t('到付转月结用户编号')" align="center" prop="customerCode" min-width="100" />
+      <el-table-column :label="$t('到付转月结用户名称')" align="center" prop="customerName" min-width="100" /> -->
         <el-table-column :label="$t('派件日期')" align="center" prop="dispatchDate" min-width="170" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.dispatchDate) }}</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteCode" min-width="100" />
-      <el-table-column :label="$t('录件重量')" align="center" prop="volumeWeight" min-width="100" />
+      <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="100" />
+      <el-table-column :label="$t('录件重量')" align="center" prop="billWeight" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
       <el-table-column :label="$t('签收图片')" align="center" min-width="100"> 
         <el-table-column :label="$t('保存目录')" align="center" prop="picUrl" width="200" >
@@ -542,6 +542,10 @@ export default {
           this.$modal.msgError(scanRstItem.msg);
           return;
         }
+        if(scanRstItem.waybillStatus == "50"){
+          this.$modal.msgError("已扫描");
+          return;
+        }
         let record =Object.assign({}, scanRstItem)
         record.dispatchManCode=this.form.dispatchManCode;
         record.signManCode=this.form.signManCode;
diff --git a/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue b/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
index 9c4c8fae..b156d101 100644
--- a/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
@@ -35,11 +35,11 @@
           </el-col>
 
           <el-col :span="16">
-            <el-form-item :label="$t('')" prop="thisSite" label-width="70px">
-              <el-radio-group v-model="queryParams.thisSite">
-                <el-radio :label="1">本站发件</el-radio>
-                <el-radio :label="2">本站到件</el-radio>
-                <el-radio :label="3">本站派件</el-radio>
+            <el-form-item :label="$t('')" prop="sacnType" label-width="70px">
+              <el-radio-group v-model="queryParams.params.sacnType">
+                <el-radio :label="20">本站发件</el-radio>
+                <el-radio :label="30">本站到件</el-radio>
+                <el-radio :label="40">本站派件</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
index 18de3b53..9a38616a 100644
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@@ -29,10 +29,10 @@
           </el-form-item>
         <!-- </el-col> -->
         <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('签收图片')" prop="isSignPic">
-            <el-select v-model="queryParams.params.isSignPic" :placeholder="$t('全部')" value="0">
-              <el-option :label="$t('未上传')" value="1"></el-option>
-              <el-option :label="$t('已上传')" value="2"></el-option>
+          <el-form-item :label="$t('签收图片')" prop="isUploadPic">
+            <el-select v-model="queryParams.params.isUploadPic" :placeholder="$t('全部')" value="0">
+              <el-option :label="$t('未上传')" value="0"></el-option>
+              <el-option :label="$t('已上传')" value="1"></el-option>
             </el-select>
           </el-form-item>
         <!-- </el-col> -->
@@ -43,8 +43,8 @@
         <!-- </el-col> -->
 
         <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('收件国家')" prop="destCode" label-width="70px">
-            <CountryPicker v-model="queryParams.destCode"  @onChange="onCountrySelect"  ></CountryPicker>
+          <el-form-item :label="$t('收件国家')" prop="country" label-width="70px">
+            <CountryPicker v-model="queryParams.params.country"  @onChange="onCountrySelect"  ></CountryPicker>
           </el-form-item>
         <!-- </el-col> -->
 
@@ -79,50 +79,85 @@
 
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('签收状态')" align="center" prop="status" min-width="100">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.status"/>
-        </template>
+        </template> -->
+        {{ $t("已签收") }}
       </el-table-column>/>
-      <el-table-column :label="$t('签收地址')" align="center" prop="signAddress" min-width="100" />
+      <!-- <el-table-column :label="$t('签收地址')" align="center" prop="signAddress" min-width="100" /> -->
       <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
       <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.scanDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100" />
-      <el-table-column :label="$t('寄件日期')" align="center" prop="xxx" min-width="170" >
+      <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100">
+        {{ scope.row.waybillDetail.dispatchManName }}
+      </el-table-column>
+      <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.xxx) }}</span>
+            <span>{{ parseTime(scope.row.waybillDetail.sendDate) }}</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('预计到达时间')" align="center" prop="xxx" min-width="170" >
+      <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.xxx) }}</span>
+            <span>{{ parseTime(scope.row.waybillDetail.estimateDate) }}</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('线路')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('产品类型')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('时效')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('录入人')" align="center" prop="recordMan" min-width="100" />
-      <el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100" />
+      <el-table-column :label="$t('线路')" align="center" prop="" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.transLineTypeName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('产品类型')" align="center" prop="" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.productTypeName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('时效')" align="center" prop="" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.timeType }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.registerManName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.registerSiteName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('录入时间')" align="center" prop="xxx" min-width="170" >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.xxx) }}</span>
+            <span>{{ parseTime(scope.row.waybillDetail.registerDate) }}</span>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" />
+      <!-- <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" /> -->
       <el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
       <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('到付款')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('代收付款')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('机器码/PDA编号')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('数据推送标识')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('数据插入时间')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
+      <!-- <el-table-column :label="$t('到付款')" align="center" prop="xxx" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('代收付款')" align="center" prop="xxx" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('机器码/PDA编号')" align="center" prop="xxx" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('数据推送标识')" align="center" prop="xxx" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('数据插入时间')" align="center" prop="xxx" min-width="100" /> -->
+      <el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.dataFrom }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('签收信息备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('收件国家')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('收件省份')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('收件国家')" align="center" prop="xxx" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.receiveCountryName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('收件省份')" align="center" prop="xxx" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.waybillDetail.receiveProvinceName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100"/> 
     </xd-table>
   </div>
@@ -260,7 +295,7 @@ export default {
         queryParams.orderSN=this.queryParams.billCode;
         queryParams.billCode=null;
       }
-
+      queryParams.scanType="50";
       listEmisTmsScanRecord(queryParams).then(response => {
         this.tmsScanList = [];
         this.loading = false;
@@ -286,8 +321,10 @@ export default {
       this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
     },
     onCountrySelect(item){
-      this.form.countryName=item.name;
-      this.form.countryCode=item.code;
+      this.queryParams.params.countryName=item.name;
+      this.queryParams.params.countryCode=item.code;
+      // this.form.countryName=item.name;
+      // this.form.countryCode=item.code;
     },
     onScanSiteSelect(item){
       this.queryParams.scanSite=item && item.siteName;