diff --git a/package.json b/package.json
index 6ca42b3..8f8c64a 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
     "mxgraph-js": "^1.0.1",
     "nprogress": "0.2.0",
     "print-js": "^1.6.0",
+    "qrcode": "^1.5.4",
     "qrcodejs2": "^0.0.2",
     "qs": "^6.14.0",
     "quill": "1.3.7",
diff --git a/src/views/oms/BillMgnt/CustSettleBillQueryList.vue b/src/views/oms/BillMgnt/CustSettleBillQueryList.vue
index 2ddcb2a..f8d4951 100644
--- a/src/views/oms/BillMgnt/CustSettleBillQueryList.vue
+++ b/src/views/oms/BillMgnt/CustSettleBillQueryList.vue
@@ -16,16 +16,13 @@
               />
             </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="$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-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="$t('开票状态')" prop="openBillStatus">
               <el-select  clearable v-model="queryParams.openBillStatus" placeholder="开票状态" style="width:100%">
                 <el-option key="1" label="已开票" value="1"></el-option>
@@ -35,34 +32,28 @@
                   <el-option key="2" label="部分开票" value="2"></el-option>
               </el-select>
             </el-form-item>
+            <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="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="dateTimeRange" label-width="110px">
+                  <elDateAdvPicker  placeholder="账单生成时间" v-model="dateTimeRange"  style="z-index:9999;width:300px" ></elDateAdvPicker>
+              </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>
 
@@ -169,15 +160,16 @@
             <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="creditPeriod" min-width="100" />
-            <el-table-column :label="$t('账单日')" align="center" prop="settleDay" min-width="100" />
-            <el-table-column :label="$t('最后回款日')" align="center" prop="paymentDueDate" min-width="170" />
-
-
             <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" >
+
+            <!-- <el-table-column :label="$t('账期(天)')" align="center" prop="creditPeriod" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('账单日')" align="center" prop="settleDay" min-width="100" /> -->
+            <!-- <el-table-column :label="$t('最后回款日')" align="center" prop="paymentDueDate" min-width="170" /> -->
+
+
+
+            <!-- <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>
@@ -187,14 +179,14 @@
             </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" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" :show-overflow-tooltip="true"/> -->
 
-            <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+            <!-- <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
             <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-            <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+            <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/> -->
 
           </XdTable>
 
@@ -204,11 +196,7 @@
 </template>
 
 <script>
-import { listSimple,confirmSettleBillBySite, getEmisSettleBill, delEmisSettleBill, addEmisSettleBill, updateEmisSettleBill } from "@/api/oms/emisSettleBill";
-
-import PayeePicker from '@/views/oms/EmisBaseTools/PayeePicker.vue';
-import SalemanPicker from '@/views/oms/EmisBaseTools/SalemanPicker.vue';
-import EmisMonthpayAccountPicker from '@/views/oms/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+import { listSimple } from "@/api/oms/emisSettleBill";
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 
 export default {
@@ -218,7 +206,7 @@ export default {
         type:[String,Number]
     }
   },
-  components: {elDateAdvPicker,PayeePicker,SalemanPicker,EmisMonthpayAccountPicker },
+  components: {elDateAdvPicker },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
         'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
diff --git a/src/views/oms/BillMgnt/OmsHasSettleBillQuery.vue b/src/views/oms/BillMgnt/OmsHasSettleBillQuery.vue
index 8aa6773..d605c3a 100644
--- a/src/views/oms/BillMgnt/OmsHasSettleBillQuery.vue
+++ b/src/views/oms/BillMgnt/OmsHasSettleBillQuery.vue
@@ -1,101 +1,688 @@
 <template>
-  <div class="app-container">
+  <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>
 
-      <div class="tab-container">
-        <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
-          <el-tab-pane label="已出账单列表" name="billList" >
-            <CustSettleBillQueryList key="billList"  @onSelect="onSelectBill" > </CustSettleBillQueryList>
-          </el-tab-pane>
-          <el-tab-pane v-for="(item, index) in billTabs" :key="index"  :name="item.settleBillNo" :label="'账单:'+item.settleBillNo"  closable >
-            <BillDetailPanelReadOnly :key="'Detail_'+index" :settleBillNo="item.settleBillNo"></BillDetailPanelReadOnly>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
+            <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="$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="4" label="已完成" value="4"></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="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="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="账单生成时间" 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="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>
+           
 
-  </div>
+          </SearchForm>
+
+          <XdTable
+                slot="pageContent"
+                slot-scope="slotProps"
+                :height="(slotProps.contentHeight)+'px'"
+
+                v-loading="loading"
+                border stripe
+                size="mini"
+
+                ref="refTable"
+
+                storageName="emisSettleBillList_custbill_query_main_2"
+                :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="warning"
+                        plain
+                        icon="el-icon-download"
+                        size="mini"
+                        @click="handleExport"
+                      >导出</el-button>
+                    </el-col>
+                    <!-- <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">
+                      <el-button
+                        type="primary"
+                        plain
+                        size="mini"
+                        :disabled="single"
+                        @click="handleGenPayCode"
+                      >去付款</el-button>
+                    </el-col>
+
+                </el-row>
+            </div>
+
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column :label="$t('账单编号')" align="center" prop="settleBillNo" width="180" :show-overflow-tooltip="true"/>
+            <el-table-column :label="$t('账单名称')" align="left" prop="settleBillName" width="150" :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>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</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="custName" min-width="150" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                  <span  type="normal">{{ scope.row.custName }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('账单生成时间')" align="center" prop="createTime" width="170" :show-overflow-tooltip="true"/>
+            
+          </XdTable>
+
+          <el-dialog :title="titleForm" :visible.sync="openForm" width="40%" :destroy-on-close="true" v-dialogDrag append-to-body>
+              <PayQrCode :key="'payqr_'+resetRefreshId" :settleBillNo="currentSettleBillNo"   ></PayQrCode>
+          </el-dialog>
+
+  </XdPageContainer>
 </template>
 
 <script>
-import CustSettleBillQueryList from '@/views/oms/BillMgnt/CustSettleBillQueryList.vue';
-import BillDetailPanelReadOnly from '@/views/oms/BillMgnt/BillDetailPanelReadOnly.vue';
+import { listSimple } from "@/api/oms/emisSettleBill";
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+import PayQrCode from '@/views/oms/BillMgnt/PayQrCode.vue';
+
 export default {
   name: "EmisSettleBillQuery",
-  components: {
-    CustSettleBillQueryList,
-    BillDetailPanelReadOnly
- },
-  dicts: [
+  props:{
+    confirmStatus:{
+        type:[String,Number]
+    }
+  },
+  components: {elDateAdvPicker,PayQrCode },
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
   ],
   data() {
     return {
-      activeTab:'billList',
-      billTabs:[],
-      currentSettleBillNo:null,
+      resetRefreshId:null,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 结算总账单表格数据
+      emisSettleBillList: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+
+      subBillTotal: 0,
+     // 结算子账单表格数据
+     emisSettleSubBillList: [],
+
+     currentSettleBillNo:null,
+     selectList: [],
+
+     queryOrderType:null,
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新站点时间范围
+      daterangeSettleStartDate: [],
+      // 更新站点时间范围
+      daterangeSettleEndDate: [],
+      // 更新站点时间范围
+      daterangeCreateTime: [],
+      // 更新站点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+
+        queryCode:null,
+
+
+        settleBillNo: null,
+        settleBillName: null,
+        settleType: null,
+        settleStartDate: null,
+        settleEndDate: null,
+        billMonth: null,
+        recMoney: null,
+        recedMoney: null,
+        custNo: null,
+        customerCode: null,
+        customerName: null,
+        siteCode: null,
+        siteName: null,
+        satisfyMoney: null,
+        allowanceMoney: null,
+        deductionMoney: null,
+        otherMoney: null,
+        satisfyReason: null,
+        allowanceReason: null,
+        deductionReason: null,
+        otherReason: null,
+        openBillStatus: null,
+        paymentStatus: null,
+        chargeStatus: null,
+        sendPieceSum: null,
+        pieceNumber: null,
+        feeWeight: null,
+        uncollectedAmount: null,
+        sendMoneySum: null,
+        refundAmount: null,
+        refundMoney: 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,
+        }
+      },
     };
   },
-  created() {
+   watch: {
   },
+  created() {
+    this.queryOrderType="1"
+    this.queryParams.paymentStatus='1';
+    this.getList();
+  },
+
   methods: {
-    handleTabsClick(){
+    initQueryParams(){
+      // 按运单查询时的处理
+      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;
+      }
 
     },
-    onPayInput(settleBillNo){
-      this.currentSettleBillNo=settleBillNo;
-      this.activeTab="payRecordInput";
-    },
-    handleFormChanged(){
-      this.currentSettleBillNo=null;
-      this.activeTab="billList";
-    },
-    cancelForm(){
-      this.currentSettleBillNo=null;
-      this.activeTab="billList";
+
+  /** 查询结算总账单列表 */
+  getList() {
+      this.loading = true;
+
+      this.initQueryParams();
+
+      listSimple(this.addDateRange(this.queryParams, this.dateTimeRange,'createTime')).then(response => {
+        this.emisSettleBillList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
 
-    onSelectBill(item) {
+    handleConfirmBySite(row) {
+     const ids = row.id || this.ids;
+     this.$modal.confirm('请仔细确认,确认后不可撤销').then(function() {
+       return confirmSettleBillBySite(ids);
+     }).then(() => {
+       this.getList();
+       this.$modal.msgSuccess("操作成功");
+     }).catch(() => {});
+   },
 
-      let old=this.billTabs.find(mItem=>mItem.settleBillNo==item.settleBillNo);
-      if(old){
-        this.activeTab=item.settleBillNo;
-      }else{
-        this.billTabs.push(item);
-        this.activeTab=item.settleBillNo;
+   handleGenPayCode(row) {
+    let selItem=this.selectList[0];
+     
+     if(selItem.paymentStatus == 1){
+        this.$modal.msgError("已支付，无需再支付");
+        return 
+     }
+
+    this.resetRefreshId="pay-"+Math.random().toString(36).substring(3,10);
+    this.titleForm="二维码支付";
+    this.openForm=true;
+   },
+    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() {
+      if(this.selectList&&this.selectList.length>0){
+        this.selectList.forEach(item=>{
+          this.download('oms/emisSettleBill/exportBill', {
+            settleBillNo:item.settleBillNo
+          }, `账单${item.settleBillName}.xlsx`)
+        });
       }
    },
-   removeTab(targetName) {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
 
-        var self=this;
-        let tabs = self.billTabs;
-        self.billTabs = tabs.filter(tab => tab.settleBillNo !== targetName);
-        if(self.billTabs.length>0){
-          this.activeTab=self.billTabs[self.billTabs.length-1].settleBillNo;
-        }else{
-          this.activeTab="billList";
-        }
+
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+
+      this.selectList=selection;
+
+      if(this.selectList&&this.selectList.length>0){
+        this.currentSettleBillNo=selection[0].settleBillNo;
+      }
 
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+       this.currentId= row.id || this.ids;
+       this.openForm = true;
+       this.titleForm = "账单修改:"+this.currentSettleBillNo;
+    },
+    handleView(row) {
+       this.id=row.id;
+       this.titleView="查看";
+       this.openView=true;
+    //   this.router.push({ path: '/oms2c/emisSettleBill/viewDetail', query: { id: row.id }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisSettleBill(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
     },
 
+     /** 导出按钮操作 */
+     handleExport() {
+      const loadingInstance = this.$loading({
+            text: '正在导出...'
+      })
+
+      if(this.selectList&&this.selectList.length>0){
+        this.exportData(this.selectList,loadingInstance);
+      }
+      else{
+
+          this.initQueryParams();
+
+          let qExportParam={...this.queryParams};
+          qExportParam=this.addDateRange(qExportParam, this.dateTimeRange,'createTime')
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=20000;
+
+          listEmisSettleBill(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 === 'kjlx') {
+          return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
+        }
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+        if (j === 'custName') {
+          let paymentType=v['paymentType'];
+          if(paymentType==2 || paymentType==4 || paymentType==5 ){
+            return v['custName'];
+          }else{
+            return "";
+          }
+        }
+
+        if (j === 'sendMobile') {
+          return "";
+        }
+        if (j === 'paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
+        }
+
+        if (j === 'pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        }
+        if (j === 'customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        }
+        if (j === 'customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        }
+        if (j === 'packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        }
+        if (j === 'openBillStatus') {
+          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 '/';
+          }
+        }
+        if (j === 'chargeStatus') {
+          if(v[j] == 0){
+            return '未核销';
+          }else{
+            return '已核销';
+          }
+        }
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
+        }
+        return v[j]
+      }))
+    },
+
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
   }
 };
 </script>
 
-<style>
-.el-descriptions-item__label {
-  width: 80px;
-}
-
-.el-descriptions-item__cell {
-    font-weight: 500!important;
-    color: black;
-}
-
-
-.tab-container {
-  width: 100%;
-}
-
-.el-tabs__nav{
-    display: flex !important;
-    flex-wrap: wrap !important;
-}
+<style lang="scss" scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
 </style>
diff --git a/src/views/openpage/onlinePay.vue b/src/views/openpage/onlinePay.vue
index fc5d7d4..a55cd8d 100644
--- a/src/views/openpage/onlinePay.vue
+++ b/src/views/openpage/onlinePay.vue
@@ -131,13 +131,13 @@
                         <span class="item-label">寄件公司:</span><span class="item-value">{{ item.waybillDetail.sendCompany }}</span>
                     </el-col>
                     <el-col :span="24">
-                        <span class="item-label">备注:</span><span class="item-value">{{ item.waybillDetail.remark }} {{ item.waybillDetail.feeRemark }}</span>
+                        <span class="item-label">备注:</span><span class="item-value">{{ item.waybillDetail.feeRemark }}</span>
                     </el-col>
                   </el-row>
               </el-col>
             </el-row>
         </el-form>
-        <div v-if="settleBillItem!=null&&payStatus==0" style="margin-bottom: 20px;">
+        <div v-if="settleBillItem!=null&&payStatus==0" style="margin-bottom: 20px;margin-top: 20px;">
           <el-button  type="primary" style="width: 100%;" @click="handleWeixinPay" >确认付款</el-button>
         </div>
     </div>