diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index d937d75e..a0434b63 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -322,10 +322,11 @@ export default {
                   }
 
                   var fileRowNodes = oDiv.getElementsByTagName("tr");
+                  refTableObj.clearSelection()
                   for (var i = 0; i < fileRowNodes.length; i++) {
                       if (fileRowNodes[i].className.indexOf("el-table__row") != -1) {
-                        fileRowNodes[i].className = "el-table__row";
-                          selRowList.push(fileRowNodes[i]);
+                        fileRowNodes[i].classList.remove("rowSeled");
+                        selRowList.push(fileRowNodes[i]);
                       }
                   }
 
@@ -415,8 +416,8 @@ export default {
                                   }
                               } else {
                                   if (selRowList[i].className.indexOf("rowSeled") != -1 ) {
-                                    selRowList[i].className = "el-table__row";
-                                    refTableObj.toggleRowSelection(vnode.context.tableData[i],false);
+                                    // selRowList[i].className = "el-table__row";
+                                    // refTableObj.toggleRowSelection(vnode.context.tableData[i],false);
                                       // vnode.context.multipleSelection.forEach((ele,i)=>{
                                       //     //这里没用对象是否相等用的是传入table中的唯一的myKey字段
                                       //     if(ele[vnode.context.myKey]==vnode.context.tableData[i][vnode.context.myKey] ){
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index e9d949f5..7a18848c 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -176,7 +176,7 @@
             <!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" min-width="100" /> -->
             <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="100" />
             <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
-            <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
+            <el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="100" />
             <el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" min-width="170" :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" />
diff --git a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
index 13920bcf..b6840285 100644
--- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
@@ -147,7 +147,7 @@
             <!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" min-width="100" /> -->
             <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="100" />
             <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
-            <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
+            <el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="100" />
             <el-table-column :label="$t('生成账单时间')" align="center" prop="createTime" min-width="170" :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" :disabled="$store.getters.ownerSiteCode !='88888'"/>
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index 84b2a0d2..f73f2204 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -342,10 +342,11 @@
    <!-- <el-dialog :title="titleMergeForm" :visible.sync="openMergeForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
      <MergeBillForm :settleBillNo="currentSettleBillNo"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
    </el-dialog>
+-->
 
    <el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
      <TraceWaybillDetailView  :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
-   </el-dialog> -->
+   </el-dialog>
 
  </XdPageContainer>
 </template>
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 4bafadad..b3ae16a8 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -41,8 +41,9 @@
         </el-col>
 
         <el-col :span="5">
+
           <el-form-item label="寄件网点" prop="productType">
-            <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
+            <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')" ></EmisSiteSimplePicker1>
           </el-form-item>
           <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
             <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
@@ -120,8 +121,6 @@
               />
             </el-form-item>
 
-
-
         </el-col>
         <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
 
@@ -649,9 +648,6 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-
-
-
       // 时间搜索
       dateRange:[],
       // 查询参数
@@ -817,9 +813,9 @@ export default {
     };
   },
   created() {
-    // if(this.$store.getters.ownerSiteCode!='88888'){
-    //   this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
-    // }
+    if(this.$store.getters.ownerSiteCode!='88888'){
+      this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+    }
     const end = new Date()
     const start = new Date()
     start.setHours(0,0,0,0)
@@ -880,6 +876,11 @@ export default {
           billCode:this.queryParams.billCode,
         }
       }else{
+
+        if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='') ){
+          this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+        }
+
         qParam=this.queryParams
       }