diff --git a/public/static/tpl/imp_month_user.xlsx b/public/static/tpl/imp_month_user.xlsx
index e3fc6554..095ea73c 100644
Binary files a/public/static/tpl/imp_month_user.xlsx and b/public/static/tpl/imp_month_user.xlsx differ
diff --git a/public/static/tpl/imp_month_user_enterpriseTaxId.xlsx b/public/static/tpl/imp_month_user_enterpriseTaxId.xlsx
new file mode 100644
index 00000000..d48beb90
Binary files /dev/null and b/public/static/tpl/imp_month_user_enterpriseTaxId.xlsx differ
diff --git a/src/api/emis/emisCustomerUser.js b/src/api/emis/emisCustomerUser.js
index 57d7e37e..2dcafc38 100644
--- a/src/api/emis/emisCustomerUser.js
+++ b/src/api/emis/emisCustomerUser.js
@@ -84,3 +84,12 @@ export function delEmisCustomerUser(id) {
     method: 'delete'
   })
 }
+
+//导入企业税号
+export function batchImportEnterprise(data) {
+  return request({
+    url: '/emis/emisCustomerUser/batchImportEnterprise',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index 44ba0576..b36d678e 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -93,13 +93,13 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="所属国家" prop="country">
-                <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
+                <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" @change="handleCountryChange"></CountryPicker>
             </el-form-item>
           </el-col>
           <el-col :span="16">
             <el-form-item label="省市区" prop="province">
             <div style="display: inline-flex">
-              <ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
+              <ProvincePicker v-model="form.province" :countryCode="form.country"></ProvincePicker>
               <CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
               <DistrictPicker v-model="form.county" :parentCode="form.city" ></DistrictPicker>
               <!-- <TownPicker v-model="form.town" :parentCode="form.county" ></TownPicker> -->
@@ -113,6 +113,16 @@
               <el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="form.country === '0086' ">
+            <el-form-item label="企业名称" prop="enterpriseName">
+              <el-input v-model="form.enterpriseName" placeholder="请输入企业名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="form.country === '0086' ">
+            <el-form-item label="企业税号" prop="enterpriseTaxId">
+              <el-input v-model="form.enterpriseTaxId" placeholder="请输入企业税号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="账期(天)" prop="creditPeriod">
               <el-input-number  v-model="form.creditPeriod"  placeholder="账期(天)" :min="0" :max="365" :controls="false" :precision="0"></el-input-number>
@@ -482,7 +492,13 @@ export default {
         }
       });
     },
-
+    handleCountryChange(val){
+      console.log('handleCountryChange',val);
+      if(val.code !== '0086'){
+        this.form.enterpriseName = null;
+        this.form.enterpriseTaxId = null;
+      }
+    }
   }
 };
 </script>
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 39a4f97b..6b51f470 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -85,7 +85,20 @@
               @input="handleQuery"
             />
           </el-form-item>
-
+        <el-form-item label="企业名称" prop="enterpriseName">
+            <el-input
+              v-model="queryParams.enterpriseName"
+              :placeholder="$t('企业名称')"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="企业税号" prop="enterpriseTaxId">
+            <el-input
+              v-model="queryParams.enterpriseTaxId"
+              :placeholder="$t('企业税号')"
+              clearable
+            />
+          </el-form-item>
 
     </SearchForm>
 
@@ -169,7 +182,7 @@
                   :show-file-list="false"
                   v-hasPermi="['emis:emisCustomerUser:add']"
                   :before-upload="beforeAvatarUpload">
-                  <el-button slot="trigger" plain class="filter-item" size="mini"  type="primary" >导入</el-button>
+                  <el-button slot="trigger" plain class="filter-item" size="mini"  type="primary" @click="blImport=1" >导入</el-button>
                   <el-link type="primary" style="line-height: 28px;font-size:13px" href="/static/tpl/imp_month_user.xlsx">下载导入模版</el-link>
                 </el-upload>
               </el-col>
@@ -187,6 +200,19 @@
                 月结网点维护
                </el-button>
               </el-col>
+               <el-col :span="1.5">
+                <el-upload
+                  action=""
+                  name="file"
+                  accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                  :show-file-list="false"
+                  v-hasPermi="['emis:emisCustomerUser:edit']"
+                  :before-upload="beforeAvatarUpload">
+                  <el-button slot="trigger" plain class="filter-item" size="mini"  type="primary" @click="blImport=2">导入企业税号</el-button>
+
+                  <el-link type="primary" style="line-height: 28px;font-size:13px" href="/static/tpl/imp_month_user_enterpriseTaxId.xlsx">下载导入模版</el-link>
+                </el-upload>
+              </el-col>
           </el-row>
       </div>
 
@@ -217,7 +243,9 @@
          </template>
       </el-table-column>
       <el-table-column :label="$t('地址')" align="center" prop="address" min-width="100" :show-overflow-tooltip="true" />
-         <el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('企业名称')" align="left" prop="enterpriseName" min-width="170"  :show-overflow-tooltip="true" :sortable="true" />
+      <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="100" />
+      <el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="150" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
       <el-table-column :label="$t('开通oms')" align="center" prop="blOpenOms" min-width="100" >
@@ -331,7 +359,7 @@
 </template>
 
 <script>
-import { listMonthUser, delEmisCustomerUser,addMonthUser ,resetCustomerUserPwd} from "@/api/emis/emisCustomerUser";
+import { listMonthUser, delEmisCustomerUser,addMonthUser ,resetCustomerUserPwd, batchImportEnterprise} from "@/api/emis/emisCustomerUser";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisCustomerUserView from '@/views/emis/emisCustomerUser/emisCustomerUserView';
 import monthUserForm from '@/views/emis/emisCustomerUser/monthUserForm';
@@ -405,6 +433,7 @@ export default {
       // 修改站点代码时间范围
       daterangeUpdateTime: [],
       selectionList:[],
+      blImport:1,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -579,8 +608,9 @@ export default {
       for (let index = 0; index < results.length; index++) {
         const element = results[index]
         // 客户名称	英文简称	月结编号	联系人	手机号码	主归属网点	回款联系人	销售联系人 销售主管 销售支持	结算类型	国家	省份	城市	区县	联系地址	E-Mail	是否启用	是否开启OMS账号	首次签约时间	备注
-        
-        const postData= {
+        let  postData={}
+         if(this.blImport==1){
+          postData= {
             customerName: element['客户名称'],
             customerNameEn: element['客户英文简称'],
             contact: element['联系人'],
@@ -595,6 +625,8 @@ export default {
             city:element['城市'],
             county: element['区县'],
             address: element['联系地址'],
+            enterpriseName: element['企业名称'],
+            enterpriseTaxId: element['企业税号'],
             creditPeriod: element['账期(天)'],
             settleDay: element['账单日'],
             email: element['E-Mail'],
@@ -609,8 +641,16 @@ export default {
             blOpenOms: element['是否开启OMS账号'],
             blSms: element['是否短信'],
             remark: element['备注'],
-            blImport: 1,
+            blImport: this.blImport,
           };
+        }else {
+          postData= {
+            customerName: element['客户名称'],
+            monthlyPayCode: element['月结编号'],
+            enterpriseName: element['企业名称'],
+            enterpriseTaxId: element['企业税号'],
+          }
+        }
         // postData.cosignee= element['']
         // postData.cosigneeAddress= element['收件地址']
         // postData.cosigneeTelephone= element['收件电话']
@@ -620,14 +660,21 @@ export default {
           if(postData.firstSigningDay){
             postData.firstSigningDay=excelDateToJSDate(postData.firstSigningDay).split(' ')[0]
           }
+        if (this.blImport == 1) { //新增
           const res = await addMonthUser(postData)
-          console.log(res);
-
           if (res.code !== 200) {
             this.$modal.msgError(JSON.stringify(res.msg))
             loadingInstance.close()
             return
           }
+        } else { //更新
+          const res = await batchImportEnterprise(postData)
+          if (res.code !== 200) {
+            this.$modal.msgError(JSON.stringify(res.msg))
+            loadingInstance.close()
+            return
+          }
+        }
           loadingInstance.close()
           loadingInstance = this.$loading({
           text: '正在导入 ' + _index  + ' 数据...'
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 0c117dd6..7c3b68c1 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -257,14 +257,16 @@
                         <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' ">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></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' ">
                       <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -976,7 +978,14 @@ data() {
       mainHasCnt:0,
       subHasCnt:0
     },
-
+    // 选中的寄件人企业名称
+    selectedSenderEnterpriseName:null,
+    // 选中的寄件人企业税号
+    selectedSenderEnterpriseTaxId:null,
+    //选中的月结客户企业号
+    selectedMonthUserEnterpriseName: null,
+    //选中的月结客户企业税号
+    selectedMonthUserEnterpriseTaxId: null,
     // 表单校验
     rules: {
       billCode: [
@@ -1505,6 +1514,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 +1534,14 @@ 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;
+      // 选中的月结客户企业号
+      this.selectedMonthUserEnterpriseName = item.enterpriseName;
+      // 选中的月结客户企业税号
+      this.selectedMonthUserEnterpriseTaxId = item.enterpriseTaxId;
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -1672,7 +1692,17 @@ methods: {
 
             this.startTimer();
           }
-
+          if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
+            this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+            this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+            this.selectedSenderEnterpriseName = '';
+            this.selectedSenderEnterpriseTaxId = '';
+          } else {
+            this.selectedMonthUserEnterpriseName = '';
+            this.selectedMonthUserEnterpriseTaxId = '';
+            this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+            this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          }
         });
       }else{
 
@@ -2009,6 +2039,25 @@ 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;
+    }
+    //非月结且地址是非中国 企业号置空
+    if(this.form.sender.country!='0086' ){
+      this.form.sender.enterpriseName='';
+      this.form.sender.enterpriseTaxId='';
+    }
+    // 月结且中国 企业号取值月结客户企业号
+    if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+      this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+      this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+    }
   },
   onChangeSelectReceiver(value){
     this.form.reciever.name=value.name;
@@ -2020,10 +2069,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..550a9786 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -259,14 +259,16 @@
                         <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' ">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                          <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                          <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></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' ">
                         <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                         </el-form-item>
                     </el-col>
                   </el-row>
@@ -962,7 +964,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 +1006,14 @@ data() {
     //寄件人省份的国家
     senderCountryCode:null,
     recieverCountryCode:null,
+    // 选中的寄件人企业名称
+    selectedSenderEnterpriseName:null,
+    // 选中的寄件人企业税号
+    selectedSenderEnterpriseTaxId:null,
+    //选中的月结客户企业号
+    selectedMonthUserEnterpriseName: null,
+    //选中的月结客户企业税号
+    selectedMonthUserEnterpriseTaxId: null,
     // 表单校验
     rules: {
       billCode: [
@@ -1521,6 +1530,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 +1553,15 @@ 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;
+      // 选中的月结客户企业号
+      this.selectedMonthUserEnterpriseName = item.enterpriseName;
+      // 选中的月结客户企业税号
+      this.selectedMonthUserEnterpriseTaxId = item.enterpriseTaxId;
+
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -1622,6 +1643,8 @@ methods: {
 
   },
   initData() {
+    console.log('----initData----')
+
 
     //console.log("====>this.action=2222=>",this.action);
     //console.log("====>this.billCode=2222=>",this.billCode);
@@ -1694,6 +1717,17 @@ methods: {
           }
         this.senderCountryCode = this.form.sender.country;
         this.recieverCountryCode = this.form.reciever.country;
+        if(['2','4','5'].includes(this.form.paymentType)){ //月结
+          this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+          this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          this.selectedSenderEnterpriseName ='';
+          this.selectedSenderEnterpriseTaxId ='';
+        }else{
+          this.selectedMonthUserEnterpriseName = '';
+          this.selectedMonthUserEnterpriseTaxId = '';
+          this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+          this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+        }
         });
       }
       else{
@@ -2037,10 +2071,26 @@ 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;
+    }
+    //非月结且地址是非中国 企业号置空
+    if(this.form.sender.country!='0086' ){
+      this.form.sender.enterpriseName='';
+      this.form.sender.enterpriseTaxId='';
+    }
+    // 月结且中国 企业号取值月结客户企业号
+    if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+      this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+      this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+    }
   },
   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..393cc403 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -262,12 +262,12 @@
                     </el-col>
                     <el-col :span="12" v-if="form.sender.country=='0086'">
                       <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                         <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12" v-if="form.sender.country=='0086'">
                       <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1007,6 +1007,14 @@ data() {
     //寄件人省份的国家
     senderCountryCode:null,
     recieverCountryCode:null,
+    // 选中的寄件人企业名称
+    selectedSenderEnterpriseName:null,
+    // 选中的寄件人企业税号
+    selectedSenderEnterpriseTaxId:null,
+    //选中的月结客户企业号
+    selectedMonthUserEnterpriseName:null,
+    //选中的月结客户企业税号
+    selectedMonthUserEnterpriseTaxId:null,
     // 表单校验
     rules: {
       billCode: [
@@ -1521,6 +1529,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 +1549,15 @@ 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;
+      // 选中的月结客户企业号
+      this.selectedMonthUserEnterpriseName=item.enterpriseName;
+      // 选中的月结客户企业税号
+      this.selectedMonthUserEnterpriseTaxId=item.enterpriseTaxId;
+
     }else{
       this.form.paymentType= '1';
       this.form.payee=null;
@@ -1690,7 +1710,17 @@ methods: {
 
             this.startTimer();
           }
-
+          // if (['2', '4', '5'].includes(this.form.paymentType)) { //月结
+          //   this.selectedMonthUserEnterpriseName = this.form.sender.enterpriseName;
+          //   this.selectedMonthUserEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          //   this.selectedSenderEnterpriseName = '';
+          //   this.selectedSenderEnterpriseTaxId = '';
+          // } else {
+          //   this.selectedMonthUserEnterpriseName = '';
+          //   this.selectedMonthUserEnterpriseTaxId = '';
+          //   this.selectedSenderEnterpriseName = this.form.sender.enterpriseName;
+          //   this.selectedSenderEnterpriseTaxId = this.form.sender.enterpriseTaxId;
+          // }
         });
       }else{
 
@@ -2029,11 +2059,28 @@ 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;
+    }
+    //非月结且地址是非中国 企业号置空
+    if(this.form.sender.country!='0086' ){
+      this.form.sender.enterpriseName='';
+      this.form.sender.enterpriseTaxId='';
+    }
+    // 月结且中国 企业号取值月结客户企业号
+    if (['2', '4', '5'].includes(this.form.paymentType) && this.form.sender.country == '0086') {
+      this.form.sender.enterpriseName = this.selectedMonthUserEnterpriseName;
+      this.form.sender.enterpriseTaxId = this.selectedMonthUserEnterpriseTaxId;
+    }
   },
   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..ea6bf8b0 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -593,7 +593,7 @@
                   </el-row>
               </el-col>
 
-              <el-col :span="24" v-if="applyType&&applyTypeArr.includes('18')">
+              <el-col :span="24" v-if="applyType&&(applyTypeArr.includes('18') || applyTypeArr.includes('20'))">
                     <el-row :gutter="0" class="md-row">
                       <el-col :span="3" class="md-title">
                         <span>寄件信息调整</span>
@@ -648,14 +648,15 @@
                                 <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
                               </el-form-item>
                             </el-col>
-                            <el-col :span="12">
+                            <el-col :span="12" v-if="form.sender.country=='0086'">
                               <el-form-item :label="$t('企业名称')" prop="sender.enterpriseName">
-                                <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称"></el-input>
+                                <el-input v-model="form.sender.enterpriseName" placeholder="请输入企业名称" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
+
                               </el-form-item>
                             </el-col>
-                            <el-col :span="12">
+                            <el-col :span="12" v-if="form.sender.country=='0086'">
                               <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
-                                <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                                <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号" :disabled="['2','4','5'].includes(form.paymentType)"></el-input>
                               </el-form-item>
                             </el-col>
 
@@ -1355,6 +1356,15 @@ export default {
       //寄件人省份的国家
       senderCountryCode:null,
       recieverCountryCode:null,
+      // 选中的寄件人企业名称
+      selectedSenderEnterpriseName:null,
+      // 选中的寄件人企业税号
+      selectedSenderEnterpriseTaxId:null,
+      //选中的月结客户企业号
+      selectedMonthUserEnterpriseName:null,
+      //选中的月结客户企业税号
+      selectedMonthUserEnterpriseTaxId:null,
+
       // 表单校验
       rules: {
         billCode: [
@@ -1613,6 +1623,14 @@ 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.selectedMonthUserEnterpriseName=item.enterpriseName;
+        // 选中的月结客户企业税号
+        this.selectedMonthUserEnterpriseTaxId=item.enterpriseTaxId;
       }
       this.calcBillFee()
     },
@@ -1645,10 +1663,12 @@ export default {
       // if(this.newValue.feeItems){
       //   this.form.feeItems=[...this.newValue.feeItems];
       // }
-
+  
       console.log("====>this.oldValue==>",this.oldValue);
       console.log("====>this.form==>",this.form);
       this.billDetail=this.oldValue;
+      this.senderCountryCode = this.form.sender.country;
+      this.recieverCountryCode = this.form.reciever.country;
     },
     getJsonData(){
       if(this.form.packType&&this.form.packType.length>0){
@@ -1771,10 +1791,27 @@ 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.senderCountryCode=value.country;
       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;
+      }
+      //非月结且地址是非中国 企业号置空
+      if(this.form.sender.country!='0086' ){
+        this.form.sender.enterpriseName='';
+        this.form.sender.enterpriseTaxId='';
+      }
+      // 月结且中国 企业号取值月结客户企业号
+      if(['2','4','5'].includes(this.form.paymentType) && this.form.sender.country=='0086' ){
+        this.form.sender.enterpriseName=this.selectedMonthUserEnterpriseName;
+        this.form.sender.enterpriseTaxId=this.selectedMonthUserEnterpriseTaxId;
+      }
     },
     onChangeSelectReceiver(value){
       this.form.reciever.name=value.name;
@@ -2223,6 +2260,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();
       }