md

src/components/XdTextareaInput/index.vue

@@ -46,7 +46,7 @@ export default {
   },
   methods: {
     onClear(){
-      this.svalue='';
+       this.svalue=null;
        this.$emit("input", this.svalue);
        this.dispatch('ElFormItem', 'el.form.blur');
     },

src/utils/TanexPrinterSdk.js

@@ -165,7 +165,7 @@ class TanexPrinterSdk {
           }
 
           clearTimeout(this.recievePdfFileTimer);
-        }, 60000)
+        }, 6000)
 
       }
     }
@@ -223,7 +223,7 @@ class TanexPrinterSdk {
         this.sendPdfFileListCount = orderList.length;
 
         printCmd['Data']=printData
-        console.log(JSON.stringify(printCmd));
+        // console.log(JSON.stringify(printCmd));
         this.send(JSON.stringify(printCmd),null);
       }
     }
@@ -346,7 +346,6 @@ class TanexPrinterSdk {
                   }
                   else if(msg["CMD"]=='batchGetPDF'){
                     this.innerBatchGetPDF(msg)
-
                   }
 
 
@@ -406,8 +405,8 @@ class TanexPrinterSdk {
     }
 
     innerBatchGetPDF(msg){
-      console.log("innerBatchGetPDF")
+      // console.log("innerBatchGetPDF")
-      console.log(msg)
+      // console.log(msg)
       // 有出错，停止接收数据
       if(msg.Status!='2'){
         clearTimeout(this.recievePdfFileTimer);
@@ -455,7 +454,7 @@ class TanexPrinterSdk {
           })
         }
 
-        console.log("文件已接收完成");
+        // console.log("文件已接收完成");
         return;
       }
 

src/utils/pdfUtils.js

@@ -169,7 +169,6 @@ export default class PdfUtils {
   }
 
   async mergePdf3(pdfFileList, fileName,isNeedDown=false) {
-    let startTime = +new Date()
     let pdfBuffers = [];
     pdfFileList.map((item) => {
       let dateArray=this.base64ToBuffer(item);
@@ -199,8 +198,6 @@ export default class PdfUtils {
       if (typeof link.download === 'undefined') {
         link.setAttribute('target', '_blank')
       }
-      // document.body.appendChild(link);
-      // link.click();
       document.body.appendChild(link)
       link.click()
       document.body.removeChild(link)
@@ -210,7 +207,6 @@ export default class PdfUtils {
       });
       return URL.createObjectURL(mergedPdfBlob);;
     }
-    console.log(+new Date() - startTime)
   }
   downloadBase64(base64Str,fileName) {
     let result = base64Str.replace(/[\r\n]/g, "");
@@ -231,7 +227,6 @@ export default class PdfUtils {
   fileTobase64(file) {
     let reader = new FileReader();
     reader.readAsDataURL(file)
-    console.log(reader)
   }
 
 

src/views/emis/EmisBaseTools/EmisBrandPicker.vue

@@ -6,7 +6,7 @@
       :placeholder="placeholder"
       style="width: 100%;"
       @change="onChange">
-        <el-option key="-1" label="全部" value="-1" ></el-option>
+        <el-option key="-1" label="全品牌" value="-1" ></el-option>
         <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
     </el-select>
     <!-- <div >{{ item.name }}({{ item.nameEn }})</div> -->

src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue

@@ -20,7 +20,7 @@
       @clear="onClear"
       @visible-change="reverseArrow"
       >
-        <el-option v-for="item in dataList" :key="item.destSite" :label="item.destSite+'-'+item.destSiteName" :value="item.destSite" ></el-option>
+        <el-option v-for="item in dataList" :key="item.destSite" :label="item.destSiteName" :value="item.destSite" ></el-option>
     </el-select>
 
 
@@ -86,14 +86,6 @@
         this.firstFlag = true;
         this.initData();
       },
-      // siteType(newVal, oldVal) {
-      //   if(newVal!= oldVal ){
-      //   }
-      // },
-      // countryCode(newVal, oldVal) {
-      //   if(newVal!= oldVal ){
-      //   }
-      // }
     },
     created() {
       // this.queryData();

src/views/emis/emisTransLine/index.vue

@@ -125,7 +125,7 @@
       </el-table-column>
       <el-table-column label="品牌" align="center" prop="logoTypeName" width="150" >
         <template slot-scope="scope">
-          <span v-if="scope.row.logoType=='all'">全部</span>
+          <span v-if="scope.row.logoType=='-1'">全品牌</span>
           <span v-else>{{ scope.row.logoTypeName }}</span>
         </template>
       </el-table-column>

src/views/emis/emisWaybill/waybillIsPrinted.vue

@@ -2,28 +2,21 @@
   <div class="app-container">
     <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">
+        <div slot="label">
-                <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
+              <el-radio-group class="query-label" v-model="queryOrderType">
-                    <el-radio :key="1" :label="1">运单号</el-radio>
+                    <el-radio :key="1" label="1">运单号</el-radio>
-                    <el-radio :key="0" :label="0">订单号</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"
               />
+              <!-- @keyup.enter.native="handleQuery" -->
             </el-form-item>
-            <el-form-item label="" prop="dateTimeRange">
+            <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>
 
@@ -52,9 +45,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
@@ -81,11 +71,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
@@ -98,7 +97,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"
@@ -108,8 +107,8 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="清关方式" prop="customsClear">
+            <el-form-item  label="清关方式" prop="customsClear">
-              <el-select v-model="queryParams.customsClear" placeholder="请选择">
+              <el-select clearable v-model="queryParams.customsClear" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.emis_customs_clear"
                   :key="dict.value"
@@ -118,8 +117,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="付款方式" prop="paymentType" label-width="70px">
+            <el-form-item label="付款方式" prop="paymentType" >
-              <el-select v-model="queryParams.paymentType" placeholder="请选择">
+              <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
                   <el-option
                     v-for="dict in dict.type.emis_payment_type"
                     :key="dict.value"
@@ -128,14 +127,75 @@
                   ></el-option>
                 </el-select>
             </el-form-item>
-    </SearchForm>
 
-    <!-- 打印机状态 -->
+            <el-form-item label="派送方式" prop="dispatchMethod" >
-    <div style="padding:5px 0px;text-align: right;position: fixed;top: 150px;right: 10px;    z-index: 9999;">
+              <el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
-        <el-tag type="danger" v-if="printerStatus==0">{{ printerStatusMessage }}</el-tag>
+                  <el-option
-        <el-tag type="success" v-if="printerStatus==1">{{ printerStatusMessage }}</el-tag>
+                    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>
+
+
+
+
+      </SearchForm>
 
-    </div>
 
     <XdTable v-loading="loading"
            border stripe
@@ -159,7 +219,7 @@
                   plain
                   icon="el-icon-print"
                   size="mini"
-                  :disabled="multiple||(printerStatus!=1)"
+                  :disabled="multiple"
                   @click="handleBatchPrint"
                 >打印</el-button>
               </el-col>
@@ -178,7 +238,7 @@
                   type="primary"
                   plain
                   size="mini"
-                  :disabled="multiple||(printerStatus!=1)"
+                  :disabled="multiple"
                   @click="handlePrintPreview"
                 >预览面单</el-button>
               </el-col>
@@ -187,49 +247,16 @@
                   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;">
+            <TanexPrinterPanel ref="tanexPrinter"></TanexPrinterPanel>
-            <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-button
@@ -444,11 +471,6 @@
     </el-dialog>
     -->
 
-    <el-dialog class="previe_dialog" title="打印预览" :visible.sync="openPdfView" width="70%"  :close-on-click-modal="false" v-dialogFullScreen v-dialogDrag append-to-body>
-      <div style="height: 100%;width:100%">
-          <PdfViewer :pdfUrl="pdfUrl"  style="width:100%" @onPrint="handleBatchPrint" ></PdfViewer>
-        </div>
-    </el-dialog>
 
   </div>
 </template>
@@ -460,12 +482,50 @@ 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 PdfViewer from '@/components/PdfViewer/index.vue';
 import PdfUtils from '@/utils/pdfUtils'
+import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
+
 
 export default {
   name: "WaybillIsPrinted",
-  components: { PdfViewer,elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
+  components: {
+    TanexPrinterPanel,
+    PdfViewer,
+    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'
@@ -493,19 +553,7 @@ export default {
       currentId:null,
       openForm: false,
       titleForm: "",
-
+      queryOrderType:null,
-      openPdfView:false,
-      pdfUrl:null,
-
-
-      tanexPrinter:null,
-      printerDownUrl:null,
-      printerStatus:0,
-      printerStatusMessage:'打印组件未连接',
-      printerList:[],
-      printTplList:[],
-      selTplName:null,
-      selPrinterName:null,
       currentSelection:[],
 
       // 弹出展示层
@@ -691,7 +739,9 @@ export default {
   },
   created() {
     this.getList();
-    this.initTanexPrinterSdk();
+    this.queryOrderType="1";
+
+    // this.initTanexPrinterSdk();
 
      // 调整表格的高度，不允许滚动
      this.$nextTick(function() {
@@ -700,81 +750,9 @@ export default {
       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);
-      // this.tanexPrinter.setOnBatchGetPDF(this.onBatchGetPDF);
-
-    },
-    onBatchGetPDF(pdfList){
-        console.log(pdfList);
-        const pdfDataList=[...pdfList];
-        console.log(pdfDataList);
-        let pdfUtils=new PdfUtils({});
-        // const loadingInstance = this.$loading({
-        //       text: '正在生成预览...'
-        // })
-        pdfUtils.mergePdf3(pdfDataList, (new Date()).getTime()+".pdf",false )
-        .then(url=>{
-          // loadingInstance.close();
-          // this.pdfUrl='/static/pdfjs/dist/web/printPreview.html?file=' +encodeURIComponent(url);
-          this.pdfUrl=url;
-          console.log(url)
-          this.openPdfView = true;
-        })
-        .catch(error => {
-          console.log(error)
-        });
-
-        // pdfDataList.forEach(item => {
-        //   pdfUtils.downloadBase64(item,(new Date()).getTime()+".pdf")
-        // });
-    },
-    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: "确定打印",
@@ -786,86 +764,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(){
+    handlePrintPreview(){
-        let that =this;
+      let orderList=[];
-        let orderList=[];
           this.currentSelection.forEach(item=>{
             orderList.push(item.billCode);
         });
-          const loadingInstance = this.$loading({
+        this.$refs.tanexPrinter.printPreview(orderList);
-                text: '正在生成预览...'
-          })
-        this.tanexPrinter.batchGetPDF(this.selTplName,this.selPrinterName,orderList,function(pdfList,success,erroMsg){
-            console.log(success);
-            console.log(erroMsg);
-            if(success){
-                const pdfDataList=[...pdfList];
-                console.log(pdfDataList);
-                let pdfUtils=new PdfUtils({});
-                pdfUtils.mergePdf3(pdfDataList, (new Date()).getTime()+".pdf",false )
-                .then(url=>{
-                  loadingInstance.close();
-                  // this.pdfUrl='/static/pdfjs/dist/web/printPreview.html?file=' +encodeURIComponent(url);
-                  that.pdfUrl=url;
-                  console.log(url)
-                  that.openPdfView = true;
-                })
-                .catch(error => {
-                  console.log(error)
-                });
-            }else{
-              console.log(erroMsg);
-              // this.$modal.msgError("打印出错:"+erroMsg);
-            }
-        });
-    },
-    async handlePrintPreview_old(){
-      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 => {
-      });
-
     },
     handleDownPDF(){
-      // let pdfUrlList=[];
+      let orderList=[];
-      // this.currentSelection.forEach(item=>{
+        this.currentSelection.forEach(item=>{
-      //     let url=this.tanexPrinter.getPdfUrl(item.billCode,this.selTplName,this.selPrinterName);
+          orderList.push(item.billCode);
-      //     pdfUrlList.push(url)
-      // });
-      let pdfUrlList=[];
-      this.currentSelection.forEach(item=>{
-          let url=this.tanexPrinter.getPdfUrl(item.billCode,this.selTplName,this.selPrinterName);
-          pdfUrlList.push(url)
       });
-
+      this.$refs.tanexPrinter.downPDF(orderList);
-      let pdfUtils=new PdfUtils({});
-      pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" ,true);
     },
-
-
     /** 查询运单列表列表 */
     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;
@@ -997,20 +950,9 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 
-  .el-divider{
+.query-label {
-    margin-top: 0px;
-    background: 0 0;
-    border-top: 1px solid #E6EBF5;
-  }
-  .el-divider__text {
-    color: #0955ee;
-    cursor: pointer;
-  }
-
-
-   .query-label {
     .el-radio{
         display: block;
         line-height: 23px;
@@ -1019,35 +961,9 @@ export default {
     }
   }
 
-  .previe_dialog {
+  .printPreDialog .el-dialog__body {
-    display: flex;
+    margin: 0px!important;
-    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;
-        }
-    }
   }
 
+
 </style>