diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls
index 0c91af16..dab07786 100644
Binary files a/public/static/tpl/batch_import_order.xls and b/public/static/tpl/batch_import_order.xls differ
diff --git a/public/static/tpl/import_site_batch.xlsx b/public/static/tpl/import_site_batch.xlsx
index 2022c70d..578dab16 100644
Binary files a/public/static/tpl/import_site_batch.xlsx and b/public/static/tpl/import_site_batch.xlsx differ
diff --git a/src/api/emis/emisCreditSalesmen.js b/src/api/emis/emisCreditSalesmen.js
index 1b0c08fe..17c8de83 100644
--- a/src/api/emis/emisCreditSalesmen.js
+++ b/src/api/emis/emisCreditSalesmen.js
@@ -42,3 +42,12 @@ export function delEmisCreditSalesmen(id) {
     method: 'delete'
   })
 }
+
+//理赔金额明细
+export function getEmisCreditSalesmenDetail(params) {
+  return request({
+    url: '/emis/emisCreditSalesmen/getSalesSatisfyDetail',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/src/api/emis/emisTmsSiteBatchMiss.js b/src/api/emis/emisTmsSiteBatchMiss.js
index 268dd23e..85d999d7 100644
--- a/src/api/emis/emisTmsSiteBatchMiss.js
+++ b/src/api/emis/emisTmsSiteBatchMiss.js
@@ -42,3 +42,20 @@ export function delEmisTmsSiteBatchMiss(id) {
     method: 'delete'
   })
 }
+
+// 确认组批次完成
+export function confirmBatch(data) {
+  return request({
+    url: '/emis/emisTmsSiteBatchMiss/confirmBatch',
+    method: 'post',
+    data: data
+  })
+}
+// 取消确认批次
+export function cancelConfirmBatch(data) {
+  return request({
+    url: '/emis/emisTmsSiteBatchMiss/cancelConfirmBatch',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue
index 2ffbe65f..0bcd5d58 100644
--- a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue
@@ -26,6 +26,8 @@
               </template>
             </el-table-column>
             <el-table-column :label="$t('公司')" align="left" prop="company" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('企业名称')" align="left" prop="enterpriseName" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('企业税号')" align="left" prop="enterpriseTaxId" width="100" :show-overflow-tooltip="true"/>
           </el-table>
           <el-pagination
             v-show="pagination"
diff --git a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue
index 413b79c3..0a966085 100644
--- a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue
@@ -101,7 +101,6 @@
        this.bakOptionItems=[];
        this.optionItems=[];
        listSimpleEmisMonthpayAccount(queryParams).then(response => {
-        console.log('response',response.rows);
          this.loading = false;
          this.bakOptionItems =  response.rows;
          this.optionItems =this.bakOptionItems;
diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
index e80f8ac4..a2fe31a5 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
@@ -152,7 +152,7 @@
           if(key==null && val==null){
             this.defaultItems=[...this.optionItems]
           }else{
-            // this.onChange();
+            this.onChange();
           }
         });
       },
diff --git a/src/views/emis/emisCreditSalesmen/index.vue b/src/views/emis/emisCreditSalesmen/index.vue
index e665fdcf..eaa6e0fe 100644
--- a/src/views/emis/emisCreditSalesmen/index.vue
+++ b/src/views/emis/emisCreditSalesmen/index.vue
@@ -40,7 +40,7 @@
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
            ref="refTable"
-           storageName="emisCreditSalesmenList_main_250426"
+           storageName="emisCreditSalesmenList_main_250820"
 
            border stripe
            size="small"
@@ -108,7 +108,7 @@
 
       <el-table-column :label="$t('剩余额度')" align="center" prop="curMoney" min-width="120" :sortable="true">
         <template slot-scope="scope">
-          {{ (scope.row.tempCreditMoney - scope.row.useMoney).toFixed(2)  }}
+          {{ (scope.row.tempCreditMoney - scope.row.useMoney + scope.row.satisfyMoney).toFixed(2)  }}
         </template>
       </el-table-column>
       <el-table-column :label="$t('总已用额度')" align="center" prop="useMoney" min-width="120" :sortable="true">
@@ -126,6 +126,11 @@
           <div  class="link-type" @click="handleShowBillList(scope.row,1)">{{ scope.row.overTermMoney }}</div>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" min-width="80" >
+         <template slot-scope="scope">
+          <div  class="link-type" @click="handleShowSatisfyMoneyList(scope.row,null)">{{ scope.row.satisfyMoney }}</div>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('剩余比例(%)')" align="center" prop="curMoneyRate" min-width="130" :sortable="true">
         <template slot-scope="scope">
           {{ ( ((scope.row.tempCreditMoney - scope.row.useMoney)/(scope.row.tempCreditMoney))*100 ).toFixed(2)  }}%
@@ -306,6 +311,25 @@ export default {
           }
         );
     },
+    //理赔金额明细列表
+    handleShowSatisfyMoneyList(row,queryQuotaType){
+      console.log('handleShowStatisfy')
+       let item0=row;
+      this.$router.push(
+        {
+          path: '/d24/customerManagement/SatisfyMoneySendWaybillList',
+          query: {
+            action: "queryByCredit",
+            payee: item0.salesmen,
+            startDate: item0.startDate,
+            endDate: item0.endDate,
+            transType: item0.transType,
+            queryQuotaType:queryQuotaType,
+            '_t':(new Date()).getTime()
+          }
+        }
+      );
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue
index 6bfae3a6..4a4d0f06 100644
--- a/src/views/emis/emisCustomerAddress/senderAddress.vue
+++ b/src/views/emis/emisCustomerAddress/senderAddress.vue
@@ -32,7 +32,22 @@
        </el-form-item>
        <el-form-item :label="$t('使用网点')" prop="useSiteCode">
           <EmisSiteSimplePicker :placeholder="$t('使用网点')" :countryCode="queryParams.country"  v-model="queryParams.useSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
-        </el-form-item>
+       </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>
 
@@ -40,17 +55,17 @@
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
-
-           v-loading="loading"
-           border
-           size="small"
-           :data="emisCustomerAddressList"
-           :showSearch.sync="showSearch"
-           :queryParams="queryParams"
-           :total="total"
-           @queryTable="getList"
-           @selection-change="handleSelectionChange"
-           @sort-change="handleSortChange"
+          storageName="senderAddress_main_250825"
+          v-loading="loading"
+          border
+          size="small"
+          :data="emisCustomerAddressList"
+          :showSearch.sync="showSearch"
+          :queryParams="queryParams"
+          :total="total"
+          @queryTable="getList"
+          @selection-change="handleSelectionChange"
+          @sort-change="handleSortChange"
            >
 
       <div slot="toolbar">
@@ -139,6 +154,9 @@
       <!-- <el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> -->
       <!-- <el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> -->
       <el-table-column :label="$t('地址')" align="left" prop="address" min-width="200"  :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="postCode" min-width="100" /> -->
       <el-table-column :label="$t('公司')" align="left" prop="company" min-width="170"  :show-overflow-tooltip="true" :sortable="true" />
       <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />
diff --git a/src/views/emis/emisCustomerAddress/senderAddressForm.vue b/src/views/emis/emisCustomerAddress/senderAddressForm.vue
index 2b916194..1f36b47a 100644
--- a/src/views/emis/emisCustomerAddress/senderAddressForm.vue
+++ b/src/views/emis/emisCustomerAddress/senderAddressForm.vue
@@ -29,7 +29,7 @@
           </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">
@@ -47,6 +47,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="12">
             <el-form-item label="邮编(选填)" prop="postCode">
@@ -215,6 +225,9 @@ export default {
         updateTime: null,
         remark: null,
         parseAddress:null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
+
       };
       this.resetForm("form");
     },
@@ -236,6 +249,13 @@ export default {
         }
       });
     },
+    handleCountryChange(val){
+      if(val !== '0086'){
+        this.form.enterpriseName = null;
+        this.form.enterpriseTaxId = null;
+      }
+    }
+
 
   }
 };
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index e7640977..525af74b 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -902,6 +902,13 @@ export default {
           } else {
             this.isDoing=true;
             try{
+              if(this.isCopy){
+                this.form.updateTime = null;
+                this.form.updateBy = null;
+                this.form.updateByName = null;
+                this.form.updateSite = null;
+                this.form.updateSiteName = null;
+              }         
               let res=await addAllEmisTmsSiteBatch(this.form);
               this.isDoing=false;
               this.$modal.msgSuccess("新增成功");
diff --git a/src/views/emis/emisTmsSiteBatchMiss/confirmForm.vue b/src/views/emis/emisTmsSiteBatchMiss/confirmForm.vue
new file mode 100644
index 00000000..aa04776d
--- /dev/null
+++ b/src/views/emis/emisTmsSiteBatchMiss/confirmForm.vue
@@ -0,0 +1,97 @@
+<template>
+    <div>
+        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="类型">
+                <el-radio-group v-model="form.blManual" @change="handleChange">
+                    <el-radio label="3">无需组批次</el-radio>
+                    <el-radio label="2">组批次已经完成</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="修改原因" prop="manualRemark">
+                <el-input v-model="form.manualRemark" placeholder="" type="textarea" />
+            </el-form-item>
+        </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>
+<script>
+import { confirmBatch } from "@/api/emis/emisTmsSiteBatchMiss";
+
+export default {
+props:{
+    billCodeList:{
+     type:Array,
+     default:()=>[]
+    }
+},
+data() {
+
+return {
+form:{
+    blManual:'3',
+    manualRemark:'',
+},
+queryParams: {
+    pageNum: 1,
+    pageSize: 20,
+   
+},
+rules: {
+    manualRemark: [
+      { required: true, message: '请输入修改原因', trigger: 'blur' }
+    ]
+  }
+}
+},
+methods: {
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {    
+            let formData = {...this.form}
+            formData.params={
+                billCodeList:this.billCodeList
+            }
+          confirmBatch(formData).then(res => {
+            if (res.code == 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success"
+              });
+              this.$emit("on-cancel");
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "error"
+              });
+            }
+          });
+        } else {
+        //  console.log('校验失败')
+          }
+      });
+    },
+    cancel() {
+      this.$refs["form"].resetFields();
+      this.$emit("on-cancel");
+    },
+    handleChange(val) {
+      if (val == '3') {
+          this.$set(this.rules, 'manualRemark',[{ required: true, message: '请输入修改原因', trigger: 'blur' }])
+      }else{
+        this.$set(this.rules, 'manualRemark',[])
+        //清除校验
+        this.$refs.form.clearValidate('manualRemark');
+      }
+    },
+
+  }
+}
+
+
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue
index b2d590bb..c5b6fb28 100644
--- a/src/views/emis/emisTmsSiteBatchMiss/index.vue
+++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue
@@ -42,6 +42,7 @@
 
       <el-form-item label="漏组次数" prop="missCount">
         <el-select clearable v-model="queryParams.missCount" placeholder="请选择">
+          <el-option label="人工修改运单" :value="-7"></el-option>
           <el-option label="运单分批后未组完" :value="-6"></el-option>
           <el-option label="其他" :value="-5"></el-option>
           <el-option label="组批次完成" :value="-4"></el-option>
@@ -126,6 +127,25 @@
                   v-hasPermi="['emis:emisTmsSiteBatchMiss:export']"
                 >导出</el-button>
               </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleConfirm"
+                  :disabled="confirmDisabled"
+                  v-hasPermi="['emis:emisTmsSiteBatchMiss:confirm']"
+                >确认组批次完成</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  plain
+                  size="mini"
+                  @click="handleCancelBatchConfirm"
+                  :disabled="confirmDisabled"
+                  v-hasPermi="['emis:emisTmsSiteBatchMiss:cancelConfirm']"
+                >取消确认批次</el-button>
+              </el-col>
           </el-row>
       </div>
 
@@ -177,14 +197,33 @@
       <!-- <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" /> -->
       <el-table-column :label="$t('录单备注')" align="center" prop="waybillRemark" min-width="200" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('创建人')" align="center" prop="createByName" min-width="100" /> -->
+      <el-table-column :label="$t('修改原因')" align="center" prop="manualRemark" min-width="100" >
+      </el-table-column>
+      <el-table-column :label="$t('完成状态')" align="center" prop="blManual" min-width="100" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.blManual==1">系统审核完成</span>
+          <span v-if="scope.row.blManual==2">人工审核完成</span>
+          <span v-if="scope.row.blManual==3">无需组批次</span>
+        </template>
+      </el-table-column>
+
 
     </XdTable>
+    <!-- 确认组批次完成 弹窗 -->
+    <el-dialog
+      title="确认组批次完成"
+      :visible.sync="openConfirmForm"
+      width="30%"
+    >
+    <confirmForm ref="confirmForm"  @on-cancel="handleCancel" :billCodeList="billCodeList"/>
+    </el-dialog>
 
   </XdPageContainer>
 </template>
 
 <script>
-import { listEmisTmsSiteBatchMiss, getEmisTmsSiteBatchMiss, delEmisTmsSiteBatchMiss, addEmisTmsSiteBatchMiss, updateEmisTmsSiteBatchMiss } from "@/api/emis/emisTmsSiteBatchMiss";
+import { listEmisTmsSiteBatchMiss, getEmisTmsSiteBatchMiss, delEmisTmsSiteBatchMiss, addEmisTmsSiteBatchMiss, updateEmisTmsSiteBatchMiss, cancelConfirmBatch } from "@/api/emis/emisTmsSiteBatchMiss";
+
 import emisTmsSiteBatchMissForm from '@/views/emis/emisTmsSiteBatchMiss/emisTmsSiteBatchMissForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
@@ -204,7 +243,7 @@ import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 import {timeFormat} from '@/utils/dateUtils'
-
+import confirmForm from "@/views/emis/emisTmsSiteBatchMiss/confirmForm.vue";
 
 export default {
   name: "EmisTmsSiteBatchMiss",
@@ -217,7 +256,8 @@ export default {
     TransLinePicker,
     TransProductPicker,
     EmpNamePicker1,
-    EmpNamePicker2
+    EmpNamePicker2,
+    confirmForm
    },
   dicts: ['emis_payment_type'],
   data() {
@@ -230,6 +270,7 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      confirmDisabled:true,
       // 显示搜索条件
       showSearch: true,
       // 创建时间搜索
@@ -243,6 +284,7 @@ export default {
 
       currentId:null,
       openForm: false,
+      openConfirmForm: false,
       titleForm: "",
 
       // 弹出展示层
@@ -268,6 +310,7 @@ export default {
         missCount:null,
         sendSiteCode:null
       },
+      billCodeList:[] // 选中的单号
     };
   },
   created() {
@@ -327,6 +370,7 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
       this.selectList = selection
+      this.confirmDisabled = selection.length ===0;
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
     handleSortChange(column) {
@@ -482,6 +526,17 @@ export default {
         if (j === 'paymentType') {
           return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
         }
+        if(j === 'blManual'){
+          if(v[j] == 1){
+            return '系统审核完成';
+          }
+          else if(v[j] == 2){
+            return '人工审核完成';
+          }
+          else if(v[j] == 3){
+            return '无需组批次';
+          }
+        }
         return v[j]
       }))
     },
@@ -494,6 +549,42 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;
     },
+    //确认组批次完成
+    handleConfirm(){
+      //有选中值
+      this.openConfirmForm= true;
+      //获取选择数据的 运单号
+      this.billCodeList=[];
+      this.selectList.forEach(item=>{
+        this.billCodeList.push(item.billCode);
+      })
+    },
+    handleCancel(){
+      this.openConfirmForm= false;
+    },
+    handleCancelBatchConfirm() {
+      const that = this;
+      // 确认弹窗
+      this.$modal.confirm('是否取消批次确认完成？').then(function () {
+        // 取消确认批次
+        let billCodeList = [];
+        that.selectList.forEach(item => {
+          billCodeList.push(item.billCode);
+        })
+        // 取消确认批次
+        return cancelConfirmBatch({
+          params: {
+            billCodeList: billCodeList
+          }
+        });
+      }).then(() => {
+        this.getList();
+        this.$message({
+          message: "操作成功",
+          type: "success"
+        });
+      }).catch(() => { });
+    }
   }
 };
 </script>
diff --git a/src/views/emis/emisWaybill/CreditSendWaybillList.vue b/src/views/emis/emisWaybill/CreditSendWaybillList.vue
index 5591da56..2b0bbda4 100644
--- a/src/views/emis/emisWaybill/CreditSendWaybillList.vue
+++ b/src/views/emis/emisWaybill/CreditSendWaybillList.vue
@@ -343,7 +343,7 @@ export default {
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
-        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
+        'emis_payment_status'
   ],
   data() {
     return {
diff --git a/src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue b/src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue
new file mode 100644
index 00000000..f170118f
--- /dev/null
+++ b/src/views/emis/emisWaybill/SatisfyMoneySendWaybillList .vue	
@@ -0,0 +1,607 @@
+<template>
+  <XdPageContainer class="app-container">
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          highlight-current-row
+
+          ref="refTable"
+          row-key="id"
+
+          storageName="CreditSendWaybillList_main_250821"
+           :showStatInfo="true"
+
+           v-loading="loading"
+           border
+           size="mini"
+           :data="emisWaybillList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams1"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+           @row-dblclick="handleShowTraceInfo"
+           show-summary
+           :summary-method="getSummaries"
+           :row-class-name="tableRowClassName"
+           >
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisWaybill:export']"
+                >导出</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+ <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" width="80" />
+            <el-table-column :label="$t('账单期间')" align="center" prop="billMonth" width="200" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
+              </template>
+            </el-table-column>
+
+            <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
+            <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
+            <el-table-column :label="$t('结算重量')" align="center" prop="feeWeight" width="80" />
+            <el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" width="150" />
+            <el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" width="150" />
+            <el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" width="150" />
+            <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" width="100"  :show-overflow-tooltip="true" />
+            <el-table-column :label="$t('抵让原因')" align="center" prop="deductionReason" width="100"  :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100"  :show-overflow-tooltip="true" />
+            <el-table-column :label="$t('其他费用')" align="center" prop="otherReason" width="170"  :show-overflow-tooltip="true"/>
+            <!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/> -->
+
+            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
+
+            <el-table-column :label="$t('生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
+
+            <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
+                <el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
+                <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
+              </template>
+            </el-table-column>
+
+            <el-table-column :label="$t('核销状态')" align="center" prop="chargeStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.chargeStatus=='0'" type="error">未核销</el-tag>
+                <el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
+                  <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
+            <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
+            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
+    </XdTable>
+  </XdPageContainer>
+</template>
+
+<script>
+import {listEmisSettleBill} from "@/api/emis/emisSettleBill";
+import {getEmisCreditSalesmenDetail} from "@/api/emis/emisCreditSalesmen";
+import {timeFormat} from '@/utils/dateUtils'
+
+export default {
+  name: "SatisfyMoneySendWaybillList",
+  components: {},
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
+  ],
+
+  data() {
+    return {
+      tableHeight: 200,
+
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+
+      // 总条数
+      total: 0,
+      // 运单列表表格数据
+      emisWaybillList: [],
+      selectionList:[],
+
+      tableData: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+      billCode:null,
+
+      openTraceInfo:false,
+      currentTraceBillItem:null,
+      currentTraceBillCode:null,
+
+      queryOrderType:null,
+      queryOrderDateType:null,
+      queryExpireNotSign:null,
+
+      queryStatInfoMap:null,
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 时间搜索
+      dateRange:[],
+      // 获取运单号查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        paymentType:null,
+        payee:null,
+        paymentStatus:null,
+        carryType:null,
+        params:{
+          problemQueryType:null,
+          problemQueryIds:null,
+          queryTabType:"1",
+          querySendType:"1",
+          beginSendDate:null,
+          endSendDate:null,
+        }
+      },
+      //获取账单查询参数
+      queryParams1:{
+        pageNum: 1,
+        pageSize: 20,
+        settleType:null,
+        queryCode:null, // 换行符隔开
+        params:{
+          beginCreateTime:null,
+          endCreateTime:null,
+          billCode:null
+        }
+      },
+      billCodes:[],
+    };
+  },
+  watch: {
+    $route () {
+	      if(this.$route.query.action=='queryByCredit'){
+          if(this.$route.query.custNo!=null){
+            this.queryParams.custNo=this.$route.query.custNo;
+            this.queryParams.paymentType='2,4,5';
+          }
+
+          if(this.$route.query.payee!=null){
+            this.queryParams.payee=this.$route.query.payee;
+            this.queryParams.paymentType='1,3';
+          }
+
+          this.queryParams.carryType=this.$route.query.transType;
+          this.queryParams.params.queryQuotaType=this.$route.query.queryQuotaType;
+
+          this.queryParams.paymentStatus='0,2';
+          this.queryParams.params.problemQueryType=2;
+          this.queryParams.params.problemQueryIds="173,170,151";
+
+          let startTime=this.$route.query.startDate;
+          let endTime=this.$route.query.endDate;
+          this.dateRange=[timeFormat(startTime), timeFormat(endTime)]
+          this.queryOrderType="1";
+          this.queryOrderDateType="1";
+
+          this.getList();
+	      }
+
+	  }
+  },
+  created() {
+    if(this.$route.query.action=='queryByCredit'){
+
+          if(this.$route.query.custNo!=null){
+            this.queryParams.custNo=this.$route.query.custNo;
+            this.queryParams.paymentType='2,4,5';
+          }
+
+          if(this.$route.query.payee!=null){
+            this.queryParams.payee=this.$route.query.payee;
+            this.queryParams.paymentType='1,3';
+          }
+
+          this.queryParams.carryType=this.$route.query.transType;
+          this.queryParams.params.queryQuotaType=this.$route.query.queryQuotaType;
+
+          this.queryParams.paymentStatus='0,2';
+          this.queryParams.params.problemQueryType=2;
+          this.queryParams.params.problemQueryIds="173,170,151";
+
+          let startTime=this.$route.query.startDate;
+          let endTime=this.$route.query.endDate;
+          this.dateRange=[timeFormat(startTime), timeFormat(endTime)]
+          this.queryOrderType="1";
+          this.queryOrderDateType="1";
+          this.getList();
+	  }
+  },
+  mounted() {
+  },
+  methods: {
+      //标红table指定行
+    tableRowClassName({row, rowIndex}) {
+
+      if (this.selectionList.some((item) => item === row)) {
+        return "select-row";
+      }
+
+      if (row.blSign=='1') {
+        return 'success-row';
+      }
+      else if (row.blIsQuestion=='1') {
+        return 'warning-row';
+      }
+
+      return '';
+    },
+    handleShowTraceInfo(row){
+        this.currentTraceBillCode=row.billCode;
+        this.currentTraceBillItem=row;
+        this.openTraceInfo=true;
+    },
+    initQueryParams(){
+      this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
+      let qParam=null;
+      if(this.queryParams.billCode){
+        qParam={
+          pageNum:this.queryParams.pageNum,
+          pageSize:this.queryParams.pageSize,
+          billCode:this.queryParams.billCode,
+        }
+      }else{
+        qParam=this.queryParams
+      }
+      // qParam.pageSize = 10;
+      return qParam;
+    },
+    initQueryParams1(){
+     this.queryParams1 ={
+        settleType:1,
+        queryCode:this.billCodes.join('\n'), // 换行符隔开
+        params:{
+          billCode:this.billCodes.join('\n')
+        }
+      }
+      return this.queryParams1;
+    },
+    /** 查询运单列表列表 */
+   async getList() {
+      this.loading = true;
+      let qParam=this.initQueryParams();
+      let  data =await getEmisCreditSalesmenDetail(qParam);
+      this.billCodes = data.rows.map((item)=>{
+        return item.settleBillName
+      })
+      if(this.billCodes.length>0){
+        let qParam1 =this.initQueryParams1();
+        const res= await listEmisSettleBill(qParam1);
+        this.emisWaybillList = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      }else{
+        this.emisWaybillList = [];
+        this.total = 0;
+        this.loading = false;
+      }
+
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      // if(selection!=null){
+      //   this.billCode=selection[0].billCode;
+      // }
+      this.selectionList=selection;
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+
+     /** 导出按钮操作 */
+    handleExport() {
+      const loadingInstance = this.$loading({
+            text: '正在导出...'
+      })
+
+      var qParam = {...this.queryParams};
+      // 增加导出记录
+      let postExportRecord={
+        menuName: '理赔金额账单明细',
+        dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
+      }
+
+      this.addExportAuditRecord(postExportRecord);
+
+      if(this.selectionList&&this.selectionList.length>0){
+        this.exportData(this.selectionList,loadingInstance);
+      }
+      else{
+          let qExportParam=this.initQueryParams1();
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=20000;
+   
+         listEmisSettleBill(qExportParam).then(response => {
+            if (response.code === 200) {
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam=this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '理赔金额账单明细',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'kjlx') {
+          return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
+        }
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+        if (j === 'custName') {
+          let paymentType=v['paymentType'];
+          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+            return v['custName'];
+          }else{
+            return "";
+          }
+        }
+
+        if (j === 'sendMobile') {
+          return "";
+        }
+        if (j === 'paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
+        }
+
+        if (j === 'pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        }
+        if (j === 'customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        }
+        if (j === 'customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        }
+        if (j === 'packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        }
+
+        if (j === 'dispatchMethod') {
+          if(v[j] == 1){
+            return '派送';
+          }else{
+            return '自提';
+          }
+        }
+        if (j === 'blUploadPic') {
+          if(v['goodsPics']!=null && v['goodsPics']!=''){
+            return '是';
+          }else{
+            return '否';
+          }
+        }
+
+        if (j === 'blMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blAcceptMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blSign') {
+          if(v[j] == 1){
+            return '已签收';
+          }else{
+            return '未签收';
+          }
+        }
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
+        }
+        return v[j]
+      }))
+    },
+
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    //指定列求和
+    getSummaries(param) {
+       const { columns, data } = param;
+       const sums = [];
+       columns.forEach((column, index) => {
+             if (index === 0) {
+               sums[index] = '合计';
+               return;
+             }
+             if (
+               column.property === 'sendPieceSum'
+               ) {
+                 const values = data.map(item => Number(item.sendPieceSum));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(0); //保留0位小数
+             }
+
+             else if (
+               column.property === 'pieceNumber'
+
+               ) {
+                 const values = data.map(item => Number(item.pieceNumber));
+
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(0); //保留0位小数
+             }
+             else if (
+               column.property === 'feeWeight'
+
+               ) {
+                 const values = data.map(item => Number(item.feeWeight));
+
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+
+             else if (
+               column.property === 'recMoney'
+               ) {
+                 const values = data.map(item => Number(item.recMoney));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+               }
+             else if(
+               column.property === 'recedMoney'
+             ){
+                  const values = data.map(item => Number(item.recedMoney));
+                   sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+             else if(
+               column.property === 'refundMoney'
+             ){
+                  const values = data.map(item => Number(item.refundMoney));
+                   sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }else if(
+               column.property === 'satisfyMoney'
+             ){
+                  const values = data.map(item => Number(item.satisfyMoney));
+                   sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+
+       });
+     console.log(sums);
+     return sums
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue
index 4930e2dd..a9249585 100644
--- a/src/views/emis/emisWaybill/batchWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue
@@ -94,6 +94,8 @@
       <el-table-column :label="$t('寄件市')" align="center" prop="sendCity" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件区')" align="center" prop="sendCounty" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('月结客户')" align="center" prop="custNo" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="80" :show-overflow-tooltip="true"/>
@@ -240,6 +242,8 @@ export default {
         sendCounty: null,
         sendTown: null,
         sendAddress: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         sendPostcode: null,
         sendPcd: null,
         paymentType: null,
@@ -487,6 +491,8 @@ export default {
                 sendCity:element['寄件市'],
                 sendCounty:element['寄件区'],
                 sendAddress: element['寄件地址'],
+                enterpriseName: element['企业名称'],
+                enterpriseTaxId: element['企业税号'],
                 paymentType: element['支付方式'],
                 calcFeeType: element['计费方式'],
                 transLineType:  element['线路'],
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index 1d9bd6b2..4a615a00 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -114,6 +114,22 @@
               <el-form-item label="寄件国家" prop="sendCountry">
               <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
             </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>
             <el-form-item label="录单备注" prop="remark">
               <el-input
                 v-model="queryParams.remark"
@@ -317,7 +333,7 @@
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
-          storageName="centerWaybillList_main"
+          storageName="centerWaybillList_main_20250826"
 
           ref="refTable"
           :row-key="rowKey"
@@ -486,7 +502,8 @@
               <div v-else>不发送</div>
           </template>
         </el-table-column>
-
+        <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -767,6 +784,8 @@ export default {
         sendAddress: null,
         sendPostcode: null,
         sendPcd: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         paymentType: null,
         calcFeeType: null,
         custNo: null,
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 09708d82..9b766ce7 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -485,7 +485,6 @@
           </template>
         </el-table-column>
 
-
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index e46716b9..33ae18c5 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -107,6 +107,23 @@
               <el-form-item label="寄件国家" prop="sendCountry">
               <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
             </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>
+
             <el-form-item label="录单备注" prop="remark">
               <el-input
                 v-model="queryParams.remark"
@@ -280,7 +297,7 @@
           ref="refTable"
           row-key="id"
 
-          storageName="sendWaybillList_main_240702"
+          storageName="sendWaybillList_main_250825"
           :showStatInfo="true"
 
            v-loading="loading"
@@ -459,7 +476,8 @@
               <div v-else>不发送</div>
           </template>
         </el-table-column>
-
+        <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -723,6 +741,8 @@ export default {
         sendAddress: null,
         sendPostcode: null,
         sendPcd: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         paymentType: null,
         blVirtual: null,
         calcFeeType: null,
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index c07fb849..317823e8 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -110,6 +110,23 @@
         <el-form-item label="寄件国家" prop="sendCountry">
         <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
       </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>
+
       <el-form-item label="录单备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -290,7 +307,8 @@
            :showStatInfo="true"
 
           ref="refTable"
-          storageName="sendWaybillListNew_main_240702"
+          storageName="sendWaybillListNew_main_250825"
+
            v-loading="loading"
            border
            size="mini"
@@ -464,7 +482,8 @@
               <div v-else>不发送</div>
           </template>
         </el-table-column>
-
+        <el-table-column :label="$t('企业名称')" align="center" prop="enterpriseName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('企业税号')" align="center" prop="enterpriseTaxId" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -741,6 +760,8 @@ export default {
         sendAddress: null,
         sendPostcode: null,
         sendPcd: null,
+        enterpriseName: null,
+        enterpriseTaxId: null,
         paymentType: null,
         blVirtual:null,
         calcFeeType: null,
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index eac4c130..23eb8e2c 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -50,6 +50,9 @@
             <el-descriptions-item label="寄件公司" :span="4">{{ form.sender.company }}</el-descriptions-item>
             <el-descriptions-item label="寄件地区"  >{{ form.sender.countryName }} {{ form.sender.provinceName }} {{ form.sender.cityName }} {{ form.sender.countyName }}</el-descriptions-item>
             <el-descriptions-item label="寄件地址" :span="4" >{{ form.sender.address }}</el-descriptions-item>
+            <el-descriptions-item label="企业名称" :span="4">{{ form.sender.enterpriseName }}</el-descriptions-item>
+            <el-descriptions-item label="企业税号" :span="4">{{ form.sender.enterpriseTaxId }}</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>
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 21bdee53..0c117dd6 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -257,7 +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-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-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
 
@@ -839,7 +848,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
-import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue';
 
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
@@ -2011,6 +2020,9 @@ 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.handleCalcDestSite();
 
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index d762c6c0..1bc36964 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -259,7 +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-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-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                          <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                        </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
 
@@ -839,7 +848,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
-import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue';
 
 import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
 import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
@@ -2028,6 +2037,10 @@ 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;
+
   },
   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 3f274843..12cf8802 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -260,7 +260,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-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-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                         <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-col>
 
@@ -841,7 +850,7 @@ import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
 import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
-import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker2.vue';
 
 import SeaSiteSimplePicker0 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
 import SeaSiteSimplePicker1 from '@/views/emis/EmisBaseTools/SeaSiteSimplePicker.vue';
@@ -1995,7 +2004,7 @@ methods: {
 
   },
    // 弹出地址簿选择
-   handleSelectCustomerAddress(addressType){
+  handleSelectCustomerAddress(addressType){
        this.addressType = addressType;
        this.titleSelectAddress = this.addressType==1? this.$t('选择寄件人'):this.$t('选择收件人');
        this.openSelectAddress = true;
@@ -2020,6 +2029,9 @@ 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;
   },
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index f8411c80..e079f211 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -608,6 +608,9 @@
                              {{ billDetail.sender.cityName }}
                              {{ billDetail.sender.countyName }}
                              {{ billDetail.sender.address }}
+                             {{ billDetail.sender.enterpriseName }}
+                             {{ billDetail.sender.enterpriseTaxId }}
+
                         </span>
                       </el-col>
                       <el-col :span="14">
@@ -645,6 +648,17 @@
                                 <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
                               </el-form-item>
                             </el-col>
+                            <el-col :span="12">
+                              <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">
+                              <el-form-item :label="$t('企业税号')" prop="sender.enterpriseTaxId">
+                                <el-input v-model="form.sender.enterpriseTaxId" placeholder="请输入企业税号"></el-input>
+                              </el-form-item>
+                            </el-col>
+
                         </el-row>
                       </el-col>
                     </el-row>
@@ -1757,6 +1771,10 @@ 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;
+
     },
     onChangeSelectReceiver(value){
       this.form.reciever.name=value.name;