diff --git a/src/components/CardWithHeader/index.vue b/src/components/CardWithHeader/index.vue
index 18f11e9d..e9056858 100644
--- a/src/components/CardWithHeader/index.vue
+++ b/src/components/CardWithHeader/index.vue
@@ -2,11 +2,10 @@
   <div>
     <!-- { height: height } -->
       <el-card shadow="hover" :style="{ height: height }" v-if="isLinearBg == 'true'" class="home-card linear-background">
-          <div class="header" v-if="header">
+          <div v-if="header" class="header" >
               <span>{{ header }}</span>
               <slot name="header-r" />
           </div>
-
           <div>
               <slot name="body" />
           </div>
diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index e19ff961..7de31d89 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -217,6 +217,11 @@ export default {
       type: Boolean,
       default: true,
     },
+    showCustomizeTpl:{
+      type: Boolean,
+      default: true,
+    },
+
   },
   // 框选的指令
   directives: {
@@ -861,7 +866,7 @@ export default {
       let list = [];
       const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
       // 不管是否初次还是要做一下处理，万一页面有修改，做一下更新，以最新的node节点数组为准
-      if(this.saveStorageName!=undefined && this.saveStorageName!=''){
+      if(this.showCustomizeTpl && this.saveStorageName!=undefined && this.saveStorageName!=''){
         list = storage[this.saveStorageName] ? storage[this.saveStorageName] : []
       }
 
@@ -910,9 +915,11 @@ export default {
       this.config.key = Math.random() + ''
       // 控制下表格重新刷新
       // this.getInstance()?.doLayout()
-      const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
-      storage[this.saveStorageName] = this.storageList
-      window.localStorage.setItem('tableStorage', JSON.stringify(storage))
+      if(this.showCustomizeTpl){
+        const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
+        storage[this.saveStorageName] = this.storageList
+        window.localStorage.setItem('tableStorage', JSON.stringify(storage))
+      }
     },
 
   }
diff --git a/src/i18n/config/en.js b/src/i18n/config/en.js
index 0edcc8c0..bb344df6 100755
--- a/src/i18n/config/en.js
+++ b/src/i18n/config/en.js
@@ -13,7 +13,7 @@ const en = {
     rememberMe:'Remember password',
     vcode:'Verification code',
     password:'Password',
-    username:'username/mobile',
+    username:'username',
     accountLogin:'Account Login',
 
   },
diff --git a/src/i18n/config/zh-CN.js b/src/i18n/config/zh-CN.js
index 8e5a10db..2cb8b90f 100755
--- a/src/i18n/config/zh-CN.js
+++ b/src/i18n/config/zh-CN.js
@@ -13,7 +13,7 @@ const zh = {
     rememberMe:'记住登录状态',
     vcode:'验证码',
     password:'密码',
-    username:'账号/手机号',
+    username:'账号',
     accountLogin:'账号登录',
   },
   common: {
diff --git a/src/utils/custom.js b/src/utils/custom.js
index d8349a0d..93fae6fb 100644
--- a/src/utils/custom.js
+++ b/src/utils/custom.js
@@ -654,3 +654,8 @@ export function genJsSeqNo() {
 export function getUUID() {
   return Math.random().toString(36).substring(3,10);
 }
+
+
+export function lpadZero(val,len) {
+  return (new Array(len + 1).join('0') + val).slice(-len);
+}
diff --git a/src/views/emis/customerService/billPicList.vue b/src/views/emis/customerService/billPicList.vue
index dc731429..704687ae 100644
--- a/src/views/emis/customerService/billPicList.vue
+++ b/src/views/emis/customerService/billPicList.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="">
 
-    <div v-for="(item,index) in dataList" :key="index">
-      <ImagePreview height="80px" v-for="(pic,index2) in (item.fileUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>
+    <div v-for="(item,index) in dataList" :key="index" style="display:inline-flex">
+      <div v-if="item.attachType==0" >
+        <ImagePreview height="80px" v-for="(pic,index2) in (item.fileUrl||'').split(',')" :key="index2" :src="pic" ></ImagePreview>
+      </div>
     </div>
 
   </div>
diff --git a/src/views/emis/customerService/traceRecordList.vue b/src/views/emis/customerService/traceRecordList.vue
index 89068065..cf5980a7 100644
--- a/src/views/emis/customerService/traceRecordList.vue
+++ b/src/views/emis/customerService/traceRecordList.vue
@@ -1,15 +1,14 @@
 <template>
   <div class="">
-    <xd-table v-loading="loading"
+    <XdTable v-loading="loading"
            border
            size="mini"
            :data="scanRecordList"
-           :queryParams="queryParams"
            :total="total"
-           @queryTable="getList"
            :showRightButton="false"
            :showPagination="false"
            :showOperateButton="false"
+           :showCustomizeTpl="false"
            :default-sort="{prop: 'scanDate', order: 'descending'}"
            >
       <el-table-column label="序号" align="center" min-width="60">
@@ -37,21 +36,23 @@
       </el-table-column>
       <el-table-column :label="$t('扫描网点')" align="center" prop="scanSite" min-width="120" />
       <el-table-column :label="$t('操作人')" align="center" prop="scanMan" min-width="80" />
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-      <el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="80" />
+      <!-- <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" /> -->
+      <el-table-column :label="$t('扫描重量')" align="center" prop="scanWeight" min-width="80" />
       <el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('数据来源')" align="center" prop="createTime" min-width="80" >
+      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
+
+      <!-- <el-table-column :label="$t('数据来源')" align="center" prop="da" min-width="80" >
         <template slot-scope="scope">
           <span>网点扫描</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
             <!-- <el-table-column :label="$t('上/下一网点')" align="center" prop="preOrNextStation" min-width="100" /> -->
 
-    </xd-table>
+    </XdTable>
   </div>
 </template>
 
diff --git a/src/views/emis/customerService/waybillTracking.vue b/src/views/emis/customerService/waybillTracking.vue
index ff2ead65..95900710 100644
--- a/src/views/emis/customerService/waybillTracking.vue
+++ b/src/views/emis/customerService/waybillTracking.vue
@@ -38,7 +38,7 @@
     </div>
 
     <div style="min-height: 100%;padding: 0px 10px 5px 0px;">
-      <el-scrollbar style="height: 1000px">
+      <!-- <el-scrollbar style="height: 1000px"> -->
         <!-- 如果显示子单勾选则循环显示子单 -->
         <div v-for="(item,index) in emisWaybillList" :key="resetRefreshId+'.'+index">
           <CardWithHeader :header="'运单号:'+item.billCode" >
@@ -47,14 +47,16 @@
               </template>
           </CardWithHeader>
 
-          <CardWithHeader :header="'运单号:'+item.billCode" >
-              <template v-slot:body>
-                <TraceWaybillDetailView :scanBillCode="item.billCode" :billDetail="item.waybillDetail" :key="resetRefreshId+'.d.'+index" ></TraceWaybillDetailView>
-              </template>
-          </CardWithHeader>
+          <div v-if="blSubBill==1"  >
+            <CardWithHeader v-for="subSeqNum in item.waybillDetail.parcelQty" :key="subSeqNum" :header="'子单号:'+item.billCode+lpadZero(subSeqNum,4) +' - 主单:'+item.billCode" >
+                <template v-slot:body>
+                  <TraceWaybillDetailView :scanBillCode="item.billCode+lpadZero(subSeqNum,4)" :billDetail="item.waybillDetail" :key="resetRefreshId+'.d.'+index+'.'+subSeqNum" ></TraceWaybillDetailView>
+                </template>
+            </CardWithHeader>
+          </div>
         </div>
 
-      </el-scrollbar>
+      <!-- </el-scrollbar> -->
     </div>
 
   </XdPageContainer>
@@ -97,6 +99,9 @@ export default {
     getUUID() {
         return Math.random().toString(36).substring(3,10);
     },
+    lpadZero(val,len) {
+      return (new Array(len + 1).join('0') + val).slice(-len);
+    },
     /** 查询运单列表列表 */
     getList() {
 
diff --git a/src/views/emis/emisCustomerAddress/recipientAddressForm.vue b/src/views/emis/emisCustomerAddress/recipientAddressForm.vue
index dc6f9ac8..bb562287 100644
--- a/src/views/emis/emisCustomerAddress/recipientAddressForm.vue
+++ b/src/views/emis/emisCustomerAddress/recipientAddressForm.vue
@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="智能填写" prop="parseAddress" style="position: relative">
-              <el-input v-model="form.parseAddress" type="textarea" rows="5" placeholder="粘贴整段地址，自动识别姓名，公司名称（输入需包含“公司”两个字），手机号码、固话和地址，每项用逗号隔开更准确“例如XXX,XX公司，188****8888,021-88****88，上海上海市xxx区xx路1080号" >
+              <el-input v-model="form.parseAddress" type="textarea" rows="5" placeholder="例如XXX,XX公司，188****8888,021-88****88，上海上海市xxx区xx路1080号" >
               </el-input>
               <el-button @click="handleParseAddress" type="primary" size="mini" style="position:absolute;bottom:8px;right:8px" >智能识别</el-button>
             </el-form-item>
diff --git a/src/views/emis/emisCustomerUser/moneyUserForm.vue b/src/views/emis/emisCustomerUser/moneyUserForm.vue
index c3a83546..8b78604b 100644
--- a/src/views/emis/emisCustomerUser/moneyUserForm.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserForm.vue
@@ -152,57 +152,6 @@
             </el-form-item>
           </el-col>
 
-          <!-- <el-col :span="8">
-            <el-form-item label="发件国" prop="sendCountry">
-              <el-input v-model="form.sendCountry" placeholder="请输入发件国" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="发件省" prop="sendProvince">
-              <el-input v-model="form.sendProvince" placeholder="请输入发件省" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="发件区" prop="sendCity">
-              <el-input v-model="form.sendCity" placeholder="请输入发件区" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="发件区" prop="sendCounty">
-              <el-input v-model="form.sendCounty" placeholder="请输入发件区" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="发件镇" prop="sendTown">
-              <el-input v-model="form.sendTown" placeholder="请输入发件镇" />
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="8">
-            <el-form-item label="邮编" prop="postCode">
-              <el-input v-model="form.postCode" placeholder="请输入邮编" />
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="8">
-            <el-form-item label="真实姓名" prop="realName">
-              <el-input v-model="form.realName" placeholder="请输入真实姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="身份证号" prop="idNo">
-              <el-input v-model="form.idNo" placeholder="请输入身份证号" />
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="8">
-            <el-form-item label="所属站点" prop="ownerSite">
-              <EmisSiteSimplePicker :placeholder="$t('所属站点')"  v-model="form.ownerSite" disabled></EmisSiteSimplePicker>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="8">
-            <el-form-item label="所属业务员" prop="opEmpCode" label-width="100px">
-              <EmisUserSimplePicker0 :placeholder="$t('所属业务员')" v-model="form.opEmpCode"  ></EmisUserSimplePicker0>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <el-form-item label="主所属网点" prop="ownerSite">
               <EmisSiteSimplePicker :placeholder="$t('所属站点')"  v-model="form.ownerSite" ></EmisSiteSimplePicker>
@@ -216,35 +165,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <!-- postCode="OP" -->
             <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
               <SalemanPicker :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
-              <!-- <EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker2> -->
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="8">
-            <el-form-item label="启用状态" prop="status">
-              <el-input v-model="form.status" placeholder="请输入启用状态" />
-            </el-form-item>
-          </el-col> -->
 
-          <!-- <el-col :span="12">
-            <el-form-item label="开通OMS" prop="blOpenOms" label-width="100px">
-              <el-radio-group v-model="form.blOpenOms">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="是否短信" prop="blSms">
-              <el-radio-group v-model="form.blSms">
-                <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="12">
             <el-form-item label="启用状态" prop="status">
               <el-radio-group v-model="form.status">
@@ -253,26 +178,20 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-<!--
-          <el-col :span="8">
-            <el-form-item label="排序" prop="orderNum">
-              <el-input v-model="form.orderNum" placeholder="请输入排序" />
-            </el-form-item>
-          </el-col> -->
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>
+        <div style="text-align: center;margin-bottom: 10px;">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+
+    </el-form>
 
 
-        </el-form>
-
-      <div style="text-align: center;margin-bottom: 10px;">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
 
   </div>
 </template>
diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue
index 6d380ac2..67602820 100644
--- a/src/views/emis/emisCustomerUser/moneyUserList.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserList.vue
@@ -241,7 +241,7 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 
 
 export default {
-  name: "moneyUserList",
+  name: "MoneyUserList",
   components: {AirTable, PayeePicker,SalemanPicker,elDateSimplePicker,moneyUserForm ,CountryPicker,
     EmisSiteSimplePicker,ProvincePicker,CityPicker,
     EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
@@ -339,7 +339,7 @@ export default {
     handleAdd(row) {
       this.currentId=null;
       this.openForm= true;
-      this.titleForm = "新增现金客户";
+      this.titleForm = "现金客户";
     },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
@@ -348,7 +348,7 @@ export default {
     handleUpdate(row) {
        this.currentId= row.id;
        this.openForm = true;
-       this.titleForm = "修改现金客户";
+       this.titleForm = "现金客户";
     },
     handleView(row) {
        this.id=row.id;
diff --git a/src/views/emis/emisNotCalcAging/index.vue b/src/views/emis/emisNotCalcAging/index.vue
index 41cfcf1d..d7752e83 100644
--- a/src/views/emis/emisNotCalcAging/index.vue
+++ b/src/views/emis/emisNotCalcAging/index.vue
@@ -110,11 +110,11 @@
         </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisRegion/emisRegionForm.vue b/src/views/emis/emisRegion/emisRegionForm.vue
index bb13ec75..6e5b531b 100644
--- a/src/views/emis/emisRegion/emisRegionForm.vue
+++ b/src/views/emis/emisRegion/emisRegionForm.vue
@@ -63,7 +63,7 @@
             </el-col>
             <el-col :span="12"  v-if="form.regionType==1 || form.regionType==2" >
               <el-form-item label="所属片区" prop="countryAreaId">
-                  <CountryAreaPicker :placeholder="$t('区域')" :countryCode="form.countryCode" v-model="form.areaId"  @onChange="onCountryAreaChange"></CountryAreaPicker>
+                  <CountryAreaPicker :placeholder="$t('区域')" :countryCode="form.countryCode" v-model="form.areaId" ></CountryAreaPicker>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -185,7 +185,7 @@ export default {
       this.form.countryName = data.name;
     },
     onCountryAreaChange(data){
-      this.form.areaName = data.name;
+      // this.form.areaName = data.name;
     },
     validateParentCode(rule, value, callback){
       if(this.form.regionType==2 || this.form.regionType==3 ){
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index ce7079c4..6f5eb5bd 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -215,7 +215,7 @@
         <el-table-column label="特殊区域" align="center" prop=""  width="80"/>
         <el-table-column label="对外备注" align="center" prop=""  width="80"/>
         <el-table-column label="数据来源" align="center" prop="dataFrom"  width="80"/>
-
+        <el-table-column label="排序" align="center" prop="orderNum"  width="80"  />
 
         <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
           <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 69e4c52f..ba6c43e3 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="" >
-    <el-descriptions :title="$t('发货信息')" size="mini"  :column="4">
+    <el-descriptions :title="$t('发货信息')" size="small"  :column="4">
             <el-descriptions-item label="运单号">{{ form.billCode }}</el-descriptions-item>
             <el-descriptions-item label="寄件网点">{{ form.sendSiteName }}</el-descriptions-item>
             <el-descriptions-item label="所属线路">{{ form.transLineTypeName }}</el-descriptions-item>
@@ -27,56 +27,197 @@
               <dict-tag :options="dict.type.emis_tab_dispatch_mode" :value="form.dispatchMethod"/>
             </el-descriptions-item>
             <el-descriptions-item label="合同号"  :span="4">{{ form.custOrderId }}</el-descriptions-item>
-
+            <el-descriptions-item label="取件员/操作员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item>
+            <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item>
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" >{{ form.customerName }}</el-descriptions-item>
+            <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
+            <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
     </el-descriptions>
 
-    <el-descriptions :title="$t('收寄件信息')"  size="mini" :column="4"  style="margin-top:10px">
+    <el-descriptions :title="$t('收寄件信息')"  size="small" :column="4"  style="margin-top:10px">
             <el-descriptions-item label="寄件人">{{ form.sender.name }}</el-descriptions-item>
             <el-descriptions-item label="寄件电话">{{ form.sender.phone }}</el-descriptions-item>
-            <el-descriptions-item label="寄件公司">{{ form.sender.company }}</el-descriptions-item>
-            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户">{{ form.customerName }}</el-descriptions-item>
+            <el-descriptions-item label="寄件公司" :span="4">{{ form.sender.company }}</el-descriptions-item>
             <!-- <el-descriptions-item label="寄件人国家">{{ form.sendCountry }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="寄件省">{{ form.sendProvince }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="寄件市">{{ form.sendCity }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="寄件区">{{ form.sendCounty }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="寄件县">{{ form.sendTown }}</el-descriptions-item> -->
-            <el-descriptions-item label="寄件地址"  :span="4">{{ form.sender.address }}</el-descriptions-item>
+            <el-descriptions-item label="寄件地址" :span="4" >{{ form.sender.address }}</el-descriptions-item>
 
             <el-descriptions-item label="收件人" :span="1">{{ form.reciever.name }}</el-descriptions-item>
             <el-descriptions-item label="收件电话" :span="1">{{ form.reciever.phone }}</el-descriptions-item>
-            <el-descriptions-item label="收件公司" :span="1">{{ form.reciever.company }}</el-descriptions-item>
+            <el-descriptions-item label="收件公司" :span="4">{{ form.reciever.company }}</el-descriptions-item>
             <!-- <el-descriptions-item label="收件客户">{{  }}</el-descriptions-item> -->
-            <el-descriptions-item label="收件地址"  :span="4">{{ form.reciever.address }}</el-descriptions-item>
+            <el-descriptions-item label="收件地址"  >{{ form.reciever.address }}</el-descriptions-item>
 
   </el-descriptions>
 
-  <el-descriptions :title="$t('货物收费信息')" size="mini" :column="4" style="margin-top:10px">
-            <!-- <el-descriptions-item label="总重量">{{ form.totalWeight }}</el-descriptions-item> -->
-
+  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 10px;">
+    <el-col :span="12">
+      <el-descriptions :title="$t('货物信息')" size="small" :column="4" style="margin-top:10px">
+            <el-descriptions-item label="货物名称" :span="4">{{ form.goodsInfo }}</el-descriptions-item>
             <el-descriptions-item label="件数">{{ form.parcelQty }}件</el-descriptions-item>
-            <el-descriptions-item label="体积">{{ form.totalVolume }}(m³)</el-descriptions-item>
-            <el-descriptions-item label="支付方式">
-              <dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
-            </el-descriptions-item>
-            <el-descriptions-item label="运费">{{ form.freight }}</el-descriptions-item>
-            <el-descriptions-item label="实际重量">{{ form.billWeight }}(kg)</el-descriptions-item>
-            <el-descriptions-item label="体积重量">{{ form.volumeWeight }}(kg)</el-descriptions-item>
-            <!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
-            <el-descriptions-item label="结算重量">{{ form.settlementWeight }}(kg)</el-descriptions-item>
-            <el-descriptions-item label="货物名称">{{ form.goodsInfo }}</el-descriptions-item>
-            <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
-            <el-descriptions-item label="取件员/操作员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item>
-
-            <el-descriptions-item label="包装类型">
+            <el-descriptions-item label="包装类型" :span="4">
               <dict-tag v-if="form.packType&&form.packType!=''" :options="dict.type.emis_tab_packing_type" :value="form.packType.split(',')"/>
             </el-descriptions-item>
+            <el-descriptions-item label="实际重量">{{ form.billWeight }}(kg)</el-descriptions-item>
+            <el-descriptions-item label="体积">{{ form.totalVolume }}(m³)</el-descriptions-item>
+            <el-descriptions-item label="体积重量" :span="4">{{ form.volumeWeight }}(kg)</el-descriptions-item>
+            <el-descriptions-item label="货物尺寸" :span="4">
+              <el-table
+                            class="cargoList"
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
+                            border
+                            stripe
+                            :data="form.cargoList"
+                            size="small"
+                            style="width: 100%"
+                            max-height="300px"
+                          >
+
+                            <el-table-column  :label="$t('序号')" align="center" width="60">
+                                  <template slot-scope="scope">
+                                      <span > {{scope.$index+1}}</span>
+                                  </template>
+                            </el-table-column>
+                            <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="60">
+                              <template slot-scope="scope">
+                                {{ scope.row.length }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="60">
+                              <template slot-scope="scope">
+                                {{  scope.row.width }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="60">
+                              <template slot-scope="scope">
+                                {{  scope.row.height }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
+                              <template slot-scope="scope">
+                                {{  scope.row.cargoQty }}
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="volume"  :label="$t('体积(m³)')" align="center" width="80">
+                              <template slot-scope="scope">
+                                {{  scope.row.volume }}
+                              </template>
+                            </el-table-column>
+
+                            <!-- <el-table-column prop="volume"  :label="$t('描述')" align="center" width="80">
+                              <template slot-scope="scope">
+                                {{  scope.row.goodsName }}
+                              </template>
+                            </el-table-column> -->
+
+                       </el-table>
+
+            </el-descriptions-item>
+            <el-descriptions-item label="结算重量" :span="4">{{ form.settlementWeight }}(kg)</el-descriptions-item>
+
+      </el-descriptions>
+
+    </el-col>
+
+
+
+    <el-col :span="12">
+      <el-descriptions :title="$t('收费信息')" size="small" :column="4" style="margin-top:10px">
+            <el-descriptions-item label="计费方式" :span="4">
+              <dict-tag :options="dict.type.emis_calc_fee_type" :value="form.calcFeeType"/>
+            </el-descriptions-item>
+            <el-descriptions-item label="是否特殊报价" :span="1">
+              <span v-if="form.blSpecialQuote == 1"> 是 </span>
+              <span v-else> 否 </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="是否敏感物" :span="4">
+              <span v-if="form.blSensitive == 1"> 是 </span>
+              <span v-else> 否 </span>
+            </el-descriptions-item>
+            <el-descriptions-item label="支付方式" :span="4">
+              <dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
+            </el-descriptions-item>
+            <!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" >{{ form.customerName }}</el-descriptions-item>
+            <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
+            <el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item>
+            <el-descriptions-item label="费用明细" :span="4">
+              <el-table
+                            class="cargoList"
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
+                            border
+                            stripe
+                            :data="form.feeItems"
+                            size="mini"
+                            max-height="300px"
+                            style="width: 100%"
+                          >
+
+
+                            <el-table-column prop="feeName"  :label="$t('收费项')"  align="center" width="70">
+                              <template slot-scope="scope">
+                                <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="fee"  :label="$t('应收')"  align="center" width="50">
+                              <template slot-scope="scope">
+                                <span>{{ scope.row.fee }}</span>
+                              </template>
+                            </el-table-column>
+
+                            <el-table-column prop="initialWeightFee"  :label="$t('首重费')"  align="center" width="60">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.initialWeightFee}} </div>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="addWeightPrice"  :label="$t('续重单价')"  align="center" width="70">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.addWeightPrice}} </div>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="realFee" :label="$t('实收')" align="center" width="50">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.realFee}} </div>
+                              </template>
+                            </el-table-column>
+                            <el-table-column  prop="remark" :label="$t('描述')"  align="center" min-width="50">
+                              <template slot-scope="scope">
+                                <div> {{scope.row.remark}} </div>
+                              </template>
+                            </el-table-column>
+                          </el-table>
+
+            </el-descriptions-item>
+            <el-descriptions-item label="运费" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
 
-            <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
-            <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item>
             <el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item>
-            <el-descriptions-item label="运单备注" :span="4">{{ form.remark }}</el-descriptions-item>
 
-    </el-descriptions>
+
+      </el-descriptions>
+    </el-col>
+  </el-row>
+  <el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;">
+    <el-descriptions-item label="运单备注" :span="4">{{ form.remark }}</el-descriptions-item>
+  </el-descriptions>
 
 </div>
 </template>
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 9bfcec4f..82043a51 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -20,12 +20,12 @@
                 </el-col>
 
                 <el-col :span="18" v-if="action=='add'">
-                    <el-form-item label="运单号" prop="billCode"  >
+                    <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
-                            <el-input v-model="form.billCode" placeholder="运单号" @blur="onBillCodeChange" style="font-weight:600;color:black" />
+                            <el-input v-model="form.billCode" placeholder="" @blur="onBillCodeChange" style="font-weight:600;color:black" />
                           </div>
-                          <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
+                          <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">{{ $t('电子主单') }}</span></el-checkbox></div>
                       </div>
                     </el-form-item>
                 </el-col>
@@ -34,11 +34,11 @@
 
                 <!-- 运单修改 -->
                 <el-col :span="8" v-if="action=='modify'">
-                    <el-form-item label="运单号" prop="billCode"  >
+                    <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
                             <el-form :disabled="false" @submit.native.prevent>
-                              <el-input v-model="form.billCode" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  :disabled="false" style="font-weight:600;color:black" >
+                              <el-input v-model="form.billCode" :placeholder="$t('单号输入后按回车')" @keyup.enter.native="handleScanInput"  :disabled="false" style="font-weight:600;color:black" >
                                 <i slot="suffix" class="iconfont">&#xe656;</i>
                               </el-input>
                             </el-form>
@@ -61,19 +61,19 @@
 
 
                   <el-col :span="6">
-                    <el-form-item label="目的国" prop="destinationCountry">
+                    <el-form-item :label="$t('目的国')"  prop="destinationCountry">
                         <CountryPicker0 v-model="form.destinationCountry" @onChange="onDestCountryChange"></CountryPicker0>
                     </el-form-item>
                   </el-col>
 
                   <el-col :span="8">
-                    <el-form-item label="产品类型" prop="productType">
+                    <el-form-item  :label="$t('产品类型')"  prop="productType">
                       <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.destinationCountry" @onChange="onProductChange" ></TransProductCasPicker>
                     </el-form-item>
                   </el-col>
                   <el-col :span="5">
-                    <el-form-item label="报关方式" prop="customsEclaration">
-                      <el-select v-model="form.customsEclaration" placeholder="请选择"  @change="calcBillFee">
+                    <el-form-item  :label="$t('报关方式')"  prop="customsEclaration">
+                      <el-select v-model="form.customsEclaration" placeholder=""  @change="calcBillFee">
                         <el-option
                           v-for="dict in dict.type.emis_declare_mode"
                           :key="dict.value"
@@ -84,8 +84,8 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="5">
-                    <el-form-item label="清关方式" prop="customsClear">
-                      <el-select v-model="form.customsClear" placeholder="请选择"  @change="calcBillFee">
+                    <el-form-item :label="$t('清关方式')"  prop="customsClear">
+                      <el-select v-model="form.customsClear" placeholder=""  @change="calcBillFee">
                         <el-option
                           v-for="dict in dict.type.emis_customs_clear"
                           :key="dict.value"
@@ -97,8 +97,8 @@
                   </el-col>
 
                   <el-col :span="6">
-                    <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="form.pickupMethod" placeholder="请选择" @change="calcBillFee">
+                    <el-form-item :label="$t('取件方式')" prop="pickupMethod">
+                      <el-select v-model="form.pickupMethod" placeholder="" @change="calcBillFee">
                         <el-option
                           v-for="dict in dict.type.emis_qujian_fangshi"
                           :key="dict.value"
@@ -120,14 +120,14 @@
                   </el-col>
 
                   <el-col :span="6">
-                    <el-form-item label="派件方式" prop="dispatchMethod">
+                    <el-form-item :label="$t('派件方式')" prop="dispatchMethod">
                       <el-radio-group v-model="form.dispatchMethod">
                         <el-radio
                           v-for="dict in dict.type.emis_tab_dispatch_mode"
                           :key="dict.value"
                           :label="dict.value"
                         >
-                        <span  >{{dict.label}}</span>
+                        <span  >{{ $t(dict.label) }}</span>
                       </el-radio>
                       </el-radio-group>
                     </el-form-item>
@@ -135,19 +135,19 @@
                   <el-col :span="24">
                     <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                       <el-col :span="8">
-                        <el-form-item label="月结客户" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
+                        <el-form-item  :label="$t('月结客户')" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                        <el-form-item label="回款联系人" prop="payee" label-width="85px">
+                        <el-form-item   :label="$t('回款联系人')"  prop="payee" label-width="85px">
                           <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                           <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
 
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                        <el-form-item label="销售联系人" prop="salesmen" label-width="85px">
+                        <el-form-item  :label="$t('销售联系人')"  prop="salesmen" label-width="85px">
                           <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
                           <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
                         </el-form-item>
@@ -163,44 +163,22 @@
 
                       <div style="width:230px">
                           <el-form-item  prop="sendSiteCode">
-                            <span slot="label" style="color:gray">寄件网点:</span>
+                            <span slot="label" style="color:gray">{{ $t('寄件网点') }}:</span>
                             <EmisSiteSimplePicker v-if="$store.getters.ownerSiteCode== '88888'" v-model="form.sendSiteCode"  @onChange="onSendSiteSelect"  ></EmisSiteSimplePicker>
                             <el-input v-else  v-model="form.sendSiteName" placeholder="" disabled />
                           </el-form-item>
                       </div>
                         <div style="margin-left: 12px;">
-                          主单剩余:<span>{{ totalAvailablePag.mainHasCnt }}</span>
+                          {{ $t('主单剩余') }}:<span>{{ totalAvailablePag.mainHasCnt }}</span>
                         </div>
                         <div>
-                          子单剩余:<span>{{ totalAvailablePag.subHasCnt }}</span>
+                          {{ $t('子单剩余') }}:<span>{{ totalAvailablePag.subHasCnt }}</span>
                         </div>
                     </div>
                     <div v-else >
-                        <div @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">主单余量:0，请立即【<span style="color:blue">申购</span>】</div>
+                        <div @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
                     </div>
               </div>
-              <!-- <div v-if="action=='add'" style="position: absolute;right: 80px;top: 260px;z-index: 1;">
-                    <el-form-item label="打印选项:" prop="printTypeCheckList">
-                      <div style="display:inline-flex">
-                        <div>
-                          <el-checkbox-group v-model="form.printTypeCheckList">
-                            <el-checkbox :key="0" :label="0" >
-                              <span  >客户联</span>
-                            </el-checkbox>
-                            <el-checkbox :key="1" :label="1" >
-                              <span  >寄件网点存根联</span>
-                            </el-checkbox>
-                            <el-checkbox :key="5" :label="5" >
-                              <span  >子单</span>
-                            </el-checkbox>
-                          </el-checkbox-group>
-                        </div>
-                        <div style="margin-left:10px">
-                          <TanexPrinterPanel ref="tanexPrinter" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false"  @onPrintComplete="onComplete"></TanexPrinterPanel>
-                        </div>
-                    </div>
-                    </el-form-item>
-              </div> -->
 
             </div>
           </el-collapse-item>
@@ -217,7 +195,7 @@
                             padding: 5px 15px;
                             background: black;
                             font-size: 13px;
-                            color: white;">寄件信息</span>
+                            color: white;">{{ $t('寄件信息') }}</span>
                       </div>
                       <div style="width:50%;text-align:right;padding-right: 15px;">
                           <!-- icon="el-icon-edit" -->
@@ -227,22 +205,22 @@
                         style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
                         class="iconfont icon-dizhibao"
                         @click="handleSelectCustomerAddress(1)"
-                      >寄件地址薄</el-button>
+                      >{{ $t('寄件地址薄') }}</el-button>
                       </div>
                     </el-col>
 
                     <el-col :span="12">
-                      <el-form-item label="寄件人" prop="sender.name">
+                      <el-form-item :label="$t('寄件人')" prop="sender.name">
                         <CustomerAddressSimplePicker0 addressType="1" :useSiteCode="form.sendSiteCode" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item label="寄件电话" prop="sender.phone">
+                      <el-form-item :label="$t('寄件电话')" prop="sender.phone">
                         <el-input v-model="form.sender.phone" placeholder="" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="寄件公司" prop="sender.company"
+                      <el-form-item :label="$t('寄件公司')" prop="sender.company"
                       :rules="form.paymentType != 2 ? rules.sender.company : []"
                       >
                         <el-input
@@ -250,7 +228,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="国家地区" prop="sender.province"  >
+                      <el-form-item  :label="$t('国家地区')" prop="sender.province"  >
                         <div style="display:inline-flex">
                           <country-picker1 v-model="form.sender.country" ></country-picker1>
                           <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
@@ -260,14 +238,14 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="寄件地址" prop="sender.address">
+                      <el-form-item :label="$t('寄件地址')"  prop="sender.address">
                         <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
                       </el-form-item>
                     </el-col>
 
                     <el-col :span="24">
                       <el-form-item label="" prop="blMessage">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
 
@@ -282,7 +260,7 @@
                               padding: 5px 15px;
                               background: #b12e29;
                               font-size: 13px;
-                              color: white;">收件信息</span>
+                              color: white;"> {{ $t('收件信息') }}</span>
                           </div>
                         <div style="width:50%;text-align:right;padding-right: 15px;">
                           <el-button
@@ -291,30 +269,30 @@
                           style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
                           class="iconfont icon-dizhibao"
                           @click="handleSelectCustomerAddress(2)"
-                        >收件地址薄</el-button>
+                        > {{ $t('收件地址薄') }}</el-button>
                         </div>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="收件人" prop="reciever.name">
+                        <el-form-item  :label="$t('收件人')" prop="reciever.name">
                           <CustomerAddressSimplePicker1 addressType="2" :useSiteCode="form.sendSiteCode"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="收件电话" prop="reciever.phone">
+                        <el-form-item  :label="$t('收件电话')"  prop="reciever.phone">
                           <el-input v-model="form.reciever.phone" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="收件公司" prop="reciever.company"
+                        <el-form-item  :label="$t('收件公司')" prop="reciever.company"
                         :rules="form.paymentType != 4 ? rules.reciever.company : []"
                         >
                           <el-input v-model="form.reciever.company" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="国家地区" prop="reciever.province">
+                        <el-form-item :label="$t('国家地区')" prop="reciever.province">
                           <div style="display:inline-flex">
                             <country-picker2 v-model="form.reciever.country"  ></country-picker2>
                             <ProvincePicker2  v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
@@ -324,24 +302,24 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="收件地址" prop="reciever.address">
+                        <el-form-item  :label="$t('收件地址')" prop="reciever.address">
                           <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="目的地" prop="destinationCode">
+                        <el-form-item  :label="$t('目的地')"  prop="destinationCode">
                           <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
+                        <el-form-item  :label="$t('目的网点')"  prop="dispatchUnderlingSiteCode">
                           <el-input v-model="form.dispatchUnderlingSiteCode" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
                         <el-form-item label="" prop="blAcceptMessage">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('派件短信') }}</span></el-checkbox>
                         </el-form-item>
                       </el-col>
                   </el-row>
@@ -359,23 +337,23 @@
                 <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
                     <!-- <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col> -->
                     <el-col :span="24">
-                        <el-form-item label="货物大类" prop="goodsType" label-width="70px">
-                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
+                        <el-form-item :label="$t('货物大类')"  prop="goodsType" label-width="70px">
+                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder=""></GoodsMultiplePicker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="货物名称" prop="goodsInfo" label-width="70px">
+                        <el-form-item  :label="$t('货物名称')"  prop="goodsInfo" label-width="70px">
                           <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
+                        <el-form-item  :label="$t('总件数')"  prop="parcelQty" label-width="70px">
                           <el-input v-model="form.parcelQty" style="text-align: right;" @blur="handleCargoQtyChangeDebounce" @keyup.enter.native="handleCargoQtyChangeDebounce" placeholder=""  />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="实际重量" prop="billWeight" label-width="70px">
-                          <el-input v-model="form.billWeight" @blur="handleCalcSettlementWeight" @keyup.enter.native="handleCalcSettlementWeight"  style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
+                        <el-form-item  :label="$t('实际重量')"  prop="billWeight" label-width="70px">
+                          <el-input v-model="form.billWeight" @blur="handleCalcSettlementWeight" @keyup.enter.native="handleCalcSettlementWeight"  style="text-align: right;min-width: 80px" placeholder="" >
                             <span slot="suffix">(kg)</span>
                           </el-input>
                         </el-form-item>
@@ -403,32 +381,32 @@
                             max-height="300px"
                           >
 
-                            <el-table-column label="序号" align="center" width="60">
+                            <el-table-column  :label="$t('序号')" align="center" width="60">
                                   <template slot-scope="scope">
                                       <span > {{scope.$index+1}}</span>
                                   </template>
                             </el-table-column>
-                            <el-table-column prop="length" label="长(cm)" align="center" width="60">
+                            <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.length" @input="(val)=>handleCalcVolumeDebounce(scope.row)" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="width" label="宽(cm)" align="center" width="60">
+                            <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.width" @input="(val)=>handleCalcVolumeDebounce(scope.row)" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="height" label="高(cm)" align="center" width="60">
+                            <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.height" @input="(val)=>handleCalcVolumeDebounce(scope.row)" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="cargoQty" label="件数" align="center" width="60">
+                            <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChangeDebounce(scope.row)" @keyup.enter.native="(val)=>handleCargoQtyChange(scope.row)"   size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="volume" label="体积(m³)" align="center" width="80">
+                            <el-table-column prop="volume"  :label="$t('体积(m³)')" align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
                               </template>
@@ -441,7 +419,7 @@
                               </template>
                             </el-table-column> -->
 
-                            <el-table-column label="操作" align="left" min-width="50">
+                            <el-table-column :label="$t('操作')"  align="left" min-width="50">
                                   <template slot-scope="scope">
                                     <span class="icon iconfont"
                                     style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@@ -459,7 +437,7 @@
 
 
                       <el-col :span="12">
-                        <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
+                        <el-form-item  :label="$t('总体积')"  prop="totalVolume" label-width="70px" >
                           <div style="">
                             <el-input v-model="form.totalVolume" @blur="handleCalcVolumeWeight" @keyup.enter.native="handleCalcVolumeWeight" style="text-align: right;width: 120px" placeholder="体积" >
                               <span slot="suffix">(m³)</span>
@@ -469,7 +447,7 @@
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
+                        <el-form-item  :label="$t('体积重量')"  prop="volumeWeight" label-width="70px">
                           <el-input v-model="form.volumeWeight"   placeholder="" disabled>
                             <span slot="suffix">(kg)</span>
                           </el-input>
@@ -477,15 +455,15 @@
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
+                        <el-form-item  :label="$t('结算重量')"  prop="settlementWeight" label-width="70px">
                           <el-input v-model="form.settlementWeight" placeholder="" disabled >
                             <span slot="suffix">(kg)</span>
                           </el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="包装类型" prop="packType" label-width="70px"">
-                            <el-select multiple="" v-model="form.packType" placeholder="请选择">
+                        <el-form-item  :label="$t('包装类型')"  prop="packType" label-width="70px"">
+                            <el-select multiple="" v-model="form.packType" placeholder="">
                               <el-option
                                 v-for="dict in dict.type.emis_tab_packing_type"
                                 :key="dict.value"
@@ -501,12 +479,12 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="12" v-if="form.blOverWeight==1">
-                        <el-form-item label="超重件数" prop="overWeightNumber" label-width="70px">
-                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
+                        <el-form-item  :label="$t('超重件数')" prop="overWeightNumber" label-width="70px">
+                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" >
+                        <el-form-item  :label="$t('生成子单')" prop="blGenSubbill" label-width="70px" >
                           <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill" >
                             <el-radio :key="'1'" label="1">是</el-radio>
                             <el-radio :key="'0'" label="0">否</el-radio>
@@ -515,23 +493,23 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="24" v-if="form.blGenSubbill==1">
-                        <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
+                        <el-form-item  :label="$t('子单号')" prop="billCodeSub" label-width="70px">
                           <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="进仓单" prop="warehouseInNo" label-width="70px">
+                        <el-form-item  :label="$t('进仓单')" prop="warehouseInNo" label-width="70px">
                           <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="合同号" prop="custOrderId" label-width="70px">
+                        <el-form-item :label="$t('合同号')"  prop="custOrderId" label-width="70px">
                           <el-input v-model="form.custOrderId" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="运单备注" prop="remark" label-width="70px">
+                        <el-form-item :label="$t('运单备注')" prop="remark" label-width="70px">
                           <el-input v-model="form.remark" type="textarea" placeholder="" />
                         </el-form-item>
                       </el-col>
@@ -542,8 +520,8 @@
                   <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
 
                     <el-col :span="12">
-                      <el-form-item label="付款方式" prop="paymentType" label-width="70px">
-                        <el-select v-model="form.paymentType" placeholder="请选择"  @change="onPaymentTypeChange">
+                      <el-form-item :label="$t('付款方式')"  prop="paymentType" label-width="70px">
+                        <el-select v-model="form.paymentType" placeholder=""  @change="onPaymentTypeChange">
                             <el-option
                               v-for="dict in dict.type.emis_payment_type"
                               :key="dict.value"
@@ -556,19 +534,19 @@
                     <el-col :span="12">
                     </el-col>
                     <el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
-                      <el-form-item label="付款客户" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" label-width="70px">
+                      <el-form-item  :label="$t('付款客户')" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" label-width="70px">
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item label="回款联系人" prop="payee" label-width="85px">
+                      <el-form-item   :label="$t('回款联系人')" prop="payee" label-width="85px">
                         <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
-                        <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
+                        <PayeePicker v-else :placeholder="$t('回款联系人')"    v-model="form.payee"  ></PayeePicker>
 
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item label="销售联系人" prop="salesmen" label-width="85px">
+                      <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
                         <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
                         <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
 
@@ -576,7 +554,7 @@
                     </el-col>
 
                     <el-col :span="24">
-                      <el-form-item label="计费方式" prop="calcFeeType" label-width="70px">
+                      <el-form-item  :label="$t('计费方式')" prop="calcFeeType" label-width="70px">
                         <el-radio-group v-model="form.calcFeeType" @change="calcBillFee" >
                           <el-radio
                             v-for="dict in dict.type.emis_calc_fee_type"
@@ -588,9 +566,9 @@
                       </el-form-item>
                     </el-col>
 
-                    <el-form-item label="特殊报价" prop="ext" label-width="70px">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0">特殊报价</el-checkbox>
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0">敏感物</el-checkbox>
+                    <el-form-item :label="$t('特殊报价')"  prop="ext" label-width="70px">
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0"> {{ $t('特殊报价') }}</el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0"> {{ $t('敏感物') }}</el-checkbox>
 
                     </el-form-item>
 
@@ -616,43 +594,43 @@
                           >
 
 
-                            <el-table-column prop="feeName" label="收费项" align="center" width="70">
+                            <el-table-column prop="feeName"  :label="$t('收费项')"  align="center" width="70">
                               <template slot-scope="scope">
                                 <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="fee" label="应收" align="center" width="50">
+                            <el-table-column prop="fee"  :label="$t('应收')"  align="center" width="50">
                               <template slot-scope="scope">
                                 <span>{{ scope.row.fee }}</span>
                               </template>
                             </el-table-column>
 
-                            <el-table-column prop="initialWeightFee" label="首重费" align="center" width="60">
+                            <el-table-column prop="initialWeightFee"  :label="$t('首重费')"  align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-if="form.blSpecialQuote==1" v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.initialWeightFee}} </div>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
+                            <el-table-column prop="addWeightPrice"  :label="$t('续重单价')"  align="center" width="70">
                               <template slot-scope="scope">
                                 <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.addWeightPrice}} </div>
 
                               </template>
                             </el-table-column>
-                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
+                            <el-table-column prop="realFee" :label="$t('实收')" align="center" width="50">
                               <template slot-scope="scope">
                                 <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.realFee}} </div>
                               </template>
                             </el-table-column>
-                            <el-table-column  prop="remark" label="描述" align="center" min-width="50">
+                            <el-table-column  prop="remark" :label="$t('描述')"  align="center" min-width="50">
                               <template slot-scope="scope">
                                 <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.remark" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.remark}} </div>
                               </template>
                             </el-table-column>
-                            <el-table-column label="操作" align="center" width="50">
+                            <el-table-column :label="$t('操作')" align="center" width="50">
                                   <template slot-scope="scope">
                                     <span class="icon iconfont"
                                     style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@@ -679,40 +657,40 @@
                                       type="text"
                                       icon="el-icon-plus"
                                       @click="handleAddFee"
-                                    >增加自定义费用</el-button>
+                                    >{{ $t('增加自定义费用') }}</el-button>
                               </el-popover>
                           </div>
 
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="总运费" prop="freight" label-width="70px">
+                      <el-form-item :label="$t('总运费')"  prop="freight" label-width="70px">
                             <el-input v-if="form.calcFeeType == 3" v-model="form.freight" placeholder="" >   </el-input>
                             <el-input v-else v-model="form.freight" disabled placeholder="" >   </el-input>
                       </el-form-item>
-                      <el-form-item label="费用备注" prop="feeRemark" label-width="70px">
+                      <el-form-item  :label="$t('费用备注')" prop="feeRemark" label-width="70px">
                             <el-input v-model="form.feeRemark" type="textarea" placeholder="" >
                         </el-input>
                       </el-form-item>
                     </el-col>
 
                     <el-col :span="24" v-if="action=='add'">
-                        <el-form-item label="打印选项" prop="printTypeCheckList">
+                        <el-form-item  :label="$t('打印选项')"  prop="printTypeCheckList">
                           <el-checkbox-group v-model="form.printTypeCheckList">
                               <el-checkbox :key="0" :label="0" >
-                                <span  >客户联</span>
+                                <span  >{{$t('客户联')}}</span>
                               </el-checkbox>
                               <el-checkbox :key="1" :label="1" >
-                                <span  >寄件网点存根联</span>
+                                <span  >{{$t('寄件网点存根联')}}</span>
                               </el-checkbox>
                               <el-checkbox :key="5" :label="5" >
-                                <span  >子单</span>
+                                <span  >{{$t('子单')}}</span>
                               </el-checkbox>
                             </el-checkbox-group>
                        </el-form-item>
                     </el-col>
                     <el-col :span="24" v-if="action=='add'">
-                      <el-form-item label="打印组件" prop="printTypeCheckList">
+                      <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>
                     </el-col>
@@ -727,8 +705,8 @@
       </el-collapse>
 
       <div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="initData">重置</el-button>
+        <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
+        <el-button @click="initData">{{$t('重置')}}</el-button>
       </div>
 
 
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 8d8307b7..cfa495b2 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -20,12 +20,12 @@
                 </el-col>
 
                 <el-col :span="18" v-if="action=='add'">
-                    <el-form-item label="运单号" prop="billCode"  >
+                    <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
-                            <el-input v-model="form.billCode" placeholder="运单号" @blur="onBillCodeChange" style="font-weight:600;color:black" />
+                            <el-input v-model="form.billCode" placeholder="" @blur="onBillCodeChange" style="font-weight:600;color:black" />
                           </div>
-                          <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
+                          <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">{{ $t('电子主单') }}</span></el-checkbox></div>
                       </div>
                     </el-form-item>
                 </el-col>
@@ -34,11 +34,11 @@
 
                 <!-- 运单修改 -->
                 <el-col :span="8" v-if="action=='modify'">
-                    <el-form-item label="运单号" prop="billCode"  >
+                    <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
                             <el-form :disabled="false" @submit.native.prevent>
-                              <el-input v-model="form.billCode" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput"  :disabled="false" style="font-weight:600;color:black" >
+                              <el-input v-model="form.billCode" :placeholder="$t('单号输入后按回车')" @keyup.enter.native="handleScanInput"  :disabled="false" style="font-weight:600;color:black" >
                                 <i slot="suffix" class="iconfont">&#xe656;</i>
                               </el-input>
                             </el-form>
@@ -61,19 +61,19 @@
 
 
                   <el-col :span="6">
-                    <el-form-item label="目的国" prop="destinationCountry">
+                    <el-form-item :label="$t('目的国')"  prop="destinationCountry">
                         <CountryPicker0 v-model="form.destinationCountry" @onChange="onDestCountryChange"></CountryPicker0>
                     </el-form-item>
                   </el-col>
 
                   <el-col :span="8">
-                    <el-form-item label="产品类型" prop="productType">
+                    <el-form-item  :label="$t('产品类型')"  prop="productType">
                       <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.destinationCountry" @onChange="onProductChange" ></TransProductCasPicker>
                     </el-form-item>
                   </el-col>
                   <el-col :span="5">
-                    <el-form-item label="报关方式" prop="customsEclaration">
-                      <el-select v-model="form.customsEclaration" placeholder="请选择"  @change="calcBillFee">
+                    <el-form-item  :label="$t('报关方式')"  prop="customsEclaration">
+                      <el-select v-model="form.customsEclaration" placeholder=""  @change="calcBillFee">
                         <el-option
                           v-for="dict in dict.type.emis_declare_mode"
                           :key="dict.value"
@@ -84,8 +84,8 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="5">
-                    <el-form-item label="清关方式" prop="customsClear">
-                      <el-select v-model="form.customsClear" placeholder="请选择"  @change="calcBillFee">
+                    <el-form-item :label="$t('清关方式')"  prop="customsClear">
+                      <el-select v-model="form.customsClear" placeholder=""  @change="calcBillFee">
                         <el-option
                           v-for="dict in dict.type.emis_customs_clear"
                           :key="dict.value"
@@ -97,8 +97,8 @@
                   </el-col>
 
                   <el-col :span="6">
-                    <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="form.pickupMethod" placeholder="请选择" @change="calcBillFee">
+                    <el-form-item :label="$t('取件方式')" prop="pickupMethod">
+                      <el-select v-model="form.pickupMethod" placeholder="" @change="calcBillFee">
                         <el-option
                           v-for="dict in dict.type.emis_qujian_fangshi"
                           :key="dict.value"
@@ -120,14 +120,14 @@
                   </el-col>
 
                   <el-col :span="6">
-                    <el-form-item label="派件方式" prop="dispatchMethod">
+                    <el-form-item :label="$t('派件方式')" prop="dispatchMethod">
                       <el-radio-group v-model="form.dispatchMethod">
                         <el-radio
                           v-for="dict in dict.type.emis_tab_dispatch_mode"
                           :key="dict.value"
                           :label="dict.value"
                         >
-                        <span  >{{dict.label}}</span>
+                        <span  >{{ $t(dict.label) }}</span>
                       </el-radio>
                       </el-radio-group>
                     </el-form-item>
@@ -135,19 +135,19 @@
                   <el-col :span="24">
                     <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                       <el-col :span="8">
-                        <el-form-item label="月结客户" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
+                        <el-form-item  :label="$t('月结客户')" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                        <el-form-item label="回款联系人" prop="payee" label-width="85px">
+                        <el-form-item   :label="$t('回款联系人')"  prop="payee" label-width="85px">
                           <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
                           <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
 
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                        <el-form-item label="销售联系人" prop="salesmen" label-width="85px">
+                        <el-form-item  :label="$t('销售联系人')"  prop="salesmen" label-width="85px">
                           <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
                           <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
                         </el-form-item>
@@ -163,44 +163,22 @@
 
                       <div style="width:230px">
                           <el-form-item  prop="sendSiteCode">
-                            <span slot="label" style="color:gray">寄件网点:</span>
+                            <span slot="label" style="color:gray">{{ $t('寄件网点') }}:</span>
                             <EmisSiteSimplePicker v-if="$store.getters.ownerSiteCode== '88888'" v-model="form.sendSiteCode"  @onChange="onSendSiteSelect"  ></EmisSiteSimplePicker>
                             <el-input v-else  v-model="form.sendSiteName" placeholder="" disabled />
                           </el-form-item>
                       </div>
                         <div style="margin-left: 12px;">
-                          主单剩余:<span>{{ totalAvailablePag.mainHasCnt }}</span>
+                          {{ $t('主单剩余') }}:<span>{{ totalAvailablePag.mainHasCnt }}</span>
                         </div>
                         <div>
-                          子单剩余:<span>{{ totalAvailablePag.subHasCnt }}</span>
+                          {{ $t('子单剩余') }}:<span>{{ totalAvailablePag.subHasCnt }}</span>
                         </div>
                     </div>
                     <div v-else >
-                        <div @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">主单余量:0，请立即【<span style="color:blue">申购</span>】</div>
+                        <div @click="handleApplyPag" style="font-size: 15px;font-weight: 700;color:red;cursor: pointer;">{{ $t('主单余量') }}:0，{{ $t('请立即') }}【<span style="color:blue">{{ $t('申购') }}</span>】</div>
                     </div>
               </div>
-              <!-- <div v-if="action=='add'" style="position: absolute;right: 80px;top: 260px;z-index: 1;">
-                    <el-form-item label="打印选项:" prop="printTypeCheckList">
-                      <div style="display:inline-flex">
-                        <div>
-                          <el-checkbox-group v-model="form.printTypeCheckList">
-                            <el-checkbox :key="0" :label="0" >
-                              <span  >客户联</span>
-                            </el-checkbox>
-                            <el-checkbox :key="1" :label="1" >
-                              <span  >寄件网点存根联</span>
-                            </el-checkbox>
-                            <el-checkbox :key="5" :label="5" >
-                              <span  >子单</span>
-                            </el-checkbox>
-                          </el-checkbox-group>
-                        </div>
-                        <div style="margin-left:10px">
-                          <TanexPrinterPanel ref="tanexPrinter" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false"  @onPrintComplete="onComplete"></TanexPrinterPanel>
-                        </div>
-                    </div>
-                    </el-form-item>
-              </div> -->
 
             </div>
           </el-collapse-item>
@@ -217,7 +195,7 @@
                             padding: 5px 15px;
                             background: black;
                             font-size: 13px;
-                            color: white;">寄件信息</span>
+                            color: white;">{{ $t('寄件信息') }}</span>
                       </div>
                       <div style="width:50%;text-align:right;padding-right: 15px;">
                           <!-- icon="el-icon-edit" -->
@@ -227,22 +205,22 @@
                         style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
                         class="iconfont icon-dizhibao"
                         @click="handleSelectCustomerAddress(1)"
-                      >寄件地址薄</el-button>
+                      >{{ $t('寄件地址薄') }}</el-button>
                       </div>
                     </el-col>
 
                     <el-col :span="12">
-                      <el-form-item label="寄件人" prop="sender.name">
+                      <el-form-item :label="$t('寄件人')" prop="sender.name">
                         <CustomerAddressSimplePicker0 addressType="1" :useSiteCode="form.sendSiteCode" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item label="寄件电话" prop="sender.phone">
+                      <el-form-item :label="$t('寄件电话')" prop="sender.phone">
                         <el-input v-model="form.sender.phone" placeholder="" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="寄件公司" prop="sender.company"
+                      <el-form-item :label="$t('寄件公司')" prop="sender.company"
                       :rules="form.paymentType != 2 ? rules.sender.company : []"
                       >
                         <el-input
@@ -250,7 +228,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="国家地区" prop="sender.province"  >
+                      <el-form-item  :label="$t('国家地区')" prop="sender.province"  >
                         <div style="display:inline-flex">
                           <country-picker1 v-model="form.sender.country" ></country-picker1>
                           <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
@@ -260,14 +238,14 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="寄件地址" prop="sender.address">
+                      <el-form-item :label="$t('寄件地址')"  prop="sender.address">
                         <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
                       </el-form-item>
                     </el-col>
 
                     <el-col :span="24">
                       <el-form-item label="" prop="blMessage">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('寄件/签收短信') }} </span></el-checkbox>
                       </el-form-item>
                     </el-col>
 
@@ -282,7 +260,7 @@
                               padding: 5px 15px;
                               background: #b12e29;
                               font-size: 13px;
-                              color: white;">收件信息</span>
+                              color: white;"> {{ $t('收件信息') }}</span>
                           </div>
                         <div style="width:50%;text-align:right;padding-right: 15px;">
                           <el-button
@@ -291,30 +269,30 @@
                           style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
                           class="iconfont icon-dizhibao"
                           @click="handleSelectCustomerAddress(2)"
-                        >收件地址薄</el-button>
+                        > {{ $t('收件地址薄') }}</el-button>
                         </div>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="收件人" prop="reciever.name">
+                        <el-form-item  :label="$t('收件人')" prop="reciever.name">
                           <CustomerAddressSimplePicker1 addressType="2" :useSiteCode="form.sendSiteCode"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="收件电话" prop="reciever.phone">
+                        <el-form-item  :label="$t('收件电话')"  prop="reciever.phone">
                           <el-input v-model="form.reciever.phone" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="收件公司" prop="reciever.company"
+                        <el-form-item  :label="$t('收件公司')" prop="reciever.company"
                         :rules="form.paymentType != 4 ? rules.reciever.company : []"
                         >
                           <el-input v-model="form.reciever.company" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="国家地区" prop="reciever.province">
+                        <el-form-item :label="$t('国家地区')" prop="reciever.province">
                           <div style="display:inline-flex">
                             <country-picker2 v-model="form.reciever.country"  ></country-picker2>
                             <ProvincePicker2  v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
@@ -324,24 +302,24 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="收件地址" prop="reciever.address">
+                        <el-form-item  :label="$t('收件地址')" prop="reciever.address">
                           <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="目的地" prop="destinationCode">
+                        <el-form-item  :label="$t('目的地')"  prop="destinationCode">
                           <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
+                        <el-form-item  :label="$t('目的网点')"  prop="dispatchUnderlingSiteCode">
                           <el-input v-model="form.dispatchUnderlingSiteCode" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
                         <el-form-item label="" prop="blAcceptMessage">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">  {{ $t('派件短信') }}</span></el-checkbox>
                         </el-form-item>
                       </el-col>
                   </el-row>
@@ -359,23 +337,23 @@
                 <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
                     <!-- <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col> -->
                     <el-col :span="24">
-                        <el-form-item label="货物大类" prop="goodsType" label-width="70px">
-                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
+                        <el-form-item :label="$t('货物大类')"  prop="goodsType" label-width="70px">
+                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder=""></GoodsMultiplePicker>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <el-form-item label="货物名称" prop="goodsInfo" label-width="70px">
+                        <el-form-item  :label="$t('货物名称')"  prop="goodsInfo" label-width="70px">
                           <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
+                        <el-form-item  :label="$t('总件数')"  prop="parcelQty" label-width="70px">
                           <el-input v-model="form.parcelQty" style="text-align: right;" @blur="handleCargoQtyChangeDebounce" @keyup.enter.native="handleCargoQtyChangeDebounce" placeholder=""  />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="实际重量" prop="billWeight" label-width="70px">
-                          <el-input v-model="form.billWeight" @blur="handleCalcSettlementWeight" @keyup.enter.native="handleCalcSettlementWeight"  style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
+                        <el-form-item  :label="$t('实际重量')"  prop="billWeight" label-width="70px">
+                          <el-input v-model="form.billWeight" @blur="handleCalcSettlementWeight" @keyup.enter.native="handleCalcSettlementWeight"  style="text-align: right;min-width: 80px" placeholder="" >
                             <span slot="suffix">(kg)</span>
                           </el-input>
                         </el-form-item>
@@ -403,32 +381,32 @@
                             max-height="300px"
                           >
 
-                            <el-table-column label="序号" align="center" width="60">
+                            <el-table-column  :label="$t('序号')" align="center" width="60">
                                   <template slot-scope="scope">
                                       <span > {{scope.$index+1}}</span>
                                   </template>
                             </el-table-column>
-                            <el-table-column prop="length" label="长(cm)" align="center" width="60">
+                            <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.length" @input="(val)=>handleCalcVolumeDebounce(scope.row)" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="width" label="宽(cm)" align="center" width="60">
+                            <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.width" @input="(val)=>handleCalcVolumeDebounce(scope.row)" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="height" label="高(cm)" align="center" width="60">
+                            <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.height" @input="(val)=>handleCalcVolumeDebounce(scope.row)" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="cargoQty" label="件数" align="center" width="60">
+                            <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChangeDebounce(scope.row)" @keyup.enter.native="(val)=>handleCargoQtyChange(scope.row)"   size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="volume" label="体积(m³)" align="center" width="80">
+                            <el-table-column prop="volume"  :label="$t('体积(m³)')" align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
                               </template>
@@ -441,7 +419,7 @@
                               </template>
                             </el-table-column> -->
 
-                            <el-table-column label="操作" align="left" min-width="50">
+                            <el-table-column :label="$t('操作')"  align="left" min-width="50">
                                   <template slot-scope="scope">
                                     <span class="icon iconfont"
                                     style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@@ -459,7 +437,7 @@
 
 
                       <el-col :span="12">
-                        <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
+                        <el-form-item  :label="$t('总体积')"  prop="totalVolume" label-width="70px" >
                           <div style="">
                             <el-input v-model="form.totalVolume" @blur="handleCalcVolumeWeight" @keyup.enter.native="handleCalcVolumeWeight" style="text-align: right;width: 120px" placeholder="体积" >
                               <span slot="suffix">(m³)</span>
@@ -469,7 +447,7 @@
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
+                        <el-form-item  :label="$t('体积重量')"  prop="volumeWeight" label-width="70px">
                           <el-input v-model="form.volumeWeight"   placeholder="" disabled>
                             <span slot="suffix">(kg)</span>
                           </el-input>
@@ -477,15 +455,15 @@
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
+                        <el-form-item  :label="$t('结算重量')"  prop="settlementWeight" label-width="70px">
                           <el-input v-model="form.settlementWeight" placeholder="" disabled >
                             <span slot="suffix">(kg)</span>
                           </el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="包装类型" prop="packType" label-width="70px"">
-                            <el-select multiple="" v-model="form.packType" placeholder="请选择">
+                        <el-form-item  :label="$t('包装类型')"  prop="packType" label-width="70px"">
+                            <el-select multiple="" v-model="form.packType" placeholder="">
                               <el-option
                                 v-for="dict in dict.type.emis_tab_packing_type"
                                 :key="dict.value"
@@ -501,12 +479,12 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="12" v-if="form.blOverWeight==1">
-                        <el-form-item label="超重件数" prop="overWeightNumber" label-width="70px">
-                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
+                        <el-form-item  :label="$t('超重件数')" prop="overWeightNumber" label-width="70px">
+                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" >
+                        <el-form-item  :label="$t('生成子单')" prop="blGenSubbill" label-width="70px" >
                           <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill" >
                             <el-radio :key="'1'" label="1">是</el-radio>
                             <el-radio :key="'0'" label="0">否</el-radio>
@@ -515,23 +493,23 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="24" v-if="form.blGenSubbill==1">
-                        <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
+                        <el-form-item  :label="$t('子单号')" prop="billCodeSub" label-width="70px">
                           <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="12">
-                        <el-form-item label="进仓单" prop="warehouseInNo" label-width="70px">
+                        <el-form-item  :label="$t('进仓单')" prop="warehouseInNo" label-width="70px">
                           <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="合同号" prop="custOrderId" label-width="70px">
+                        <el-form-item :label="$t('合同号')"  prop="custOrderId" label-width="70px">
                           <el-input v-model="form.custOrderId" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
-                        <el-form-item label="运单备注" prop="remark" label-width="70px">
+                        <el-form-item :label="$t('运单备注')" prop="remark" label-width="70px">
                           <el-input v-model="form.remark" type="textarea" placeholder="" />
                         </el-form-item>
                       </el-col>
@@ -542,8 +520,8 @@
                   <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
 
                     <el-col :span="12">
-                      <el-form-item label="付款方式" prop="paymentType" label-width="70px">
-                        <el-select v-model="form.paymentType" placeholder="请选择"  @change="onPaymentTypeChange">
+                      <el-form-item :label="$t('付款方式')"  prop="paymentType" label-width="70px">
+                        <el-select v-model="form.paymentType" placeholder=""  @change="onPaymentTypeChange">
                             <el-option
                               v-for="dict in dict.type.emis_payment_type"
                               :key="dict.value"
@@ -556,19 +534,19 @@
                     <el-col :span="12">
                     </el-col>
                     <el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
-                      <el-form-item label="付款客户" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" label-width="70px">
+                      <el-form-item  :label="$t('付款客户')" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" label-width="70px">
                         <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item label="回款联系人" prop="payee" label-width="85px">
+                      <el-form-item   :label="$t('回款联系人')" prop="payee" label-width="85px">
                         <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
-                        <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
+                        <PayeePicker v-else :placeholder="$t('回款联系人')"    v-model="form.payee"  ></PayeePicker>
 
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                      <el-form-item label="销售联系人" prop="salesmen" label-width="85px">
+                      <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="85px">
                         <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
                         <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
 
@@ -576,7 +554,7 @@
                     </el-col>
 
                     <el-col :span="24">
-                      <el-form-item label="计费方式" prop="calcFeeType" label-width="70px">
+                      <el-form-item  :label="$t('计费方式')" prop="calcFeeType" label-width="70px">
                         <el-radio-group v-model="form.calcFeeType" @change="calcBillFee" >
                           <el-radio
                             v-for="dict in dict.type.emis_calc_fee_type"
@@ -588,9 +566,9 @@
                       </el-form-item>
                     </el-col>
 
-                    <el-form-item label="特殊报价" prop="ext" label-width="70px">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0">特殊报价</el-checkbox>
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0">敏感物</el-checkbox>
+                    <el-form-item :label="$t('特殊报价')"  prop="ext" label-width="70px">
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0"> {{ $t('特殊报价') }}</el-checkbox>
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0"> {{ $t('敏感物') }}</el-checkbox>
 
                     </el-form-item>
 
@@ -616,43 +594,43 @@
                           >
 
 
-                            <el-table-column prop="feeName" label="收费项" align="center" width="70">
+                            <el-table-column prop="feeName"  :label="$t('收费项')"  align="center" width="70">
                               <template slot-scope="scope">
                                 <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="fee" label="应收" align="center" width="50">
+                            <el-table-column prop="fee"  :label="$t('应收')"  align="center" width="50">
                               <template slot-scope="scope">
                                 <span>{{ scope.row.fee }}</span>
                               </template>
                             </el-table-column>
 
-                            <el-table-column prop="initialWeightFee" label="首重费" align="center" width="60">
+                            <el-table-column prop="initialWeightFee"  :label="$t('首重费')"  align="center" width="60">
                               <template slot-scope="scope">
                                 <el-input  v-if="form.blSpecialQuote==1" v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.initialWeightFee}} </div>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
+                            <el-table-column prop="addWeightPrice"  :label="$t('续重单价')"  align="center" width="70">
                               <template slot-scope="scope">
                                 <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.addWeightPrice}} </div>
 
                               </template>
                             </el-table-column>
-                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
+                            <el-table-column prop="realFee" :label="$t('实收')" align="center" width="50">
                               <template slot-scope="scope">
                                 <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.realFee}} </div>
                               </template>
                             </el-table-column>
-                            <el-table-column  prop="remark" label="描述" align="center" min-width="50">
+                            <el-table-column  prop="remark" :label="$t('描述')"  align="center" min-width="50">
                               <template slot-scope="scope">
                                 <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.remark" size="mini" placeholder=""></el-input>
                                 <div v-else> {{scope.row.remark}} </div>
                               </template>
                             </el-table-column>
-                            <el-table-column label="操作" align="center" width="50">
+                            <el-table-column :label="$t('操作')" align="center" width="50">
                                   <template slot-scope="scope">
                                     <span class="icon iconfont"
                                     style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@@ -679,40 +657,40 @@
                                       type="text"
                                       icon="el-icon-plus"
                                       @click="handleAddFee"
-                                    >增加自定义费用</el-button>
+                                    >{{ $t('增加自定义费用') }}</el-button>
                               </el-popover>
                           </div>
 
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                      <el-form-item label="总运费" prop="freight" label-width="70px">
+                      <el-form-item :label="$t('总运费')"  prop="freight" label-width="70px">
                             <el-input v-if="form.calcFeeType == 3" v-model="form.freight" placeholder="" >   </el-input>
                             <el-input v-else v-model="form.freight" disabled placeholder="" >   </el-input>
                       </el-form-item>
-                      <el-form-item label="费用备注" prop="feeRemark" label-width="70px">
+                      <el-form-item  :label="$t('费用备注')" prop="feeRemark" label-width="70px">
                             <el-input v-model="form.feeRemark" type="textarea" placeholder="" >
                         </el-input>
                       </el-form-item>
                     </el-col>
 
                     <el-col :span="24" v-if="action=='add'">
-                        <el-form-item label="打印选项" prop="printTypeCheckList">
+                        <el-form-item  :label="$t('打印选项')"  prop="printTypeCheckList">
                           <el-checkbox-group v-model="form.printTypeCheckList">
                               <el-checkbox :key="0" :label="0" >
-                                <span  >客户联</span>
+                                <span  >{{$t('客户联')}}</span>
                               </el-checkbox>
                               <el-checkbox :key="1" :label="1" >
-                                <span  >寄件网点存根联</span>
+                                <span  >{{$t('寄件网点存根联')}}</span>
                               </el-checkbox>
                               <el-checkbox :key="5" :label="5" >
-                                <span  >子单</span>
+                                <span  >{{$t('子单')}}</span>
                               </el-checkbox>
                             </el-checkbox-group>
                        </el-form-item>
                     </el-col>
                     <el-col :span="24" v-if="action=='add'">
-                      <el-form-item label="打印组件" prop="printTypeCheckList">
+                      <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>
                     </el-col>
@@ -727,8 +705,8 @@
       </el-collapse>
 
       <div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="initData">重置</el-button>
+        <el-button type="primary" @click="submitForm">{{$t('确 定')}}</el-button>
+        <el-button @click="initData">{{$t('重置')}}</el-button>
       </div>
 
 
diff --git a/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue b/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
index cf9864f7..b48303c9 100644
--- a/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
+++ b/src/views/emis/emisWaybillAjustApply/WaybillAjustStatList.vue
@@ -3,7 +3,7 @@
     <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col :span="4">
-          <el-form-item label="运单号" prop="billCode"  label-width="auto">
+          <el-form-item label="运单号" prop="billCode"  >
             <XdTextareaInput
                         v-model="queryParams.billCode"
                         :placeholder="$t('多个流水号逗号或换行隔开')"