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;