From 1b1e2493869c7db1ca75adcfbcad71369df55955 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 28 Aug 2024 19:23:46 +0800
Subject: [PATCH] md

---
 src/utils/request.js                          |  2 +-
 .../emis/emisWaybill/centerWaybillList.vue    | 38 +--------------
 .../emis/emisWaybill/dispatchWaybillList.vue  | 38 ++-------------
 .../emis/emisWaybill/sendWaybillList.vue      | 26 ++---------
 .../emis/emisWaybill/sendWaybillListNew.vue   | 46 ++-----------------
 5 files changed, 16 insertions(+), 134 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 4ebd053c..a3dbcf45 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -18,7 +18,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 3000000
+  timeout: 300000000
 })
 
 // request拦截器
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index f526993c..98bb03ee 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -457,18 +457,9 @@
         </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="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
 
-
-      <!-- <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 :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="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
@@ -483,11 +474,6 @@
               <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 :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="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
@@ -539,8 +525,8 @@
           </template>
         </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="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="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
 
 
@@ -557,31 +543,11 @@
         <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="blPrint" min-width="80" >
-          <template slot-scope="scope">
-              <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
-              <el-tag v-else type="danger">未打印</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
-
-        <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-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="remark" min-width="80" :show-overflow-tooltip="true" />
 
       <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="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"/>
-
 
     </XdTable>
 
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 639b2c84..73201871 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -458,17 +458,8 @@
         </el-table-column>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" 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="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
-
-
-      <!-- <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 :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" 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"/>
@@ -484,10 +475,6 @@
               <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 :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="receiveName" min-width="80" :show-overflow-tooltip="true"/>
@@ -540,8 +527,8 @@
           </template>
         </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="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="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
 
 
@@ -558,30 +545,11 @@
         <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="blPrint" min-width="80" >
-          <template slot-scope="scope">
-              <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
-              <el-tag v-else type="danger">未打印</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
-
-        <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-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="remark" min-width="80" :show-overflow-tooltip="true" />
 
       <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="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"/>
 
     </XdTable>
 
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index fa3c796f..50424573 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -434,7 +434,7 @@
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :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="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
+      // <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" 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"/>
@@ -450,11 +450,6 @@
               <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 :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="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
@@ -499,15 +494,10 @@
             <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" >
-          <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 :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="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="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
 
 
@@ -528,12 +518,6 @@
 
       <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="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"/>
 
     </XdTable>
 
@@ -987,7 +971,7 @@ export default {
       else{
           let qExportParam=this.initQueryParams();
           qExportParam.pageNum=1;
-          qExportParam.pageSize=5000;
+          qExportParam.pageSize=20000;
 
           listEmisWaybill(qExportParam).then(response => {
             if (response.code === 200) {
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index 5bc28b90..094d50d2 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -434,14 +434,7 @@
       <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="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
-
-
-      <!-- <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 :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
 
 
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
@@ -458,11 +451,6 @@
               <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 :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="receiveName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
@@ -507,15 +495,10 @@
             <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" >
-          <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 :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="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="feeRemark" min-width="80" :show-overflow-tooltip="true"/>
 
 
@@ -531,31 +514,12 @@
         <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="blPrint" min-width="80" >
-          <template slot-scope="scope">
-              <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
-              <el-tag v-else type="danger">未打印</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
-
-        <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-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="remark" min-width="80" :show-overflow-tooltip="true" />
 
       <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="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"/>
-
 
     </XdTable>
 
@@ -1024,7 +988,7 @@ export default {
           this.initQueryParams();
 
           qParam.pageNum=1;
-          qParam.pageSize=5000;
+          qParam.pageSize=20000;
           listEmisWaybill(qParam).then(response => {
             if (response.code === 200) {
               this.exportData(response.rows,loadingInstance);