diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index 3abdae7b..73330993 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -79,7 +79,7 @@
       <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-tab-pane label="业务置账单异常" name="siteBillError" /> -->
 
     </el-tabs>
 
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 3abdae7b..73330993 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -79,7 +79,7 @@
       <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-tab-pane label="业务置账单异常" name="siteBillError" /> -->
 
     </el-tabs>
 
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 3245bd46..bae67e4f 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -757,26 +757,24 @@ export default {
     handleClick(tab, event) {
 				// console.log(tab, event);
         if (tab.name == 'all') {
-          this.queryParams.blConfirm=null;
+          this.queryParams.blSiteConfirm=null;
 				}
 				else if (tab.name == 'waitConfirm') {
-          this.queryParams.blConfirm='0';
+          this.queryParams.blSiteConfirm='0';
 				}
         else if (tab.name == 'hasConfirm') {
-          this.queryParams.blConfirm='1';
-				}
-        else if (tab.name == 'confirmNotBill') {
-          this.queryParams.blConfirm='2';
+          this.queryParams.blSiteConfirm='1';
 				}
+        // else if (tab.name == 'confirmNotBill') {
+        //   this.queryParams.blSiteConfirm='2';
+				// }
         else if (tab.name == 'billError') {
-          this.queryParams.blConfirm='3';
-				}
-        else if (tab.name == 'siteBillError') {
           this.queryParams.blSiteConfirm='3';
 				}
 
 
 
+
         this.getList();
 		},
 
diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index 3ada043a..3abdae7b 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -1,264 +1,60 @@
 <template>
   <div class="app-container">
-    <!-- <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
-      <el-form-item label="" prop="billNo">
-        <el-input
-          v-model="queryParams.billNo"
-          :placeholder="$t('分账单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="parentBillNo">
-        <el-input
-          v-model="queryParams.parentBillNo"
-          :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="billCode">
-        <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billDate">
-        <el-date-picker clearable
-          v-model="queryParams.billDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('出账时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="billFee">
-        <el-input
-          v-model="queryParams.billFee"
-          :placeholder="$t('账单费用')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="currency">
-        <el-input
-          v-model="queryParams.currency"
-          :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="blSplit">
-        <el-input
-          v-model="queryParams.blSplit"
-          :placeholder="$t('是否已拆单')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="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="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="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-    </SearchForm> -->
-
-    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
-<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-  <!-- :span="6" -->
-  <el-col :span="9">
-    <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-      <el-col :span="24">
-          <el-form-item label="" prop="billCode">
-            <div slot="label">
-                <el-radio-group class="query-label" v-model="queryOrderType">
-                  <el-radio :key="1" label="1">运单号</el-radio>
-                  <!-- <el-radio :key="0" label="0">订单号</el-radio> -->
-                </el-radio-group>
-            </div>
+    <SearchForm slot="pageHeader" :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="4"
+              :rows="2"
             />
-                  <!-- @keyup.enter.native="handleQuery" -->
           </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="查询时间范围" prop="">
-            <div slot="label">
-                  <el-radio-group  class="query-label" v-model="queryOrderDateType">
-                        <el-radio :key="1" label="1">发货时间</el-radio>
-                  </el-radio-group>
-            </div>
-            <elDateAdvPicker      v-model="dateRange"  ></elDateAdvPicker>
+        <el-form-item label="发货时间" prop="">
+            <elDateAdvPicker v-model="dateTimeRange"  ></elDateAdvPicker>
         </el-form-item>
-
-      </el-col>
-    </el-row>
-  </el-col>
-
-  <el-col :span="5">
-    <el-form-item label="寄件网点" prop="productType">
-      <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
-    </el-form-item>
-    <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
-      <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
-    </el-form-item>
-  </el-col>
-  <el-col :span="5">
-      <el-form-item label="月结客户" prop="custNo">
+        <el-form-item label="寄件网点" prop="waybillDetail.sendSiteCode">
+        <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
+      </el-form-item>
+      <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
+        <EmisSiteSimplePicker2  v-model="queryParams.params.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+      </el-form-item>
+      <el-form-item v-if="settleType==2" label="月结客户" prop="custNo">
         <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
       </el-form-item>
       <el-form-item label="付款方式" prop="paymentType" >
-      <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
+          <el-select  v-if="settleType==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="settleType==2" clearable v-model="queryParams.params.paymentType" placeholder="请选择">
           <el-option
-            v-for="dict in dict.type.emis_payment_type"
+            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-col>
-
-  <el-col :span="5">
       <el-form-item :label="$t('回款联系人')" prop="payee">
-        <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+        <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.params.payee"  ></PayeePicker>
       </el-form-item>
     <el-form-item :label="$t('销售联系人')" prop="salesmen">
-      <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+      <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen"  ></SalemanPicker>
     </el-form-item>
     <el-form-item label="寄件公司" prop="sendCompany">
           <el-input
-            v-model="queryParams.sendCompany"
+            v-model="queryParams.params.sendCompany"
             :placeholder="$t('寄件公司')"
             clearable
             @keyup.enter.native="handleQuery"
@@ -267,37 +63,35 @@
 
       <el-form-item label="收件公司" prop="receiveCompany">
             <el-input
-              v-model="queryParams.receiveCompany"
+              v-model="queryParams.params.receiveCompany"
               :placeholder="$t('收件公司')"
               clearable
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-  </el-col>
-</el-row>
 
+      </SearchForm>
 
-</SearchForm>
 
     <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleClick">
-      <el-tab-pane label="待确认" name="waitConfirm" />
+      <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 v-show="activeTab==='waitConfirm'">
-      <!-- <EmisCountryAreaPanel :countryCode="queryParams.countryCode"></EmisCountryAreaPanel> -->
+    <!-- <div v-show="activeTab==='waitConfirm'">
     </div>
     <div v-show="activeTab==='hasConfirm'">
-      <!-- <EmisPcdPanel :countryCode="queryParams.countryCode"></EmisPcdPanel> -->
-    </div>
-    <div v-show="activeTab==='confirmNotBill'">
-      <!-- <EmisPcdPanel :countryCode="queryParams.countryCode"></EmisPcdPanel> -->
-    </div>
+    </div> -->
+    <!-- <div v-show="activeTab==='confirmNotBill'">
+    </div> -->
 
     <XdTable v-loading="loading"
-           border stripe
+           border
            size="mini"
 
            ref="refTable"
@@ -312,62 +106,65 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+
+           :row-style="tableRowClassName"
+
+           highlight-current-row
            >
 
       <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:emisSettleSubBill:add']"
-                >新增</el-button>
-              </el-col> -->
-
-              <el-col :span="1.5">
+              <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                 <el-button
                   type="primary"
                   plain
                   size="mini"
                   :disabled="multiple"
                   @click="handleConfirmByCenter"
-                  v-hasPermi="['emis:emisSettleSubBill:edit']"
+                  v-hasPermi="['emis:emisSettleSubBill:confirmBillByCenter']"
                 >批量确认</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                 <el-button
                   type="primary"
                   plain
                   size="mini"
-                  :disabled="single"
-                  @click="handleConfirmNoBill"
-                  v-hasPermi="['emis:emisSettleSubBill:edit']"
+                  :disabled="multiple"
+                  @click="handleConfirmNoBillByCenter"
+                  v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
                 >确认不出账</el-button>
-              </el-col> -->
-              <el-col :span="1.5">
+              </el-col>
+              <el-col :span="1.5" v-if="activeTab=='waitConfirm'">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleSetBillErrorByCenter"
+                  v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
+                >置账单异常</el-button>
+              </el-col>
+              <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
                 <el-button
                   type="danger"
                   plain
                   size="mini"
                   :disabled="multiple"
                   @click="handleCancelConfirmByCenter"
-                  v-hasPermi="['emis:emisSettleSubBill:edit']"
+                  v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillByCenter']"
                 >取消确认</el-button>
               </el-col>
 
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
                   size="mini"
                   :disabled="single"
                   @click="handleSplit"
-                  v-hasPermi="['emis:emisSettleSubBill:edit']"
+                  v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
                 >拆分子账单</el-button>
-              </el-col>
+              </el-col> -->
 
               <el-col :span="1.5">
                 <el-button
@@ -382,23 +179,72 @@
           </el-row>
       </div>
 
+
+      <div slot="statInfo" style="font-size: 13px;">
+        总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
+        总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
+      </div>
+
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="expand">
+        <template slot-scope="scope">
+            <div style="padding: 8px 50px;background: white;">
+
+              <div style="display:inline-flex" >
+                <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
+                <div>
+                  <el-button
+                    type="text"
+                    size="mini"
+                    style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
+                    @click="handleShowTraceInfo(scope.row)"
+                  >运单详情</el-button>
+                </div>
+              </div>
+               <div class="feeItem">
+                  <ul class="th">
+                    <li>费用名称</li>
+                    <li>费用</li>
+                    <!-- <li>币种</li> -->
+                    <li>描述</li>
+                  </ul>
+                  <ul v-for="(item,index) in scope.row.feeitemList" :key="index">
+                    <li style="background: #f4f4f4;font-weight: 600;">{{$t(item.feeName)}}</li>
+                    <li>{{item.billFee}}</li>
+                    <!-- <li>{{item.currency}}</li> -->
+                    <li>{{item.remark}}</li>
+                  </ul>
+
+                </div>
+
+            </div>
+        </template>
+      </el-table-column>
 
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
       <el-table-column :label="$t('子账单号')" align="center" prop="billNo" min-width="130" />
       <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirm" min-width="120" >
           <template slot-scope="scope">
             <span v-if="scope.row.blConfirm=='0'" >未确认</span>
-            <span v-if="scope.row.blConfirm=='1'" >已确认</span>
+            <el-tag v-if="scope.row.blConfirm=='1'" type="success">已确认</el-tag>
+            <el-tag v-if="scope.row.blConfirm=='2'" type="error">确认不出账</el-tag>
+            <el-tag v-if="scope.row.blConfirm=='3'" type="error">账单异常</el-tag>
           </template>
       </el-table-column>
-      <el-table-column :label="$t('确认人')" align="center" prop="confirmManName" min-width="100" />
-      <!-- <el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
+      <el-table-column :label="$t('财务备注')" align="center" prop="confirmNote" min-width="100" />
+      <el-table-column :label="$t('财务确认人')" align="center" prop="confirmManName" min-width="100" />
+      <el-table-column :label="$t('财务确认时间')" align="center" prop="confirmDate" min-width="170" />
+
+      <el-table-column :label="$t('业务确认状态')" align="center" prop="blSiteConfirm" min-width="120" >
           <template slot-scope="scope">
             <span v-if="scope.row.blSiteConfirm=='0'" >未确认</span>
-            <span v-if="scope.row.blSiteConfirm=='1'" >已确认</span>
+            <el-tag v-if="scope.row.blSiteConfirm=='1'" type="success">已确认</el-tag>
+            <el-tag v-if="scope.row.blSiteConfirm=='2'" type="error">确认不出账</el-tag>
+            <el-tag v-if="scope.row.blSiteConfirm=='3'" type="error">账单异常</el-tag>
           </template>
-      </el-table-column> -->
+      </el-table-column>
+      <el-table-column :label="$t('业务备注')" align="center" prop="siteConfirmNote" min-width="100" />
+      <el-table-column :label="$t('业务确认时间')" align="center" prop="siteConfirmDate" min-width="170" />
 
       <el-table-column :label="$t('结算类型')" align="center" prop="settleType" min-width="100" >
           <template slot-scope="scope">
@@ -431,13 +277,187 @@
       <el-table-column :label="$t('站点确认日期')" align="center" prop="siteConfirmDate" min-width="100" />
       <el-table-column :label="$t('网点确认备注')" align="center" prop="siteConfirmNote" min-width="100" /> -->
 
+
+      <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_status" :value="scope.row.waybillDetail.paymentStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.waybillDetail.pickupMethod"/>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="180" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <span>{{ scope.row.waybillDetail.sendSiteName }}--{{ scope.row.waybillDetail.dispatchUnderlingSiteName }}</span>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="170" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.waybillDetail.estimateDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('发货日期')" align="center" prop="waybillDetail.sendDate" min-width="100" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件员')"  align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==2">{{scope.row.waybillDetail.takePieceEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('合同号')" align="center" prop="waybillDetail.custOrderId" width="100" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作员')"   align="center" prop="waybillDetail.operateEmployeeName" min-width="100" >
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('时效')" align="center" prop="waybillDetail.timeType" min-width="80" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('报关方式')" align="center" prop="waybillDetail.customsEclaration" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.waybillDetail.customsEclaration"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('清关方式')" align="center" prop="waybillDetail.customsClear" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.waybillDetail.customsClear"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('录入人')" align="center" prop="waybillDetail.registerManName" min-width="80" :show-overflow-tooltip="true" />
+
+      <el-table-column :label="$t('客户名称')" align="center" prop="waybillDetail.customerName" min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.customerName}}</span>
+             <span v-else></span>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
+      <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
+
+      <el-table-column :label="$t('是否问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
+              <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('寄件财务中心')" align="center" prop="waybillDetail.sendSiteFincailName" min-width="150" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件手机')" align="center" prop="waybillDetail.sendMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('寄件省')" align="center" prop="waybillDetail.sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件市')" align="center" prop="waybillDetail.sendCityName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件区')" align="center" prop="waybillDetail.sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件地址')" align="center" prop="waybillDetail.sendAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="waybillDetail.blMessage" min-width="150" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <div v-if="scope.row.waybillDetail.blMessage==1" >发送</div>
+              <div v-else>不发送</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('收货人')" align="center" prop="waybillDetail.receiveName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货电话')" align="center" prop="waybillDetail.receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货公司')" align="center" prop="waybillDetail.receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货国家')" align="center" prop="waybillDetail.receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货省')" align="center" prop="waybillDetail.receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货市')" align="center" prop="waybillDetail.receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货区')" align="center" prop="waybillDetail.receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货地址')" align="center" prop="waybillDetail.receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派货短信')" align="center" prop="waybillDetail.blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                <div v-if="scope.row.waybillDetail.blAcceptMessage==1" >发送</div>
+                <div v-else>不发送</div>
+            </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('目的地')" align="center" prop="waybillDetail.destinationName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('目的网点')" align="center" prop="waybillDetail.dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
+
+
+        <el-table-column :label="$t('货物名称')" align="center" prop="waybillDetail.goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('包装类型')" align="center" prop="waybillDetail.packType" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.waybillDetail.packType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
+        <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
+        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
+        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
+        <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
+
+        <el-table-column :label="$t('派件方式')" align="center" prop="waybillDetail.dispatchMethod" min-width="80" >
+          <template slot-scope="scope">
+              <div v-if="scope.row.waybillDetail.dispatchMethod==1" >派送</div>
+              <div v-else>自提</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
+          <template slot-scope="scope">
+             <span v-if="scope.row.waybillDetail.paymentType==3">{{scope.row.waybillDetail.freight}}</span>
+             <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
+        <el-table-column :label="$t('保价金额')" align="center" prop="waybillDetail.insureValue" min-width="80" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('保费')" align="center" prop="waybillDetail.insureFee" min-width="80" :show-overflow-tooltip="true"/> -->
+        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('签收状态')" align="center" prop="waybillDetail.blSign" width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.waybillDetail.blSign=='1'" type="success">已签收</el-tag>
+              <el-tag v-else type="danger">未签收</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('签收时间')" align="center" prop="waybillDetail.signDate" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('签收人')" align="center" prop="waybillDetail.signMan" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件员')" align="center" prop="waybillDetail.dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件网点')" align="center" prop="waybillDetail.dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('录单网点')" align="center" prop="waybillDetail.registerSiteName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
+
+      <!-- <el-table-column :label="$t('数据来源')" align="center" prop="waybillDetail.dataFrom" min-width="80" /> -->
+
+      <!-- <el-table-column label="创建人" align="center" prop="waybillDetail.createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="waybillDetail.createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="waybillDetail.createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="waybillDetail.updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="waybillDetail.updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="waybillDetail.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="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisSettleSubBillForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleSubBillForm>
+    </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 :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
         <emisSettleSubBillView :id="id" ></EmisSettleSubBillView>
@@ -448,7 +468,19 @@
 </template>
 
 <script>
-import { listEmisSettleSubBill, getEmisSettleSubBill, delEmisSettleSubBill, confirmBillByCenter, cancelConfirmBillByCenter } from "@/api/emis/emisSettleSubBill";
+import { listEmisSettleSubBill,
+  getQueryStatInfoMap,
+  delEmisSettleSubBill,
+  confirmBillByCenter,
+  cancelConfirmBillByCenter,
+  confirmNoBillByCenter,
+  setBillErrorByCenter,
+
+  confirmBillBySite,
+  cancelConfirmBillBySite,
+  confirmNoBillBySite,
+  setBillErrorBySite
+} from "@/api/emis/emisSettleSubBill";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisSettleSubBillView from '@/views/emis/emisSettleSubBill/emisSettleSubBillView';
 import emisSettleSubBillForm from '@/views/emis/emisSettleSubBill/emisSettleSubBillForm';
@@ -480,9 +512,11 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
 
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
 
 export default {
-  name: "emisSettleSubBill",
+  name: "SubBillConfirmByMoneyList",
+  // name: "SubBillConfirmByMonthList",
   components: {
     elDateSimplePicker,emisSettleSubBillForm,
     EmisMonthpayAccountPicker,
@@ -500,6 +534,8 @@ export default {
     EmisSiteSimplePicker2,
     ProblemTypePicker,
 
+    TraceWaybillDetailView
+
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@@ -525,10 +561,20 @@ export default {
       // 结算子账单表格数据
       emisSettleSubBillList: [],
 
+      settleType:null,
+
+      queryStatInfoMap:null,
+
       currentId:null,
       openForm: false,
       titleForm: "",
 
+      openTraceInfo:false,
+      openTraceInfoTitle:null,
+      currentTraceBillItem:null,
+      currentTraceBillCode:null,
+
+           // 时间搜索
       // 弹出展示层
       id:null,
       titleView:"",
@@ -566,46 +612,234 @@ export default {
         siteConfirmManCode: null,
         siteConfirmNote: null,
         delFlag: null,
+        params:{
+              customerCode: null,
+              customerName: null,
+              receiveCustomerCode: null,
+              receiveCustomerName: null,
+              thirdCustomerCode: null,
+              thirdCustomerName: null,
+              receiveName: null,
+              receiveCompany: null,
+              receiveMobile: null,
+              receiveTel: null,
+              receiveCountry: null,
+              receiveProvince: null,
+              receiveCity: null,
+              receiveCounty: null,
+              receiveTown: null,
+              receiveAddress: null,
+              receivePostcode: null,
+              receivePcd: null,
+              sendName: null,
+              sendCompany: null,
+              sendMobile: null,
+              sendTel: null,
+              sendCountry: null,
+              sendProvince: null,
+              sendCity: null,
+              sendCounty: null,
+              sendTown: null,
+              sendAddress: null,
+              sendPostcode: null,
+              sendPcd: null,
+              paymentType: null,
+              calcFeeType: null,
+              custNo: null,
+              transLineType: null,
+              productType: null,
+              timeType: null,
+              meterType: null,
+              customsClear: null,
+              customsEclaration: null,
+              estimateDate: null,
+              packType: null,
+              dispatchMethod: null,
+              pickupMethod: null,
+              pickStartDate: null,
+              pickFinishDate: null,
+              pickFailReason: null,
+              intoWarehouseCode: null,
+              intoWarehouseName: null,
+              intoWarehouseAddress: null,
+              intoWarehouseContact: null,
+              intoWarehousePhone: null,
+              intoWarehouseBillCode: null,
+              warehouseInNo: null,
+              customerDeliveryBeginTime: null,
+              customerDeliveryEndTime: null,
+              goodsType: null,
+              goodsInfo: null,
+              goodsPics: null,
+              blPrepareInFreight: null,
+              prepareInEstFee: null,
+              prepareInRealFee: null,
+              prepareInExpress: null,
+              prepareInBillCode: null,
+              prepareInRemark: null,
+              prepareInSupplier: null,
+              totalWeight: null,
+              totalVolume: null,
+              parcelQty: null,
+              billWeight: null,
+              volumeWeight: null,
+              currency: null,
+              settlementWeight: null,
+              feeWeight: null,
+              freight: null,
+              blOverLong: null,
+              blBill: null,
+              blOverWeight: null,
+              overWeightNumber: null,
+              feeRemark: null,
+              thirdCode: null,
+              realValue: null,
+              blInsure: null,
+              insureValue: null,
+              insureValueCurrency: null,
+              insureFeeCurrency: null,
+              insureFee: null,
+              insureRemark: null,
+              insureSiteCode: null,
+              insureDate: null,
+              blPrint: null,
+              printManCode: null,
+              printSite: null,
+              printDate: null,
+              printCount: null,
+              blDispFd: null,
+              transferCode: null,
+              transferBillcode: null,
+              dispFdDate: null,
+              dispFdReason: null,
+              currentSiteCode: null,
+              lastSiteCode: null,
+              registerSiteCode: null,
+              registerDate: null,
+              registerManCode: null,
+              takePieceEmployeeCode: null,
+              sendSiteCode: null,
+              sendDate: null,
+              dispatchManCode: null,
+              dispatchDate: null,
+              dispatchSiteCode: null,
+              produceBillDate: null,
+              produceBillSiteCode: null,
+              produceBillManCode: null,
+              destinationCode: null,
+              destinationProvince: null,
+              destinationCity: null,
+              destinationCounty: null,
+              dispatchUnderlingSiteCode: null,
+              destinationCenterCode: null,
+              marketManCode: null,
+              payee: null,
+              salesmen: null,
+              operateEmployeeCode: null,
+              blIsQuestion: null,
+              problemType: null,
+              problemCause: null,
+              problemDelayDays: null,
+              blMessage: null,
+              blAcceptMessage: null,
+              blGenSubbill: null,
+              signMan: null,
+              signManCode: null,
+              signSiteCode: null,
+              signDate: null,
+              billPicSendRmk: null,
+              billPicDispatchRmk: null,
+              timezoneOffset: null,
+              delFlag: null,
+              remark: null,
+              blSign:null,
+        }
       },
     };
   },
   created() {
+    this.queryParams.blConfirm='0';
+    this.settleType=this.$route.query.settleType;
+
     this.getList();
   },
   methods: {
     handleClick(tab, event) {
-				console.log(tab, event);
-				if (tab.name == 'second') {
-					// 触发‘配置管理’事件
-					// this.second();
-				} else {
-					// 触发‘用户管理’事件
-					// this.first();
+				// console.log(tab, event);
+        if (tab.name == 'all') {
+          this.queryParams.blConfirm=null;
 				}
+				else if (tab.name == 'waitConfirm') {
+          this.queryParams.blConfirm='0';
+				}
+        else if (tab.name == 'hasConfirm') {
+          this.queryParams.blConfirm='1';
+				}
+        else if (tab.name == 'confirmNotBill') {
+          this.queryParams.blConfirm='2';
+				}
+        else if (tab.name == 'billError') {
+          this.queryParams.blConfirm='3';
+				}
+        else if (tab.name == 'siteBillError') {
+          this.queryParams.blSiteConfirm='3';
+				}
+
+
+
+        this.getList();
 		},
+
+    tableRowClassName({row, rowIndex}) {
+        // if (row.blConfirm=='0') {
+        //   return {"color": "black !important"}
+        // }
+        // else if (row.blConfirm=='1') {
+        //   return {};
+        // }
+        // else if (row.blConfirm=='2') {
+        //   return {"color": "black !important"}
+        // }
+        // else if (row.blConfirm=='3') {
+        //   return {"color": "black !important"}
+        // }
+
+        return '';
+    },
     /** 查询结算子账单列表 */
+
+    initQueryParams(){
+      this.queryParams.settleType=this.settleType;
+      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
+    },
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeBillDate && '' != this.daterangeBillDate) {
-        this.queryParams.params["beginBillDate"] = this.daterangeBillDate[0];
-        this.queryParams.params["endBillDate"] = this.daterangeBillDate[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];
-      }
-      listEmisSettleSubBill(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+
+      this.initQueryParams();
+
+      listEmisSettleSubBill(this.queryParams).then(response => {
         this.emisSettleSubBillList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
+
+        // 查询统计
+      getQueryStatInfoMap(this.queryParams).then(response => {
+        this.queryStatInfoMap = response.data;
+      });
+
     },
 
+    handleShowTraceInfo(row){
+        this.openTraceInfoTitle="运单详情【"+row.billCode+"】";
+        this.currentTraceBillCode=row.billCode;
+        this.currentTraceBillItem=row.waybillDetail;
+        this.openTraceInfo=true;
+    },
+
+    handleSplit(){
+
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -628,15 +862,7 @@ 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;
@@ -661,7 +887,36 @@ export default {
         this.$modal.msgSuccess("操作成功");
       }).catch(() => {});
     },
-
+    handleConfirmNoBillByCenter(row) {
+      const ids = row.id || this.ids;
+      this.$prompt('请输入不出账原因', "操作确认", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{1,30}$/,
+        inputErrorMessage: "原因长度必须介于 1 和 30 之间"
+      }).then(({ value }) => {
+        confirmNoBillByCenter(ids,value).then(response => {
+            this.$modal.msgSuccess("操作成功" );
+            this.getList();
+        });
+      }).catch(() => {});
+    },
+    handleSetBillErrorByCenter(row) {
+      const ids = row.id || this.ids;
+      this.$prompt('请输入账单异常原因', "操作确认", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{1,30}$/,
+        inputErrorMessage: "原因长度必须介于 1 和 30 之间"
+      }).then(({ value }) => {
+        setBillErrorByCenter(ids,value).then(response => {
+            this.$modal.msgSuccess("操作成功" );
+            this.getList();
+        });
+      }).catch(() => {});
+    },
     handleView(row) {
        this.id=row.id;
        this.titleView="查看";
@@ -675,16 +930,7 @@ export default {
     cancelForm(){
       this.openForm = false;
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisSettleSubBill(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
+
     /** 导出按钮操作 */
     handleExport() {
     //   this.download('emis/emisSettleSubBill/export', {
@@ -744,14 +990,36 @@ export default {
 };
 </script>
 
-<style scoped>
-  .el-divider{
-    margin-top: 0px;
-    background: 0 0;
-    border-top: 1px solid #E6EBF5;
+<style lang="scss" scoped>
+
+.feeItem{
+
+  border: 1px solid #d4d4d4;
+
+  ul{
+    list-style: none;
+    padding: 0px;
+    margin: 0px;
+    width: 590px;
+    height: 32px;
+    line-height: 32px;
+    border: 1px solid #ffffff;
+    border-top: 0px;
+    font-size: 12px;
+
   }
-  .el-divider__text {
-    color: #0955ee;
-    cursor: pointer;
+  ul li{
+    display:block; width:33%; float:left;text-indent:2em
+  }
+  .th{
+    background:#F1FADE; font-weight:bold; border-top:1px
+  }
+}
+
+
+ .statInfoValue{
+    color: red;
+    font-size: 13px;
+    font-weight: 500;
   }
 </style>