diff --git a/src/main.js b/src/main.js
index 2622032f..0606d9f7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -52,6 +52,8 @@ import DictData from '@/components/DictData'
 // XdTable
 import XdTable from "@/components/XdTable"
 
+import XdTextareaInput from "@/components/XdTextareaInput"
+
 // XdDialog
 import XdDialog from "@/components/XdDialog"
 // 搜索区域
@@ -114,6 +116,8 @@ Vue.component('CustomDatePicker', CustomDatePicker)
 Vue.component('XdTable', XdTable)
 Vue.component('XdDialog', XdDialog)
 Vue.component('SearchForm', SearchForm)
+Vue.component('XdTextareaInput', XdTextareaInput)
+
 
 Vue.use(Print)
 Vue.use(directive)
diff --git a/src/views/emis/EmisBaseTools/ProblemTypePicker.vue b/src/views/emis/EmisBaseTools/ProblemTypePicker.vue
index f733deb9..e9085fae 100644
--- a/src/views/emis/EmisBaseTools/ProblemTypePicker.vue
+++ b/src/views/emis/EmisBaseTools/ProblemTypePicker.vue
@@ -20,7 +20,7 @@
       @clear="onClear"
       @visible-change="reverseArrow"
       >
-        <el-option v-for="item in dataList" :key="item.id" :label="item.id+'-'+item.typeName" :value="item.id" ></el-option>
+        <el-option v-for="item in dataList" :key="item.id" :label="item.typeName" :value="item.id" ></el-option>
     </el-select>
 
 
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 3b54ebcb..15e54a82 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -143,7 +143,7 @@
                       </el-form-item>
                   </el-col>
 
-                  <el-col :span="18">
+                  <el-col :span="18" v-if="action=='add'">
                     <el-form-item label="打印选项:" prop="printTypeCheckList">
                       <el-checkbox-group v-model="form.printTypeCheckList">
                         <!-- <el-checkbox
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 19d30232..44bfd01b 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -4,8 +4,8 @@
       <el-form-item label="" prop="billCode">
               <div slot="label">
                 <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
-                    <el-radio label="1">运单号</el-radio>
-                    <el-radio label="0">订单号</el-radio>
+                    <el-radio :key="1" :label="1">运单号</el-radio>
+                    <el-radio :key="0" :label="0">订单号</el-radio>
                   </el-radio-group>
               </div>
               <el-input
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 196188f5..73d1c0f3 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -3,26 +3,25 @@
     <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="" prop="billCode">
-              <div slot="label">
-                <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
-                    <el-radio label="1">运单号</el-radio>
-                    <el-radio label="0">订单号</el-radio>
+        <div slot="label">
+              <el-radio-group class="query-label" v-model="queryOrderType">
+                    <el-radio :key="1" label="1">运单号</el-radio>
+                    <el-radio :key="0" label="0">订单号</el-radio>
                   </el-radio-group>
               </div>
-              <el-input
+              <XdTextareaInput
                 v-model="queryParams.billCode"
                 :placeholder="$t('多个流水号逗号或换行隔开')"
                 clearable
-                          type="textarea"
-                          rows="2"
-                @keyup.enter.native="handleQuery"
+                :rows="2"
               />
+              <!-- @keyup.enter.native="handleQuery" -->
             </el-form-item>
             <el-form-item label="" prop="dateTimeRange">
               <div slot="label">
-                      <el-radio-group  class="query-label" v-model="queryParams.params.queryOrderDateType">
-                          <el-radio label="1">下单时间</el-radio>
-                          <el-radio label="0">录单时间</el-radio>
+                      <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>
@@ -53,9 +52,6 @@
               />
             </el-form-item>
 
-            <el-form-item label="目的国" prop="receiveCountry">
-              <CountryPicker0 v-model="queryParams.receiveCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker0>
-            </el-form-item>
 
             <el-form-item label="寄件人" prop="sendName">
               <el-input
@@ -82,11 +78,20 @@
               />
             </el-form-item>
 
-            <el-form-item label="寄件国" prop="sendCountry">
-              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker1>
 
+            <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">
+              <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  style="margin-left:5px"  ></ProvincePicker2>
+            </el-form-item>
+
+
             <el-form-item label="运单状态" prop="siteType">
               <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
                     <el-option
@@ -99,7 +104,7 @@
             </el-form-item>
 
             <el-form-item label="报关方式" prop="customsEclaration">
-                <el-select v-model="queryParams.customsEclaration" placeholder="请选择">
+                <el-select clearable v-model="queryParams.customsEclaration" placeholder="请选择">
                   <el-option
                     v-for="dict in dict.type.emis_declare_mode"
                     :key="dict.value"
@@ -109,8 +114,8 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="清关方式" prop="customsClear">
-              <el-select v-model="queryParams.customsClear" placeholder="请选择">
+            <el-form-item  label="清关方式" prop="customsClear">
+              <el-select clearable v-model="queryParams.customsClear" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.emis_customs_clear"
                   :key="dict.value"
@@ -119,8 +124,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="付款方式" prop="paymentType" label-width="70px">
-              <el-select v-model="queryParams.paymentType" placeholder="请选择">
+            <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"
@@ -130,6 +135,68 @@
                 </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="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-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="payee">
+            <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+
+          </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
+
+          <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
+            <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
+          </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="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 label="问题件类型" prop="problemType">
+          <ProblemTypePicker v-model="queryParams.problemType"  ></ProblemTypePicker>
+        </el-form-item>
+
+          <el-form-item label="问题件原因" prop="problemCause">
+            <el-input
+              v-model="queryParams.problemCause"
+              :placeholder="$t('问题件原因')"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
 
 
@@ -445,16 +512,49 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
 import emisWaybillForm from '@/views/emis/emisWaybill/emisWaybillForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
-import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
 import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 
+import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+
+
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+
+
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
+
+import {dateToStr} from '@/utils/custom'
 
 export default {
   name: "WaybillIsPrinted",
-  components: { elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
+  components: {
+    elDateAdvPicker,emisWaybillForm,
+    CountryPicker1,
+    CountryPicker2,ProvincePicker2,
+    TransLinePicker,TransProductPicker,
+    PayeePicker,
+    SalemanPicker,
+    EmisUserSimplePicker0,
+    EmisUserSimplePicker1,
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    ProblemTypePicker
+
+  },
   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','emis_payment_status','emis_waybill_status'
+        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
   ],
   data() {
     return {
@@ -482,6 +582,9 @@ export default {
       titleForm: "",
       billCode:null,
 
+      queryOrderType:null,
+      queryOrderDateType:null,
+
       // 弹出展示层
       id:null,
       titleView:"",
@@ -657,14 +760,15 @@ export default {
         delFlag: null,
         remark: null,
         params:{
-          queryOrderType:1,
-          queryOrderDateType:1
+
         }
       },
     };
   },
   created() {
     this.getList();
+    this.queryOrderType="1";
+    this.queryOrderDateType="1";
 
     // 调整表格的高度，不允许滚动
     this.$nextTick(function() {
@@ -678,47 +782,86 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeOrderDate && '' != this.daterangeOrderDate) {
-        this.queryParams.params["beginOrderDate"] = this.daterangeOrderDate[0];
-        this.queryParams.params["endOrderDate"] = this.daterangeOrderDate[1];
+
+    //   this.queryOrderType="1";
+    // this.queryOrderDateType="1";
+      if(this.queryParams.billCode){
+        if(this.queryOrderType != "1"){
+            this.queryParams.orderSn=this.queryParams.billCode+"";
+            this.queryParams.billCode=null;
+        }else{
+          // 处理子单号
+          let billArr = this.queryParams.billCode.split(",");
+          let newBillCodeStr="";
+          billArr.forEach(item=>{
+              if(item.startsWith("T")){
+                let mainBillCode=item.substr(0,14);
+                newBillCodeStr=newBillCodeStr+mainBillCode+",";
+              }else{
+                newBillCodeStr=newBillCodeStr+item+",";
+              }
+          });
+          this.queryParams.billCode=newBillCodeStr;
+
+        }
       }
-      if (null != this.daterangeEstimateDate && '' != this.daterangeEstimateDate) {
-        this.queryParams.params["beginEstimateDate"] = this.daterangeEstimateDate[0];
-        this.queryParams.params["endEstimateDate"] = this.daterangeEstimateDate[1];
+      if(this.dateTimeRange&&this.dateTimeRange.length==2){
+
+        let startDate = new Date(this.dateTimeRange[0]);
+        let endDate= new Date(this.dateTimeRange[1]);
+        startDate=dateToStr(startDate);
+        endDate=dateToStr(endDate)
+
+        if(this.queryOrderDateType != "1"){
+          this.queryParams.params["beginCreateTime"] = startDate;
+          this.queryParams.params["endCreateTime"] =  endDate;
+        }else{
+          this.queryParams.params["beginSendDate"] = startDate;
+          this.queryParams.params["endSendDate"] = endDate;
+        }
       }
-      if (null != this.daterangePickStartDate && '' != this.daterangePickStartDate) {
-        this.queryParams.params["beginPickStartDate"] = this.daterangePickStartDate[0];
-        this.queryParams.params["endPickStartDate"] = this.daterangePickStartDate[1];
-      }
-      if (null != this.daterangePickFinishDate && '' != this.daterangePickFinishDate) {
-        this.queryParams.params["beginPickFinishDate"] = this.daterangePickFinishDate[0];
-        this.queryParams.params["endPickFinishDate"] = this.daterangePickFinishDate[1];
-      }
-      if (null != this.daterangeDispFdDate && '' != this.daterangeDispFdDate) {
-        this.queryParams.params["beginDispFdDate"] = this.daterangeDispFdDate[0];
-        this.queryParams.params["endDispFdDate"] = this.daterangeDispFdDate[1];
-      }
-      if (null != this.daterangeRegisterDate && '' != this.daterangeRegisterDate) {
-        this.queryParams.params["beginRegisterDate"] = this.daterangeRegisterDate[0];
-        this.queryParams.params["endRegisterDate"] = this.daterangeRegisterDate[1];
-      }
-      if (null != this.daterangeSendDate && '' != this.daterangeSendDate) {
-        this.queryParams.params["beginSendDate"] = this.daterangeSendDate[0];
-        this.queryParams.params["endSendDate"] = this.daterangeSendDate[1];
-      }
-      if (null != this.daterangeProduceBillDate && '' != this.daterangeProduceBillDate) {
-        this.queryParams.params["beginProduceBillDate"] = this.daterangeProduceBillDate[0];
-        this.queryParams.params["endProduceBillDate"] = this.daterangeProduceBillDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisWaybill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      // if (null != this.daterangeOrderDate && '' != this.daterangeOrderDate) {
+      //   this.queryParams.params["beginOrderDate"] = this.daterangeOrderDate[0];
+      //   this.queryParams.params["endOrderDate"] = this.daterangeOrderDate[1];
+      // }
+      // if (null != this.daterangeEstimateDate && '' != this.daterangeEstimateDate) {
+      //   this.queryParams.params["beginEstimateDate"] = this.daterangeEstimateDate[0];
+      //   this.queryParams.params["endEstimateDate"] = this.daterangeEstimateDate[1];
+      // }
+      // if (null != this.daterangePickStartDate && '' != this.daterangePickStartDate) {
+      //   this.queryParams.params["beginPickStartDate"] = this.daterangePickStartDate[0];
+      //   this.queryParams.params["endPickStartDate"] = this.daterangePickStartDate[1];
+      // }
+      // if (null != this.daterangePickFinishDate && '' != this.daterangePickFinishDate) {
+      //   this.queryParams.params["beginPickFinishDate"] = this.daterangePickFinishDate[0];
+      //   this.queryParams.params["endPickFinishDate"] = this.daterangePickFinishDate[1];
+      // }
+      // if (null != this.daterangeDispFdDate && '' != this.daterangeDispFdDate) {
+      //   this.queryParams.params["beginDispFdDate"] = this.daterangeDispFdDate[0];
+      //   this.queryParams.params["endDispFdDate"] = this.daterangeDispFdDate[1];
+      // }
+      // if (null != this.daterangeRegisterDate && '' != this.daterangeRegisterDate) {
+      //   this.queryParams.params["beginRegisterDate"] = this.daterangeRegisterDate[0];
+      //   this.queryParams.params["endRegisterDate"] = this.daterangeRegisterDate[1];
+      // }
+      // if (null != this.daterangeSendDate && '' != this.daterangeSendDate) {
+      //   this.queryParams.params["beginSendDate"] = this.daterangeSendDate[0];
+      //   this.queryParams.params["endSendDate"] = this.daterangeSendDate[1];
+      // }
+      // if (null != this.daterangeProduceBillDate && '' != this.daterangeProduceBillDate) {
+      //   this.queryParams.params["beginProduceBillDate"] = this.daterangeProduceBillDate[0];
+      //   this.queryParams.params["endProduceBillDate"] = this.daterangeProduceBillDate[1];
+      // }
+      // if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+      //   this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+      //   this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      // }
+      // if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
+      //   this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
+      //   this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
+      // }
+
+      listEmisWaybill(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -726,7 +869,6 @@ export default {
     },
 
     onDateSelect(value){
-      console.log("date picker---->", value)
       this.dateTimeRange=value;
       // scanDate
     },
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 10ffdc1c..3d99c61a 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -66,7 +66,7 @@ export default {
     close() {
       this.$emit("on-close");
       // this.$tab.closePage();
-      this.$store.dispatch("tagView/delView",this.$router)
+      // this.$store.dispatch("tagView/delView",this.$router)
       let indexUrl=this.$store.state.permission.indexPage;
       this.$router.push({path:indexUrl});