diff --git a/public/index.html b/public/index.html
index f79b9019..bc417116 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
+    <meta name="force-rendering" content="webkit"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
     <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" /> -->
     <link rel="icon" href="<%= BASE_URL %>shorticon.png"/>
diff --git a/src/utils/TanexPrinterSdk.js b/src/utils/TanexPrinterSdk.js
index b928e13b..41b972c8 100644
--- a/src/utils/TanexPrinterSdk.js
+++ b/src/utils/TanexPrinterSdk.js
@@ -546,14 +546,14 @@ class TanexPrinterSdk {
       }
     }
 
-    innerBatchGetPDF(msg){
+    async innerBatchGetPDF(msg){
       // console.log("innerBatchGetPDF")
       // 有出错，停止接收数据
       if(msg.Status!='2'){
         clearTimeout(this.recievePdfFileTimer);
 
         if(this.onBatchGetPDFCallback){
-          this.onBatchGetPDFCallback(500,msg.Data)
+          await this.onBatchGetPDFCallback(500,msg.Data)
         }
 
         return;
@@ -572,7 +572,7 @@ class TanexPrinterSdk {
           this.pdfFileReceiveMap[ydSn]=1;
 
           if(this.onBatchGetPDFCallback!=null){
-            this.onBatchGetPDFCallback(200,"获取成功",msg.Data);
+            await this.onBatchGetPDFCallback(200,"获取成功",msg.Data);
           }
         }
       }
@@ -583,7 +583,7 @@ class TanexPrinterSdk {
         if(this.onBatchGetPDFCallback!=null){
           // clearTimeout(this.recievePdfFileTimer);
           // 把PDF文件传给终端处理
-           this.onBatchGetPDFCallback(800,"获取成功",this.recievePdfFileList);
+           await this.onBatchGetPDFCallback(800,"获取成功",this.recievePdfFileList);
         }
 
          // 发送完成后数据清空
diff --git a/src/views/emis/emisTmsScanRecord/customsClearScan.vue b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
index da99f873..6168cad9 100644
--- a/src/views/emis/emisTmsScanRecord/customsClearScan.vue
+++ b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
@@ -2,6 +2,17 @@
   <div class="app-container">
     <el-row :gutter="0">
         <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+
+
+          <el-col :span="8">
+            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
+              <span slot="label">
+                <span style="color: red">{{$t('下一站')}}</span>
+              </span>
+              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="7">
             <el-form-item label="扫描单号" prop="billCode" label-width="70px">
               <span slot="label">
@@ -13,15 +24,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
-              <span slot="label">
-                <span style="color: red">{{$t('下一站')}}</span>
-              </span>
-              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
diff --git a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
index 793d7380..99a425de 100644
--- a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
+++ b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
@@ -2,6 +2,16 @@
   <div class="app-container">
     <el-row :gutter="0">
         <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+
+
+          <el-col :span="8">
+            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
+              <span slot="label">
+                <span style="color: red">{{$t('下一站')}}</span>
+              </span>
+              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="7">
             <el-form-item label="扫描单号" prop="billCode" label-width="70px">
               <span slot="label">
@@ -12,15 +22,6 @@
               </el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="8">
-            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
-              <span slot="label">
-                <span style="color: red">{{$t('下一站')}}</span>
-              </span>
-              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
-            </el-form-item>
-          </el-col>
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index 4a1b503a..4f88e2f3 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -2,6 +2,14 @@
   <div class="app-container">
     <el-row :gutter="0">
         <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
+          <el-col :span="8">
+            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
+              <span slot="label">
+                <span style="color: red">{{$t('下一站')}}</span>
+              </span>
+              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="7">
             <el-form-item label="扫描单号" prop="billCode" label-width="70px">
               <span slot="label">
@@ -12,15 +20,8 @@
               </el-input>
             </el-form-item>
           </el-col>
-       
-          <el-col :span="8">
-            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
-              <span slot="label">
-                <span style="color: red">{{$t('下一站')}}</span>
-              </span>
-              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
-            </el-form-item>
-          </el-col>
+
+
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@@ -253,7 +254,7 @@ export default {
         this.$message.error("输入单号后回车");
         return;
       }
-      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[]; 
+      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
 
       let scanWeight = this.form.scanWeight
       let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index fd234d4d..a243eee1 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -2,17 +2,6 @@
   <div class="app-container">
     <el-row :gutter="0">
         <el-form ref="form" size="mini"  :model="form" :rules="rules" label-width="80px">
-          <el-col :span="8">
-            <el-form-item label="扫描单号" prop="billCode" label-width="70px">
-              <span slot="label">
-                <span style="color: red">扫描单号</span>
-              </span>
-              <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  >
-                <i slot="suffix" class="iconfont">&#xe656;</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
-         
           <el-col :span="8">
             <el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
               <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
@@ -23,6 +12,16 @@
               <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="扫描单号" prop="billCode" label-width="70px">
+              <span slot="label">
+                <span style="color: red">扫描单号</span>
+              </span>
+              <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  >
+                <i slot="suffix" class="iconfont">&#xe656;</i>
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="重量" prop="scanWeight" label-width="100px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@@ -318,7 +317,7 @@ export default {
       this.openBatch=false;
     },
     submitFormBatch(){
-      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[]; 
+      let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
       let scanWeight = this.form.scanWeight
       let dispatchOrSendMan = this.form.dispatchOrSendMan;
       let dispatchOrSendManCode = this.form.dispatchOrSendManCode;