diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 39f74dee..257994e8 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -45,7 +45,8 @@
         <el-col :span="5">
 
           <el-form-item label="寄件网点" prop="productType">
-            <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')" ></EmisSiteSimplePicker1>
+            <!-- <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')" ></EmisSiteSimplePicker1> -->
+            <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="sendSiteCodeDisable" ></EmisSiteSimplePicker1>
           </el-form-item>
           <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
             <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
@@ -186,7 +187,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="始发网点" prop="startSiteCode">
-              <EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" ></EmisSiteSimplePicker3>
+              <EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" @onChange="handleStartSiteChange"></EmisSiteSimplePicker3>
             </el-form-item>
         </el-col>
         <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@@ -904,6 +905,11 @@ export default {
       },
     };
   },
+  computed: {
+    sendSiteCodeDisable() {
+      return this.$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='') && (this.$store.getters.ownerSiteCode!=this.queryParams.startSiteCode)
+    }
+  },
   watch: {
     $route () {
 	      if(this.$route.query.action=='queryByCredit'){
@@ -1053,7 +1059,8 @@ export default {
         }
       }else{
 
-        if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.salesmen=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')){
+        // if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.salesmen=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')){
+        if(this.sendSiteCodeDisable){
           this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
         }
 
@@ -1143,7 +1150,7 @@ export default {
       const loadingInstance = this.$loading({
             text: '正在导出...'
       })
-
+ 
       var qParam = {...this.queryParams};
       // 增加导出记录
       let postExportRecord={
@@ -1299,6 +1306,13 @@ export default {
     },
     onMoneyUserChange(){
      this.queryParams.sendSiteCode=null;
+    },
+    handleStartSiteChange(val){
+      if(this.$store.getters.ownerSiteCode !='88888'){ // 不是总部账号
+        if(val &&this.$store.getters.ownerSiteCode == val.siteCode){
+          this.queryParams.sendSiteCode=null;
+        }
+      }
     }
   }
 };
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index bb5f45f5..3f44e8e7 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -46,7 +46,8 @@
 
   <el-col :span="5">
     <el-form-item label="寄件网点" prop="productType">
-      <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='')&&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')" ></EmisSiteSimplePicker1>
+      <!-- <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='')&&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')" ></EmisSiteSimplePicker1> -->
+        <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="sendSiteCodeDisable" ></EmisSiteSimplePicker1>
     </el-form-item>
 
 
@@ -191,7 +192,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="始发网点" prop="startSiteCode">
-        <EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" ></EmisSiteSimplePicker3>
+        <EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" @onChange="handleStartSiteChange"></EmisSiteSimplePicker3>
       </el-form-item>
   </el-col>
   <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@@ -909,6 +910,11 @@ export default {
       },
     };
   },
+  computed: {
+    sendSiteCodeDisable(){
+      return this.$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='') && (this.$store.getters.ownerSiteCode!=this.queryParams.startSiteCode)
+    }
+  },
   created() {
     if(this.$store.getters.ownerSiteCode!='88888'){
       this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
@@ -999,8 +1005,9 @@ export default {
         }
       }else{
 
-        if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')){
-          this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+        // if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')){
+        if(this.sendSiteCodeDisable){  
+        this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
         }
 
         qParam=this.queryParams
@@ -1241,6 +1248,13 @@ export default {
     },
     onMoneyUserChange(){
       this.queryParams.sendSiteCode=null;
+    },
+    handleStartSiteChange(val) {
+      if (this.$store.getters.ownerSiteCode != '88888') { // 不是总部账号
+        if (val && this.$store.getters.ownerSiteCode == val.siteCode) {
+          this.queryParams.sendSiteCode = null;
+        } 
+      }
     }
   }
 };