diff --git a/src/views/emis/emisSettleBill/index.vue b/src/views/emis/emisSettleBill/index.vue
index 28714dab..a89cb244 100644
--- a/src/views/emis/emisSettleBill/index.vue
+++ b/src/views/emis/emisSettleBill/index.vue
@@ -1,521 +1,268 @@
 <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="settleBillNo">
-        <el-input
-          v-model="queryParams.settleBillNo"
-          :placeholder="$t('总结算账单编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="settleBillName">
-        <el-input
-          v-model="queryParams.settleBillName"
-          :placeholder="$t('结算账单名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="settleType">
-        <el-input
-          v-model="queryParams.settleType"
-          :placeholder="$t('结算账单类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="settleStartDate">
-        <el-date-picker clearable
-          v-model="queryParams.settleStartDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('结算开始时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="settleEndDate">
-        <el-date-picker clearable
-          v-model="queryParams.settleEndDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('结算结束时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="billMonth">
-        <el-input
-          v-model="queryParams.billMonth"
-          :placeholder="$t('账单月份')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="recMoney">
-        <el-input
-          v-model="queryParams.recMoney"
-          :placeholder="$t('应收款金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="recedMoney">
-        <el-input
-          v-model="queryParams.recedMoney"
-          :placeholder="$t('已收款金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="custNo">
-        <el-input
-          v-model="queryParams.custNo"
-          :placeholder="$t('月结编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="siteCode">
-        <el-input
-          v-model="queryParams.siteCode"
-          :placeholder="$t('结算站点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="siteName">
-        <el-input
-          v-model="queryParams.siteName"
-          :placeholder="$t('结算站点名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="satisfyMoney">
-        <el-input
-          v-model="queryParams.satisfyMoney"
-          :placeholder="$t('理赔金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="allowanceMoney">
-        <el-input
-          v-model="queryParams.allowanceMoney"
-          :placeholder="$t('折让金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="deductionMoney">
-        <el-input
-          v-model="queryParams.deductionMoney"
-          :placeholder="$t('抵扣金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="otherMoney">
-        <el-input
-          v-model="queryParams.otherMoney"
-          :placeholder="$t('其他金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="satisfyReason">
-        <el-input
-          v-model="queryParams.satisfyReason"
-          :placeholder="$t('理赔原因')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="allowanceReason">
-        <el-input
-          v-model="queryParams.allowanceReason"
-          :placeholder="$t('折让原因')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="deductionReason">
-        <el-input
-          v-model="queryParams.deductionReason"
-          :placeholder="$t('抵扣原因')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="otherReason">
-        <el-input
-          v-model="queryParams.otherReason"
-          :placeholder="$t('其他原因')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openBillStatus">
-        <el-input
-          v-model="queryParams.openBillStatus"
-          :placeholder="$t('开票状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="paymentStatus">
-        <el-input
-          v-model="queryParams.paymentStatus"
-          :placeholder="$t('付款状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendPieceSum">
-        <el-input
-          v-model="queryParams.sendPieceSum"
-          :placeholder="$t('总票数')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pieceNumber">
-        <el-input
-          v-model="queryParams.pieceNumber"
-          :placeholder="$t('总件数')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="feeWeight">
-        <el-input
-          v-model="queryParams.feeWeight"
-          :placeholder="$t('总重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="uncollectedAmount">
-        <el-input
-          v-model="queryParams.uncollectedAmount"
-          :placeholder="$t('未结数量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendMoneySum">
-        <el-input
-          v-model="queryParams.sendMoneySum"
-          :placeholder="$t('合计金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="refundAmount">
-        <el-input
-          v-model="queryParams.refundAmount"
-          :placeholder="$t('退款数量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="refundMoney">
-        <el-input
-          v-model="queryParams.refundMoney"
-          :placeholder="$t('退款金额')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blConfirm">
-        <el-input
-          v-model="queryParams.blConfirm"
-          :placeholder="$t('财务确认状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="confirmDate">
-        <el-input
-          v-model="queryParams.confirmDate"
-          :placeholder="$t('财务确认日期')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="confirmSite">
-        <el-input
-          v-model="queryParams.confirmSite"
-          :placeholder="$t('财务确认站点')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="confirmManCode">
-        <el-input
-          v-model="queryParams.confirmManCode"
-          :placeholder="$t('财务确认人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blSiteConfirm">
-        <el-input
-          v-model="queryParams.blSiteConfirm"
-          :placeholder="$t('站点确认状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="confirmNote">
-        <el-input
-          v-model="queryParams.confirmNote"
-          :placeholder="$t('财务确认备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="siteConfirmDate">
-        <el-input
-          v-model="queryParams.siteConfirmDate"
-          :placeholder="$t('站点确认日期')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="siteConfirmManCode">
-        <el-input
-          v-model="queryParams.siteConfirmManCode"
-          :placeholder="$t('站点确认人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="siteConfirmNote">
-        <el-input
-          v-model="queryParams.siteConfirmNote"
-          :placeholder="$t('网点确认备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    </SearchForm>
-
-
-    <XdTable v-loading="loading"
-           border stripe
-           size="small"
-           :data="emisSettleBillList"
-           :showSearch.sync="showSearch"
-           :queryParams="queryParams"
-           :total="total"
-           @queryTable="getList"
-           @selection-change="handleSelectionChange"
-           @sort-change="handleSortChange"
-           >
-
-      <div slot="toolbar">
-        <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="handleAdd"
-                  v-hasPermi="['emis:emisSettleBill:add']"
-                >新增</el-button>
-              </el-col>
-              <!--
-              <el-col :span="1.5">
-                <el-button
-                  type="success"
-                  plain
-                  icon="el-icon-edit"
-                  size="mini"
-                  :disabled="single"
-                  @click="handleUpdate"
-                  v-hasPermi="['emis:emisSettleBill:edit']"
-                >修改</el-button>
-              </el-col> -->
-              <el-col :span="1.5">
-                <el-button
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
-                  v-hasPermi="['emis:emisSettleBill:remove']"
-                >删除</el-button>
-              </el-col>
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="warning"
-                  plain
-                  icon="el-icon-download"
-                  size="mini"
-                  @click="handleExport"
-                  v-hasPermi="['emis:emisSettleBill:export']"
-                >导出</el-button>
-              </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">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
+  <XdPageContainer class="app-container">
+        <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+            <el-form-item label="" prop="queryCode" label-width="80px">
+              <div slot="label">
+                  <el-radio-group class="query-label" v-model="queryOrderType">
+                    <el-radio :key="1" label="1">运单号</el-radio>
+                    <el-radio :key="2" label="2">账单号</el-radio>
+                  </el-radio-group>
               </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>
-            </template>
-          </el-table-column>
-      -->
+              <XdTextareaInput
+                v-model="queryParams.queryCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                :rows="2"
+              />
+            </el-form-item>
 
-      <el-table-column :label="$t('总结算账单编号')" align="center" prop="settleBillNo" min-width="100" />
-      <el-table-column :label="$t('结算账单名称')" align="center" prop="settleBillName" min-width="100" />
-      <el-table-column :label="$t('结算账单类型')" align="center" prop="settleType" min-width="100" />
-      <el-table-column :label="$t('结算开始时间')" align="center" prop="settleStartDate" min-width="100" />
-      <el-table-column :label="$t('结算结束时间')" align="center" prop="settleEndDate" min-width="100" />
-      <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" min-width="100" />
-      <el-table-column :label="$t('应收款金额')" align="center" prop="recMoney" min-width="100" />
-      <el-table-column :label="$t('已收款金额')" align="center" prop="recedMoney" min-width="100" />
-      <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="100" />
-      <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('结算站点代码')" align="center" prop="siteCode" min-width="100" />
-      <el-table-column :label="$t('结算站点名称')" align="center" prop="siteName" min-width="100" />
-      <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" min-width="100" />
-      <el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" min-width="100" />
-      <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" min-width="100" />
-      <el-table-column :label="$t('其他金额')" align="center" prop="otherMoney" min-width="100" />
-      <el-table-column :label="$t('理赔原因')" align="center" prop="satisfyReason" min-width="100" />
-      <el-table-column :label="$t('折让原因')" align="center" prop="allowanceReason" min-width="100" />
-      <el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" min-width="100" />
-      <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" min-width="100" />
-      <el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" min-width="100" />
-      <el-table-column :label="$t('付款状态')" align="center" prop="paymentStatus" min-width="100" />
-      <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" min-width="100" />
-      <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" />
-      <el-table-column :label="$t('总重量')" align="center" prop="feeWeight" min-width="100" />
-      <el-table-column :label="$t('未结数量')" align="center" prop="uncollectedAmount" min-width="100" />
-      <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" min-width="100" />
-      <el-table-column :label="$t('退款数量')" align="center" prop="refundAmount" min-width="100" />
-      <el-table-column :label="$t('退款金额')" align="center" prop="refundMoney" min-width="100" />
-      <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="100" />
-      <el-table-column :label="$t('财务确认日期')" align="center" prop="confirmDate" min-width="100" />
-      <el-table-column :label="$t('财务确认站点')" align="center" prop="confirmSite" min-width="100" />
-      <el-table-column :label="$t('财务确认人')" align="center" prop="confirmManCode" min-width="100" />
-      <el-table-column :label="$t('站点确认状态')" align="center" prop="blSiteConfirm" min-width="100" />
-      <el-table-column :label="$t('财务确认备注')" align="center" prop="confirmNote" min-width="100" />
-      <el-table-column :label="$t('站点确认日期')" align="center" prop="siteConfirmDate" min-width="100" />
-      <el-table-column :label="$t('站点确认人')" align="center" prop="siteConfirmManCode" min-width="100" />
-      <el-table-column :label="$t('网点确认备注')" align="center" prop="siteConfirmNote" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" 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:emisSettleBill:edit']"
-          >修改</el-button>
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisSettleBill:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
-    </XdTable>
+            <el-form-item label="账单生成时间" prop="dateTimeRange" label-width="110px">
+                  <elDateAdvPicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+              </el-form-item>
+            <el-form-item label="账单月份" prop="billMonth">
+              <el-date-picker  size="mini" style="width:120px" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+            </el-form-item>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <emisSettleBillForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleBillForm>
-    </el-dialog>
+            <el-form-item   :label="$t('核销状态')" prop="chargeStatus">
+              <el-select  clearable v-model="queryParams.chargeStatus" placeholder="核销状态" style="width:100%">
+                  <el-option key="0" label="未核销" value="0"></el-option>
+                  <el-option key="1" label="已核销" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item :label="$t('开票状态')" prop="openBillStatus">
+              <el-select  clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
+                <el-option key="1" label="已开票" value="1"></el-option>
+                  <el-option key="0" label="未开票" value="0"></el-option>
+                  <el-option key="3" label="不开票" value="3"></el-option>
+                  <el-option key="2" label="部分开票" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item   :label="$t('确认状态')" prop="blConfirmSite">
+              <el-select  clearable v-model="queryParams.blConfirmSite" placeholder="确认状态">
+                  <el-option key="0" label="业务未确认" value="0"></el-option>
+                  <el-option key="1" label="业务已确认" value="1"></el-option>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item   :label="$t('收款状态')" prop="paymentStatus">
+              <el-select  clearable v-model="queryParams.paymentStatus" placeholder="收款状态" style="width:100%">
+                  <el-option key="0" label="未收款" value="0"></el-option>
+                  <el-option key="1" label="已收款" value="1"></el-option>
+                  <el-option key="2" label="部分收款" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="账单生成时间" prop="sendDate" label-width="110px">
+                  <elDateSimplePicker  placeholder="" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateSimplePicker>
+              </el-form-item> -->
+            <el-form-item label="账单月份" prop="billMonth">
+              <el-date-picker  size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="月结客户" prop="custNo">
+              <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
+            </el-form-item>
+            <el-form-item :label="$t('回款联系人')" prop="payee" label-width="100px">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen" label-width="100px">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
+
+          </SearchForm>
+         <!-- 账单表 -->
+         <!-- slot-scope="slotProps"
+         :height="(slotProps.contentHeight)+'px'" -->
+         <!-- -->
+          <XdTable
+                slot="pageContent"
+
+                v-loading="loading"
+                border stripe
+                size="mini"
+                storageName="emisSettleBillList_custbill_query_main"
+                :data="emisSettleBillList"
+                :showSearch.sync="showSearch"
+                :queryParams="queryParams"
+                :total="total"
+                @queryTable="getList"
+                @selection-change="handleSelectionChange"
+                @sort-change="handleSortChange"
+                 @row-dblclick="handleSendDbClick"
+                 show-summary
+                 :summary-method="getSummaries"
+                >
+            <div slot="toolbar">
+            <el-row :gutter="10" class="mb8">
+                    <!-- <el-col :span="1.5">
+                      <el-button
+                        type="primary"
+                        plain
+                        icon="el-icon-edit"
+                        size="mini"
+                        :disabled="single"
+                        @click="handleUpdate"
+                        v-hasPermi="['emis:emisSettleBill:edit']"
+                      >修改账单</el-button>
+                    </el-col> -->
+                    <!-- <el-col :span="1.5">
+                      <el-button
+                        type="warning"
+                        plain
+                        icon="el-icon-download"
+                        size="mini"
+                        @click="handleExport"
+                        v-hasPermi="['emis:emisSettleBill:export']"
+                      >导出</el-button>
+                    </el-col> -->
+              <!-- <el-col :span="1.5" v-if="confirmStatus==0">
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleConfirmBySite"
+               >确认账单</el-button>
+             </el-col> -->
+
+             <!-- <el-col :span="1.5" v-if="confirmStatus==1">
+               <el-button
+                 type="danger"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleCancelConfirmBySite"
+               >取消确认</el-button>
+             </el-col> -->
+             <!-- <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleConfirmNoBillBySite"
+                 v-hasPermi="['emis:emisSettleSubBill:confirmNoBillBySite']"
+               >确认不出账</el-button>
+             </el-col> -->
 
 
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
-        <emisSettleBillView :id="id" ></EmisSettleBillView>
-    </el-dialog>
-    -->
+                    <el-col :span="1.5">
+                      <el-button
+                        type="warning"
+                        plain
+                        icon="el-icon-download"
+                        size="mini"
+                        @click="handleExportToBill"
+                      >导出EXCEL电子表</el-button>
+                    </el-col>
+                    <!-- <el-col :span="1.5" v-if="confirmStatus==1">
+                      <el-button
+                        type="primary"
+                        plain
+                        size="mini"
+                        :disabled="single"
+                        @click="handleGenPayCode"
+                      >微信收款码</el-button>
+                    </el-col> -->
+                </el-row>
+            </div>
 
-  </div>
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="200" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="170" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('账单月份')" align="center" prop="billMonth" width="80" />
+            <el-table-column :label="$t('账单期间')" align="center" prop="billMonth" width="200" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <div >{{scope.row.settleStartDate}}~{{scope.row.settleEndDate}}</div>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.paymentStatus=='0'" type="error">未收款</el-tag>
+                <el-tag v-if="scope.row.paymentStatus=='1'" type="success">已收款</el-tag>
+                <el-tag v-if="scope.row.paymentStatus=='2'" type="warning">部分收款</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('开票状态')" align="center" prop="openBillStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.openBillStatus=='0'" type="error">未开票</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='1'" type="success">已开票</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='2'" type="warning">部分开票</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='3'" type="warning">不开票</el-tag>
+              </template>
+            </el-table-column>
+
+            <el-table-column :label="$t('核销状态')" align="center" prop="chargeStatus" width="100" >
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.chargeStatus=='0'" type="error">未核销</el-tag>
+                <el-tag v-if="scope.row.chargeStatus=='1'" type="success">已核销</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" width="80" />
+            <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" width="80" />
+            <el-table-column :label="$t('结算重量')" align="center" prop="feeWeight" width="80" />
+            <el-table-column :label="$t('账单应收金额')" align="center" prop="recMoney" width="150" />
+            <el-table-column :label="$t('账单已收金额')" align="center" prop="recedMoney" width="150" />
+            <el-table-column :label="$t('账单退款金额')" align="center" prop="refundMoney" width="150" />
+            <el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="80" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="80" :show-overflow-tooltip="true"/>
+
+            <el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" width="100"  :show-overflow-tooltip="true" />
+            <el-table-column :label="$t('折让原因')" align="center" prop="allowanceReason" width="100" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" width="100"  :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100"  :show-overflow-tooltip="true" />
+            <el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
+            <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" width="100" />
+
+            <el-table-column :label="$t('账单生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
+
+            <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
+                  <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
+                  <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
+            <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
+            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
+
+            <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>
+
+        <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
+          <MergeBillForm :id="currentId"  @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
+        </el-dialog>
+
+
+  </XdPageContainer>
 </template>
 
 <script>
-import { listEmisSettleBill, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
+import { listEmisSettleBill,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/emis/emisSettleBill";
+import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisSettleBillView from '@/views/emis/emisSettleBill/emisSettleBillView';
-import emisSettleBillForm from '@/views/emis/emisSettleBill/emisSettleBillForm';
+
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
 export default {
-  name: "emisSettleBill",
-  components: { elDateSimplePicker,emisSettleBillForm },
+  name: "EmisSettleBillQuery",
+  props:{
+    confirmStatus:{
+        type:[String,Number]
+    }
+  },
+  components: { MergeBillForm,elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
   dicts: [
   ],
   data() {
@@ -541,6 +288,14 @@ export default {
       openForm: false,
       titleForm: "",
 
+      subBillTotal: 0,
+     // 结算子账单表格数据
+     emisSettleSubBillList: [],
+
+     currentSettleBillNo:null,
+
+     queryOrderType:null,
+
       // 弹出展示层
       id:null,
       titleView:"",
@@ -557,6 +312,10 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+
+        queryCode:null,
+
+
         settleBillNo: null,
         settleBillName: null,
         settleType: null,
@@ -580,6 +339,7 @@ export default {
         otherReason: null,
         openBillStatus: null,
         paymentStatus: null,
+        chargeStatus: null,
         sendPieceSum: null,
         pieceNumber: null,
         feeWeight: null,
@@ -587,51 +347,199 @@ export default {
         sendMoneySum: null,
         refundAmount: null,
         refundMoney: null,
-        blConfirm: null,
-        confirmDate: null,
-        confirmSite: null,
-        confirmManCode: null,
-        blSiteConfirm: null,
-        confirmNote: null,
-        siteConfirmDate: null,
-        siteConfirmManCode: null,
-        siteConfirmNote: null,
+        payee: null,
+        salesmen: null,
+        blSendOms: null,
+        blConfirmCenter: null,
+        confirmCenterDate: null,
+        confirmCenterNote: null,
+        confirmCenterManCode: null,
+        confirmCenterCode: null,
+        blConfirmSite: this.confirmStatus,
+        confirmSiteDate: null,
+        confirmSiteManCode: null,
+        confirmSiteNote: null,
+        confirmSiteCode: null,
         remark: null,
         delFlag: null,
+        params:{
+          billCode:null,
+        }
       },
     };
+  },
+   watch: {
   },
   created() {
+    this.queryOrderType="1"
     this.getList();
   },
+
   methods: {
-    /** 查询结算总账单列表 */
-    getList() {
+  /** 查询结算总账单列表 */
+  getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeSettleStartDate && '' != this.daterangeSettleStartDate) {
-        this.queryParams.params["beginSettleStartDate"] = this.daterangeSettleStartDate[0];
-        this.queryParams.params["endSettleStartDate"] = this.daterangeSettleStartDate[1];
+
+      // 按运单查询时的处理
+      if(this.queryOrderType=='1'){
+        this.queryParams.params.billCode=this.queryParams.queryCode;
+        this.queryParams.settleBillNo=null;
       }
-      if (null != this.daterangeSettleEndDate && '' != this.daterangeSettleEndDate) {
-        this.queryParams.params["beginSettleEndDate"] = this.daterangeSettleEndDate[0];
-        this.queryParams.params["endSettleEndDate"] = this.daterangeSettleEndDate[1];
+      else if(this.queryOrderType=='2'){
+        this.queryParams.params.billCode=null;
+        this.queryParams.settleBillNo=this.queryParams.queryCode;
       }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+
+      // console.log("====>this.$store.getters.ownerSiteCode==>",this.$store.getters.ownerSiteCode)
+      // if(this.$store.getters.ownerSiteCode !='88888'){
+      //   this.queryParams.salesmen=this.$store.getters.empName
+      // }
+      listEmisSettleBill(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
         this.emisSettleBillList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
 
+    handleConfirmBySite(row) {
+     const ids = row.id || this.ids;
+     this.$modal.confirm('请仔细确认,确认后不可撤销').then(function() {
+       return confirmSettleBillBySite(ids);
+     }).then(() => {
+       this.getList();
+       this.$modal.msgSuccess("操作成功");
+     }).catch(() => {});
+   },
+   handleGenPayCode(row) {
+    this.$modal.msgSuccess("暂不支持");
+     const ids = row.id || this.ids;
+    //  this.$modal.confirm('').then(function() {
+    //    return confirmSettleBillBySite(ids);
+    //  }).then(() => {
+    //    this.getList();
+    //    this.$modal.msgSuccess("操作成功");
+    //  }).catch(() => {});
+   },
+
+    handleSendDbClick(row){
+      this.$emit("onSelect",row);
+    },
+
+      //指定列求和
+      getSummaries(param) {
+       const { columns, data } = param;
+       const sums = [];
+       columns.forEach((column, index) => {
+             if (index === 0) {
+               sums[index] = '合计';
+               return;
+             }
+             if (
+               column.property === 'sendPieceSum'
+               ) {
+                 const values = data.map(item => Number(item.sendPieceSum));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(0); //保留0位小数
+             }
+
+             else if (
+               column.property === 'pieceNumber'
+
+               ) {
+                 const values = data.map(item => Number(item.pieceNumber));
+
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(0); //保留0位小数
+             }
+             else if (
+               column.property === 'feeWeight'
+
+               ) {
+                 const values = data.map(item => Number(item.feeWeight));
+
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+
+             else if (
+               column.property === 'recMoney'
+               ) {
+                 const values = data.map(item => Number(item.recMoney));
+                 sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+               }
+             else if(
+               column.property === 'recedMoney'
+             ){
+                  const values = data.map(item => Number(item.recedMoney));
+                   sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+             else if(
+               column.property === 'refundMoney'
+             ){
+                  const values = data.map(item => Number(item.refundMoney));
+                   sums[index] = values.reduce((prev, curr) => {
+                   const value = Number(curr);
+                   if (!isNaN(value)) {
+                     return prev + curr;
+                   } else {
+                     return prev;
+                   }
+                 }, 0);
+                 sums[index] = sums[index].toFixed(2); //保留2位小数
+             }
+       });
+     console.log(sums);
+     return sums
+   },
+   handleAddBillCode(){
+
+   },
+   handleRemovceBillCode(){
+
+    },
+    handleExportToBill() {
+    this.download('emis/emisSettleBill/exportBill', {
+      settleBillNo:this.currentSettleBillNo
+    }, `账单${new Date().getTime()}.xlsx`)
+
+   },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -644,9 +552,15 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
+
+      if(selection&&selection.length>0){
+        this.currentSettleBillNo=selection[0].settleBillNo;
+      }
+
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
     handleSortChange(column) {
@@ -654,20 +568,11 @@ export default {
       this.queryParams.isAsc = column.order;
       this.getList();
     },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "新增";
-    },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
-       this.currentId= row.id;
+       this.currentId= row.id || this.ids;
        this.openForm = true;
-       this.titleForm = "修改";
+       this.titleForm = "账单修改:"+this.currentSettleBillNo;
     },
     handleView(row) {
        this.id=row.id;
@@ -700,6 +605,8 @@ export default {
      const loadingInstance = this.$loading({
             text: '正在导出...'
         })
+
+
        var qParam = {...this.queryParams};
        qParam.pageNum=1;
        qParam.pageSize=5000;
@@ -707,19 +614,69 @@ export default {
        listEmisSettleBill(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','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','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()
+
+           const curList = response.rows
+          import('@/vendor/Export2Excel').then(excel => {
+
+            const tHeader = ['id','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+            const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
+            const data = this.formatJson(filterVal, curList, response.rows)
+            axios({
+                method: "get",
+                url: this.templateFile,
+                responseType: "arraybuffer",
+              }).then(response =>{
+
+
+                console.log("==this.templateFile=>",this.templateFile);
+                console.log("==xxxx=>",response);
+
+                excel.export_json_to_excel_by_tpl({
+                  tplData:response,
+                  header: tHeader,
+                  data,
+                  filename: '账单',
+                  autoWidth: true
                 })
+
+
+            }).catch(error => console.log(error))
+
+
+            loadingInstance.close()
+          })
+        }
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport_old() {
+    //   this.download('emis/emisSettleBill/export', {
+    //     ...this.queryParams
+    //   }, `emisSettleBill_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisSettleBill(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','总结算账单编号','结算账单名称','结算账单类型','结算开始时间','结算结束时间','账单月份','应收款金额','已收款金额','月结编号','客户编码','客户名称','结算站点代码','结算站点名称','理赔金额','折让金额','抵扣金额','其他金额','理赔原因','折让原因','抵扣原因','其他原因','开票状态','付款状态','总票数','总件数','总重量','未结数量','合计金额','退款数量','退款金额','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
+                //   const filterVal = ['id','settleBillNo','settleBillName','settleType','settleStartDate','settleEndDate','billMonth','recMoney','recedMoney','custNo','customerCode','customerName','siteCode','siteName','satisfyMoney','allowanceMoney','deductionMoney','otherMoney','satisfyReason','allowanceReason','deductionReason','otherReason','openBillStatus','paymentStatus','sendPieceSum','pieceNumber','feeWeight','uncollectedAmount','sendMoneySum','refundAmount','refundMoney','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','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()
+                // })
         }
       });
     },
@@ -751,7 +708,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .el-divider{
     margin-top: 0px;
     background: 0 0;
@@ -761,4 +718,12 @@ export default {
     color: #0955ee;
     cursor: pointer;
   }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
 </style>
diff --git a/src/views/emis/emisSettleInvoiceRecord/index.vue b/src/views/emis/emisSettleInvoiceRecord/index.vue
index d2b3942a..e1d4c6bd 100644
--- a/src/views/emis/emisSettleInvoiceRecord/index.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/index.vue
@@ -1,96 +1,66 @@
 <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="applySeqNo">
-        <el-input
-          v-model="queryParams.applySeqNo"
-          :placeholder="$t('申请序号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+  <XdPageContainer class="app-container">
+    <SearchForm  slot="pageHeader"  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+
+          <el-form-item label="" prop="queryCode" label-width="80px">
+            <div slot="label">
+                <el-radio-group class="query-label" v-model="queryOrderType">
+                  <el-radio :key="1" label="1">运单号</el-radio>
+                  <el-radio :key="2" label="2">账单号</el-radio>
+                </el-radio-group>
+            </div>
+            <XdTextareaInput
+              v-model="queryParams.queryCode"
+              :placeholder="$t('多个流水号逗号或换行隔开')"
+              clearable
+              :rows="2"
+            />
+          </el-form-item>
+          <el-form-item label="申请时间" prop="dateTimeRange" label-width="110px">
+                  <elDateAdvPicker  placeholder="申请时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+              </el-form-item>
+
+          <el-form-item label="账单名称" prop="settleBillName">
+            <el-input
+              v-model="queryParams.settleBillName"
+              :placeholder="$t('账单名称')"
+              clearable
+            />
+          </el-form-item>
+
+      <el-form-item label="开票状态" prop="invoiceStatus">
+          <el-select clearable v-model="queryParams.invoiceStatus" placeholder="请选择" style="width:100%">
+             <el-option label="未开票" :value="0"></el-option>
+             <el-option label="开票中" :value="1"></el-option>
+             <el-option label="已开票" :value="2"></el-option>
+             <el-option label="开票异常" :value="3"></el-option>
+           </el-select>
       </el-form-item>
-      <el-form-item label="" prop="applyDate">
-        <el-date-picker clearable
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('申请时间')">
-        </el-date-picker>
+      <el-form-item label="审核状态" prop="blAudit">
+        <el-select v-model="queryParams.blAudit" placeholder="" clearable filterable style="width:100%">
+                <el-option label="未审核" :value="0"></el-option>
+                <el-option label="审核通过" :value="1"></el-option>
+                <el-option label="审核不通过" :value="2"></el-option>
+          </el-select>
       </el-form-item>
-      <el-form-item label="" prop="applyManCode">
-        <el-input
-          v-model="queryParams.applyManCode"
-          :placeholder="$t('审核人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+      <el-form-item label="发票类型" prop="invoiceType">
+          <el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
+             <el-option label="增值税电子普通发票" :value="1"></el-option>
+             <el-option label="增值税普通发票" :value="2"></el-option>
+             <el-option label="增值税专用发票" :value="3"></el-option>
+           </el-select>
       </el-form-item>
-      <el-form-item label="" prop="applySiteCode">
-        <el-input
-          v-model="queryParams.applySiteCode"
-          :placeholder="$t('审核站点')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="settleBillNo">
-        <el-input
-          v-model="queryParams.settleBillNo"
-          :placeholder="$t('账单号编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="settleBillName">
-        <el-input
-          v-model="queryParams.settleBillName"
-          :placeholder="$t('账单名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="applyMoney">
-        <el-input
-          v-model="queryParams.applyMoney"
-          :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="companyName">
+
+      <el-form-item label="开票抬头" prop="companyName">
         <el-input
           v-model="queryParams.companyName"
-          :placeholder="$t('开票名称')"
+          :placeholder="$t('开票抬头')"
           clearable
           @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('开票税号')"
@@ -98,55 +68,7 @@
           @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="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="realTaxType">
-        <el-input
-          v-model="queryParams.realTaxType"
-          :placeholder="$t('税类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openMoneyMax">
-        <el-input
-          v-model="queryParams.openMoneyMax"
-          :placeholder="$t('开票上限')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="openMoney">
+      <el-form-item label="开票金额" prop="openMoney">
         <el-input
           v-model="queryParams.openMoney"
           :placeholder="$t('开票金额')"
@@ -154,164 +76,38 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="" prop="invoiceNo">
+      <!-- <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="invoiceStatus">
-        <el-input
-          v-model="queryParams.invoiceStatus"
-          :placeholder="$t('开票状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="invoiceStatusDesc">
-        <el-input
-          v-model="queryParams.invoiceStatusDesc"
-          :placeholder="$t('开票状态描述')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="recieveAddress">
-        <el-input
-          v-model="queryParams.recieveAddress"
-          :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="filePath">
-        <el-input
-          v-model="queryParams.filePath"
-          :placeholder="$t('发票下载路径')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blAudit">
+      </el-form-item> -->
+
+      <!-- <el-form-item label="" prop="blAudit">
         <el-input
           v-model="queryParams.blAudit"
           :placeholder="$t('审核状态')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="" prop="auditDate">
-        <el-date-picker clearable
-          v-model="queryParams.auditDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('审核日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="auditManCode">
-        <el-input
-          v-model="queryParams.auditManCode"
-          :placeholder="$t('审核人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="auditSiteCode">
-        <el-input
-          v-model="queryParams.auditSiteCode"
-          :placeholder="$t('审核站点')"
-          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="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      </el-form-item> -->
+
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
-           border stripe
-           size="small"
+
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
+           border
+           size="mini"
+
+            storageName="emisSettleInvoiceRecordList_index_apply_main"
            :data="emisSettleInvoiceRecordList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -319,11 +115,13 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+
+           @row-dblclick="handleSendDbClick"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -331,9 +129,9 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['emis:emisSettleInvoiceRecord:add']"
-                >新增</el-button>
-              </el-col>
-              <!-- 
+                >新增开票申请</el-button>
+              </el-col> -->
+              <!--
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -345,7 +143,18 @@
                   v-hasPermi="['emis:emisSettleInvoiceRecord:edit']"
                 >修改</el-button>
               </el-col> -->
-              <el-col :span="1.5">
+
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleDownPDF"
+                >下载发票PDF</el-button>
+              </el-col> -->
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="danger"
                   plain
@@ -355,121 +164,102 @@
                   @click="handleDelete"
                   v-hasPermi="['emis:emisSettleInvoiceRecord:remove']"
                 >删除</el-button>
-              </el-col>
-              <!-- <el-col :span="1.5">
+              </el-col> -->
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
-                  v-hasPermi="['emis:emisSettleInvoiceRecord: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="$t('申请时间')" align="center" prop="applyDate" min-width="170" />
+      <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('发票文件')" align="center" prop="filePath" min-width="170" :show-overflow-tooltip="true">
+      <template slot-scope="scope">
+
+                <el-button
+                  v-if="scope.row.invoiceStatus=='2'"
+                  type="primary"
+                  plain
+                  icon="el-icon-document-copy"
+                  size="mini"
+                  @click="handleDownPDF(scope.row,$event)"
+                >复制发票地址</el-button>
+
 
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <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>
-            </template>
-          </el-table-column>
-      -->
 
-      <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="100" />
-      <el-table-column :label="$t('申请时间')" align="center" prop="applyDate" min-width="100" />
-      <el-table-column :label="$t('审核人')" align="center" prop="applyManCode" min-width="100" />
-      <el-table-column :label="$t('审核站点')" align="center" prop="applySiteCode" min-width="100" />
-      <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('账单号编号')" align="center" prop="settleBillNo" min-width="100" />
-      <el-table-column :label="$t('账单名称')" align="center" prop="settleBillName" min-width="100" />
-      <el-table-column :label="$t('申请开票金额')" align="center" prop="applyMoney" min-width="100" />
-      <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" 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="contact" min-width="100" />
-      <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" />
-      <el-table-column :label="$t('税类型')" align="center" prop="realTaxType" min-width="100" />
-      <el-table-column :label="$t('开票上限')" align="center" prop="openMoneyMax" min-width="100" />
-      <el-table-column :label="$t('开票金额')" align="center" prop="openMoney" min-width="100" />
-      <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="100" />
-      <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" min-width="100" />
-      <el-table-column :label="$t('开票状态描述')" align="center" prop="invoiceStatusDesc" min-width="100" />
-      <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" />
-      <el-table-column :label="$t('发票投递邮箱')" align="center" prop="email" min-width="100" />
-      <el-table-column :label="$t('发票下载路径')" align="center" prop="filePath" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('审核状态')" align="center" prop="blAudit" min-width="100" />
-      <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="100" />
-      <el-table-column :label="$t('审核人')" align="center" prop="auditManCode" min-width="100" />
-      <el-table-column :label="$t('审核站点')" align="center" prop="auditSiteCode" 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('删除标志（0代表存在')" align="center" prop="delFlag" 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:emisSettleInvoiceRecord:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisSettleInvoiceRecord:remove']"
-          >删除</el-button> -->
         </template>
       </el-table-column>
+      <el-table-column :label="$t('开票状态')" align="center" prop="invoiceStatus" width="100" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.invoiceStatus=='0'" type="info">未开票</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='1'" type="warning">开票中</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='2'" type="success">已开票</el-tag>
+          <el-tag v-if="scope.row.invoiceStatus=='3'" type="error">开票异常</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('审核状态')" align="center" prop="blAudit" width="100" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.blAudit=='0'" type="info">未审核</el-tag>
+          <el-tag v-if="scope.row.blAudit=='1'" type="success">审核通过</el-tag>
+          <el-tag v-if="scope.row.blAudit=='2'" type="error">审核不通过</el-tag>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column :label="$t('状态描述')" align="center" prop="invoiceStatusDesc" min-width="100" :show-overflow-tooltip="true"/> -->
+        <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
+      <!-- <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" /> -->
+      <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请金额')" align="center" prop="applyMoney" min-width="100" />
+      <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag>
+          <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('开票抬头')" align="center" prop="companyName" min-width="170"  :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('开票税号')" align="center" prop="companyTaxNo" min-width="170" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('开票电话')" align="center" prop="companyTel" min-width="100" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column :label="$t('开票地址')" align="center" prop="companyAddress" min-width="100" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column :label="$t('联系人')" align="center" prop="contact" min-width="100" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column :label="$t('联系电话')" align="center" prop="phone" min-width="100" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column :label="$t('发票号')" align="center" prop="invoiceNo" min-width="170" :show-overflow-tooltip="true" /> -->
+
+      <el-table-column :label="$t('申请序号')" align="center" prop="applySeqNo" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请人')" align="center" prop="createByName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('申请站点')" align="center" prop="createSiteName" min-width="100" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('纸质发票邮寄地址')" align="center" prop="recieveAddress" min-width="100" /> -->
+      <el-table-column :label="$t('邮箱')" align="center" prop="email" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('审核日期')" align="center" prop="auditDate" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('审核人')" align="center" prop="auditManName" min-width="100" />
+      <el-table-column :label="$t('操作人')" align="center" prop="opManName" min-width="100" />
+      <el-table-column :label="$t('操作时间')" align="center" prop="opDate" min-width="100" />
+      <el-table-column :label="$t('操作站点')" align="center" prop="opSiteName" 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="创建人" 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>
 
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
+    <!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisSettleInvoiceRecordForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceRecordForm>
-    </el-dialog>
-    
+    </el-dialog> -->
+
 
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@@ -477,7 +267,7 @@
     </el-dialog>
     -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
@@ -485,10 +275,13 @@ import { listEmisSettleInvoiceRecord, getEmisSettleInvoiceRecord, delEmisSettleI
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisSettleInvoiceRecordView from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordView';
 import emisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm';
+import { listEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord";
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+import clip from '@/utils/clipboard'
 
 export default {
-  name: "emisSettleInvoiceRecord",
-  components: { elDateSimplePicker,emisSettleInvoiceRecordForm },
+  name: "EmisSettleInvoiceRecord",
+  components: { elDateAdvPicker,emisSettleInvoiceRecordForm },
   dicts: [
   ],
   data() {
@@ -509,7 +302,10 @@ export default {
       total: 0,
       // 开票记录表表格数据
       emisSettleInvoiceRecordList: [],
-    
+
+      queryCode:null,
+      queryOrderType:null,
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -518,20 +314,15 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 更新站点时间范围
-      daterangeApplyDate: [],
-      // 更新站点时间范围
-      daterangeAuditDate: [],
-      // 更新站点时间范围
-      daterangeOpDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
+
+      dateTimeRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+
+
+
         applySeqNo: null,
         applyDate: null,
         applyManCode: null,
@@ -570,44 +361,41 @@ export default {
         openChStatusDesc: null,
         openComCode: null,
         delFlag: null,
+        params:{
+          billCode:null,
+        }
       },
     };
   },
   created() {
+    this.queryOrderType="1";
     this.getList();
   },
   methods: {
+    handleSendDbClick(row){
+      this.$emit("onSelect",row);
+    },
     /** 查询开票记录表列表 */
     getList() {
+
+       // 按运单查询时的处理
+       if(this.queryOrderType=="1"){
+        this.queryParams.params.billCode=this.queryParams.queryCode;
+        this.queryParams.settleBillNo=null;
+      }
+      else if(this.queryOrderType=="2"){
+        this.queryParams.params.billCode=null;
+        this.queryParams.settleBillNo=this.queryParams.queryCode;
+      }
+
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeApplyDate && '' != this.daterangeApplyDate) {
-        this.queryParams.params["beginApplyDate"] = this.daterangeApplyDate[0];
-        this.queryParams.params["endApplyDate"] = this.daterangeApplyDate[1];
-      }
-      if (null != this.daterangeAuditDate && '' != this.daterangeAuditDate) {
-        this.queryParams.params["beginAuditDate"] = this.daterangeAuditDate[0];
-        this.queryParams.params["endAuditDate"] = this.daterangeAuditDate[1];
-      }
-      if (null != this.daterangeOpDate && '' != this.daterangeOpDate) {
-        this.queryParams.params["beginOpDate"] = this.daterangeOpDate[0];
-        this.queryParams.params["endOpDate"] = this.daterangeOpDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
-      listEmisSettleInvoiceRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+      listEmisSettleInvoiceRecord(this.addDateRange(this.queryParams, this.dateTimeRange,'creatTime')).then(response => {
         this.emisSettleInvoiceRecordList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -634,7 +422,7 @@ export default {
     handleAdd(row) {
       this.currentId=null;
       this.openForm= true;
-      this.titleForm = "新增";
+      this.titleForm = "新增开票申请";
     },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
@@ -645,6 +433,108 @@ export default {
        this.openForm = true;
        this.titleForm = "修改";
     },
+
+    handleDownPDF(row) {
+      let qParam = {
+        pageNum:1,
+        pageSize:50,
+        applySeqNo: row.applySeqNo,
+        openChStatus:'2'
+      }
+      listEmisSettleInvoiceChRecord(qParam).then(response => {
+        let list = response.rows;
+        if(list&&list.length>0){
+            let downUrl="";
+            list.forEach(item=>{
+              downUrl=downUrl+item.filePath+",";
+            });
+
+            downUrl=this.removeEndChar(downUrl,',','');
+
+            if (navigator.clipboard && window.isSecureContext) {
+              // navigator clipboard 向剪贴板写文本
+              this.$modal.msgSuccess('复制成功')
+              return navigator.clipboard.writeText(downUrl)
+            } else {
+              // 创建text area
+              const textArea = document.createElement('textarea')
+              textArea.value = downUrl
+              // 使text area不在viewport，同时设置不可见
+              document.body.appendChild(textArea)
+              textArea.focus()
+              textArea.select()
+              this.$modal.msgSuccess('复制成功')
+              return new Promise((res, rej) => {
+                // 执行复制命令并移除文本框
+                document.execCommand('copy') ? res() : rej()
+                textArea.remove()
+              })
+            }
+
+        }
+      });
+    },
+    removeEndChar(str,char, type) {
+      if (char) {
+        if (type == 'left') {
+          return str.replace(new RegExp('^\\'+char+'+', 'g'), '');
+        } else if (type == 'right') {
+          return str.replace(new RegExp('\\'+char+'+$', 'g'), '');
+        }
+        return str.replace(new RegExp('^\\'+char+'+|\\'+char+'+$', 'g'), '');
+      }
+      return str.replace(/^\s+|\s+$/g, '');
+    },
+
+    handleDownPDFOld(row) {
+
+      let settleBillName=row.settleBillName;
+
+      let qParam = {
+        pageNum:1,
+        pageSize:50,
+        applySeqNo: row.applySeqNo,
+        openChStatus:'2'
+      }
+
+      listEmisSettleInvoiceChRecord(qParam).then(response => {
+        let list = response.rows;
+        if(list&&list.length>0){
+            list.forEach(item=>{
+              // this.downPdfFile(item.filePath);
+              let pdfUrl=item.filePath;
+              let fileName=settleBillName+"-"+item.invoiceNo+".pdf";
+              this.downloadUrlFile(pdfUrl,fileName);
+            });
+        }
+      });
+    },
+    // 下载含有url的文件
+    downloadUrlFile(url, fileName) {
+        const url2 = url.replace(/\\/g, '/');
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url2, true);
+        xhr.responseType = 'blob';
+        //xhr.setRequestHeader('Authorization', 'Basic a2VybWl0Omtlcm1pdA==');
+        // 为了避免大文件影响用户体验，建议加loading
+        xhr.onload = () => {
+            if (xhr.status === 200) {
+                // 获取文件blob数据并保存
+                this.saveAs(xhr.response, fileName);
+            }
+        };
+        xhr.send();
+    },
+    saveAs(data, name) {
+        const urlObject = window.URL || window.webkitURL || window;
+        const export_blob = new Blob([data]);
+        //createElementNS() 方法可创建带有指定命名空间的元素节点。
+        //此方法可返回一个 Element 对象。
+        const save_link = document.createElementNS('http://www.w3.org/1999/xhtml', 'a');
+        save_link.href = urlObject.createObjectURL(export_blob);
+        save_link.download = name;
+        save_link.click();
+    },
     handleView(row) {
        this.id=row.id;
        this.titleView="查看";
diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index 6e18ed24..6bd50559 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -242,7 +242,7 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import emisSettlePayRecordForm from '@/views/emis/emisSettlePayRecord/emisSettlePayRecordForm';
 
 export default {
-  name: "emisSettlePayRecord",
+  name: "EmisSettlePayRecord",
   components: { elDateSimplePicker,emisSettlePayRecordForm },
   dicts: [
   ],