From 97bd4c3811971e04de5461a6932fe0c574d66e7f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 24 Nov 2024 16:24:14 +0800
Subject: [PATCH] md

---
 .../emisSettleBill/BillPaybackBillList.vue    |   2 +-
 .../CustSettleBillQueryList.vue               |   2 +-
 .../emisSettleBill/SiteInvoiceRecordApply.vue |   7 +-
 .../panel/BillDetailPanelReadOnly.vue         |  28 +-
 .../panel/ChargeBillMoneyPanel.vue            |   2 +-
 .../panel/ChargeBillMonthPanel.vue            |   2 +-
 .../emis/emisSettleBill/panel/MoneyPanel.vue  |   2 +-
 .../emis/emisSettleBill/panel/MonthPanel.vue  |   2 +-
 .../emisSettleBill/panel/SiteConfimPanel.vue  |   2 +-
 .../panel/SiteConfirmSubBillListPanel.vue     |  58 +-
 .../panel/SiteWaitOpenBillPanel.vue           |   2 +-
 .../SubBillConfirmByMoneyList.vue             |   2 +-
 .../SubBillConfirmByMonthList.vue             |   2 +-
 .../SubBillConfirmBySiteList.vue              |   2 +-
 .../emis/emisSettleSubBill/SubBillList.vue    | 999 ------------------
 .../emisSettleSubBill/subBillMergeMgnt.vue    |   2 +-
 16 files changed, 24 insertions(+), 1092 deletions(-)
 delete mode 100644 src/views/emis/emisSettleSubBill/SubBillList.vue

diff --git a/src/views/emis/emisSettleBill/BillPaybackBillList.vue b/src/views/emis/emisSettleBill/BillPaybackBillList.vue
index cc98657a..f6bdf820 100644
--- a/src/views/emis/emisSettleBill/BillPaybackBillList.vue
+++ b/src/views/emis/emisSettleBill/BillPaybackBillList.vue
@@ -58,7 +58,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
index 3af1dfbd..91cc45da 100644
--- a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
+++ b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
@@ -187,7 +187,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
index 76061f39..197fda52 100644
--- a/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
+++ b/src/views/emis/emisSettleBill/SiteInvoiceRecordApply.vue
@@ -13,7 +13,8 @@
             <EmisSettleInvoiceRecordForm :billList="selectBillList"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSettleInvoiceRecordForm>
           </el-tab-pane>
           <el-tab-pane label="账单详情"  name="billDetail" v-if="showBillDetail" closable>
-            <SiteConfirmSubBillListPanel :settleBillNo="curSettleBillNo"></SiteConfirmSubBillListPanel>
+            <BillDetailPanelReadOnly :key="'Detail_'+curSettleBillNo" :settleBillNo="curSettleBillNo"></BillDetailPanelReadOnly>
+            <!-- <SiteConfirmSubBillListPanel :settleBillNo="curSettleBillNo"></SiteConfirmSubBillListPanel> -->
           </el-tab-pane>
           <el-tab-pane label="开票详情"  name="applyDetail" v-if="showApplyDetail" closable>
             <InvoiceDetailPanel :id="currApplyId"></InvoiceDetailPanel>
@@ -33,6 +34,7 @@ import InvoiceDetailPanel from '@/views/emis/emisSettleInvoiceRecord/panel/Invoi
 import SiteWaitOpenBillPanel from '@/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue';
 import EmisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm';
 import SiteConfirmSubBillListPanel from '@/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue';
+import BillDetailPanelReadOnly from '@/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue';
 
 export default {
   name: "SiteInvoiceRecordApply",
@@ -41,7 +43,8 @@ export default {
     InvoiceDetailPanel,
     SiteWaitOpenBillPanel,
     EmisSettleInvoiceRecordForm,
-    SiteConfirmSubBillListPanel
+    SiteConfirmSubBillListPanel,
+    BillDetailPanelReadOnly
  },
   dicts: [
   ],
diff --git a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
index 54ec52a3..6cccd6ad 100644
--- a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
+++ b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
@@ -51,7 +51,7 @@
           <el-tag type="success" v-if="settleBillItem.openBillStatus==1">已开票</el-tag>
           <el-tag type="warning" v-if="settleBillItem.openBillStatus==2">部分开票</el-tag>
           <el-tag type="warning" v-if="settleBillItem.openBillStatus==3">不开票</el-tag>
-          <el-tag type="danger" v-if="settleBillItem.openBillStatus==4">已完成</el-tag>
+          <el-tag type="success" v-if="settleBillItem.openBillStatus==4">已完成</el-tag>
 
         </div>
 
@@ -66,36 +66,20 @@
         </div> -->
     </div>
     <div style="margin-bottom:20px">
-
-
-        <!--
-          <div>最高可开票金额:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已开票:<span style="color:blue;font-weight:500;"></span></div>
-        -->
         <div>
-          <!-- <div>已开发票列表</div>
-          <InvoiceChRecordListReadOnly :settleBillNo="settleBillNo" > </InvoiceChRecordListReadOnly> -->
           <div>开票记录</div>
           <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList>
         </div>
 
-        <!-- <div>开票单号</div>
-        <div>
-            <InvoiceSubBillRelList :settleBillNo="settleBillNo" > </InvoiceSubBillRelList>
-        </div> -->
-
-
     </div>
 
-    <!--
     <div style="margin-bottom:20px">
-      <div style="font-weight:500;margin-bottom:20px">
-            子账单列表:
-      </div>
+      <div>运单账单列表</div>
       <div>
-        <SubBillList :settleBillNo="settleBillNo"> </SubBillList>
+        <SubBillListReadOnly :settleBillNo="settleBillNo"> </SubBillListReadOnly>
       </div>
     </div>
-    -->
+
  </div>
 </template>
 
@@ -108,7 +92,7 @@ import PayRecordSubBillRelList from '@/views/emis/emisSettlePayRecord/panel/PayR
 import InvoiceRecordList from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue';
 import InvoiceSubBillRelList from '@/views/emis/emisSettleInvoiceRel/InvoiceSubBillRelList.vue';
 
-import SubBillList from '@/views/emis/emisSettleSubBill/SubBillList.vue';
+import SubBillListReadOnly from '@/views/emis/emisSettleSubBill/SubBillListReadOnly.vue';
 import InvoiceChRecordListReadOnly from '@/views/emis/emisSettleInvoiceChRecord/InvoiceChRecordListReadOnly.vue';
 
 
@@ -126,7 +110,7 @@ export default {
     InvoiceRecordList,
     InvoiceSubBillRelList,
 
-    SubBillList,
+    SubBillListReadOnly,
     InvoiceChRecordListReadOnly
  },
   dicts: [
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
index c8363ecf..943a4f46 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue
@@ -189,7 +189,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
index ccd7e140..61248e05 100644
--- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue
@@ -149,7 +149,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
index 8c944663..dd2fa377 100644
--- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue
@@ -187,7 +187,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleBill/panel/MonthPanel.vue b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
index 1bc149fe..5282e309 100644
--- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue
@@ -163,7 +163,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
index a050c6de..f057f217 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue
@@ -192,7 +192,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
index b566fcf9..16585737 100644
--- a/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteConfirmSubBillListPanel.vue
@@ -133,19 +133,6 @@
         </el-table-column>
         <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
 
-        <!-- <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
-                <span v-else>否</span>
-              </template>
-          </el-table-column> -->
-       <!-- </el-table-column>
-          <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
-              </template>
-          </el-table-column> -->
-
         <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.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('月结编号')" align="center" prop="custNo" min-width="150" :show-overflow-tooltip="true">
@@ -159,14 +146,6 @@
             </template>
         </el-table-column>
 
-        <!-- <el-table-column :label="$t('取件员/操作员')"  align="center" prop="takePieceEmployeeName" min-width="170" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-                <span v-if="scope.row.pickupMethod==1">{{scope.row.waybillDetail.operateEmployeeName}}</span>
-                <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.sendName" min-width="80" :show-overflow-tooltip="true"/>
           <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" />
@@ -193,7 +172,7 @@
               <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="danger">已完成</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="recedMoney" width="120" :show-overflow-tooltip="true"/>
@@ -204,41 +183,6 @@
           <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.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>
-                  <span v-else >/</span>
-              </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="blConfirmCenter" min-width="120" >
-            <template slot-scope="scope">
-              <span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
-              <el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
-              <el-tag v-if="scope.row.blConfirmCenter=='2'" type="error">确认不出账</el-tag>
-              <el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
-            </template>
-          </el-table-column> -->
-          <!-- <el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" /> -->
-          <!-- <el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" /> -->
-          <!-- <el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" /> -->
-
-          <!-- <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
-            <template slot-scope="scope">
-              <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
-              <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
-              <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
-              <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
-            </template>
-        </el-table-column> -->
-        <!-- <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" /> -->
-        <!-- <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" /> -->
-        <!-- <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" /> -->
-
-
         </XdTable>
 
 
diff --git a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
index d28b5484..8fbe7b8f 100644
--- a/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
+++ b/src/views/emis/emisSettleBill/panel/SiteWaitOpenBillPanel.vue
@@ -169,7 +169,7 @@
                 <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="danger">已完成</el-tag>
+                <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
               </template>
             </el-table-column>
 
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index cf8f35c2..355d3140 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -342,7 +342,7 @@
             <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="danger">已完成</el-tag>
+            <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
           </template>
         </el-table-column>
 
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 60b7def6..363a5ee6 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -368,7 +368,7 @@
                   <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="danger">已完成</el-tag>
+                  <el-tag v-if="scope.row.openBillStatus=='4'" type="success">已完成</el-tag>
                 </template>
               </el-table-column>
 
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index bbbd671e..db8a741b 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -365,7 +365,7 @@
             <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="danger">已完成</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="blSpecialQuote" min-width="120"   >
diff --git a/src/views/emis/emisSettleSubBill/SubBillList.vue b/src/views/emis/emisSettleSubBill/SubBillList.vue
deleted file mode 100644
index 05aef120..00000000
--- a/src/views/emis/emisSettleSubBill/SubBillList.vue
+++ /dev/null
@@ -1,999 +0,0 @@
-<template>
-  <div>
-
-   <XdTable
-         slot="pageContent"
-         slot-scope="slotProps"
-         :height="(slotProps.contentHeight)+'px'"
-
-         v-loading="loading"
-          border
-          size="mini"
-
-          ref="refTable"
-
-          row-key="id"
-          storageName="SubBillConfirmBySiteList_main_dtl"
-
-          :data="emisSettleSubBillList"
-          :showSearch.sync="showSearch"
-          :queryParams="queryParams"
-          :total="total"
-          @queryTable="getList"
-          @selection-change="handleSelectionChange"
-          highlight-current-row
-           show-summary :summary-method="getSummaries"
-          >
-
-     <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;padding: 15px 0px;" >
-                <div style="font-weight:500">总费用(CNY):<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 style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
-
-              <div style="width: 500px;">
-                  <BillFeeListPanel :key="'feeitem_'+scope.$index" :feeitemList="scope.row.feeitemList"></BillFeeListPanel>
-              </div>
-           </div>
-       </template>
-     </el-table-column>
-
-     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true"  />
-     <el-table-column :label="$t('子账单')" align="center" prop="billNo" width="130" :show-overflow-tooltip="true"/>
-
-     <el-table-column :label="$t('预警提示')" align="center" prop="waybillDetail.blSpecialQuote" width="150"   :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span v-if="scope.row.blConfirmCenter=='0'" style="color:red;font-weight:500">财务未确认,</span>
-            <span v-if="scope.row.blConfirmSite=='0'" style="color:red;font-weight:500">业务未确认</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="waybillDetail.blSpecialQuote" width="80"     :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
-            <span v-else>否</span>
-          </template>
-      </el-table-column>
-      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="80" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
-          </template>
-      </el-table-column>
-     <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :sortable="true"    :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.sendCompany" min-width="150" :sortable="true"   :show-overflow-tooltip="true"/>
-
-     <!-- <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :sortable="true"   :show-overflow-tooltip="true">
-       <template slot-scope="scope">
-           <span  v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custNo }}</span>
-         </template>
-     </el-table-column> -->
-
-     <el-table-column  :label="$t('月结客户')" align="center" prop="custName" min-width="150"  :sortable="true"   :show-overflow-tooltip="true">
-       <template slot-scope="scope">
-           <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.custName }}</span>
-         </template>
-     </el-table-column>
-
-
-     <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="80" :sortable="true"   :show-overflow-tooltip="true"/>
-
-     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :sortable="true"   :show-overflow-tooltip="true">
-       <template slot-scope="scope">
-            <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
-         </template>
-     </el-table-column>
-
-
-       <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.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="120" :sortable="true"  />
-       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80"    >
-            <template slot-scope="scope">
-                <span  style="color: red;font-weight: 500" v-if="scope.row.waybillDetail.realFee!=scope.row.waybillDetail.freight">{{scope.row.waybillDetail.freight}}</span>
-                <span v-else>{{scope.row.waybillDetail.freight}}</span>
-            </template>
-          </el-table-column>
-       <el-table-column :label="$t('标准报价')" align="center" prop="waybillDetail.realFee" min-width="80"    />
-       <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.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="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true"  />
-       <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100"  :sortable="true" />
-       <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100"   :sortable="true" />
-
-       <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>
-               <span v-else >/</span>
-           </template>
-         </el-table-column>
-       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sortable="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="blConfirmCenter" min-width="120"    >
-         <template slot-scope="scope">
-           <span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
-           <el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
-           <el-tag v-if="scope.row.blConfirmCenter=='2'" type="error">确认不出账</el-tag>
-           <el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
-         </template>
-       </el-table-column>
-       <el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100"    />
-       <el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170"    />
-       <el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100"  />
-
-       <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120"   >
-         <template slot-scope="scope">
-           <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
-           <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
-           <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
-           <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
-         </template>
-     </el-table-column>
-     <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170"    />
-     <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100"    />
-     <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100"   />
-     <el-table-column :label="$t('出账日期')" align="center" prop="createTime" min-width="170"    />
-
-
-   </XdTable>
-
-   <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>
-
- </div>
-</template>
-
-<script>
-import { listEmisSettleSubBill,getQueryStatInfoMap,
-} from "@/api/emis/emisSettleSubBill";
-
-import { listEmisSettleBill, addEmisSettleBill } from "@/api/emis/emisSettleBill";
-
-import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
-
-
-import { parseTime,genJsSeqNo } from "@/utils/custom";
-
-export default {
- name: "SubBillConfirmBySiteList",
- props:{
-    settleBillNo:{
-        type:String
-    }
-  },
- components: {
-   TraceWaybillDetailView,
- },
- 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: "waitConfirm",
-     // 遮罩层
-     loading: true,
-     // 选中数组
-     ids: [],
-     // 非单个禁用
-     single: true,
-     // 非多个禁用
-     multiple: true,
-     // 显示搜索条件
-     showSearch: true,
-     // 创建时间搜索
-     dateTimeRange:[],
-     // 总条数
-     total: 0,
-     // 结算子账单表格数据
-     emisSettleSubBillList: [],
-
-     actionType:null,
-     settleType:null,
-
-     billName:null,
-     billMonth:null,
-
-     titleMergeForm:null,
-     openMergeForm:false,
-
-     currentSettleBillNo:null,
-     selectBillList:[],
-
-
-     storageName:null,
-
-     queryStatInfoMap:null,
-
-     currentId:null,
-     openForm: false,
-     titleForm: "",
-
-     openTraceInfo:false,
-     openTraceInfoTitle:null,
-     currentTraceBillItem:null,
-     currentTraceBillCode:null,
-
-          // 时间搜索
-     // 弹出展示层
-     id:null,
-     titleView:"",
-     openView: false,
-     // 更新网点时间范围
-     daterangeBillDate: [],
-     // 更新网点时间范围
-     daterangeCreateTime: [],
-     // 更新网点时间范围
-     daterangeUpdateTime: [],
-     // 查询参数
-     queryParams: {
-      pageNum: 1,
-        pageSize: 20,
-        billNo: null,
-        parentBillNo: null,
-        settleBillNo: null,
-        billCode: null,
-        billDate: null,
-        billFee: null,
-        currency: null,
-        settleType: null,
-        blSplit: null,
-        blMerge: null,
-        billMonth: null,
-        custNo: null,
-        customerCode: null,
-        customerName: null,
-        payee: null,
-        salesmen: null,
-        blSpecialQuote: null,
-        blSensitive: null,
-        blConfirmCenter: null,
-        confirmCenterDate: null,
-        confirmCenterNote: null,
-        confirmCenterManCode: null,
-        confirmCenterCode: null,
-        blConfirmSite: null,
-        confirmSiteDate: null,
-        confirmSiteManCode: null,
-        confirmSiteNote: null,
-        confirmSiteCode: 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,
-
-             mergeStatus:null,
-
-             problemQueryType:null,
-             problemQueryIds:null,
-
-       }
-     },
-   };
- },
- watch: {
-    settleBillNo(newVal){
-      this.queryParams.settleBillNo=this.settleBillNo;
-      this.initData();
-      this.getList();
-
-    }
-  },
- created() {
-  //  this.queryParams.blConfirmCenter='0';
-   this.actionType=this.$route.query.actionType;
-
-   this.initData();
-   this.getList();
- },
- methods: {
-   initData(){
-    this.storageName="SubBillConfirmBySitehList_subbilllist_main";
-   },
-
-   /** 查询结算子账单列表 */
-
-   initQueryParams(){
-
-    // if(this.$store.getters.ownerSiteCode != '88888'){
-    //    this.queryParams.params.salesmen=this.$store.getters.empName
-    //   }
-
-     if(this.queryParams.confirmStatus==1){
-        this.queryParams.blConfirmCenter=0;
-        this.queryParams.blConfirmSite=null;
-     }
-     else if(this.queryParams.confirmStatus==2){
-      this.queryParams.blConfirmCenter=null;
-      this.queryParams.blConfirmSite=0;
-     }
-
-     this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
-
-      let qParam=null;
-      if(this.queryParams.billCode){
-        qParam={
-          pageNum:this.queryParams.pageNum,
-          pageSize:this.queryParams.pageSize,
-          billCode:this.queryParams.billCode,
-        }
-      }else{
-        qParam=this.queryParams
-      }
-
-      return qParam;
-    },
-
-
-   getList() {
-     this.loading = true;
-
-     let qParam=this.initQueryParams();
-     listEmisSettleSubBill(qParam).then(response => {
-       this.emisSettleSubBillList = response.rows;
-       this.total = response.total;
-       this.loading = false;
-     });
-
-       // 查询统计
-     getQueryStatInfoMap(qParam).then(response => {
-       this.queryStatInfoMap = response.data;
-     });
-
-   },
-   //指定列求和
-   getSummaries(param) {
-       const { columns, data } = param;
-      //  console.log("===>getSummaries==>",param)
-       const sums = [];
-       columns.forEach((column, index) => {
-             if (index === 0) {
-               sums[index] = '合计';
-               return;
-             }
-
-
-             if (
-               column.property === 'waybillDetail.billWeight'
-               ) {
-                 const values = data.map(item => Number(item.waybillDetail.billWeight));
-                 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 === 'waybillDetail.volumeWeight'
-
-               ) {
-                 const values = data.map(item => Number(item.waybillDetail.volumeWeight));
-
-                 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 === 'waybillDetail.freight'
-
-               ) {
-                 const values = data.map(item => Number(item.waybillDetail.freight));
-
-                 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 === 'waybillDetail.totalVolume'
-               ) {
-                 const values = data.map(item => Number(item.waybillDetail.totalVolume));
-                 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(5); //保留2位小数
-               }
-             else if(
-               column.property === 'waybillDetail.parcelQty'
-             ){
-                  const values = data.map(item => Number(item.waybillDetail.parcelQty));
-                   sums[index] = values.reduce((prev, curr) => {
-                   const value = Number(curr);
-                   if (!isNaN(value)) {
-                     return prev + curr;
-                   } else {
-                     return prev;
-                   }
-                 }, 0);
-                 sums[index];
-             }
-       });
-     console.log(sums);
-     return sums
-   },
-
-   handleShowTraceInfo(row){
-       this.openTraceInfoTitle="运单详情【"+row.billCode+"】";
-       this.currentTraceBillCode=row.billCode;
-       this.currentTraceBillItem=row.waybillDetail;
-       this.openTraceInfo=true;
-   },
-
-   handleMergeBill(){
-
-    if(!this.billName){
-      this.$modal.msgError("账单名称不能为空!");
-      return;
-    }
-
-    if(!this.billMonth){
-      this.$modal.msgError("账单月不能为空!");
-      return;
-    }
-
-    this.$confirm("确定合账吗?", "提示", {
-          cancelButtonText: "否",
-          confirmButtonText: "确定",
-          type: "warning",
-          distinguishCancelAndClose: true,
-          closeOnClickModal: false
-      }).then(() => {
-
-        this.currentSettleBillNo=genJsSeqNo();
-
-        let startDate =  new Date(this.billMonth+"-01 00:00:00");
-        let endDate= this.getMonthLast(startDate);
-        endDate.setHours(23,59,59,0)
-
-        let settleBillForm={
-            settleBillNo: this.currentSettleBillNo,
-            settleBillName: this.billName,
-            billMonth: this.billMonth,
-            settleStartDate:parseTime(startDate),
-            settleEndDate:parseTime(endDate),
-            subBillList:this.selectBillList,
-        }
-
-
-        // 生成合账单号
-        addEmisSettleBill(settleBillForm).then(response => {
-              this.$modal.msgSuccess("合并成功");
-              this.$emit("on-changed");
-              // this.titleMergeForm="账单-"+this.currentSettleBillNo;
-              // this.openMergeForm=true;
-        });
-
-
-      }).catch(() => {});
-   },
-
-   handleAutoMergeBill(){
-
-      if(!this.billMonth){
-        this.$modal.msgError("账单月不能为空!");
-        return;
-      }
-
-      this.$confirm("确定自动合账吗?", "提示", {
-            cancelButtonText: "否",
-            confirmButtonText: "确定",
-            type: "warning",
-            distinguishCancelAndClose: true,
-            closeOnClickModal: false
-        }).then(() => {
-
-          this.currentSettleBillNo=genJsSeqNo();
-
-          let startDate =  new Date(this.billMonth+"-01 00:00:00");
-          let endDate= this.getMonthLast(startDate);
-          endDate.setHours(23,59,59,0)
-
-          let settleBillForm={
-              settleBillNo: this.currentSettleBillNo,
-              settleBillName: this.billName,
-              billMonth: this.billMonth,
-              settleStartDate:parseTime(startDate),
-              settleEndDate:parseTime(endDate),
-              subBillList:this.selectBillList,
-          }
-
-
-          // 生成合账单号
-          addEmisSettleBill(settleBillForm).then(response => {
-                this.$modal.msgSuccess("合并成功");
-                this.$emit("on-changed");
-                this.titleMergeForm="账单-"+this.currentSettleBillNo;
-                this.openMergeForm=true;
-          });
-
-
-        }).catch(() => {});
-  },
-
-   // 获取当前月的最后一天
-  getMonthLast(date) {
-        var currentMonth = date.getMonth()
-        var nextMonth = ++currentMonth
-        var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)
-        var oneDay = 1000 * 60 * 60 * 24
-        return new Date(nextMonthFirstDay - oneDay)
-   },
-
-   handleSplit(){
-
-   },
-   /** 搜索按钮操作 */
-   handleQuery() {
-     this.queryParams.pageNum = 1;
-     this.getList();
-   },
-   /** 重置按钮操作 */
-   resetQuery() {
-     this.resetForm("queryForm");
-     this.handleQuery();
-   },
-
-  lpadZero(val,len) {
-    return (new Array(len + 1).join('0') + val).slice(-len);
-  },
-   // 多选框选中数据
-   handleSelectionChange(selection) {
-     this.ids = selection.map(item => item.id)
-     this.single = selection.length!==1
-     this.multiple = !selection.length
-
-     this.selectBillList=selection;
-     if(this.selectBillList&&this.selectBillList.length>0){
-        const item0=this.selectBillList[0];
-        this.billName=item0.waybillDetail.customerName+"账单-"+this.billMonth;
-     }else{
-      this.billName=null;
-     }
-   },
-   sortFun: function (attr, rev) {
-            //第一个参数传入info里的prop表示排的是哪一列，第二个参数是升还是降排序
-            if (rev == undefined) {
-                rev = 1;
-            } else {
-                rev = (rev) ? 1 : -1;
-            }
-
-            return function (a, b) {
-                a = a[attr];
-                b = b[attr];
-                if (a < b) {
-                    return rev * -1;
-                }
-                if (a > b) {
-                    return rev * 1;
-                }
-                return 0;
-            }
-    },
-
-   // 排序 查询字段是表格中字段名字 动态取值排序顺序
-   handleSortChange(column) {
-
-      console.log(column)
-      this.currentPage = 1 // return to the first page after sorting
-      if (column.prop === 'billCode') {
-          this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
-          console.log(this.emisSettleSubBillList);
-      } else if (column.prop === 'waybillDetail.sendDate') {
-          this.emisSettleSubBillList = this.emisSettleSubBillList.sort(
-            this.sortFun(column.prop, column.order === 'ascending')
-          );
-          console.log(this.emisSettleSubBillList);
-      }else if (column.prop === 'priority') {
-          this.emisSettleSubBillList = this.emisSettleSubBillList.sort(this.sortFun(column.prop, column.order === 'ascending'));
-          console.log(this.emisSettleSubBillList);
-      }
-      // this.showed_data = this.emisSettleSubBillList.slice(0, this.pageSize) // 排序完显示到第一页
-      console.log('Finished')
-      // console.log(this.showed_data)
-
-    // console.log("==column.prop==>",column.prop);
-    // if(column.prop=='billCode'){
-    //   this.queryParams.params.orderByColumn = 'billCode';
-    // }
-    // else if(column.prop=='waybillDetail.sendDate'){
-    //   this.queryParams.params.orderByColumn = 'sendDate';
-    // }
-
-    //  this.queryParams.isAsc = column.order;
-    //  this.getList();
-   },
-
-   /** 修改按钮操作 */
-   handleUpdate(row) {
-      this.currentId= row.id;
-      this.openForm = true;
-      this.titleForm = "修改";
-   },
-   handleConfirmByCenter(row) {
-     const ids = row.id || this.ids;
-     this.$modal.confirm('是否确认').then(function() {
-       return confirmBillByCenter(ids);
-     }).then(() => {
-       this.getList();
-       this.$modal.msgSuccess("操作成功");
-     }).catch(() => {});
-   },
-   handleCancelConfirmByCenter(row) {
-     const ids = row.id || this.ids;
-     this.$modal.confirm('是否取消确认').then(function() {
-       return cancelConfirmBillByCenter(ids);
-     }).then(() => {
-       this.getList();
-       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(() => {});
-   },
-
-   handleConfirmBySite(row) {
-     const ids = row.id || this.ids;
-     this.$modal.confirm('是否确认').then(function() {
-       return confirmBillBySite(ids);
-     }).then(() => {
-        let empName=this.$store.getters.empName;
-        let message=empName+" 确认了出账明细，请及时出账单！";
-        this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059,88888083",message);
-
-       this.getList();
-       this.$modal.msgSuccess("操作成功");
-     }).catch(() => {});
-   },
-   handleCancelConfirmBySite(row) {
-     const ids = row.id || this.ids;
-     this.$modal.confirm('是否取消确认').then(function() {
-       return cancelConfirmBillBySite(ids);
-     }).then(() => {
-       this.getList();
-       this.$modal.msgSuccess("操作成功");
-     }).catch(() => {});
-   },
-   handleConfirmNoBillBySite(row) {
-     const ids = row.id || this.ids;
-     this.$prompt('请输入不出账原因', "操作确认", {
-       confirmButtonText: "确定",
-       cancelButtonText: "取消",
-       closeOnClickModal: false,
-       inputPattern: /^.{1,30}$/,
-       inputErrorMessage: "原因长度必须介于 1 和 30 之间"
-     }).then(({ value }) => {
-       confirmNoBillBySite(ids,value).then(response => {
-           this.$modal.msgSuccess("操作成功" );
-           this.getList();
-       });
-     }).catch(() => {});
-   },
-   handleSetBillErrorBySite(row) {
-     const ids = row.id || this.ids;
-     this.$prompt('请输入账单异常原因', "操作确认", {
-       confirmButtonText: "确定",
-       cancelButtonText: "取消",
-       closeOnClickModal: false,
-       inputPattern: /^.{1,30}$/,
-       inputErrorMessage: "原因长度必须介于 1 和 30 之间"
-     }).then(({ value }) => {
-       setBillErrorBySite(ids,value).then(response => {
-           this.$modal.msgSuccess("操作成功" );
-           this.getList();
-       });
-     }).catch(() => {});
-   },
-
-   handleFormChanged(){
-       this.openForm = false;
-       this.getList();
-   },
-   cancelForm(){
-     this.openForm = false;
-   },
-
-   /** 导出按钮操作 */
-   handleExport() {
-   //   this.download('emis/emisSettleSubBill/export', {
-   //     ...this.queryParams
-   //   }, `emisSettleSubBill_${new Date().getTime()}.xlsx`)
-    const loadingInstance = this.$loading({
-           text: '正在导出...'
-       })
-       let qParam=this.initQueryParams();
-      qParam.pageNum=1;
-      qParam.pageSize=5000;
-
-      listEmisSettleSubBill(qParam).then(response => {
-       this.downloadLoading = false
-       if (response.code === 200) {
-               const curList = response.rows
-               import('@/vendor/Export2Excel').then(excel => {
-                 const tHeader = ['id','分账单号','父账单号','总结算账单号','运单号','出账时间','账单费用','费用币种','结算账单类型','是否已拆单','账单月份','月结编号','客户编码','客户名称','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
-                 const filterVal = ['id','billNo','parentBillNo','settleBillNo','billCode','billDate','billFee','currency','settleType','blSplit','billMonth','custNo','customerCode','customerName','blConfirm','confirmDate','confirmSite','confirmManCode','blSiteConfirm','confirmNote','siteConfirmDate','siteConfirmManCode','siteConfirmNote','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                 const data = this.formatJson(filterVal, curList, response.rows)
-                 excel.export_json_to_excel({
-                   header: tHeader,
-                   data,
-                   filename: '结算子账单',
-                   autoWidth: true
-                 })
-                 loadingInstance.close()
-               })
-       }
-     });
-   },
-   formatJson(filterVal, jsonData, resData) {
-     let index = 0
-     return jsonData.map(v => filterVal.map(j => {
-       if (j === 'index') {
-         return ++index
-       }
-       if (j === 'status') {
-         var statusStr='xxx'
-         if(v[j] == 10){
-             statusStr='xxx'
-         }
-         return statusStr;
-       }
-       return v[j]
-     }))
-   },
-   /** 列索引函数  */
-   getIndex($index) {
-         return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-   },
-   /** 时间搜索响应函数 */
-   dateTimeChange(value){
-       this.dateTimeRange=value;
-   },
- }
-};
-</script>
-
-<style lang="scss" scoped>
-
-.feeItem{
-
- border: 1px solid #dfe6ec;
- margin-bottom:50px;
-
- ul{
-   list-style: none;
-   padding: 0px;
-   margin: 0px;
-   width: 590px;
-   height: 32px;
-   line-height: 32px;
-   border: 1px solid #dfe6ec;
-   border-top: 0px;
-   font-size: 12px;
-
- }
- ul li{
-   display:block; width:33%; float:left;text-indent:2em
- }
- .th{
-   background:#FFF; font-weight:bold; border-top:1px
- }
-}
-
-
-.statInfoValue{
-   color: red;
-   font-size: 13px;
-   font-weight: 500;
- }
-</style>
diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index a87ec45d..c68d475d 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -311,7 +311,7 @@
                   <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="danger">已完成</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="waybillDetail.realFee" min-width="80"    />