diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 551225db..db998b45 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -13,13 +13,13 @@
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                 <!-- 运单录入 -->
 
-                <el-col :span="6" v-if="action=='add'">
+                <el-col :span="6" v-if="action=='add' || action=='preAdd'">
                     <el-form-item :label="$t('发货时间')" prop="sendDate">
                       <el-input v-model="sendDate" placeholder=""  disabled />
                     </el-form-item>
                 </el-col>
 
-                <el-col :span="18" v-if="action=='add'">
+                <el-col :span="18" v-if="action=='add' || action=='preAdd'">
                     <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
@@ -158,7 +158,7 @@
 
               </el-row>
 
-              <div v-if="action=='add'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
+              <div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
                     <div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
 
                       <div style="width:230px">
@@ -674,7 +674,7 @@
                       </el-form-item>
                     </el-col>
 
-                    <el-col :span="24" v-if="action=='add'">
+                    <el-col :span="24" v-if="action=='add' || action=='preAdd' ">
                         <el-form-item  :label="$t('打印选项')"  prop="printTypeCheckList">
                           <el-checkbox-group v-model="form.printTypeCheckList">
                               <el-checkbox :key="0" :label="0" >
@@ -689,7 +689,7 @@
                             </el-checkbox-group>
                        </el-form-item>
                     </el-col>
-                    <el-col :span="24" v-if="action=='add'">
+                    <el-col :span="24" v-if="action=='add' || action=='preAdd'">
                       <el-form-item :label="$t('打印组件')"  prop="printTypeCheckList">
                         <TanexPrinterPanel ref="tanexPrinter"  :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false"  @onPrintComplete="onComplete"></TanexPrinterPanel>
                       </el-form-item>
@@ -771,8 +771,8 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
 import { deepClone } from '@/utils/index'
 
 export default {
-  // name: "WaybillRecord",
-  name: "WaybillModify",
+  name: "WaybillRecord",
+  // name: "WaybillModify",
 components: {
   SalemanPicker,
   PayeePicker,
@@ -853,7 +853,7 @@ data() {
           { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
         ],
         province: [
-          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
+          { required: true, message: "收货省不能为空", trigger: ["blur",'change']  }
         ],
         company: [
           { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
@@ -1524,7 +1524,7 @@ methods: {
     });
   },
   startTimer(){
-    if(this.action=='add'){
+    if(this.action=='add' || action=='preAdd'){
       this.sendDate=parseTime(new Date());
       this.timer = setTimeout(this.startTimer, 1000);
     }
@@ -1642,7 +1642,10 @@ methods: {
   },
   calcDestSite(){
     let queryParams = {
-        province:this.form.reciever.province
+        country:this.form.reciever.country,
+        province:this.form.reciever.province,
+        city:this.form.reciever.city,
+        address:this.form.reciever.address
     };
 
     if(this.form.reciever.province){
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 25b1ef69..db998b45 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -853,7 +853,7 @@ data() {
           { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
         ],
         province: [
-          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
+          { required: true, message: "收货省不能为空", trigger: ["blur",'change']  }
         ],
         company: [
           { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
@@ -1642,7 +1642,10 @@ methods: {
   },
   calcDestSite(){
     let queryParams = {
-        province:this.form.reciever.province
+        country:this.form.reciever.country,
+        province:this.form.reciever.province,
+        city:this.form.reciever.city,
+        address:this.form.reciever.address
     };
 
     if(this.form.reciever.province){