From ee67f1b21fa25963acb47c61f23109423bfa7cb6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 6 Aug 2024 17:03:30 +0800
Subject: [PATCH] md

---
 src/components/XdTable/index.vue              |  14 +-
 .../emis/emisSettleInvoiceChRecord/index.vue  | 562 +++++-------------
 .../emis/emisWaybill/sendWaybillList.vue      |   3 +-
 3 files changed, 166 insertions(+), 413 deletions(-)

diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index f3bc1c82..b2113992 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -401,7 +401,6 @@ export default {
                            }
 
                            // 行
-
                            for (var i = 0; i < selRowList.length; i++) {
                               var sl = selRowList[i].offsetWidth + selRowList[i].offsetLeft;
                               var st = selRowList[i].offsetHeight + selRowList[i].offsetTop;
@@ -823,6 +822,11 @@ export default {
       },
       delTbShowTpl(){
         const ids = this.form.id;
+        if(!ids || ids==undefined){
+          this.$modal.msgSuccess("未选择模版");
+          return;
+        }
+
         this.$modal.confirm('是否确认删除').then(function() {
           return delSysCustomizeTpl(ids);
         }).then(() => {
@@ -1202,12 +1206,16 @@ export default {
           map.set(list[i].prop, true);
         } else {
           map.set(list[i].prop, false);   // 如果没有该key值
-          list2.push(list[i]);
+          // 必须要存在 列名称才处理
+          if(list[i].label){
+            list2.push(list[i]);
+          }
         }
       }
       list=list2;
+      console.log("===>list=1111=>",list);
 
-      this.storageList = list2
+      this.storageList = list
     },
     // 根据缓存的数组进行渲染表格
     updateTable() {
diff --git a/src/views/emis/emisSettleInvoiceChRecord/index.vue b/src/views/emis/emisSettleInvoiceChRecord/index.vue
index 497c9da1..feafe221 100644
--- a/src/views/emis/emisSettleInvoiceChRecord/index.vue
+++ b/src/views/emis/emisSettleInvoiceChRecord/index.vue
@@ -1,48 +1,7 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
-      <!-- <el-form-item label="" prop="reqNo">
-        <el-input
-          v-model="queryParams.reqNo"
-          :placeholder="$t('渠道请求号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="" prop="applySeqNo">
-        <el-input
-          v-model="queryParams.applySeqNo"
-          :placeholder="$t('发票申请序号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="" prop="blEcinv">
-        <el-input
-          v-model="queryParams.blEcinv"
-          :placeholder="$t('是否电子发票')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="" prop="invoiceType">
-        <el-input
-          v-model="queryParams.invoiceType"
-          :placeholder="$t('开票类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="" prop="realInvoiceType">
-        <el-input
-          v-model="queryParams.realInvoiceType"
-          :placeholder="$t('实际开票类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="" prop="companyName">
+  <XdPageContainer class="app-container">
+    <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form-item label="开票抬头" prop="companyName">
         <el-input
           v-model="queryParams.companyName"
           :placeholder="$t('开票抬头')"
@@ -50,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="companyTaxNo">
+      <el-form-item label="开票税号" prop="companyTaxNo">
         <el-input
           v-model="queryParams.companyTaxNo"
           :placeholder="$t('开票税号')"
@@ -58,244 +17,45 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="companyTel">
-        <el-input
-          v-model="queryParams.companyTel"
-          :placeholder="$t('开票电话')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="companyAddress">
-        <el-input
-          v-model="queryParams.companyAddress"
-          :placeholder="$t('开票地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="bankName">
-        <el-input
-          v-model="queryParams.bankName"
-          :placeholder="$t('开户行')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="bankAccNo">
-        <el-input
-          v-model="queryParams.bankAccNo"
-          :placeholder="$t('开户账号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="contact">
-        <el-input
-          v-model="queryParams.contact"
-          :placeholder="$t('联系人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          :placeholder="$t('联系电话')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="taxRate">
-        <el-input
-          v-model="queryParams.taxRate"
-          :placeholder="$t('税率')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openMoney">
-        <el-input
-          v-model="queryParams.openMoney"
-          :placeholder="$t('开票金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="email">
-        <el-input
-          v-model="queryParams.email"
-          :placeholder="$t('发票投递邮箱')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salerCompanyName">
+
+
+      <el-form-item label="主体名称" prop="salerCompanyName">
         <el-input
           v-model="queryParams.salerCompanyName"
-          :placeholder="$t('销方开票名称')"
+          :placeholder="$t('主体名称')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="salerCompanyTaxNo">
+      <el-form-item label="主体税号" prop="salerCompanyTaxNo">
         <el-input
           v-model="queryParams.salerCompanyTaxNo"
-          :placeholder="$t('销方开票税号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salerCompanyTel">
-        <el-input
-          v-model="queryParams.salerCompanyTel"
-          :placeholder="$t('销方开票电话')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salerCompanyAddress">
-        <el-input
-          v-model="queryParams.salerCompanyAddress"
-          :placeholder="$t('销方开票地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salerBankName">
-        <el-input
-          v-model="queryParams.salerBankName"
-          :placeholder="$t('销方开户行')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salerBankAccNo">
-        <el-input
-          v-model="queryParams.salerBankAccNo"
-          :placeholder="$t('销方开户账号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salerContact">
-        <el-input
-          v-model="queryParams.salerContact"
-          :placeholder="$t('销方联系人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salerPhone">
-        <el-input
-          v-model="queryParams.salerPhone"
-          :placeholder="$t('销方联系电话')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="invoiceNo">
-        <el-input
-          v-model="queryParams.invoiceNo"
-          :placeholder="$t('发票号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="filePath">
-        <el-input
-          v-model="queryParams.filePath"
-          :placeholder="$t('pdf下载路径')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="qrPath">
-        <el-input
-          v-model="queryParams.qrPath"
-          :placeholder="$t('qr路径')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="opManCode">
-        <el-input
-          v-model="queryParams.opManCode"
-          :placeholder="$t('操作人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="opDate">
-        <el-date-picker clearable
-          v-model="queryParams.opDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('操作时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="opSiteCode">
-        <el-input
-          v-model="queryParams.opSiteCode"
-          :placeholder="$t('操作站点')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openChId">
-        <el-input
-          v-model="queryParams.openChId"
-          :placeholder="$t('开票渠道编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openChStatus">
-        <el-input
-          v-model="queryParams.openChStatus"
-          :placeholder="$t('开票渠道状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openChStatusDesc">
-        <el-input
-          v-model="queryParams.openChStatusDesc"
-          :placeholder="$t('开票渠道描述')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openComCode">
-        <el-input
-          v-model="queryParams.openComCode"
-          :placeholder="$t('使用的开票企业代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="extData">
-        <el-input
-          v-model="queryParams.extData"
-          :placeholder="$t('扩展信息，货物名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
+          :placeholder="$t('主体税号')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
     </SearchForm>
 
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
 
-    <XdTable v-loading="loading"
+          highlight-current-row
+
+          ref="refTable"
+          :row-key="rowKey"
+
+          storageName="emisSettleInvoiceChRecordList_main_240702"
+
+
+          v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
+
+
            :data="emisSettleInvoiceChRecordList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -307,7 +67,7 @@
 
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -316,7 +76,7 @@
                   @click="handleAdd"
                   v-hasPermi="['emis:emisSettleInvoiceChRecord:add']"
                 >新增</el-button>
-              </el-col>
+              </el-col> -->
               <!--
               <el-col :span="1.5">
                 <el-button
@@ -340,7 +100,7 @@
                   v-hasPermi="['emis:emisSettleInvoiceChRecord:remove']"
                 >删除</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -349,117 +109,71 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisSettleInvoiceChRecord:export']"
                 >导出</el-button>
-              </el-col> -->
+              </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 label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
+      <el-table-column label="序号" align="center" width="60">
             <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
+                <span v-text="getIndex(scope.$index)"> </span>
             </template>
-          </el-table-column>
-      -->
-
-      <el-table-column :label="$t('渠道请求号')" align="center" prop="reqNo" min-width="100" />
-      <el-table-column :label="$t('发票申请序号')" align="center" prop="applySeqNo" min-width="100" />
-      <el-table-column :label="$t('是否电子发票')" align="center" prop="blEcinv" min-width="100" />
-      <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" />
-      <el-table-column :label="$t('实际开票类型')" align="center" prop="realInvoiceType" min-width="100" />
-      <el-table-column :label="$t('开票名称')" align="center" prop="companyName" min-width="100" />
-      <el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="100" />
-      <el-table-column :label="$t('开票电话')" align="center" prop="companyTel" min-width="100" />
-      <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" min-width="100" />
-      <el-table-column :label="$t('开户行')" align="center" prop="bankName" min-width="100" />
-      <el-table-column :label="$t('开户账号')" align="center" prop="bankAccNo" min-width="100" />
-      <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" />
-      <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" />
-      <el-table-column :label="$t('税率')" align="center" prop="taxRate" min-width="100" />
-      <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" min-width="100" />
-      <el-table-column :label="$t('发票投递邮箱')" align="center" prop="email" min-width="100" />
-      <el-table-column :label="$t('销方开票名称')" align="center" prop="salerCompanyName" min-width="100" />
-      <el-table-column :label="$t('销方开票税号')" align="center" prop="salerCompanyTaxNo" min-width="100" />
-      <el-table-column :label="$t('销方开票电话')" align="center" prop="salerCompanyTel" min-width="100" />
-      <el-table-column :label="$t('销方开票地址')" align="center" prop="salerCompanyAddress" min-width="100" />
-      <el-table-column :label="$t('销方开户行')" align="center" prop="salerBankName" min-width="100" />
-      <el-table-column :label="$t('销方开户账号')" align="center" prop="salerBankAccNo" min-width="100" />
-      <el-table-column :label="$t('销方联系人')" align="center" prop="salerContact" min-width="100" />
-      <el-table-column :label="$t('销方联系电话')" align="center" prop="salerPhone" min-width="100" />
-      <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100" />
-      <el-table-column :label="$t('pdf下载路径')" align="center" prop="filePath" min-width="100" />
-      <el-table-column :label="$t('qr路径')" align="center" prop="qrPath" min-width="100" />
-      <el-table-column :label="$t('操作人')" align="center" prop="opManCode" min-width="100" />
-      <el-table-column :label="$t('操作时间')" align="center" prop="opDate" min-width="100" />
-      <el-table-column :label="$t('操作站点')" align="center" prop="opSiteCode" min-width="100" />
-      <el-table-column :label="$t('开票渠道编号')" align="center" prop="openChId" min-width="100" />
-      <el-table-column :label="$t('开票渠道状态')" align="center" prop="openChStatus" min-width="100" />
-      <el-table-column :label="$t('开票渠道描述')" align="center" prop="openChStatusDesc" min-width="100" />
-      <el-table-column :label="$t('使用的开票企业代码')" align="center" prop="openComCode" min-width="100" />
-      <el-table-column :label="$t('扩展信息，货物名称')" align="center" prop="extData" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisSettleInvoiceChRecord:edit']"
-          >修改</el-button>
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisSettleInvoiceChRecord:remove']"
-          >删除</el-button> -->
-        </template>
       </el-table-column>
+      <el-table-column :label="$t('流水号')" align="center" prop="reqNo" width="140" :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('发票申请序号')" align="center" prop="applySeqNo" width="100" /> -->
+      <!-- <el-table-column :label="$t('是否电子发票')" align="center" prop="blEcinv" width="100" /> -->
+      <!-- <el-table-column :label="$t('申请开票类型')" align="center" prop="invoiceType" width="100" :show-overflow-tooltip="true" /> -->
+      <el-table-column :label="$t('开票类型')" align="center" prop="realInvoiceType" min-width="80" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_invoice_ch_type" :value="scope.row.realInvoiceType" :show-overflow-tooltip="true" />
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('开票状态')" align="center" prop="openChStatus" width="100" :show-overflow-tooltip="true"  >
+        <template slot-scope="scope">
+            <el-tag v-if="scope.row.openChStatus==-1" type="error" >发送异常</el-tag>
+            <el-tag v-if="scope.row.openChStatus==0"  type="info" >未发送</el-tag>
+            <el-tag v-if="scope.row.openChStatus==1" type="info"  >已发送</el-tag>
+            <el-tag v-if="scope.row.openChStatus==2"  type="success" >开票成功</el-tag>
+            <el-tag v-if="scope.row.openChStatus==3"  type="error" >开票失败</el-tag>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" width="100" :show-overflow-tooltip="true" />
+
+      <el-table-column :label="$t('开票公司')" align="center" prop="companyName" width="100" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('税号')" align="center" prop="companyTaxNo" width="100"  :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('开票电话')" align="center" prop="companyTel" width="100" /> -->
+      <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('开户行')" align="center" prop="bankName" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('开户账号')" align="center" prop="bankAccNo" width="100" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('联系人')" align="center" prop="contact" width="100" /> -->
+      <!-- <el-table-column :label="$t('联系电话')" align="center" prop="phone" width="100" /> -->
+      <!-- <el-table-column :label="$t('税率')" align="center" prop="taxRate" width="100" :show-overflow-tooltip="true" /> -->
+      <!-- <el-table-column :label="$t('发票投递邮箱')" align="center" prop="email" width="100" /> -->
+      <el-table-column :label="$t('开票主体')" align="center" prop="salerCompanyName" width="100" :show-overflow-tooltip="true"  />
+      <el-table-column :label="$t('主体税号')" align="center" prop="salerCompanyTaxNo" width="100" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('主体电话')" align="center" prop="salerCompanyTel" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('主体地址')" align="center" prop="salerCompanyAddress" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('主体银行')" align="center" prop="salerBankName" width="100" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('主体账号')" align="center" prop="salerBankAccNo" width="100" :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('销方联系人')" align="center" prop="salerContact" width="100" /> -->
+      <!-- <el-table-column :label="$t('销方联系电话')" align="center" prop="salerPhone" width="100" /> -->
+      <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" width="100" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('pdf下载路径')" align="center" prop="filePath" width="150" :show-overflow-tooltip="true"  />
+      <!-- <el-table-column :label="$t('qr路径')" align="center" prop="qrPath" width="100" /> -->
+      <!-- <el-table-column :label="$t('操作人')" align="center" prop="opManCode" width="100" /> -->
+      <!-- <el-table-column :label="$t('操作时间')" align="center" prop="opDate" width="100" /> -->
+      <!-- <el-table-column :label="$t('操作站点')" align="center" prop="opSiteCode" width="100" /> -->
+      <!-- <el-table-column :label="$t('开票渠道编号')" align="center" prop="openChId" width="100" /> -->
+
+        <el-table-column :label="$t('状态描述')" align="center" prop="openChStatusDesc" width="100" :show-overflow-tooltip="true"  />
+      <!-- <el-table-column :label="$t('使用的开票企业代码')" align="center" prop="openComCode" width="100" /> -->
+      <!-- <el-table-column :label="$t('扩展信息，货物名称')" align="center" prop="extData" width="100" :show-overflow-tooltip="true" /> -->
+      <el-table-column :label="$t('开票备注')" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
+
+
     </XdTable>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisSettleInvoiceChRecordForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceChRecordForm>
-    </el-dialog>
-
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
-        <emisSettleInvoiceChRecordView :id="id" ></EmisSettleInvoiceChRecordView>
-    </el-dialog>
-    -->
-
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -471,7 +185,7 @@ import emisSettleInvoiceChRecordForm from '@/views/emis/emisSettleInvoiceChRecor
 export default {
   name: "emisSettleInvoiceChRecord",
   components: { elDateSimplePicker,emisSettleInvoiceChRecordForm },
-  dicts: [
+  dicts: ['emis_invoice_ch_type'
   ],
   data() {
     return {
@@ -491,6 +205,7 @@ export default {
       total: 0,
       // 渠道开票记录表表格数据
       emisSettleInvoiceChRecordList: [],
+      selectionList:[],
 
       currentId:null,
       openForm: false,
@@ -553,6 +268,9 @@ export default {
     this.getList();
   },
   methods: {
+    rowKey (row) {
+      return row.id;
+    },
     /** 查询渠道开票记录表列表 */
     getList() {
       this.loading = true;
@@ -636,50 +354,78 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisSettleInvoiceChRecord/export', {
-    //     ...this.queryParams
-    //   }, `emisSettleInvoiceChRecord_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
 
-       listEmisSettleInvoiceChRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','渠道请求号','发票申请序号','是否电子发票','开票类型','实际开票类型','开票名称','开票税号','开票电话','开票地址','开户行','开户账号','联系人','联系电话','税率','开票金额','发票投递邮箱','销方开票名称','销方开票税号','销方开票电话','销方开票地址','销方开户行','销方开户账号','销方联系人','销方联系电话','发票号','pdf下载路径','qr路径','操作人','操作时间','操作站点','开票渠道编号','开票渠道状态','开票渠道描述','使用的开票企业代码','扩展信息，货物名称','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','reqNo','applySeqNo','blEcinv','invoiceType','realInvoiceType','companyName','companyTaxNo','companyTel','companyAddress','bankName','bankAccNo','contact','phone','taxRate','openMoney','email','salerCompanyName','salerCompanyTaxNo','salerCompanyTel','salerCompanyAddress','salerBankName','salerBankAccNo','salerContact','salerPhone','invoiceNo','filePath','qrPath','opManCode','opDate','opSiteCode','openChId','openChStatus','openChStatusDesc','openComCode','extData','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '渠道开票记录表',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
+     /** 导出按钮操作 */
+     handleExport() {
+      const loadingInstance = this.$loading({
+            text: '正在导出...'
+      })
+
+      if(this.selectionList&&this.selectionList.length>0){
+        this.exportData(this.selectionList,loadingInstance);
+      }
+      else{
+          let qExportParam=this.queryParams;
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=5000;
+
+          listEmisSettleInvoiceChRecord(qExportParam).then(response => {
+            if (response.code === 200) {
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam=this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '寄件运单列表',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
+
+
+        if (j === 'realInvoiceType') {
+          return this.selectDictLabel(this.dict.type.emis_invoice_ch_type,v[j]);
         }
+
+        if (j === 'openChStatus') {
+          if(v[j] == -1){
+            return '发送异常';
+          }
+          else if(v[j] == 0){
+            return '未发送';
+          }
+          else if(v[j] == 1){
+            return '已发送';
+          }
+          else if(v[j] == 2){
+            return '开票成功';
+          }
+          else if(v[j] == 3){
+            return '开票失败';
+          }
+          else{
+            return '其他';
+          }
+        }
+
         return v[j]
       }))
     },
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index a9859986..4bafadad 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -271,9 +271,8 @@
           ref="refTable"
           :row-key="rowKey"
 
-
-
           storageName="sendWaybillList_main_240702"
+
            v-loading="loading"
            border
            size="mini"