diff --git a/src/views/emis/emisWaybill/A4WaybillIPrinted.vue b/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
index f8762e02..8cd82af6 100644
--- a/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
+++ b/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
@@ -1,31 +1,43 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <XdPageContainer class="app-container">
+    <SearchForm slot="pageHeader" :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 :key="1" :label="1">运单号</el-radio>
-                    <el-radio :key="0" :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"
+                :rows="2"
+              />
+              <!-- @keyup.enter.native="handleQuery" -->
+            </el-form-item>
+            <el-form-item label="录单时间" prop="dateTimeRange">
+              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+            </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="寄件人" prop="sendName">
+              <el-input
+                v-model="queryParams.sendName"
+                :placeholder="$t('寄件人')"
+                clearable
                 @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>
-              </div>
-              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-            </el-form-item>
 
             <el-form-item label="收件人" prop="receiveName">
               <el-input
@@ -35,91 +47,8 @@
                 @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-input
-                v-model="queryParams.receiveCompany"
-                :placeholder="$t('收件公司')"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </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
-                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"
-                :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="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 v-model="queryParams.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-form-item label="清关方式" prop="customsClear">
-              <el-select v-model="queryParams.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-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"
@@ -128,16 +57,23 @@
                   ></el-option>
                 </el-select>
             </el-form-item>
-    </SearchForm>
 
-    <!-- 打印机状态 -->
-    <div style="padding:5px 0px;text-align: right;position: fixed;top: 150px;right: 10px;    z-index: 9999;">
-        <el-tag type="danger" v-if="printerStatus==0">{{ printerStatusMessage }}</el-tag>
-        <el-tag type="success" v-if="printerStatus==1">{{ printerStatusMessage }}</el-tag>
+          <el-form-item label="打印状态" prop="blPrint" >
+              <el-select clearable v-model="queryParams.blPrint" 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>
 
-    </div>
+      </SearchForm>
 
-    <XdTable v-loading="loading"
+
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border stripe
            size="small"
            :data="emisWaybillList"
@@ -147,7 +83,6 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
-           v-if="tableHeight" :max-height="tableHeight + 'px'"
            >
 
       <div slot="toolbar">
@@ -159,7 +94,7 @@
                   plain
                   icon="el-icon-print"
                   size="mini"
-                  :disabled="multiple||(printerStatus!=1)"
+                  :disabled="multiple"
                   @click="handleBatchPrint"
                 >打印</el-button>
               </el-col>
@@ -178,60 +113,20 @@
                   type="primary"
                   plain
                   size="mini"
-                  :disabled="multiple||(printerStatus!=1)"
+                  :disabled="multiple"
                   @click="handlePrintPreview"
-                >预览面单</el-button>
+                >预览</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
                   size="mini"
-                  :disabled="multiple||(printerStatus!=1)"
+                  :disabled="multiple"
                   @click="handleDownPDF"
                 >下载pdf</el-button>
               </el-col>
-
-          <el-col :span="1.5">
-          <div style="display: inline-flex;">
-            <div style="font-size: 12px; line-height: 28px;font-weight: 600;">模板:</div>
-            <div>
-              <el-select v-model="selTplName" size="mini" placeholder="选择打印模板" clearable filterable>
-              <el-option
-                v-for="item in printTplList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-              </el-select>
-            </div>
-          </div>
-
-          </el-col>
-          <el-col :span="1.5">
-
-          <div style="display: inline-flex;">
-            <div style="font-size: 12px;
-    line-height: 28px;
-    font-weight: 600;">打印机:</div>
-            <div>
-              <el-select v-model="selPrinterName" size="mini" placeholder="打印机" clearable filterable>
-              <el-option
-                v-for="item in printerList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-              </el-select>
-            </div>
-          </div>
-
-          </el-col>
-          <el-col :span="1.5">
-              <a :href="printerDownUrl" style="color: blue;font-weight: 600;font-size:13px;text-decoration: underline">下载打印组件</a>
-          </el-col>
-
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -240,33 +135,19 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisWaybill:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
+
+          <el-col :span="1.5">
+            <TanexPrinterPanel ref="tanexPrinter" :isShowPinters="true" :isShowTpl="true" :isShowSubBillRange="true" @onPrint="handleBatchPrint"></TanexPrinterPanel>
+          </el-col>
+
+              
           </el-row>
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-
-
-      -->
-
-      <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-      -->
-
-      <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> -->
 
       <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
         <template slot-scope="scope">
@@ -464,11 +345,8 @@
     </el-dialog>
     -->
 
-    <el-dialog class="previe_dialog" title="打印预览" :visible.sync="openPdfView" width="80%"  :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <PdfViewer :pdfUrl="pdfUrl"  width="100%"  @onPrint="handleBatchPrint" ></PdfViewer>
-    </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -478,12 +356,46 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 
-import PdfViewer from '@/components/PdfViewer/index.vue';
-import PdfUtils from '@/utils/pdfUtils'
+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 TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
+
 
 export default {
-  name: "WaybillIsPrinted",
-  components: { PdfViewer,elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
+  name: "A4WaybillIPrinted",
+  components: {
+    TanexPrinterPanel,
+    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'
@@ -511,19 +423,7 @@ export default {
       currentId:null,
       openForm: false,
       titleForm: "",
-
-      openPdfView:false,
-      pdfUrl:null,
-
-
-      tanexPrinter:null,
-      printerDownUrl:null,
-      printerStatus:0,
-      printerStatusMessage:'打印组件未连接',
-      printerList:[],
-      printTplList:[],
-      selTplName:null,
-      selPrinterName:null,
+      queryOrderType:null,
       currentSelection:[],
 
       // 弹出展示层
@@ -709,64 +609,12 @@ export default {
   },
   created() {
     this.getList();
-    this.initTanexPrinterSdk();
+    this.queryOrderType="1";
 
-     // 调整表格的高度，不允许滚动
-     this.$nextTick(function() {
-      let queryFormEl = this.$refs.queryForm.$el;
-      let tableH = queryFormEl.offsetHeight+190;
-      this.tableHeight = window.innerHeight - tableH;
-    });
-  },
-  beforeDestroy(){
-    this.tanexPrinter.close();
   },
+
   methods: {
-    initTanexPrinterSdk(){
-      this.tanexPrinter = this.$tanexPrinter;
-
-      this.getConfigKey("sys.printer.downurl").then(response => {
-        this.printerDownUrl = response.msg;
-      });
-
-      this.tanexPrinter.init();
-
-      this.tanexPrinter.setOnOpen(this.onPrinterOpen);
-      this.tanexPrinter.setOnClose(this.onPrinterClose);
-      this.tanexPrinter.setOnError(this.onPrinterError);
-      this.tanexPrinter.setOnGetPrinter(this.onGetPrinter);
-      this.tanexPrinter.setOnGetPrintTpl(this.onGetPrintTpl);
-    },
-    onPrinterOpen(evt){
-      console.log("onPrinterOpen")
-      this.printerStatus = 1;
-      this.printerStatusMessage="打印组件已连接,可以打印.";
-
-    },
-    onPrinterClose(evt){
-      console.log("onPrinterClose")
-      this.printerStatus = 0;
-      this.printerStatusMessage="打印组件已断开！";
-    },
-    onPrinterError(evt){
-      console.log("onPrinterError")
-      this.printerStatus = 0;
-      this.printerStatusMessage="打印组件已断开！";
-    },
-
-    onGetPrinter(msg){
-      console.log("onGetPrinter")
-      this.printerList=this.tanexPrinter.getPrinterTplList();
-      this.selPrinterName=this.tanexPrinter.getDefaultPrinter();
-    },
-    onGetPrintTpl(msg){
-      console.log("onGetPrintTpl")
-      this.printTplList=this.tanexPrinter.getPrintTplList();
-      this.selTplName=this.printTplList[0].value;
-    },
-
     handleBatchPrint(){
-      // 重要，设置为true才会把右上角X和取消区分开来
       this.$confirm("确定打印?", "提示", {
           cancelButtonText: "不打印",
           confirmButtonText: "确定打印",
@@ -778,46 +626,61 @@ export default {
           this.currentSelection.forEach(item=>{
             orderList.push(item.billCode);
         });
-        this.tanexPrinter.batchPrint(this.selTplName,this.selPrinterName,orderList)
+        this.$refs.tanexPrinter.batchPrint(orderList);
       }).catch(() => {});
 
     },
-    async handlePrintPreview(){
-      let pdfUrlList=[];
-      this.currentSelection.forEach(item=>{
-          let url=this.tanexPrinter.getPdfUrl(item.billCode,this.selTplName,this.selPrinterName);
-          pdfUrlList.push(url)
-      });
-      let pdfUtils=new PdfUtils({});
-      const loadingInstance = this.$loading({
-            text: '正在生成预览...'
-      })
-      pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" )
-      .then(url=>{
-        loadingInstance.close();
-        // this.pdfUrl='/static/pdfjs/dist/web/printPreview.html?file=' +encodeURIComponent(url);
-        this.pdfUrl=url;
-        this.openPdfView = true;
-      })
-      .catch(error => {
-      });
-
+    handlePrintPreview(){
+      let orderList=[];
+          this.currentSelection.forEach(item=>{
+            orderList.push(item.billCode);
+        });
+        this.$refs.tanexPrinter.printPreview(orderList);
     },
     handleDownPDF(){
-      let pdfUrlList=[];
-      this.currentSelection.forEach(item=>{
-          let url=this.tanexPrinter.getPdfUrl(item.billCode,this.selTplName,this.selPrinterName);
-          pdfUrlList.push(url)
+      let orderList=[];
+        this.currentSelection.forEach(item=>{
+          orderList.push(item.billCode);
       });
-      let pdfUtils=new PdfUtils({});
-      pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" ,true);
+      this.$refs.tanexPrinter.downPDF(orderList);
     },
-
     /** 查询运单列表列表 */
     getList() {
       this.loading = true;
+
       this.queryParams.params = {};
-      listEmisWaybill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+
+      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(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)
+
+        this.queryParams.params["beginSendDate"] = startDate;
+        this.queryParams.params["endSendDate"] = endDate;
+      }
+
+      listEmisWaybill(this.queryParams).then(response => {
         this.emisWaybillList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -949,20 +812,9 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 
-  .el-divider{
-    margin-top: 0px;
-    background: 0 0;
-    border-top: 1px solid #E6EBF5;
-  }
-  .el-divider__text {
-    color: #0955ee;
-    cursor: pointer;
-  }
-
-
-   .query-label {
+.query-label {
     .el-radio{
         display: block;
         line-height: 23px;
@@ -971,35 +823,9 @@ export default {
     }
   }
 
-  .previe_dialog {
-    display: flex;
-    justify-content: center;
-    align-items: Center;
-    overflow: hidden;
-    .el-dialog .el-dialog__body {
-        margin: 8px!important;
-        padding: 0;
-        overflow: auto;
-    }
-
-    .el-dialog {
-        margin: 0 auto !important;
-        height: 100%;
-        overflow: hidden;
-        .el-dialog__body {
-            margin: 0px 8px 8px 8px;
-
-            position: absolute;
-            left: 0;
-            top: 54px;
-            bottom: 0;
-            right: 0;
-            padding: 0;
-            z-index: 1;
-            overflow: hidden;
-            overflow-y: auto;
-        }
-    }
+  .printPreDialog .el-dialog__body {
+    margin: 0px!important;
   }
 
+
 </style>