diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index 4b0a3c7c..84b2a0d2 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -1,135 +1,115 @@
 <template>
   <XdPageContainer class="app-container">
-    <el-tabs slot="pageHeader"   v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
-     <el-tab-pane label="全部" name="all" />
-     <el-tab-pane label="未确认" name="waitConfirm" />
-     <el-tab-pane label="已确认" name="hasConfirm" />
-     <el-tab-pane label="确认不出账" name="confirmNotBill" />
-     <!-- <el-tab-pane label="财务置账单异常" name="billError" /> -->
-     <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
-   </el-tabs>
 
-   <el-tabs slot="pageHeader"  v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
-     <el-tab-pane label="待合账" name="waitMerge" />
-     <!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
-   </el-tabs>
+    <div slot="pageHeader" >
+        <el-tabs  v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+          <el-tab-pane label="全部" name="all" />
+          <el-tab-pane label="未确认" name="waitConfirm" />
+          <el-tab-pane label="已确认" name="hasConfirm" />
+          <el-tab-pane label="确认不出账" name="confirmNotBill" />
+        </el-tabs>
 
-   <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
-     size="mini" :maxShow="12"  label-width="100px"
-     v-show="showSearch"
-     @search="handleQuery"
-     @reset="resetQuery"
-     :isShowSearchBtn="true"
-     >
-        <el-form-item label="运单号" prop="billCode">
-           <XdTextareaInput
-             v-model="queryParams.billCode"
-             :placeholder="$t('多个流水号逗号或换行隔开')"
-             clearable
-             :rows="1"
-           />
-         </el-form-item>
-       <el-form-item label="寄件日期" prop="sendDate">
-           <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
-       </el-form-item>
-       <el-form-item label="寄件网点" prop="params.sendSiteCode">
-       <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
-     </el-form-item>
-     <el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
-       <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
-     </el-form-item>
-     <el-form-item label="账单类型"  v-if="actionType==3 || actionType==4" prop="settleType">
-      <el-select  clearable v-model="queryParams.settleType" placeholder="账单类型">
-           <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="params.blSpecialQuote">
-      <el-select  clearable v-model="queryParams.params.blSpecialQuote" placeholder="">
-           <el-option key="1" label="是" value="1"></el-option>
-           <el-option key="0" label="否" value="0"></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item label="业务确认状态"  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="params.transLineType">
-              <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
-     </el-form-item>
+        <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
+            size="mini" :maxShow="12"  label-width="100px"
+            v-show="showSearch"
+            @search="handleQuery"
+            @reset="resetQuery"
+            :isShowSearchBtn="true"
+            >
+                <el-form-item label="运单号" prop="billCode">
+                  <XdTextareaInput
+                    v-model="queryParams.billCode"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
+                    clearable
+                    :rows="1"
+                  />
+                </el-form-item>
+              <el-form-item label="寄件日期" prop="sendDate">
+                  <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
+              </el-form-item>
+              <el-form-item label="寄件网点" prop="params.sendSiteCode">
+              <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" ></EmisSiteSimplePicker1>
+            </el-form-item>
+            <el-form-item label="目的网点" prop="params.dispatchUnderlingSiteCode">
+              <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+            </el-form-item>
+            <el-form-item label="是否特殊报价"  prop="params.blSpecialQuote">
+              <el-select  clearable v-model="queryParams.params.blSpecialQuote" placeholder="">
+                  <el-option key="1" label="是" value="1"></el-option>
+                  <el-option key="0" label="否" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="业务确认状态"  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="params.transLineType">
+                      <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
+            </el-form-item>
 
-    <el-form-item label="产品类型" prop="productType">
-      <TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
-    </el-form-item>
-     <el-form-item label="计费方式"  prop="params.calcFeeType">
-         <el-select   clearable v-model="queryParams.params.calcFeeType" placeholder="请选择">
-           <el-option
-             v-for="dict in dict.type.emis_calc_fee_type"
-             :key="dict.value"
-             :label="dict.label"
-             :value="dict.value"
-           ></el-option>
-        </el-select>
-     </el-form-item>
+            <el-form-item label="产品类型" prop="productType">
+              <TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
+            </el-form-item>
+            <el-form-item label="计费方式"  prop="params.calcFeeType">
+                <el-select   clearable v-model="queryParams.params.calcFeeType" placeholder="请选择">
+                  <el-option
+                    v-for="dict in dict.type.emis_calc_fee_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+            </el-form-item>
 
-     <el-form-item v-if="actionType==2 || actionType==3 || actionType==4" label="月结客户" prop="custNo">
-       <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
-     </el-form-item>
-     <el-form-item label="付款方式" prop="params.paymentType" >
-         <el-select  v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
-           <el-option
-             v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
-             :key="dict.value"
-             :label="dict.label"
-             :value="dict.value"
-           ></el-option>
-       </el-select>
 
-       <el-select  v-if="actionType==2 || actionType==3 || actionType==4" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
-         <el-option
-           v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
-           :key="dict.value"
-           :label="dict.label"
-           :value="dict.value"
-         ></el-option>
-       </el-select>
-     </el-form-item>
-     <el-form-item :label="$t('回款联系人')" prop="params.payee">
-       <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
-     </el-form-item>
-   <el-form-item :label="$t('销售联系人')" prop="params.salesmen">
-     <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" :disabled="actionType==3" ></SalemanPicker>
-   </el-form-item>
-   <el-form-item label="寄件公司" prop="params.sendCompany">
-         <el-input
-           v-model="queryParams.params.sendCompany"
-           :placeholder="$t('寄件公司')"
-           clearable
-           @keyup.enter.native="handleQuery"
-         />
-       </el-form-item>
-
-     <el-form-item label="收件公司" prop="params.receiveCompany">
-           <el-input
-             v-model="queryParams.params.receiveCompany"
-             :placeholder="$t('收件公司')"
-             clearable
-             @keyup.enter.native="handleQuery"
-           />
-         </el-form-item>
-
-         <el-form-item label="问题件类型" prop="problemType">
-            <ProblemTypePicker v-model="queryParams.params.problemType"  ></ProblemTypePicker>
+            <el-form-item label="付款方式" prop="params.paymentType" >
+                <el-select  clearable v-model="queryParams.params.paymentType" placeholder="请选择">
+                  <el-option
+                    v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item :label="$t('回款联系人')" prop="params.payee">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="params.salesmen">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen"  ></SalemanPicker>
           </el-form-item>
+          <el-form-item label="寄件公司" prop="params.sendCompany">
+              <el-input
+                v-model="queryParams.params.sendCompany"
+                :placeholder="$t('寄件公司')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
 
-     </SearchForm>
+            <el-form-item label="收件公司" prop="params.receiveCompany">
+                  <el-input
+                    v-model="queryParams.params.receiveCompany"
+                    :placeholder="$t('收件公司')"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+
+            <el-form-item label="问题件类型" prop="problemType">
+              <ProblemTypePicker v-model="queryParams.params.problemType"  ></ProblemTypePicker>
+            </el-form-item>
+
+        </SearchForm>
+
+    </div>
 
    <XdTable
          slot="pageContent"
          slot-scope="slotProps"
-         :height="(slotProps.contentHeight-60)+'px'"
+         :height="(slotProps.contentHeight)+'px'"
 
          v-loading="loading"
           border
@@ -138,7 +118,7 @@
           ref="refTable"
 
           row-key="id"
-          :storageName="storageName"
+          storageName="SubBillConfirmByMoneyList_main_list"
 
           :data="emisSettleSubBillList"
           :showSearch.sync="showSearch"
@@ -151,11 +131,10 @@
           :row-style="tableRowClassName"
 
           highlight-current-row
+          show-summary :summary-method="getSummaries"
+      >
 
-           show-summary :summary-method="getSummaries"
-          >
-
-     <div slot="toolbar" v-if="actionType==1 || actionType==2">
+     <div slot="toolbar">
        <el-row :gutter="10" class="mb8">
              <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                <el-button
@@ -222,115 +201,6 @@
          </el-row>
      </div>
 
-     <div slot="toolbar" v-if="actionType==3">
-       <el-row :gutter="10" class="mb8">
-             <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleConfirmBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:confirmBillBySite']"
-               >批量确认</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-col :span="1.5" v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleSetBillErrorBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
-               >置账单异常</el-button>
-             </el-col> -->
-             <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
-               <el-button
-                 type="danger"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleCancelConfirmBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
-               >取消确认</el-button>
-             </el-col>
-
-       </el-row>
-     </div>
-
-     <div slot="toolbar"  v-if="actionType==4">
-       <el-row :gutter="10" class="mb8">
-             <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
-               <div style="display:inline-flex;font-size:13px;font-weight:bold;font-weight: bold;line-height: 30px;">
-                 <span>账单名称:</span>
-                 <el-input
-                   size="mini"
-                   style="width:280px"
-                   v-model="billName"
-                   :placeholder="$t('账单名称')"
-                   clearable
-                 />
-                 <span>账单月:</span>
-                 <el-date-picker  size="mini" style="width:120px" v-model="billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
-               </div>
-             </el-col>
-
-             <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleMergeBill"
-                 v-hasPermi="['emis:emisSettleBill:add']"
-               >合账</el-button>
-             </el-col>
-
-             <!-- <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleMergeBill"
-                 v-hasPermi="['emis:emisSettleBill:add']"
-               >自动合账</el-button>
-             </el-col> -->
-
-             <!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="single"
-                 @click="handleSplit"
-                 v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
-               >拆子账单</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:emisSettleSubBill:export']"
-               >导出</el-button>
-             </el-col>
-         </el-row>
-     </div>
-
 
      <div slot="statInfo" style="font-size: 13px;">
        总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
@@ -469,13 +339,13 @@
 
    </XdTable>
 
-   <el-dialog :title="titleMergeForm" :visible.sync="openMergeForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
+   <!-- <el-dialog :title="titleMergeForm" :visible.sync="openMergeForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
      <MergeBillForm :settleBillNo="currentSettleBillNo"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></MergeBillForm>
    </el-dialog>
 
    <el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
      <TraceWaybillDetailView  :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
-   </el-dialog>
+   </el-dialog> -->
 
  </XdPageContainer>
 </template>
@@ -538,7 +408,6 @@ import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPa
 
 export default {
  name: "SubBillConfirmByMoneyList",
- // name: "SubBillConfirmByMonthList",
  components: {
   BillFeeListPanel,
    elDateSimplePicker,emisSettleSubBillForm,
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index bc77498d..208e0055 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -1,18 +1,15 @@
 <template>
   <XdPageContainer class="app-container">
-    <el-tabs slot="pageHeader"   v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
-     <el-tab-pane label="全部" name="all" />
-     <el-tab-pane label="未确认" name="waitConfirm" />
-     <el-tab-pane label="已确认" name="hasConfirm" />
-     <el-tab-pane label="确认不出账" name="confirmNotBill" />
-     <!-- <el-tab-pane label="财务置账单异常" name="billError" /> -->
-     <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
-   </el-tabs>
+    <div slot="pageHeader"   >
+      <el-tabs  v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+        <el-tab-pane label="全部" name="all" />
+        <el-tab-pane label="未确认" name="waitConfirm" />
+        <el-tab-pane label="已确认" name="hasConfirm" />
+        <el-tab-pane label="确认不出账" name="confirmNotBill" />
+        <!-- <el-tab-pane label="财务置账单异常" name="billError" /> -->
+        <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
+      </el-tabs>
 
-   <el-tabs slot="pageHeader"  v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
-     <el-tab-pane label="待合账" name="waitMerge" />
-     <!-- <el-tab-pane label="已合账" name="hasMerge" /> -->
-   </el-tabs>
 
    <SearchForm slot="pageTabs" :model="queryParams" ref="queryForm"
      size="mini" :maxShow="12"  label-width="100px"
@@ -127,11 +124,16 @@
      </SearchForm>
 
 
+    </div>
+
+
+
+
 
    <XdTable
          slot="pageContent"
          slot-scope="slotProps"
-         :height="(slotProps.contentHeight-60)+'px'"
+         :height="(slotProps.contentHeight)+'px'"
 
          v-loading="loading"
           border
@@ -157,7 +159,7 @@
            show-summary :summary-method="getSummaries"
           >
 
-     <div slot="toolbar" v-if="actionType==1 || actionType==2">
+     <div slot="toolbar" >
        <el-row :gutter="10" class="mb8">
              <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                <el-button
@@ -224,114 +226,6 @@
          </el-row>
      </div>
 
-     <div slot="toolbar" v-if="actionType==3">
-       <el-row :gutter="10" class="mb8">
-             <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleConfirmBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:confirmBillBySite']"
-               >批量确认</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-col :span="1.5" v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleSetBillErrorBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
-               >置账单异常</el-button>
-             </el-col>
-             <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
-               <el-button
-                 type="danger"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleCancelConfirmBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
-               >取消确认</el-button>
-             </el-col>
-
-       </el-row>
-     </div>
-
-     <div slot="toolbar"  v-if="actionType==4">
-       <el-row :gutter="10" class="mb8">
-             <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
-               <div style="display:inline-flex;font-size:13px;font-weight:bold;font-weight: bold;line-height: 30px;">
-                 <span>账单名称:</span>
-                 <el-input
-                   size="mini"
-                   style="width:280px"
-                   v-model="billName"
-                   :placeholder="$t('账单名称')"
-                   clearable
-                 />
-                 <span>账单月:</span>
-                 <el-date-picker  size="mini" style="width:120px" v-model="billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
-               </div>
-             </el-col>
-
-             <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleMergeBill"
-                 v-hasPermi="['emis:emisSettleBill:add']"
-               >合账</el-button>
-             </el-col>
-
-             <!-- <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleMergeBill"
-                 v-hasPermi="['emis:emisSettleBill:add']"
-               >自动合账</el-button>
-             </el-col> -->
-
-             <!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="single"
-                 @click="handleSplit"
-                 v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
-               >拆子账单</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:emisSettleSubBill:export']"
-               >导出</el-button>
-             </el-col>
-         </el-row>
-     </div>
 
 
      <div slot="statInfo" style="font-size: 13px;">
@@ -820,33 +714,6 @@ export default {
     this.storageName="SubBillConfirmByMonthList_main";
     this.queryParams.blConfirmCenter=0;
    },
-   initData_old(){
-    //  if(this.actionType==1){
-    //      this.storageName="SubBillConfirmByMoneyList_main";
-    //      this.queryParams.blConfirmCenter=0;
-    //  }
-    //  else if(this.actionType==2){
-    //    this.storageName="SubBillConfirmByMonthList_main";
-    //    this.queryParams.blConfirmCenter=0;
-    //  }
-    //  else if(this.actionType==3){
-    //    this.storageName="SubBillConfirmBySitehList_main";
-    //    this.queryParams.blConfirmSite=0;
-    //  }
-    //  else if(this.actionType==4){
-    //     var date = new Date();
-    //     var year = date.getFullYear();
-    //     var month = date.getMonth();
-    //     var toMonth = year + "-" + this.lpadZero(month + 1,2);
-    //     this.billMonth = toMonth;
-
-    //     this.queryParams.blConfirmCenter=1;
-    //     this.queryParams.blConfirmSite=1;
-
-    //    this.storageName="subBillMergeMgnt_main";
-    //    this.activeTab='waitMerge';
-    //  }
-   },
    handleClick(tab, event) {
        // console.log(tab, event);
        if(this.actionType==1|| this.actionType==2){