diff --git a/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue b/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue
index 7e605eed..de1fbf1b 100644
--- a/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue
+++ b/src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue
@@ -14,11 +14,11 @@
                   <TransLinePicker v-model="form.transLineType" isInitiated="true" ></TransLinePicker>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="24">
+              <el-col :span="24">
                   <el-form-item label="产品类型" prop="productType">
                     <TransProductPicker placeholder="产品类型" v-model="form.productType" :transLineCode="form.transLineType"></TransProductPicker>
                   </el-form-item>
-                </el-col> -->
+              </el-col>
 
                 <el-col :span="24">
                   <el-form-item label="启用状态" prop="status">
@@ -144,7 +144,7 @@ export default {
 
   methods: {
     initData() {
-
+        this.reset();
         if(this.id !=null) {
           this.loading = true;
           getEmisTmsTransPlan(this.id).then(response => {
@@ -153,7 +153,6 @@ export default {
           });
         }else{
             this.form.status="1";
-            this.reset();
         }
     },
     onStepChange(){
diff --git a/src/views/emis/emisTmsTransPlan/index.vue b/src/views/emis/emisTmsTransPlan/index.vue
index f19df8ba..c13468dd 100644
--- a/src/views/emis/emisTmsTransPlan/index.vue
+++ b/src/views/emis/emisTmsTransPlan/index.vue
@@ -118,12 +118,12 @@
             <div >{{scope.row.transLineTypeName}}</div>
          </template>
       </el-table-column>
+      <el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
       <el-table-column :label="$t('国家')" align="center" prop="transLineTypeName1" min-width="100" >
         <template slot-scope="scope">
             <div >{{scope.row.fromCountryName}}---{{ scope.row.countryName  }}</div>
          </template>
       </el-table-column>
-      <!-- <el-table-column :label="$t('所属产品')" align="center" prop="productType" min-width="100" /> -->
       <!-- <el-table-column :label="$t('起始国')" align="center" prop="fromCountryName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('目的国')" align="center" prop="countryName" min-width="100" /> -->
       <el-table-column :label="$t('累计时效')" align="center" prop="totalEstCostDay" min-width="100" />
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 96f59c9a..49c4c4c7 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -1,9 +1,9 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="16"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
+    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <!-- label-width="100px" -->
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
             <el-col :span="24">
                 <el-form-item label="" prop="billCode">
@@ -17,7 +17,7 @@
                     v-model="queryParams.billCode"
                     :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
-                    :rows="10"
+                    :rows="4"
                   />
                         <!-- @keyup.enter.native="handleQuery" -->
                 </el-form-item>
@@ -25,21 +25,81 @@
           </el-row>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
               <el-form-item label="寄件网点" prop="productType">
                 <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
               </el-form-item>
-
               <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
                 <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
               </el-form-item>
-                <el-form-item :label="$t('收件业务员')" prop="takePieceEmployeeCode">
-                <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
-              </el-form-item>
-
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="月结客户" prop="custNo">
                 <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
               </el-form-item>
+              <el-form-item label="付款方式" prop="paymentType" >
+              <el-select clearable v-model="queryParams.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="6">
+                  <el-form-item label="线路" prop="transLineType">
+                    <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
+                  </el-form-item>
+                  <el-form-item label="产品类型" prop="productType">
+                    <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
+                  </el-form-item>
+
+
+            </el-col>
+
+
+      </el-row>
+
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-col :span="10">
+              <el-form-item label="查询时间范围" prop="dateTimeRange">
+                  <div slot="label">
+
+                          <el-radio-group  class="query-label" v-model="queryOrderDateType">
+                              <el-radio :key="1" label="1">发货时间</el-radio>
+                        </el-radio-group>
+
+                  </div>
+                  <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+              </el-form-item>
+              <el-form-item label="" prop="queryExpireNotSign">
+                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
+              </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-col :span="6">
+              <el-form-item label="寄件人" prop="sendName">
+                    <el-input
+                      v-model="queryParams.sendName"
+                      :placeholder="$t('寄件人')"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
+                  <el-form-item label="寄件电话" prop="sendMobile">
+              <el-input
+                v-model="queryParams.sendMobile"
+                :placeholder="$t('寄件人电话')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
               <el-form-item label="寄件公司" prop="sendCompany">
                 <el-input
                   v-model="queryParams.sendCompany"
@@ -48,46 +108,31 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
+              <el-form-item label="寄件国家" prop="sendCountry">
+              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1>
+            </el-form-item>
+            <el-form-item label="录单备注" prop="remark">
+              <el-input
+                v-model="queryParams.remark"
+                :placeholder="$t('录单备注')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="费用备注" prop="feeRemark">
+              <el-input
+                v-model="queryParams.feeRemark"
+                :placeholder="$t('费用备注')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
 
-              <el-form-item :label="$t('取件员')" prop="registerManCode">
-                <EmisUserSimplePicker1  :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
-              </el-form-item>
 
-              <!-- <el-form-item :label="$t('派件员')" prop="dispatchManCode">
-                <EmisUserSimplePicker2  :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
-              </el-form-item> -->
 
-              <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
-              <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-                  <el-form-item label="线路" prop="transLineType">
-                    <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
-                  </el-form-item>
-                  <el-form-item label="产品类型" prop="productType">
-                    <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
-                  </el-form-item>
+        </el-col>
+        <el-col :span="6">
 
-                  <el-form-item label="派送方式" prop="dispatchMethod" >
-                    <el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
-                        <el-option
-                          v-for="dict in dict.type.emis_tab_dispatch_mode"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                        ></el-option>
-                      </el-select>
-                  </el-form-item>
-
-                  <el-form-item label="寄件人" prop="sendName">
-                    <el-input
-                      v-model="queryParams.sendName"
-                      :placeholder="$t('寄件人')"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item>
                   <el-form-item label="收件人" prop="receiveName">
                   <el-input
                     v-model="queryParams.receiveName"
@@ -96,8 +141,17 @@
                     @keyup.enter.native="handleQuery"
                   />
                 </el-form-item>
+                <el-form-item label="收件电话" prop="receiveMobile">
+              <el-input
+                v-model="queryParams.receiveMobile"
+                :placeholder="$t('收件电话')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
 
-                <el-form-item label="收件公司" prop="receiveCompany">
+
+            <el-form-item label="收件公司" prop="receiveCompany">
                   <el-input
                     v-model="queryParams.receiveCompany"
                     :placeholder="$t('收件公司')"
@@ -106,67 +160,36 @@
                   />
                 </el-form-item>
 
-            </el-col>
-      </el-row>
-
-      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="24">
-              <el-form-item label="查询时间范围" prop="dateTimeRange">
-                  <div slot="label">
-
-                          <el-radio-group  class="query-label" v-model="queryOrderDateType">
-                              <el-radio :key="1" label="1">发货时间</el-radio>
-                              <!-- <el-radio :key="0" label="0">录单时间</el-radio> -->
-                            </el-radio-group>
-
-                  </div>
-                  <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-              </el-form-item>
-
-              <el-form-item label="" prop="queryExpireNotSign">
-                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryExpireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
-              </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="8">
-
-            <el-form-item label="寄件人电话" prop="sendMobile">
-              <el-input
-                v-model="queryParams.sendMobile"
-                :placeholder="$t('寄件人电话')"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            <el-form-item label="目的国家" prop="sendCountry">
+              <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
             </el-form-item>
 
-            <el-form-item label="收件人电话" prop="receiveMobile">
-              <el-input
-                v-model="queryParams.receiveMobile"
-                :placeholder="$t('收件人电话')"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-
-            <el-form-item label="发件国" prop="sendCountry">
-              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('发件国')" @onChange="handleQuery"></CountryPicker1>
-            </el-form-item>
-
-            <el-form-item label="目的国" prop="sendCountry">
-              <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker2>
-            </el-form-item>
-
-            <el-form-item label="目的省" prop="sendCountry">
+            <el-form-item label="目的省份" prop="receiveProvince">
               <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  style="margin-left:5px"  ></ProvincePicker2>
             </el-form-item>
 
+            <el-form-item label="签收状态" prop="signStatus">
+              <el-select clearable="" v-model="queryParams.params.signStatus" placeholder="请选择">
+                <el-option label="已签收" :value="1"></el-option>
+                <el-option label="未签收" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
 
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
 
-          <el-form-item label="报关方式" prop="customsEclaration">
+          <!-- <el-form-item label="运单状态" prop="siteType">
+              <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
+                    <el-option
+                      v-for="dict in dict.type.emis_waybill_status"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+              </el-select>
+            </el-form-item> -->
+
+            <el-form-item label="报关方式" prop="customsEclaration">
                 <el-select clearable v-model="queryParams.customsEclaration" placeholder="请选择">
                   <el-option
                     v-for="dict in dict.type.emis_declare_mode"
@@ -187,16 +210,57 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="付款方式" prop="paymentType" >
-              <el-select clearable v-model="queryParams.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-form-item label="派送方式" prop="dispatchMethod" >
+                    <el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_tab_dispatch_mode"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="取件方式" prop="pickupMethod">
+                      <el-select v-model="queryParams.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-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
+                <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
+              </el-form-item>
+
+              <el-form-item label="收款状态" prop="pickupMethod">
+                      <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_payment_status"
+                          :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 clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
+              <el-option label="只查问题件类型" :value="1"></el-option>
+              <el-option label="剔除问题件类型" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="问题件类型" prop="problemType">
+            <ProblemTypePicker v-model="queryParams.problemType"  ></ProblemTypePicker>
+          </el-form-item>
 
 
           <el-form-item :label="$t('回款联系人')" prop="payee">
@@ -206,46 +270,31 @@
             <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
-
-          <el-form-item label="运单状态" prop="siteType">
-              <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
-                    <el-option
-                      v-for="dict in dict.type.emis_waybill_status"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-              </el-select>
-            </el-form-item>
-
-
-
-
-
-
-
-
-          <el-form-item label="是否问题件" prop="blIsQuestion" >
+          <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
+              <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
+              </el-form-item>
+          <el-form-item :label="$t('录单员')" prop="registerManCode">
+                <EmisUserSimplePicker1  :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
+          </el-form-item>
+          <!-- <el-form-item label="是否问题件" prop="blIsQuestion" >
               <el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
                   <el-option :key="1" label="'1'" value="'1'">是</el-option>
                   <el-option :key="0" label="'0'" value="'0'">否</el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
-        <el-form-item label="问题件类型" prop="problemType">
-          <ProblemTypePicker v-model="queryParams.problemType"  ></ProblemTypePicker>
-        </el-form-item>
-
-          <el-form-item label="问题件原因" prop="problemCause">
+          <!-- <el-form-item label="问题件原因" prop="problemCause">
             <el-input
               v-model="queryParams.problemCause"
               :placeholder="$t('问题件原因')"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
+
+              <!-- <el-form-item :label="$t('派件员')" prop="dispatchManCode">
+                <EmisUserSimplePicker2  :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
+              </el-form-item> -->
 
         </el-col>
       </el-row>
@@ -769,7 +818,9 @@ export default {
         delFlag: null,
         remark: null,
         params:{
-
+          signStatus:null,
+          expireNotSign:null,
+          problemQueryType:null,
         }
       },
     };
@@ -784,7 +835,7 @@ export default {
     this.getList();
     this.queryOrderType="1";
     this.queryOrderDateType="1";
-    this.queryExpireNotSign="1"
+    // this.queryExpireNotSign="1"
 
     // 调整表格的高度，不允许滚动
     this.$nextTick(function() {
@@ -972,6 +1023,9 @@ export default {
 
 <style lang="scss" scoped>
 
+:deep .el-form-item__label-wrap {
+  margin-left: 0 !important;
+  }
   .el-divider{
     margin-top: 0px;
     background: 0 0;