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..503f7acb 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>
 
@@ -217,7 +230,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" >
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index 4a615a00..b8d3019d 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -333,7 +333,7 @@
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
-          storageName="centerWaybillList_main_20250826"
+          storageName="centerWaybillList_main"
 
           ref="refTable"
           :row-key="rowKey"
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 33ae18c5..60571114 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -297,7 +297,7 @@
           ref="refTable"
           row-key="id"
 
-          storageName="sendWaybillList_main_250825"
+          storageName="sendWaybillList_main_240702"
           :showStatInfo="true"
 
            v-loading="loading"
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index 317823e8..2d345095 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -307,7 +307,7 @@
            :showStatInfo="true"
 
           ref="refTable"
-          storageName="sendWaybillListNew_main_250825"
+          storageName="sendWaybillListNew_main_240702"
 
            v-loading="loading"
            border
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();
       }