diff --git a/src/api/oms/emisWaybill.js b/src/api/oms/emisWaybill.js
index 12f5dd5..8cbd527 100644
--- a/src/api/oms/emisWaybill.js
+++ b/src/api/oms/emisWaybill.js
@@ -25,6 +25,22 @@ export function listSimpleEmisWaybill(query) {
   })
 }
 
+export function listBindSalesmen(query) {
+  return request({
+    url: '/oms2c/emisWaybill/listBindSalesmen',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listWmsWarehouse(query) {
+  return request({
+    url: '/oms2c/emisWaybill/listWmsWarehouse',
+    method: 'get',
+    params: query
+  })
+}
+
 export function queryPrintListSimple(query) {
   return request({
     url: '/oms2c/emisWaybill/queryPrintListSimple',
diff --git a/src/views/oms/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/oms/EmisBaseTools/EmisUserSimplePicker.vue
index a595267..bc2e245 100644
--- a/src/views/oms/EmisBaseTools/EmisUserSimplePicker.vue
+++ b/src/views/oms/EmisBaseTools/EmisUserSimplePicker.vue
@@ -55,7 +55,7 @@
 <script>
 
 import emitter from 'element-ui/src/mixins/emitter';
-import { getStaffList } from "@/api/oms/emisStaff";
+import { listBindSalesmen } from "@/api/oms/emisWaybill";
 
  export default {
    name: "EmisUserSimplePicker",
@@ -206,7 +206,7 @@ import { getStaffList } from "@/api/oms/emisStaff";
        this.queryParams.searchValue = val;
        this.queryParams.empCode = key;
 
-       getStaffList(this.queryParams).then(response => {
+       listBindSalesmen(this.queryParams).then(response => {
          this.loading = false;
          this.total = response.total;
          this.optionItems = response.rows;
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index 9f9ce5e..f1caa34 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -177,6 +177,30 @@
                           <TimePicker v-model="form.pickTimeRange"  ></TimePicker>
                         </el-form-item>
                       </el-col>
+                      <el-col :span="24" v-if="form.pickupMethod==1">
+                        <el-form-item  :label="$t('选择仓库')"  prop="intoWarehouseCode">
+                          <WarehouseSimplePicker v-model="form.intoWarehouseCode" @onChange="onSelectWarehouse"></WarehouseSimplePicker>
+                            <div v-if="form.intoWarehouseCode" style="font-size: 12px;background: rgb(250, 250, 250);border: 1px solid rgb(240, 240, 240);padding: 10px;">
+                              仓库联系信息:
+                                <div  style="font-weight: 600;font-size: 13px;color: blue;">
+                                  {{form.intoWarehouseContact}} {{form.intoWarehousePhone}}
+                                  {{form.intoWarehouseAddress}}
+                                </div>
+                            </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24" v-if="form.pickupMethod==1">
+                            <el-form-item  :label="$t('进仓单号')"  prop="warehouseInNo" >
+                              <el-input v-model="form.warehouseInNo" style="text-align: right;"  placeholder=""  />
+                            </el-form-item>
+                      </el-col>
+
+                      <!-- this.form.intoWarehouseCode=item.code;
+    this.form.intoWarehouseName=item.name;
+    this.form.intoWarehouseAddress=item.address;
+    this.form.intoWarehouseContact=item.contact;
+    this.form.intoWarehousePhone=item.tel; -->
+
                       <el-col :span="24">
                       <el-form-item label="选择线路" prop="transLine">
                           <TransLinePicker v-model="form.transLine" :fromCountry="form.sender.country" :countryCode="form.reciever.country"  isInitiated="true" @onChange="preCalcFee"></TransLinePicker>
@@ -344,7 +368,7 @@
                   </el-col>
                   <el-col :span="12">
                       <el-form-item label="给快递员捎话" prop="orderRemark" >
-                        <EmisUserSimplePicker1 :placeholder="$t('专属业务员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
+                        <CustomerPrivEmpSimplePicker :placeholder="$t('专属业务员')" v-model="form.operateEmployeeCode" postCode="OP" ></CustomerPrivEmpSimplePicker>
                       <div style="width:100%;margin-bottom:5px">
                               <span class="goods-tag" @click="onQuickRemark($event)">请带纸箱</span>
                               <span class="goods-tag" @click="onQuickRemark($event)">需要爬楼</span>
@@ -584,6 +608,11 @@ import AddressSelectPicker1 from '@/views/oms/EmisBaseTools/AddressSelectPicker.
 import EmisMonthpayAccountPicker from '@/views/oms/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 import WarehouseInNoPicker from '@/views/oms/EmisBaseTools/WarehouseInNoPicker.vue';
 
+
+import CustomerPrivEmpSimplePicker from '@/views/oms/EmisBaseTools/CustomerPrivEmpSimplePicker.vue';
+
+import WarehouseSimplePicker from '@/views/oms/EmisBaseTools/WarehouseSimplePicker.vue';
+
 import PayeePicker from '@/views/oms/EmisBaseTools/PayeePicker.vue';
 import SalemanPicker from '@/views/oms/EmisBaseTools/SalemanPicker.vue';
 
@@ -635,7 +664,9 @@ components: {
   DistrictPicker2,
   CardWithHeader,
   GoodsTablePicker,
-  GoodsInput
+  GoodsInput,
+  CustomerPrivEmpSimplePicker,
+  WarehouseSimplePicker
 },
 dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@@ -812,6 +843,13 @@ mounted() {
 
 },
 methods: {
+  onSelectWarehouse(item){
+    this.form.intoWarehouseCode=item.code;
+    this.form.intoWarehouseName=item.name;
+    this.form.intoWarehouseAddress=item.address;
+    this.form.intoWarehouseContact=item.contact;
+    this.form.intoWarehousePhone=item.tel;
+  },
   selectGoods(e){
     this.form.goodsInfo = e.target.innerText;
   },
@@ -999,6 +1037,7 @@ methods: {
       intoWarehousePhone:  null,
       intoWarehouseBillCode: null,
       customerDeliveryBeginTime: null,
+      warehouseInNo:null,
       goodsType:null,
       goodsInfo: null,
       length:null,