diff --git a/public/static/tpl/batch_import_order.xls b/public/static/tpl/batch_import_order.xls
index 0289bf3..05376fc 100644
Binary files a/public/static/tpl/batch_import_order.xls and b/public/static/tpl/batch_import_order.xls differ
diff --git a/src/api/oms/emisWaybill.js b/src/api/oms/emisWaybill.js
index 99091c6..2a7eaa5 100644
--- a/src/api/oms/emisWaybill.js
+++ b/src/api/oms/emisWaybill.js
@@ -120,9 +120,9 @@ export function addEmisWaybill(data) {
 }
 
 // 草稿下单
-export function draftSubmitOrder(data) {
+export function draftSubmitOrderByOms(data) {
   return request({
-    url: '/oms2c/emisWaybill/draftSubmitOrder',
+    url: '/oms2c/emisWaybill/draftSubmitOrderByOms',
     method: 'post',
     data: data
   })
diff --git a/src/views/oms/emisWaybill/BatchOrderRecord.vue b/src/views/oms/emisWaybill/BatchOrderRecord.vue
index 4c3fd3e..00500fc 100644
--- a/src/views/oms/emisWaybill/BatchOrderRecord.vue
+++ b/src/views/oms/emisWaybill/BatchOrderRecord.vue
@@ -145,7 +145,7 @@
 </template>
 
 <script>
-import { listEmisWaybill, draftSubmitOrder } from "@/api/oms/emisWaybill";
+import { listEmisWaybill, draftSubmitOrderByOms } from "@/api/oms/emisWaybill";
 
 import { parseTime } from "@/utils/custom";
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@@ -457,6 +457,50 @@ export default {
         // 取件方式	派送方式	运费	支付方式	月结客户	回款联系人	销售联系人	费用备注
         // 取件员/操作员
         // 发货/签收短信
+        // let rowIndex=element['__rowNum__']
+        // let orderData={
+        //         billCode: element['运单号'],
+        //         sendDate: parseTime(new Date()),
+        //         custNo:  element['月结客户'],
+        //         receiveName: element['收件人'],
+        //         receiveCompany:element['收件公司'],
+        //         receiveMobile:element['收件电话'],
+        //         receiveCountry: element['收件国'],
+        //         receiveProvince: element['收件省'],
+        //         receiveCity: element['收件市'],
+        //         receiveCounty:  element['收件区'],
+        //         receiveAddress: element['收件地址'],
+        //         sendName: element['发货人'],
+        //         sendCompany: element['发货公司'],
+        //         sendMobile: element['发货电话'],
+        //         sendCountry: element['发货国'],
+        //         sendProvince: element['发货省'],
+        //         sendCity:element['发货市'],
+        //         sendCounty:element['发货区'],
+        //         sendAddress: element['发货地址'],
+        //         paymentType: element['支付方式'],
+        //         calcFeeType: element['计费方式'],
+        //         transLineType:  element['线路'],
+        //         productType: element['产品类型'],
+        //         customsClear: element['清关方式'],
+        //         customsEclaration:  element['报关方式'],
+        //         dispatchMethod:  element['派送方式'],
+        //         pickupMethod: element['取件方式'],
+        //         goodsInfo: element['货物名称'],
+        //         // totalVolume: element['体积'],
+        //         totalVolume: '0.00',
+        //         parcelQty: element['件数'],
+        //         billWeight: element['重量'],
+        //         operateEmployeeCode: element['专属业务员'],
+        //         orderRemark:  element['备注'],
+        //         packType: '纸箱',
+        //         freight:0.00,
+
+        //         uploadStatus: 0,
+        //         errorInfo:'',
+        // }
+        // this.tmpDataList.push(orderData);
+
         let rowIndex=element['__rowNum__']
         let orderData={
                 billCode: element['运单号'],
@@ -470,31 +514,36 @@ export default {
                 receiveCity: element['收件市'],
                 receiveCounty:  element['收件区'],
                 receiveAddress: element['收件地址'],
-                sendName: element['发货人'],
-                sendCompany: element['发货公司'],
-                sendMobile: element['发货电话'],
-                sendCountry: element['发货国'],
-                sendProvince: element['发货省'],
-                sendCity:element['发货市'],
-                sendCounty:element['发货区'],
-                sendAddress: element['发货地址'],
+                sendName: element['寄件人'],
+                sendCompany: element['寄件公司'],
+                sendMobile: element['寄件电话'],
+                sendCountry: element['寄件国'],
+                sendProvince: element['寄件省'],
+                sendCity:element['寄件市'],
+                sendCounty:element['寄件区'],
+                sendAddress: element['寄件地址'],
                 paymentType: element['支付方式'],
                 calcFeeType: element['计费方式'],
                 transLineType:  element['线路'],
                 productType: element['产品类型'],
                 customsClear: element['清关方式'],
                 customsEclaration:  element['报关方式'],
+                packType: element['包装类型'],
                 dispatchMethod:  element['派送方式'],
                 pickupMethod: element['取件方式'],
                 goodsInfo: element['货物名称'],
-                // totalVolume: element['体积'],
-                totalVolume: '0.00',
+                totalVolume: element['体积'],
                 parcelQty: element['件数'],
-                billWeight: element['重量'],
-                operateEmployeeCode: element['专属业务员'],
-                orderRemark:  element['备注'],
-                packType: '纸箱',
-                freight:0.00,
+                billWeight: element['实际重量'],
+                freight: element['运费'],
+                feeRemark:element['费用备注'],
+                payee: element['销售联系人'],
+                salesmen: element['销售联系人'],
+                // operateEmployeeCode: element['取件员/操作员'],
+                orderRemark:  element['下单备注'],
+                // blMessage:  element['寄件/签收短信'],
+                realValue: element['货值'],
+                extInfo: element['附加信息'],
 
                 uploadStatus: 0,
                 errorInfo:'',
@@ -519,7 +568,7 @@ export default {
               if(this.selectionList&&this.selectionList.length>0){
                 for(let i=0;i<this.selectionList.length;i++){
                   let orderItem=this.selectionList[i];
-                  let res=await draftSubmitOrder(orderItem)
+                  let res=await draftSubmitOrderByOms(orderItem)
 
                   let rstData=res.data;
                   if(rstData.result=='success'){
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index aa96ed8..17f9de3 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -104,7 +104,7 @@
                         <el-input v-model="form.sendSiteName" placeholder="" disabled />
                       </el-form-item>
                     </el-col> -->
-                    <el-col :span="12" >
+                    <!-- <el-col :span="12" >
                       <el-form-item :label="$t('专属业务员')"  prop="privSalesmen">
                         <TakeEmpPicker v-model="form.privSalesmen" ></TakeEmpPicker>
 
@@ -116,7 +116,7 @@
                           size="small"
                           @click="handlePrivSalesmen"
                         > {{ $t('去绑定业务员') }}</el-button>
-                    </el-col>
+                    </el-col> -->
 
 
                   </el-row>
@@ -255,7 +255,27 @@
                           ></el-date-picker>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="12">
+
+                      <el-col :span="12"  v-if="form.pickupMethod==2">
+                          <el-form-item :label="$t('快递员')"  prop="privSalesmen">
+                            <TakeEmpPicker v-model="form.privSalesmen" ></TakeEmpPicker>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12"  v-if="form.pickupMethod==2">
+                          <el-button
+                              type="primary"
+                              size="small"
+                              @click="handlePrivSalesmen"
+                            > {{ $t('去绑定快递员') }}</el-button>
+                        </el-col>
+                        <el-col :span="24"  v-if="form.pickupMethod==1">
+                          <el-form-item :label="$t('业务员')"  prop="salesmen">
+                            <SalemanPicker :placeholder="$t('业务员')" v-model="form.salesmen"  ></SalemanPicker>
+                          </el-form-item>
+                        </el-col>
+
+
+                      <el-col :span="12" v-if="form.pickupMethod==2">
                         <el-form-item  :label="$t('报关方式')"  prop="customsEclaration">
                           <el-select v-model="form.customsEclaration" placeholder=""  @change="preCalcFee">
                             <el-option
@@ -493,9 +513,25 @@
                                 <!-- <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> -->
                               </template>
                             </el-table-column>
-                            <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="100">
+                            <el-table-column prop="cargoQty" :label="$t('数量')" align="center" width="100">
                               <template slot-scope="scope">
-                                <el-input v-model="scope.row.cargoQty"    size="mini" placeholder=""></el-input>
+                                <el-input v-model="scope.row.cargoQty"    size="mini" placeholder="">
+
+                                </el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="unit" :label="$t('单位')" align="center" width="100">
+                              <template slot-scope="scope">
+                                <el-select filterable v-model="scope.row.unit" style="width: 100%;">
+                                        <el-option key="件" label="件" value="件" ></el-option>
+                                        <el-option key="个" label="米" value="个" ></el-option>
+                                        <el-option key="条" label="条" value="条" ></el-option>
+                                        <el-option key="米" label="米" value="米" ></el-option>
+                                        <el-option key="根" label="根" value="根" ></el-option>
+                                        <el-option key="副" label="副" value="副" ></el-option>
+                                        <el-option key="张" label="张" value="张" ></el-option>
+                                        <el-option key="块" label="块" value="块" ></el-option>
+                                    </el-select>
                               </template>
                             </el-table-column>
                             <el-table-column prop="price" label="货值(USD)" align="center" width="100" :show-overflow-tooltip="true">
@@ -508,28 +544,28 @@
                                 <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
                               </template>
                             </el-table-column> -->
-                            <el-table-column v-if="this.transType==1" prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
+                            <!-- <el-table-column v-if="this.transType==1" prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
                               </template>
-                            </el-table-column>
-                            <el-table-column  v-if="this.transType==1" prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
+                            </el-table-column> -->
+                            <el-table-column  v-if="this.transType==1" prop="goodsName" label="品牌" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.brand" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
 
-                            <el-table-column  v-if="this.transType==1" prop="material" label="材质" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column  v-if="this.transType==1" prop="material" label="材质" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.material" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column  v-if="this.transType==1" prop="purpose" label="用途" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column  v-if="this.transType==1" prop="purpose" label="用途" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.purpose" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column  v-if="this.transType==1" prop="ingredients" label="成分" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column  v-if="this.transType==1" prop="ingredients" label="成分" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.ingredients" size="mini" placeholder=""></el-input>
                               </template>
@@ -568,7 +604,7 @@
                             </el-table-column>
 
 
-                            <el-table-column :label="$t('操作')"  align="left" min-width="50">
+                            <el-table-column :label="$t('操作')"  align="left" min-width="100">
                                   <template slot-scope="scope">
                                     <span class="icon iconfont"
                                     style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@@ -1056,6 +1092,10 @@ methods: {
             this.billCode=null;
             this.form.billCode=null;
           }
+          else if(this.action=='modify'){
+            // 加载产品列表
+            this.preCalcFee();
+          }
         });
       }else{
          this.form.customsEclaration='1';