diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 0c117dd6..27577d0a 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -257,12 +257,12 @@
                         <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>
-                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
                          <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
                       <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
                       </el-form-item>
@@ -976,7 +976,10 @@ data() {
       mainHasCnt:0,
       subHasCnt:0
     },
-
+    // 选中的寄件人企业名称
+    selectedSenderEnterpriseName:null,
+    // 选中的寄件人企业税号
+    selectedSenderEnterpriseTaxId:null,
     // 表单校验
     rules: {
       billCode: [
@@ -1505,6 +1508,9 @@ methods: {
     ){
           this.form.custNo=null;
           this.form.customerCode=null;
+              //企业税号重新赋值
+          this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+          this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
           this.calcBillFee();
     }
 
@@ -1522,6 +1528,10 @@ methods: {
       this.form.payee=item.payee;
       this.form.salesmen=item.salesmen;
       this.form.paymentType= '2';
+       // 企业名称
+      this.form.sender.enterpriseName=item.enterpriseName;
+      // 企业税号
+      this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -2009,6 +2019,15 @@ methods: {
     // this.form.receiveTown=value.town;
     this.form.sender.address=value.address;
     this.form.sender.company=value.company;
+      // 选中的寄件人企业名称
+    this.selectedSenderEnterpriseName=value.enterpriseName;
+    // 选中的寄件人企业税号
+    this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+    //企业税号
+    if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+      this.form.sender.enterpriseName=value.enterpriseName;
+      this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+    }
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;
@@ -2020,10 +2039,16 @@ methods: {
     // this.form.receiveTown=value.town;
     this.form.reciever.address=value.address;
     this.form.reciever.company=value.company;
-    this.form.sender.enterpriseName=value.enterpriseName;
-    this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
     this.form.sender.id = value.id;
-
+     // 选中的寄件人企业名称
+    this.selectedSenderEnterpriseName=value.enterpriseName;
+    // 选中的寄件人企业税号
+    this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+    //企业税号
+    if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+      this.form.sender.enterpriseName=value.enterpriseName;
+      this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+    }
     this.handleCalcDestSite();
 
   },
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 1bc36964..7340145a 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -259,12 +259,12 @@
                         <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>
-                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                    <el-col :span="12" v-if="form.sender.country=='0086' ||  ['2','4','5'].includes(form.paymentType)">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
                           <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                    <el-col :span="12" v-if="form.sender.country=='0086' ||  ['2','4','5'].includes(form.paymentType)">
                         <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
                           <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
                         </el-form-item>
@@ -962,7 +962,6 @@ data() {
   }
   //校验收件国家地区国家和省份是否匹配
   var checkRecieverCountryProvince = (rule, value, callback) => {
-    console.log('value',value, this.form.reciever.country , this.recieverCountryCode)
     if (this.form.reciever.country && this.recieverCountryCode) {
       if (this.form.reciever.country != this.recieverCountryCode) {
         callback(new Error('收件国家和省份不一致'));
@@ -1005,6 +1004,10 @@ data() {
     //寄件人省份的国家
     senderCountryCode:null,
     recieverCountryCode:null,
+    // 选中的寄件人企业名称
+    selectedSenderEnterpriseName:null,
+    // 选中的寄件人企业税号
+    selectedSenderEnterpriseTaxId:null,
     // 表单校验
     rules: {
       billCode: [
@@ -1521,6 +1524,9 @@ methods: {
     ){
           this.form.custNo=null;
           this.form.customerCode=null;
+          //企业税号重新赋值
+          this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+          this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
           this.calcBillFee();
     }
 
@@ -1541,6 +1547,10 @@ methods: {
       this.form.payee=item.payee;
       this.form.salesmen=item.salesmen;
       this.form.paymentType= '2';
+       // 企业名称
+      this.form.sender.enterpriseName=item.enterpriseName;
+      // 企业税号
+      this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -2037,10 +2047,16 @@ methods: {
     this.form.sender.address=value.address;
     this.form.sender.company=value.company;
     this.senderCountryCode=value.country;
-    this.form.sender.enterpriseName=value.enterpriseName;
-    this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
     this.form.sender.id = value.id;
-
+    // 选中的寄件人企业名称
+    this.selectedSenderEnterpriseName=value.enterpriseName;
+    // 选中的寄件人企业税号
+    this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+    //企业税号
+    if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+      this.form.sender.enterpriseName=value.enterpriseName;
+      this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+    }
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 12cf8802..6f3c5e13 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -260,12 +260,12 @@
                         <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>
-                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
                          <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.sender.country=='0086'">
+                    <el-col :span="12" v-if="form.sender.country=='0086' || ['2','4','5'].includes(form.paymentType)">
                       <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
                       </el-form-item>
@@ -1007,6 +1007,10 @@ data() {
     //寄件人省份的国家
     senderCountryCode:null,
     recieverCountryCode:null,
+    // 选中的寄件人企业名称
+    selectedSenderEnterpriseName:null,
+    // 选中的寄件人企业税号
+    selectedSenderEnterpriseTaxId:null,
     // 表单校验
     rules: {
       billCode: [
@@ -1521,6 +1525,9 @@ methods: {
     ){
           this.form.custNo=null;
           this.form.customerCode=null;
+          //企业税号重新赋值
+          this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+          this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
           this.calcBillFee();
     }
 
@@ -1538,6 +1545,10 @@ methods: {
       this.form.payee=item.payee;
       this.form.salesmen=item.salesmen;
       this.form.paymentType= '2';
+      // 企业名称
+      this.form.sender.enterpriseName=item.enterpriseName;
+      // 企业税号
+      this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -2029,11 +2040,18 @@ methods: {
     // this.form.receiveTown=value.town;
     this.form.sender.address=value.address;
     this.form.sender.company=value.company;
-    this.form.sender.enterpriseName=value.enterpriseName;
-    this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
     this.form.sender.id = value.id;
     //校验数据初始化
     this.senderCountryCode=value.country;
+    // 选中的寄件人企业名称
+    this.selectedSenderEnterpriseName=value.enterpriseName;
+    // 选中的寄件人企业税号
+    this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+    //企业税号
+    if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+      this.form.sender.enterpriseName=value.enterpriseName;
+      this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+    }
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index e079f211..a9bc7077 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -1355,6 +1355,10 @@ export default {
       //寄件人省份的国家
       senderCountryCode:null,
       recieverCountryCode:null,
+      // 选中的寄件人企业名称
+      selectedSenderEnterpriseName:null,
+      // 选中的寄件人企业税号
+      selectedSenderEnterpriseTaxId:null,
       // 表单校验
       rules: {
         billCode: [
@@ -1613,6 +1617,10 @@ export default {
       if(item!=null){
         this.form.payee=item.payee;
         this.form.salesmen=item.salesmen;
+        // 企业名称
+        this.form.sender.enterpriseName=item.enterpriseName;
+        // 企业税号
+        this.form.sender.enterpriseTaxId=item.enterpriseTaxId;
       }
       this.calcBillFee()
     },
@@ -1771,10 +1779,16 @@ export default {
       // this.form.receiveTown=value.town;
       this.form.sender.address=value.address;
       this.form.sender.company=value.company;
-      this.form.sender.enterpriseName=value.enterpriseName;
-      this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
       this.form.sender.id = value.id;
-
+      // 选中的寄件人企业名称
+      this.selectedSenderEnterpriseName=value.enterpriseName;
+      // 选中的寄件人企业税号
+      this.selectedSenderEnterpriseTaxId=value.enterpriseTaxId;
+      //企业税号
+      if(!['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+        this.form.sender.enterpriseName=value.enterpriseName;
+        this.form.sender.enterpriseTaxId=value.enterpriseTaxId;
+      }
     },
     onChangeSelectReceiver(value){
       this.form.reciever.name=value.name;
@@ -2223,6 +2237,9 @@ export default {
       ) {
         this.form.custNo = null;
         this.form.customerCode = null;
+        //企业税号重新赋值
+        this.form.sender.enterpriseName=this.selectedSenderEnterpriseName;
+        this.form.sender.enterpriseTaxId=this.selectedSenderEnterpriseTaxId;
         this.calcBillFee();
       }