From a6c0f9cf82b9df0c0055c8626306824bc6288afa Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 4 Jun 2024 22:31:32 +0800
Subject: [PATCH] md

---
 .../emis/EmisBaseTools/TanexPrinterPanel.vue  |   7 +-
 .../emis/emisWaybill/A4WaybillIPrinted.vue    |  86 ++++++------
 .../emis/emisWaybill/waybillIsPrinted.vue     | 122 +++++++++---------
 3 files changed, 109 insertions(+), 106 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
index 23f9c63e..09518d43 100644
--- a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
+++ b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
@@ -200,8 +200,11 @@
         this.printTplList=[];
 
         this.printTplList=this.tanexPrinter.getPrintTplList();
-        const newList=this.printTplList.filter(item=>item.tplCode == 'A4-EP');
-        this.printTplList=newList;
+
+        if(this.isInitA4){
+          const newList=this.printTplList.filter(item=>item.tplCode == 'A4-EP');
+          this.printTplList=newList;
+        }
 
         // console.log(this.printTplList)
 
diff --git a/src/views/emis/emisWaybill/A4WaybillIPrinted.vue b/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
index 318a495b..4bab2c40 100644
--- a/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
+++ b/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
@@ -73,7 +73,7 @@
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
 
-          v-loading="loading"
+           v-loading="loading"
            border stripe
            size="small"
            :data="emisWaybillList"
@@ -147,7 +147,7 @@
 
       <el-table-column type="selection" width="55" align="center" />
       <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">
@@ -179,7 +179,7 @@
       <el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
 
-      <el-table-column :label="$t('操作员')"   align="center" prop="operateEmployeeName" min-width="100" >
+      <!-- <el-table-column :label="$t('操作员')"   align="center" prop="operateEmployeeName" min-width="100" >
         <template slot-scope="scope">
              <span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span>
              <span v-else></span>
@@ -191,23 +191,23 @@
              <span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
              <span v-else></span>
           </template>
-      </el-table-column>
-      <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
+      </el-table-column> -->
+      <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
         <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" >
+        <!-- <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
@@ -220,42 +220,42 @@
           </template>
         </el-table-column>
 
-        <el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/> -->
 
         <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/> -->
         <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
+        <!-- <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" /> -->
+        <!-- <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <div v-if="scope.row.blMessage==1" >发送</div>
               <div v-else>不发送</div>
           </template>
-        </el-table-column>
-      <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
+        </el-table-column> -->
+      <!-- <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> -->
 
         <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
 
         <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/> -->
         <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
+        <!-- <el-table-column :label="$t('收件国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
                 <div v-if="scope.row.blAcceptMessage==1" >发送</div>
                 <div v-else>不发送</div>
             </template>
-        </el-table-column>
+        </el-table-column> -->
 
 
         <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
@@ -270,35 +270,35 @@
         <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="80" />
         <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="80" />
 
-        <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
+        <!-- <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
           <template slot-scope="scope">
               <div v-if="scope.row.dispatchMethod==1" >派送</div>
               <div v-else>自提</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
+        <!-- <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
           <template slot-scope="scope">
              <span v-if="scope.row.paymentType==3">{{scope.row.freight}}</span>
              <span v-else>0</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
-        <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+        <!-- <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
-        <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
+        <!-- <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
           <template slot-scope="scope">
               <el-tag v-if="scope.row.waybillStatus=='50'" type="success">已签收</el-tag>
               <el-tag v-else type="danger">未签收</el-tag>
@@ -308,9 +308,9 @@
 
         <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/> -->
 
-        <el-table-column :label="$t('问题件')" align="center" prop="blIsQuestion" min-width="80" >
+        <!-- <el-table-column :label="$t('问题件')" align="center" prop="blIsQuestion" min-width="80" >
           <template slot-scope="scope">
               <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
               <el-tag v-else type="info">否</el-tag>
@@ -318,21 +318,21 @@
         </el-table-column>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/> -->
 
 
         <!-- <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" /> -->
         <el-table-column :label="$t('录单人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
         <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
 
-      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
+      <!-- <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" /> -->
 
-      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
       <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/> -->
 
 
 
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 3835debc..41383195 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -1,8 +1,8 @@
 <template>
   <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-form-item label="" prop="billCode">
+              <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>
@@ -20,7 +20,7 @@
               <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
 
-            <el-form-item label="收件人" prop="receiveName">
+            <!-- <el-form-item label="收件人" prop="receiveName">
               <el-input
                 v-model="queryParams.receiveName"
                 :placeholder="$t('收件人')"
@@ -43,9 +43,9 @@
                 clearable
                 @keyup.enter.native="handleQuery"
               />
-            </el-form-item>
-
+            </el-form-item> -->
 
+<!-- 
             <el-form-item label="寄件人" prop="sendName">
               <el-input
                 v-model="queryParams.sendName"
@@ -69,10 +69,10 @@
                 clearable
                 @keyup.enter.native="handleQuery"
               />
-            </el-form-item>
+            </el-form-item> -->
 
 
-            <el-form-item label="发件国" prop="sendCountry">
+            <!-- <el-form-item label="发件国" prop="sendCountry">
               <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('发件国')" @onChange="handleQuery"></CountryPicker1>
             </el-form-item>
 
@@ -82,10 +82,10 @@
 
             <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> -->
 
 
-            <el-form-item label="运单状态" prop="siteType">
+            <!-- <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"
@@ -105,9 +105,9 @@
                     :value="dict.value"
                   ></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
-            <el-form-item  label="清关方式" prop="customsClear">
+            <!-- <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"
@@ -126,9 +126,9 @@
                     :value="dict.value"
                   ></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
-            <el-form-item label="派送方式" prop="dispatchMethod" >
+            <!-- <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"
@@ -137,14 +137,14 @@
                     :value="dict.value"
                   ></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
-          <el-form-item label="线路" prop="transLineType">
+          <!-- <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> -->
 
           <el-form-item label="寄件网点" prop="productType">
             <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
@@ -154,7 +154,7 @@
             <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
           </el-form-item>
 
-
+<!-- 
           <el-form-item :label="$t('回款联系人')" prop="payee">
             <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
 
@@ -169,9 +169,9 @@
 
           <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
             <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
-          </el-form-item>
+          </el-form-item> -->
 
-          <el-form-item label="是否问题件" prop="blIsQuestion" >
+          <!-- <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>
@@ -189,7 +189,7 @@
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
 
 
 
@@ -309,7 +309,7 @@
       <el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
 
-      <el-table-column :label="$t('操作员')"   align="center" prop="operateEmployeeName" min-width="100" >
+      <!-- <el-table-column :label="$t('操作员')"   align="center" prop="operateEmployeeName" min-width="100" >
         <template slot-scope="scope">
              <span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span>
              <span v-else></span>
@@ -321,23 +321,23 @@
              <span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
              <span v-else></span>
           </template>
-      </el-table-column>
-      <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
+      </el-table-column> -->
+      <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
         <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" >
+        <!-- <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
@@ -350,42 +350,42 @@
           </template>
         </el-table-column>
 
-        <el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/> -->
 
         <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/> -->
         <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
+        <!-- <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" /> -->
+        <!-- <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <div v-if="scope.row.blMessage==1" >发送</div>
               <div v-else>不发送</div>
           </template>
-        </el-table-column>
-      <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
+        </el-table-column> -->
+      <!-- <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> -->
 
         <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
 
         <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/> -->
         <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
+        <!-- <el-table-column :label="$t('收件国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
                 <div v-if="scope.row.blAcceptMessage==1" >发送</div>
                 <div v-else>不发送</div>
             </template>
-        </el-table-column>
+        </el-table-column> -->
 
 
         <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
@@ -400,35 +400,35 @@
         <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="80" />
         <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="80" />
 
-        <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
+        <!-- <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
           <template slot-scope="scope">
               <div v-if="scope.row.dispatchMethod==1" >派送</div>
               <div v-else>自提</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
+        <!-- <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
           <template slot-scope="scope">
              <span v-if="scope.row.paymentType==3">{{scope.row.freight}}</span>
              <span v-else>0</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
-        <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+        <!-- <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
           </template>
-        </el-table-column>
+        </el-table-column> -->
 
-        <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
+        <!-- <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
           <template slot-scope="scope">
               <el-tag v-if="scope.row.waybillStatus=='50'" type="success">已签收</el-tag>
               <el-tag v-else type="danger">未签收</el-tag>
@@ -438,9 +438,9 @@
 
         <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/> -->
 
-        <el-table-column :label="$t('问题件')" align="center" prop="blIsQuestion" min-width="80" >
+        <!-- <el-table-column :label="$t('问题件')" align="center" prop="blIsQuestion" min-width="80" >
           <template slot-scope="scope">
               <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
               <el-tag v-else type="info">否</el-tag>
@@ -448,21 +448,21 @@
         </el-table-column>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/> -->
 
 
         <!-- <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" /> -->
         <el-table-column :label="$t('录单人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
         <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
 
-      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
+      <!-- <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" /> -->
 
-      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
       <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/> -->