diff --git a/src/views/emis/EmisBaseTools/CityPicker.vue b/src/views/emis/EmisBaseTools/CityPicker.vue
index 621f4dd3..b14d8e97 100644
--- a/src/views/emis/EmisBaseTools/CityPicker.vue
+++ b/src/views/emis/EmisBaseTools/CityPicker.vue
@@ -44,7 +44,7 @@
         this.svalue = newVal;
       },
       svalue(newVal, oldVal) {
-        this.$emit("input", this.svalue);
+        // this.$emit("input", this.svalue);
       },
       parentCode(newVal) {
         this.queryData();
diff --git a/src/views/emis/EmisBaseTools/ProvincePicker.vue b/src/views/emis/EmisBaseTools/ProvincePicker.vue
index b3172d83..931f3294 100644
--- a/src/views/emis/EmisBaseTools/ProvincePicker.vue
+++ b/src/views/emis/EmisBaseTools/ProvincePicker.vue
@@ -47,25 +47,24 @@
     },
     methods: {
       onChange() {
-        console.log("xxxxx00000:"+this.svalue)
         this.$emit("input", this.svalue);
         this.$emit("onChange",this.svalue);
       },
 
       queryData() {
         this.optionItems =[];
-        if(!this.countryCode && !this.svalue){
-          return;
-        }
 
         let queryParams = {
           pageNum:1,
-          pageSize:100,
+          pageSize:50,
           countryCode:this.countryCode,
+          regionCode:this.svalue,
           regionType:1
         };
+        console.log(queryParams);
         listSimpleEmisRegion(queryParams).then(response => {
           this.optionItems = response.rows;
+          console.log(response);
         });
       },
 
diff --git a/src/views/emis/emisCustomerUser/moneyUserForm.vue b/src/views/emis/emisCustomerUser/moneyUserForm.vue
index d0824b6b..7d0fdce8 100644
--- a/src/views/emis/emisCustomerUser/moneyUserForm.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserForm.vue
@@ -419,7 +419,7 @@ export default {
         customerNameEn: null,
         phone: null,
         mobile: null,
-        customerType: this.customerType,
+        customerType: '1',
         settledType: '1',
         userType: null,
         company: null,
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index d4870523..3afc30da 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -7,8 +7,8 @@
               <el-input v-model="form.customerCode" placeholder="自动生成" disabled />
             </el-form-item>
           </el-col> -->
-          <el-col :span="16">
-            <el-form-item label="客户名称" prop="company">
+          <el-col :span="10">
+            <el-form-item label="客户名称" prop="customerName">
               <el-input v-model="form.customerName" placeholder="" />
             </el-form-item>
           </el-col>
@@ -18,6 +18,9 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="6">
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="联系人" prop="customerName">
               <el-input v-model="form.contact" placeholder="" />
@@ -76,7 +79,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="首次签约日期" prop="firstSigningDay">
-              <el-input v-model="form.firstSigningDay" placeholder="" />
+              <el-date-picker
+                style="width: 100%;"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                v-model="form.firstSigningDay"
+                type="date"
+                placeholder="首次签约日期"
+              ></el-date-picker>
             </el-form-item>
           </el-col>
 
@@ -357,7 +367,7 @@ export default {
         simpleName: null,
         phone: null,
         mobile: null,
-        customerType: null,
+        customerType: '2',
         settledType: '2',
         userType: null,
         company: null,
@@ -415,13 +425,14 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
+            this.form.company=this.form.customerName;
             updateEmisCustomerUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.$emit("on-changed");
             });
           } else {
             addEmisCustomerUser(this.form).then(response => {
-               this.$modal.msgSuccess("修改成功");
+               this.$modal.msgSuccess("新增成功");
                this.$emit("on-changed");
             });
           }
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 28ad1498..d7a2a506 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -117,7 +117,7 @@
       </el-table-column> -->
       <el-table-column :label="$t('客户名称')" align="left" prop="company" width="180" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-            <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.company}}</div>
+            <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div>
          </template>
       </el-table-column>
 
diff --git a/src/views/emis/emisWaybill/emisWaybillModify copy.vue b/src/views/emis/emisWaybill/emisWaybillModify copy.vue
deleted file mode 100644
index d8835fee..00000000
--- a/src/views/emis/emisWaybill/emisWaybillModify copy.vue	
+++ /dev/null
@@ -1,1492 +0,0 @@
-<template>
-  <div class="app-container" >
-    <el-form ref="form"  size="mini" :model="form" :rules="rules" label-width="100px">
-        <el-collapse v-model="activeNames">
-          <el-collapse-item title="" name="1">
-            <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
-            </template>
-            <div>
-              <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-                <el-col :span="8">
-                    <el-form-item label="运单号" prop="billCode"  >
-                      <div style="display:inline-flex">
-                          <div>
-                            <el-input v-model="form.billCode" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" style="font-weight:600;color:black" >
-                              <i slot="suffix" class="iconfont">&#xe656;</i>
-                            </el-input>
-                          </div>
-                          <!-- <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div> -->
-                      </div>
-                    </el-form-item>
-                </el-col>
-
-                <el-col :span="6">
-                    <el-form-item :label="$t('发货时间')" prop="sendDate">
-                      <el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
-                    </el-form-item>
-                </el-col>
-
-                <el-col :span="10">
-                </el-col>
-
-
-
-
-                  <el-col :span="6">
-                    <el-form-item label="目的国" prop="reciever.country">
-                        <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="8">
-                    <el-form-item label="产品类型" prop="productType">
-                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
-                      <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="5">
-                    <el-form-item label="报关方式" prop="customsEclaration">
-                      <el-select v-model="form.customsEclaration" placeholder="请选择">
-                        <el-option
-                          v-for="dict in dict.type.emis_declare_mode"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="5">
-                    <el-form-item label="清关方式" prop="customsClear">
-                      <el-select v-model="form.customsClear" placeholder="请选择">
-                        <el-option
-                          v-for="dict in dict.type.emis_customs_clear"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="6">
-                    <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="form.pickupMethod" placeholder="请选择">
-                        <el-option
-                          v-for="dict in dict.type.emis_qujian_fangshi"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6" v-if="form.pickupMethod==2">
-                    <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
-                      <EmisUserSimplePicker0  :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6" v-if="form.pickupMethod==1">
-                    <el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
-                      <EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="24">
-                    <el-form-item label="派件方式" prop="dispatchMethod">
-                      <el-radio-group v-model="form.dispatchMethod">
-                        <el-radio
-                          v-for="dict in dict.type.emis_tab_dispatch_mode"
-                          :key="dict.value"
-                          :label="dict.value"
-                        >
-                        <!-- style="font-size:10px" -->
-                        <span  >{{dict.label}}</span>
-                      </el-radio>
-                      </el-radio-group>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                      <el-form-item label="寄件网点" prop="sendSiteName">
-                        <el-input v-model="form.sendSiteName" placeholder="" disabled />
-                      </el-form-item>
-                  </el-col>
-
-                  <el-col :span="18">
-                    <el-form-item label="打印选项:" prop="sendSiteName">
-                      <el-checkbox-group v-model="printTypeCheckList">
-                        <el-checkbox
-                          v-for="dict in dict.type.emis_print_type"
-                          :key="dict.value"
-                          :label="dict.label"
-                        >
-                          <span style="font-size:13px" >{{dict.label}}</span>
-                        </el-checkbox>
-                      </el-checkbox-group>
-                    </el-form-item>
-                    <!-- <div style="display:flex;padding-left: 30px;">
-                      <el-checkbox-group v-model="printTypeCheckList">
-                        <el-checkbox
-                          v-for="dict in dict.type.emis_print_type"
-                          :key="dict.value"
-                          :label="dict.label"
-                        >
-                          <span style="font-size:13px" >{{dict.label}}</span>
-                        </el-checkbox>
-                      </el-checkbox-group>
-                    </div> -->
-                  </el-col>
-
-                  <!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
-                    <el-form-item label="寄件客户" prop="customerCode">
-                          <customer-picker0 v-model="form.customerCode"></customer-picker0>
-                    </el-form-item>
-                  </el-col> -->
-              </el-row>
-
-            </div>
-          </el-collapse-item>
-          <el-collapse-item title="" name="2">
-            <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
-            </template>
-            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
-                <el-col :span="12">
-                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px">
-                    <el-col :span="24" style="display:inline-flex; margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
-                      <div class="form-group-title" style="width:50%">
-                          <span style="border-radius: 15px;
-                            padding: 5px 15px;
-                            background: black;
-                            font-size: 13px;
-                            color: white;">寄件信息</span>
-                      </div>
-                      <div style="width:50%;text-align:right;padding-right: 15px;">
-                          <!-- icon="el-icon-edit" -->
-                        <el-button
-                        size="mini"
-                        type="text"
-                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
-                        class="iconfont icon-dizhibao"
-                        @click="handleSelectCustomerAddress(1)"
-                      >寄件地址薄</el-button>
-                      </div>
-                    </el-col>
-
-                    <el-col :span="12">
-                      <el-form-item label="寄件人" prop="sender.name">
-                        <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="寄件电话" prop="sender.phone">
-                        <el-input v-model="form.sender.phone" placeholder="" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="国家地区" prop="sender.province"  >
-                        <div style="display:inline-flex">
-                          <country-picker1 v-model="form.sender.country" ></country-picker1>
-                          <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
-                          <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
-                          <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
-                        </div>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="寄件地址" prop="sender.address">
-                        <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="寄件公司" prop="sender.company">
-                        <el-input v-model="form.sender.company" placeholder="" />
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col :span="24">
-                      <el-form-item label="" prop="blMessage">
-                        <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">寄件/签收短信</span></el-checkbox>
-                      </el-form-item>
-                    </el-col>
-
-                  </el-row>
-                </el-col>
-
-                <el-col :span="12">
-                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
-                      <el-col :span="24" style="display:inline-flex;margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
-                        <div class="form-group-title" style="width:50%">
-                          <span style="border-radius: 15px;
-                              padding: 5px 15px;
-                              background: #b12e29;
-                              font-size: 13px;
-                              color: white;">收件信息</span>
-                          </div>
-                        <div style="width:50%;text-align:right;padding-right: 15px;">
-                          <el-button
-                          size="mini"
-                          type="text"
-                          style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
-                          class="iconfont icon-dizhibao"
-                          @click="handleSelectCustomerAddress(2)"
-                        >收件地址薄</el-button>
-                        </div>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="收件人" prop="reciever.name">
-                          <CustomerAddressSimplePicker1 addressType="2"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="收件电话" prop="reciever.phone">
-                          <el-input v-model="form.reciever.phone" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="国家地区" prop="reciever.province">
-                          <div style="display:inline-flex">
-                            <country-picker2 v-model="form.reciever.country" ></country-picker2>
-                            <ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px"></ProvincePicker2>
-                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
-                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
-                          </div>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="收件地址" prop="reciever.address">
-                          <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="收件公司" prop="reciever.company">
-                          <el-input v-model="form.reciever.company" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="目的地" prop="destinationCode">
-                          <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="派件网点" prop="dispatchSite">
-                          <el-input v-model="form.dispatchSite" placeholder="" disabled />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="" prop="blAcceptMessage">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
-                        </el-form-item>
-                      </el-col>
-                      <!-- <el-col :span="12">
-                        <el-form-item label="邮编" prop="receivePostcode">
-                          <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
-                        </el-form-item>
-                      </el-col> -->
-                  </el-row>
-                </el-col>
-            </el-row>
-          </el-collapse-item>
-          <el-collapse-item title="" name="3">
-            <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('重量收费信息') }}</span>
-              </div>
-            </template>
-            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-              <el-col :span="12">
-
-                <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
-                    <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
-                    <el-col :span="24">
-                        <el-form-item label="" prop="goodsType" label-width="0px">
-                          <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker>
-                            <el-table
-                            class="cargoList"
-                            :cell-style="{
-                              'padding': '0px!important',
-                              'padding-left': '0px!important',
-                              'padding-right': '0px!important',
-                              'font-size':'11px'
-                            }"
-                            :header-cell-style="{
-                              'font-size':'11px'
-                            }"
-                            border
-                            stripe
-                            :data="form.cargoList"
-                            size="small"
-                            style="width: 100%"
-                            max-height="300px"
-                          >
-
-
-                          <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.goodsName" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-
-                            <el-table-column prop="length" label="长(cm)" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.length" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="width" label="宽(cm)" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.width" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="height" label="高(cm)" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.height" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="volume" label="体积(m³)" align="center" width="80">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="cargoQty" label="件数" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.cargoQty" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-
-
-                            <el-table-column label="操作" align="center" width="50">
-                                  <template slot-scope="scope">
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span>
-                                  </template>
-                            </el-table-column>
-
-                          </el-table>
-
-                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" disabled />
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="12">
-                        <el-form-item label="实际重量" prop="billWeight" label-width="70px">
-                          <el-input v-model="form.billWeight" @blur="reCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
-                            <span slot="suffix">(kg)</span>
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
-                          <div style="">
-                            <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积" >
-                              <span slot="suffix">(m³)</span>
-                            </el-input>
-                          </div>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
-                          <el-input v-model="form.parcelQty" style="text-align: right;" placeholder=""  />
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
-                          <el-input v-model="form.volumeWeight" placeholder="" disabled>
-                            <span slot="suffix">(kg)</span>
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
-                          <el-input v-model="form.settlementWeight" placeholder="" disabled >
-                            <span slot="suffix">(kg)</span>
-                          </el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="包装类型" prop="packType" label-width="70px"">
-                            <el-select v-model="form.packType" placeholder="请选择">
-                              <el-option
-                                v-for="dict in dict.type.emis_tab_packing_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                              ></el-option>
-                            </el-select>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="" prop="blOverWeight">
-                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12" v-if="form.blOverWeight==1">
-                        <el-form-item label="超重件数" prop="overWeightNumber" label-width="70px">
-                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" v-if="this.form.billCode && this.form.parcelQty>0">
-                          <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill">
-                            <el-radio :key="1"  :label="1">是</el-radio>
-                            <el-radio :key="0"  :label="0">否</el-radio>
-                          </el-radio-group>
-
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24" v-if="form.blGenSubbill==1">
-                        <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
-                          <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
-                        </el-form-item>
-                      </el-col>
-
-                      <el-col :span="12">
-                        <el-form-item label="进仓单" prop="warehouseInNo" label-width="70px">
-                          <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="合同号" prop="custOrderId" label-width="70px">
-                          <el-input v-model="form.custOrderId" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="24">
-                        <el-form-item label="运单备注" prop="remark" label-width="70px">
-                          <el-input v-model="form.remark" type="textarea" placeholder="" />
-                        </el-form-item>
-                      </el-col>
-                  </el-row>
-
-              </el-col>
-               <el-col :span="12" >
-                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
-
-                    <el-col :span="24">
-                      <el-form-item label="计费方式" prop="calcFeeType" label-width="70px">
-                        <!-- <el-input v-model="form.calcFeeType" placeholder="请输入计费方式" /> -->
-                        <el-radio-group v-model="form.calcFeeType" >
-                          <el-radio
-                            v-for="dict in dict.type.emis_calc_fee_type"
-                            :key="dict.value"
-                            :label="dict.value"
-                            >{{dict.label}}</el-radio>
-                        </el-radio-group>
-
-                      </el-form-item>
-                    </el-col>
-
-                    <el-col :span="24">
-                        <el-form-item label="" prop="goodsType" label-width="0px">
-                            <el-table
-                            class="cargoList"
-                            :cell-style="{
-                              'padding': '0px!important',
-                              'padding-left': '0px!important',
-                              'padding-right': '0px!important',
-                              'font-size':'11px'
-                            }"
-                            :header-cell-style="{
-                              'font-size':'11px'
-                            }"
-                            border
-                            stripe
-                            :data="form.feeItems"
-                            size="mini"
-                            max-height="300px"
-                            style="width: 100%"
-                          >
-
-
-                            <el-table-column prop="feeName" label="收费项" align="center" width="70">
-                              <template slot-scope="scope">
-                                <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="fee" label="应收" align="center" width="50">
-                              <template slot-scope="scope">
-                                <span>{{ scope.row.fee }}</span>
-                              </template>
-                            </el-table-column>
-
-                            <el-table-column prop="initialWeightFee" label="首重费" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="remark" label="描述" align="center" min-width="50">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.remark" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="50">
-                                  <template slot-scope="scope">
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    v-if="scope.row.blAutoGen==0"
-                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
-                                  </template>
-                            </el-table-column>
-
-                          </el-table>
-                          <div>
-                            <el-popover
-                                trigger="click"
-                                ref="popoverFeeRef"
-                                placement="top"
-                                :width="400"
-                                effect="light"
-                                :show-arrow="false"
-                              >
-                                <feeItemForm :triggerCount="triggerCount" :feeList="this.form.feeItems" @on-changed="onFeeItemChange" @on-cancel="onFeeItemChange"></feeItemForm>
-                                <el-button
-                                     slot="reference"
-                                      style="padding: 0px;font-size: 12px;"
-                                      size="mini"
-                                      type="text"
-                                      icon="el-icon-plus"
-                                      @click="handleAddFee"
-                                    >增加自定义费用</el-button>
-                              </el-popover>
-                          </div>
-
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="总运费" prop="freight" label-width="70px">
-                            <el-input v-model="form.freight" placeholder="" >
-                        </el-input>
-                      </el-form-item>
-                      <el-form-item label="费用备注" prop="feeRemaker" label-width="70px">
-                            <el-input v-model="form.feeRemaker" type="textarea" placeholder="" >
-                        </el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="付款方式" prop="paymentType" label-width="70px">
-                        <el-select v-model="form.paymentType" placeholder="请选择">
-                            <el-option
-                              v-for="dict in dict.type.emis_payment_type"
-                              :key="dict.value"
-                              :label="dict.label"
-                              :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                    </el-col>
-                    <el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
-                      <el-form-item label="月结账号" prop="thirdCustomerCode" label-width="70px">
-                        <EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="回款联系人" prop="payee" label-width="80px">
-                        <EmisUserSimplePicker2 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker2>
-
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="销售联系人" prop="salesmen" label-width="80px">
-                        <EmisUserSimplePicker3 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker3>
-                      </el-form-item>
-                    </el-col>
-
-
-
-
-
-                  </el-row>
-
-               </el-col>
-            </el-row>
-          </el-collapse-item>
-
-      </el-collapse>
-
-    </el-form>
-    <div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="initData">重置</el-button>
-    </div>
-
-    <el-dialog :title="titleSelectAddress" :visible.sync="openSelectAddress" width="60%" :destroy-on-close="true"  v-dialogDrag append-to-body>
-        <AddressSelectPicker0 :addressType="addressType"   @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
-    </el-dialog>
-
-</div>
-</template>
-
-<script>
-import { realMatchWaybill } from "@/api/emis/emisElectronicPag";
-import { getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
-import { parseTime } from "@/utils/custom";
-import { getDestSite } from "@/api/emis/emisDestination";
-
-import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue';
-
-import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
-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 TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
-import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
-
-import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-
-import ProvincePicker1 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
-import CityPicker1 from '@/views/emis/EmisBaseTools/CityPicker.vue';
-import DistrictPicker1 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
-// import TownPicker1 from '@/views/emis/EmisBaseTools/TownPicker.vue';
-
-import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
-import CityPicker2 from '@/views/emis/EmisBaseTools/CityPicker.vue';
-import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
-// import TownPicker2 from '@/views/emis/EmisBaseTools/TownPicker.vue';
-
-// import CustomerPicker0 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-// import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-// import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-
-import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
-import CustomerAddressSimplePicker0 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
-import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
-import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
-import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
-import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
-import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
-
-import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
-import feeItemForm from './feeItemForm.vue';
-
-
-
-export default {
-  name: "WaybillModify",
-  // props:{
-  //   billCode:{
-  //     type:String
-  //   }
-  // },
-components: {
-  feeItemForm,
-  TransProductCasPicker,
-  WarehouseInNoPicker,
-  EmisMonthpayAccountPicker,
-  AddressSelectPicker0,
-  AddressSelectPicker1,
-  CustomerAddressSimplePicker0,
-  CustomerAddressSimplePicker1,
-  GoodsSimplePicker,
-  EmisUserSimplePicker0,
-  EmisUserSimplePicker1,
-  EmisUserSimplePicker2,
-  EmisUserSimplePicker3,
-  // CustomerPicker0,
-  // CustomerPicker1,
-  // CustomerPicker2,
-  DestinationPicker,
-  TransLinePicker,
-  TransProductPicker,
-  // AreaPicker0,
-  CountryPicker0,
-  CountryPicker1,
-  ProvincePicker1,
-  CityPicker1,
-  DistrictPicker1,
-  // TownPicker1,
-  CountryPicker2,
-  ProvincePicker2,
-  CityPicker2,
-  DistrictPicker2,
-  // TownPicker2,
-},
-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'],
-data() {
-  return {
-    activeNames:['1','2','3','4'],
-    billCode:null,
-    emisWaybillOptions: [],
-    addressType:null,
-    // 遮罩层
-    loading: true,
-    isNeedSave:false,
-    triggerCount:0,
-    printTypeCheckList:['1','2','5'],
-    // 表单参数
-    form: {},
-    timer:null,
-    isNeedCalc:false,
-    titleSelectAddress:'',
-    openSelectAddress:false,
-    // 表单校验
-    rules: {
-      billCode: [
-        { required: true, message: "运单号不能为空", trigger: ["blur",'change']  }
-      ],
-      reciever:{
-        name: [
-          { required: true, message: "收货人名不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "收货人手机号不能为空", trigger: "blur" }
-        ],
-        country: [
-          { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
-        ],
-        province: [
-          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
-        ],
-        // city: [
-        //   { required: true, message: "市不能为空", trigger: "blur" }
-        // ],
-        // county: [
-        //   { required: true, message: "区不能为空", trigger: "blur" }
-        // ],
-        address: [
-          { required: true, message: "收货地址不能为空", trigger: "blur" }
-        ],
-      },
-      sender:{
-        name: [
-          { required: true, message: "寄件人名不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "寄件人手机号不能为空", trigger: "blur" }
-        ],
-        country: [
-          { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change']  }
-        ],
-        province: [
-          { required: true, message: "寄件省不能为空", trigger: ["blur",'change']  }
-        ],
-        // city: [
-        //   { required: true, message: "寄件市不能为空", trigger: "blur" }
-        // ],
-        // county: [
-        //   { required: true, message: "寄件区不能为空", trigger: "blur" }
-        // ],
-        address: [
-          { required: true, message: "寄件地址不能为空", trigger: "blur" }
-        ],
-      },
-      paymentType: [
-        { required: true, message: "支付方式不能为空", trigger: ["blur",'change']  }
-      ],
-      calcFeeType: [
-        { required: true, message: "计费方式不能为空", trigger: ["blur",'change']  }
-      ],
-      transLine: [
-        { required: true, message: "快递线路不能为空", trigger: ["blur",'change']  }
-      ],
-      productType: [
-        { required: true, message: "快递产品类型不能为空", trigger: ["blur",'change']  }
-      ],
-      customsClear: [
-        { required: true, message: "清关方式不能为空", trigger: ["blur",'change']  }
-      ],
-      customsEclaration: [
-        { required: true, message: "报关方式不能为空", trigger: ["blur",'change']  }
-      ],
-      packType: [
-        { required: true, message: "包装类型不能为空",trigger: ["blur",'change']  }
-      ],
-      dispatchMethod: [
-        { required: true, message: "派件方式不能为空", trigger: ["blur",'change']  }
-      ],
-      pickupMethod: [
-        { required: true, message: "取件方式为空", trigger: ["blur",'change']  }
-      ],
-      goodsInfo: [
-        { required: true, message: "货物描述不能为空", trigger: ["blur",'change']  }
-      ],
-      totalVolume: [
-        { required: true, message: "总体积不能为空", trigger: "blur" }
-      ],
-      parcelQty: [
-        { required: true, message: "件数不能为空", trigger: "blur" }
-      ],
-      billWeight: [
-        { required: true, message: "实际重量不能为空", trigger: "blur" }
-      ],
-      volumeWeight: [
-        { required: true, message: "体积重量不能为空", trigger: "blur" }
-      ],
-      settlementWeight: [
-        { required: true, message: "结算重量不能为空", trigger: "blur" }
-      ],
-      freight: [
-        { required: true, message: "运费不能为空", trigger: "blur" }
-      ],
-      sendSiteCode: [
-        { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
-      ],
-      sendDate: [
-        { required: true, message: "发货时间不能为空", trigger: "blur" }
-      ],
-      dispatchUnderlingSiteCode: [
-        { required: true, message: "目的地网点代码不能为空", trigger: "blur" }
-      ],
-      // payee: [
-      //   { required: true, message: "销售回款人不能为空", trigger: "blur" }
-      // ],
-      // salesmen: [
-      //   { required: true, message: "销售联系人不能为空", trigger: "blur" }
-      // ],
-      takePieceEmployeeCode: [
-        { required: true, message: "取件员代码不能为空", trigger: ["blur",'change']  }
-      ],
-      operateEmployeeCode: [
-        { required: true, message: "操作员代码不能为空", trigger: ["blur",'change']  }
-      ],
-    }
-  };
-},
- watch: {
-    "form.reciever.province":{
-      handler (newValue, oldValue) {
-        // this.isNeedSave=true;
-        this.calcDestSite();
-      },
-      immediate: false,
-      deep: true,
-    },
-    "form.totalVolume":{
-      handler (newValue, oldValue) {
-        this.reCalcVolumeWeight();
-      },
-      deep: true
-    },
-    "form.volumeWeight":{
-      handler (newValue, oldValue) {
-        this.reCalcSettlementWeight();
-      },
-      immediate: false,
-      deep: true
-    },
-    "form.billWeight":{
-      handler (newValue, oldValue) {
-        this.reCalcSettlementWeight();
-      },
-      immediate: false,
-      deep: true
-    },
-    "form.calcFeeType":{
-      handler (newValue, oldValue) {
-          this.calcBillFee();
-      },
-      immediate: false,
-      deep: true
-    },
-    "form.settlementWeight":{
-      handler (newValue, oldValue) {
-          this.calcBillFee();
-      },
-      immediate: false,
-      deep: true
-    },
-    "form.parcelQty":{
-      handler (newValue, oldValue) {
-          this.handleGenSubbill();
-      },
-      immediate: false,
-      deep: true
-    },
-
-},
-activated(){
-},
-mouted(){
-},
-updated(){
-},
-created() {
-  this.billCode=this.$route.query.billCode;
-  this.initData();
-
-},
-methods: {
-  handleScanInput(){
-    if(this.form.billCode==null || this.form.billCode==''){
-      this.$message.error("输入单号后回车");
-      return;
-    }
-    this.billCode=this.form.billCode;
-    this.initData();
-  },
-  handleAddFee(){
-    this.triggerCount++;
-  },
-  onFeeItemChange(item){
-    this.$refs.popoverFeeRef.doClose();
-    if(item!=null){
-      let newItem=Object.assign({},item)
-      this.form.feeItems.push(newItem);
-      this.handleCalcFeeItem();
-    }
-
-  },
-  deleteFeeItem(row){
-    if(row.blAutoGen==1){
-      this.$message('不允许删除!')
-      return;
-    }
-    this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-      let newList = this.form.feeItems.filter(item => item.feeCode !== row.feeCode);
-      this.form.feeItems=newList;
-
-    }).catch(() => {
-    })
-
-  },
-  deleteGoodsItem(row){
-    this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-      let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName);
-      this.form.cargoList=newList;
-      this.handleCalcQty();
-      this.handleCalcVolume();
-    }).catch(() => {
-    })
-
-  },
-  lpadZero(val,len) {
-    return (new Array(len + 1).join('0') + val).slice(-len);
-  },
-  handleGenSubbill(value){
-    if(this.form.blGenSubbill==1 && this.form.parcelQty > 0 && this.form.billCode){
-        // let billSubCodeStr="";
-        // for(let i=1;i<this.form.parcelQty;i++){
-        //   let subBillCode = this.form.billCode+""+this.lpadZero(i,3);
-        //   billSubCodeStr=billSubCodeStr+subBillCode+";"
-        //   console.log(billSubCodeStr);
-        // }
-        let billSubCodeStr = this.form.billCode+"["+this.lpadZero(1,3)+"-"+this.lpadZero(this.form.parcelQty,3)+"]";
-        console.log(billSubCodeStr);
-        this.form.billCodeSub=billSubCodeStr;
-    }else{
-      this.form.billCodeSub=null;
-    }
-
-  },
-  openCollapse(index){
-
-  },
-  initData() {
-      this.reset();
-
-      this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
-      this.form.sendSiteName=this.$store.getters.ownerSiteName;
-      console.log(this.form.sendSiteName)
-
-      if(this.billCode !=null) {
-        this.loading = true;
-        getWaybillDetail(this.billCode).then(response => {
-          this.form = response.data;
-          this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
-          this.loading = false;
-
-          this.isNeedSave=true;
-
-          this.form.sendDate =  parseTime(new Date());
-
-        });
-      }else{
-        // console.log(this.dict.type.emis_declare_mode[0]);
-
-        // this.form.customsEclaration = this.dict.type.emis_declare_mode[0].value;
-        this.form.customsEclaration='1';
-        this.form.customsClear='1';
-        this.form.pickupMethod='2';
-        this.form.dispatchMethod='1';
-        // this.form.billWeight=1.0;
-        // this.form.totalVolume=0.0;
-        this.form.parcelQty=1;
-        this.form.packType='2';
-        this.form.blOverWeight='0';
-        this.form.blGenSubbill=0;
-        this.form.paymentType='1';
-        this.form.calcFeeType='1';
-        this.form.blMessage='1'
-
-        this.isNeedSave=true;
-      }
-
-
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-  },
-  // 取消按钮
-  cancel() {
-    this.reset();
-    this.$emit("on-cancel");
-  },
-
-  // 表单重置
-  reset() {
-    this.form = {
-      id:null,
-      reciever: {
-          country: null,
-          name: null,
-          phone:null,
-          province: null,
-          city: null,
-          district: null,
-          town: null,
-          address: null,
-          postCode: null,
-          email: null,
-          company: null,
-      },
-      sender: {
-          country: null,
-          name: null,
-          phone:null,
-          province: null,
-          city: null,
-          district: null,
-          town: null,
-          address: null,
-          postCode: null,
-          email: null,
-          company: null,
-      },
-      feeItems: [],
-      cargoList: [],
-      attachmentList: [],
-      printTypeCheckList:[],
-      billCode: null,
-      orderDate:  null,
-      openId: null,
-      customerCode: null,
-      paymentType: null,
-      calcFeeType: '1',
-      custNo:  null,
-      productTypeSelArr: null,
-      transLine:  null,
-      productType: null,
-      customsClear: null,
-      customsEclaration: null,
-      packType: null,
-      dispatchMethod: "1",
-      pickupMethod: null,
-      pickStartDate: null,
-      pickFinishDate: null,
-      intoWarehouseCode: null,
-      intoWarehouseName: null,
-      intoWarehouseAddress: null,
-      intoWarehouseContact: null,
-      intoWarehousePhone:  null,
-      intoWarehouseBillCode: null,
-      customerDeliveryBeginTime: null,
-      goodsType:null,
-      goodsInfo: null,
-      length:null,
-      width:null,
-      height:null,
-      totalWeight: null,
-      totalVolume: null,
-      parcelQty: null,
-      billWeight: null,
-      volumeWeight: null,
-      settlementWeight: null,
-      feeWeight: null,
-      freight: null,
-      blOverLong: null,
-      blOverWeight: null,
-      overWeightNumber: null,
-      feeRemaker: null,
-      realValue: null,
-      takePieceEmployeeCode: null,
-      sendSiteCode: null,
-      sendSiteName: null,
-      destinationCode:  null,
-      dispatchUnderlingSiteCode: null,
-      destinationCenterCode: null,
-      marketManCode: null,
-      payee: null,
-      salesmen: null,
-      operateEmployeeCode: null,
-      blMessage: null,
-      blAcceptMessage: null,
-      meterType:null,
-      blGenSubbill:null,
-      billCodeSub:null,
-  };
-    this.resetForm("form");
-  },
-  onProductChange(item){
-    this.form.transLine=item[0];
-    this.form.productType=item[1];
-  },
-  /** 提交按钮 */
-  submitForm() {
-    this.$refs["form"].validate(valid => {
-      if (valid) {
-        realSubmitOrder(this.form).then(response => {
-            this.$modal.msgSuccess("下单成功");
-            this.$emit("on-changed");
-        });
-      }
-    });
-  },
-   // 弹出地址簿选择
-   handleSelectCustomerAddress(addressType){
-       this.addressType = addressType;
-       this.titleSelectAddress = this.addressType==1? this.$t('选择寄件人'):this.$t('选择收件人');
-       this.openSelectAddress = true;
-  },
-  // 地址薄选择后返回
-  onAddressChangeSelect(item){
-    if(this.addressType == 1){
-      this.onChangeSelectSender(item);
-    }else{
-      this.onChangeSelectReceiver(item);
-    }
-    this.openSelectAddress = false;
-
-  },
-  onChangeSelectSender(value){
-    this.form.sender.name=value.name;
-    this.form.sender.phone=value.phone;
-    this.form.sender.country=value.country;
-    this.form.sender.province=value.province;
-    this.form.sender.city=value.city;
-    this.form.sender.county=value.district;
-    // this.form.receiveTown=value.town;
-    this.form.sender.address=value.address;
-    this.form.sender.company=value.company;
-  },
-  onChangeSelectReceiver(value){
-    this.form.reciever.name=value.name;
-    this.form.reciever.phone=value.phone;
-    this.form.reciever.country=value.country;
-    this.form.reciever.province=value.province;
-    this.form.reciever.city=value.city;
-    this.form.reciever.county=value.district;
-    // this.form.receiveTown=value.town;
-    this.form.reciever.address=value.address;
-    this.form.reciever.company=value.company;
-
-  },
-  // 计算目的站点
-  calcDestSite(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    let queryParams = {
-            province:this.form.reciever.province
-    };
-
-    if(this.form.reciever.province){
-        getDestSite(queryParams).then(response => {
-          console.log(response);
-          this.form.destinationCode = response.data.destCode+'';
-          this.form.dispatchUnderlingSiteCode= response.data.siteCode;
-          this.form.dispatchSiteCode= response.data.siteCode;
-
-          this.form.dispatchUnderlingSite= response.data.siteName;
-          this.form.dispatchSite= response.data.siteName;
-
-        });
-    }
-  },
-  handleCalcVolume(val,row){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    let totalVolume=0.0;
-    if(row!=null){
-      let volume=parseFloat(row.length)*parseFloat(row.width)*parseFloat(row.height);
-      row.volume=parseFloat((volume/1000000).toFixed(5));
-    }
-
-    this.form.cargoList.forEach(item=>{
-        totalVolume=totalVolume+item.volume;
-    });
-    this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
-
-  },
-  handleCalcQty(val,row){
-    let totalCargoQty=0;
-    let goodsInfo='';
-
-    this.form.cargoList.forEach(item=>{
-        totalCargoQty=totalCargoQty+parseInt(item.cargoQty);
-        goodsInfo=goodsInfo+item.goodsName+"x"+item.cargoQty+",";
-
-    });
-
-    this.form.goodsInfo = goodsInfo;
-    this.form.parcelQty = totalCargoQty;
-
-    this.handleGenSubbill();
-  },
-  handleCalcFeeItem(val,row){
-    let totalFee=0;
-    this.form.feeItems.forEach(item=>{
-      totalFee=totalFee+parseInt(item.realFee);
-    });
-    this.form.freight = totalFee;
-  },
-  // 计算体积重量
-  reCalcVolumeWeight(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    if( this.form.totalVolume
-        && this.form.productType
-      ){
-        let postData={
-            productType: this.form.productType,
-            totalVolume: this.form.totalVolume,
-        }
-
-        calcVolumeWeight(postData).then(response => {
-              this.form.volumeWeight = response.data.volumeWeight;
-        });
-      }
-
-  },
-   // 计算计算重量
-  reCalcSettlementWeight(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-      if(this.form.billWeight
-        && this.form.volumeWeight
-        && this.form.productType
-      ){
-        setTimeout(()=>{
-            let postData={
-              productType: this.form.productType,
-              volumeWeight: this.form.volumeWeight,
-              billWeight: this.form.billWeight,
-            }
-
-            calcSetteldWeight(postData).then(response => {
-                  this.form.settlementWeight = response.data.settlementWeight;
-                  this.form.feeWeight = this.form.settlementWeight ;
-            });
-        },1000);
-      }
-
-  },
-  calcBillFee(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    if(this.form.settlementWeight
-        && this.form.productType
-        && this.form.sendSiteCode
-        && this.form.dispatchUnderlingSiteCode
-        && this.form.calcFeeType
-      ){
-        let postData={
-          productType: this.form.productType,
-          customerCode: this.form.customerCode,
-          custNo: this.form.custNo,
-          calcFeeType: this.form.calcFeeType,
-          settlementWeight: this.form.settlementWeight,
-          sendSiteCode: this.form.sendSiteCode,
-          dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
-        }
-
-        calcWaybillFee(postData).then(response => {
-              let newFeeList=response.data.feeList;
-              let newFeeMap = new Map();
-              newFeeList.forEach(item=>{
-                  newFeeMap[item.feeCode]=item;
-              });
-
-
-              let custFeeList = [];
-              this.form.feeItems.forEach(item=>{
-                  if(item.blAutoGen!='1' && !(item.feeCode in newFeeMap)){
-                    custFeeList.push(item);
-                  }
-              });
-
-              this.form.feeItems = newFeeList.concat(custFeeList);
-              this.handleCalcFeeItem();
-        });
-      }
-  },
-  onDestinationChange(item){
-    // this.form.destinationCode = item.destCode;
-    this.form.dispatchUnderlingSiteCode= item.siteCode;
-    this.form.dispatchSiteCode= item.siteCode;
-
-    this.form.dispatchUnderlingSite= item.siteName;
-    this.form.dispatchSite= item.siteName;
-  },
-  onGoodsChange(goodsName){
-      if(goodsName&& goodsName!='') {
-        // 旧map
-        let nameOldMap = new Map();
-        if(this.form.cargoList!=null&& this.form.cargoList.length>0){
-          this.form.cargoList.forEach(item=>{
-            nameOldMap[item.goodsName]=item;
-          });
-        }
-
-        if(!(goodsName in nameOldMap)){
-            let cargo={
-              "goodsCode": goodsName,
-              "goodsName": goodsName,
-              "cargoQty": 1,
-              "length": 0,
-              "width": 0,
-              "height": 0,
-              "volume": 0,
-            }
-            this.form.cargoList.push(cargo);
-        }
-
-        this.handleCalcQty();
-        this.handleCalcVolume();
-      }
-  },
-  showLocalTime(){
-
-  },
-  /** 鼠标移入cell */
-  handleGoodsCellEnter (row, column, cell, event) {
-    row.isEdit = true
-  },
-  /** 鼠标移出cell */
-  handleGoodsCellLeave (row, column, cell, event) {
-    row.isEdit = false
-  },
-  // 实时获取运单号
-  handleBillCodeChange(checked,item){
-    if(checked){
-      realMatchWaybill().then(response => {
-          this.form.billCode=response.data;
-      });
-    }else{
-      this.form.billCode=""
-    }
-  },
-}
-};
-</script>
-
-<style lang="scss">
-
-.el-form-item__label {
-    color: #000;
-}
-
-.el-input-group__append {
-    padding: 0 4px;
-}
-
-.el-row{
-      display:flex;
-      flex-wrap: wrap;
-      // padding-right: 10px;
- }
-
-.el-form-item__label {
-  font-size: 12px!important;
-}
-
-
- .platform-auto-complete {
-  .el-autocomplete-suggestion__wrap {
-    padding: 5px 0;
-    ul li {
-      pointer-events: none; // 阻止可点击事件
-      .default {
-        text-align: center;
-        color: #999;
-      }
-      &:hover {
-        background-color: #fff;
-      }
-    }
-  }
-}
-
-.el-collapse {
-    border-top: none!important;
-    border-bottom: none!important;
-}
-
-.el-table .el-table__cell:first-child .cell {
-  padding: 0px;
-}
-
-.el-table .cell {
-    padding: 0px;
-}
-
-.cargoList{
-  .el-input__inner {
-      height: 28px;
-      line-height: 28px;
-      border: none;
-      background: #ffffcd;
-      font-size: 10px;
-      padding: 0px;
-      text-align: center;
-  }
-}
-
-  .el-collapse-item__content {
-      padding-bottom: 0px;
-  }
-  .el-collapse-item__header{
-    pointer-events: none;
-  }
-
-  .el-collapse-item__arrow {
-    pointer-events: auto;
-  }
-
-
-
-
-
-
-</style>
-
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 394f4278..8ce49cca 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -260,20 +260,17 @@
       <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
 
-      <!-- <el-table-column label="发货信息"  align="center" > -->
-        <!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-              <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
-                <span>{{ scope.row.billCode }}</span>
-              </router-link>
-          </template>
-        </el-table-column> -->
-        <el-table-column :label="$t('收件业务员')" align="center" prop="salesmen" min-width="100" :show-overflow-tooltip="true"/>
-        <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
+      <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+      <el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" />
+
+        <el-table-column :label="$t('收件业务员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
           </template>
-       </el-table-column> -->
+       </el-table-column>
         <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
@@ -287,10 +284,8 @@
         </el-table-column>
 
         <!-- </el-table-column> -->
-
-
       <!-- <el-table-column label="寄件信息" align="center" > -->
-        <el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
+
         <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
@@ -405,7 +400,8 @@
         <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/>
       <!-- </el-table-column> -->
-      <el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
+
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
     </XdTable>
@@ -432,7 +428,9 @@ import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 export default {
   name: "WaybillIsPrinted",
   components: { elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
-  dicts: ['emis_waybill_status','emis_declare_mode','emis_customs_clear','emis_payment_type'
+  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'
   ],
   data() {
     return {