From 0d08caf63c2eee384f4a238167c5dd243dc72252 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 12 Aug 2024 15:52:32 +0800
Subject: [PATCH] md

---
 src/api/emis/emisCommon.js                    |  12 ++
 src/main.js                                   |   3 +-
 src/utils/custom.js                           |  20 +++
 .../panel/BillDetailPanelReadOnly.vue         |  72 ++++----
 .../emisSettleInvoiceRecordForm.vue           |   4 +
 .../panel/InvoiceDetailPanel.vue              |  59 ++++---
 .../panel/InvoiceRecordList.vue               |   4 +-
 .../panel/PayRecordList.vue                   |   4 +-
 .../SubBillConfirmByMoneyList.vue             | 154 ++++++++++++------
 .../SubBillConfirmBySiteList.vue              |  35 ++--
 .../emis/emisWaybill/sendWaybillList.vue      |   2 +-
 .../emisWaybillAjustApplyForm.vue             |   5 +
 12 files changed, 248 insertions(+), 126 deletions(-)

diff --git a/src/api/emis/emisCommon.js b/src/api/emis/emisCommon.js
index 0c9da017..bb499a49 100644
--- a/src/api/emis/emisCommon.js
+++ b/src/api/emis/emisCommon.js
@@ -28,6 +28,9 @@ export function realMatchWaybill(useSiteCode,prefix) {
   })
 }
 
+
+
+
 // 获取总的可以使用面单数
 export function getTotalAvailablePag(useSiteCode,prefix) {
   return request({
@@ -46,5 +49,14 @@ export function getCenterTotalAvailablePag() {
   })
 }
 
+// 发送消息到对应的人
+export function pushToUser(uid,message) {
+  return request({
+    url: '/emis/common/pushToUser',
+    method: 'post',
+    data: {uid:uid,message:message}
+  })
+}
+
 
 
diff --git a/src/main.js b/src/main.js
index f210aa3b..fab08a34 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,7 @@ import plugins from './plugins' // plugins
 // const ElectronStore = require('electron-store');
 // const electronStore = new ElectronStore({encryptionKey: '123456'});
 import { download } from '@/utils/request'
-import { triggerTrans } from '@/utils/custom'
+import { triggerTrans,noticeToEmpUser } from '@/utils/custom'
 import  TanexPrinterSdk  from '@/utils/TanexPrinterSdk'
 import  XDNoticeSdk  from '@/utils/XDNoticeSdk'
 
@@ -97,6 +97,7 @@ Vue.prototype.Base64 = Base64
 Vue.prototype.MD5 = md5;
 Vue.prototype.playAudio = playAudio;
 Vue.prototype.playNoticeTone = playNoticeTone;
+Vue.prototype.noticeToEmpUser = noticeToEmpUser;
 
 const tanexPrinter = TanexPrinterSdk.getInstance();
 Vue.prototype.$tanexPrinter = tanexPrinter;
diff --git a/src/utils/custom.js b/src/utils/custom.js
index c862674f..c898e937 100644
--- a/src/utils/custom.js
+++ b/src/utils/custom.js
@@ -675,3 +675,23 @@ export function addExportAuditRecord(data) {
     data: data
   })
 }
+
+
+// 发送消息到对应的人
+// export function noticeToEmpUser(uid,message) {
+//   return request({
+//     url: '/common/pushToUser/'+uid,
+//     method: 'post',
+//     data: {message:message}
+//   })
+// }
+
+// 发送消息到对应的人
+export function noticeToEmpUser(empCode,message) {
+  return request({
+    url: '/common/pushToEmp/'+empCode,
+    method: 'post',
+    data: {message:message}
+  })
+}
+
diff --git a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
index e6e50abe..55ffb8bb 100644
--- a/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
+++ b/src/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue
@@ -1,42 +1,52 @@
 <template>
- <div>
+ <div style="font-size: 12px;" >
 
   <div style="margin-bottom:20px">
-  <el-descriptions  :title="$t('账单信息')"  size="mini"  :column="4">
-      <el-descriptions-item label="账单名称">{{ settleBillItem.settleBillName }}</el-descriptions-item>
-      <el-descriptions-item label="账单编号">{{ settleBillItem.settleBillNo }}</el-descriptions-item>
-      <el-descriptions-item label="账单月份">{{ settleBillItem.billMonth }}</el-descriptions-item>
-      <el-descriptions-item label="应收金额">{{ settleBillItem.recMoney }}</el-descriptions-item>
-      <el-descriptions-item label="总票数">{{ settleBillItem.sendPieceSum }}</el-descriptions-item>
-      <el-descriptions-item label="总件数">{{ settleBillItem.pieceNumber }}</el-descriptions-item>
-      <el-descriptions-item label="结算重量">{{ settleBillItem.feeWeight }}</el-descriptions-item>
-      <el-descriptions-item label="月结编号" v-if="settleBillItem.settleType==2">{{ settleBillItem.custNo }}</el-descriptions-item>
-      <el-descriptions-item label="月结客户" v-if="settleBillItem.settleType==2">{{ settleBillItem.custName }}</el-descriptions-item>
-      <el-descriptions-item label="账单类型" >
-        <span v-if="settleBillItem.settleType==1">现金账单</span>
-        <span v-if="settleBillItem.settleType==2">月结账单</span>
-      </el-descriptions-item>
-      <el-descriptions-item label="销售联系人">{{ settleBillItem.salesmen }}</el-descriptions-item>
-      <el-descriptions-item label="回款联系人">{{ settleBillItem.payee }}</el-descriptions-item>
+    <el-descriptions  :title="$t('账单信息')"  size="mini"  :column="4">
+        <el-descriptions-item label="账单名称">{{ settleBillItem.settleBillName }}</el-descriptions-item>
+        <el-descriptions-item label="账单编号">{{ settleBillItem.settleBillNo }}</el-descriptions-item>
+        <el-descriptions-item label="账单月份">{{ settleBillItem.billMonth }}</el-descriptions-item>
+        <el-descriptions-item label="应收金额">{{ settleBillItem.recMoney }}</el-descriptions-item>
+        <el-descriptions-item label="总票数">{{ settleBillItem.sendPieceSum }}</el-descriptions-item>
+        <el-descriptions-item label="总件数">{{ settleBillItem.pieceNumber }}</el-descriptions-item>
+        <el-descriptions-item label="结算重量">{{ settleBillItem.feeWeight }}</el-descriptions-item>
+        <el-descriptions-item label="月结编号" v-if="settleBillItem.settleType==2">{{ settleBillItem.custNo }}</el-descriptions-item>
+        <el-descriptions-item label="月结客户" v-if="settleBillItem.settleType==2">{{ settleBillItem.custName }}</el-descriptions-item>
+        <el-descriptions-item label="账单类型" >
+          <span v-if="settleBillItem.settleType==1">现金账单</span>
+          <span v-if="settleBillItem.settleType==2">月结账单</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="销售联系人">{{ settleBillItem.salesmen }}</el-descriptions-item>
+        <el-descriptions-item label="回款联系人">{{ settleBillItem.payee }}</el-descriptions-item>
 
-    </el-descriptions>
+      </el-descriptions>
   </div>
 
     <div style="margin-bottom:20px">
-                  <div style="font-weight:500;margin-bottom:20px">收款状态:<span>未收款</span></div>
-                  <div>总应收:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已收:<span style="color:blue;font-weight:500;">{{ settleBillItem.recedMoney }}</span></div>
-                  <div>
-                    <PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
-                  </div>
-              </div>
-              <div style="margin-bottom:20px">
-                  <div style="font-weight:500;margin-bottom:20px">开票状态:<span>未开票</span></div>
-                  <div>最高可开票金额:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已开票:<span style="color:blue;font-weight:500;"></span></div>
-                  <div>
-                    <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList>
-                  </div>
-              </div>
+        <div style="font-weight:500;margin-bottom:20px">收款状态:
+          <el-tag type="info" v-if="settleBillItem.paymentStatus==0">未收款</el-tag>
+          <el-tag type="success" v-if="settleBillItem.paymentStatus==1">已收款</el-tag>
+          <el-tag type="warning" v-if="settleBillItem.paymentStatus==2">部分收款</el-tag>
+        </div>
+        <div>总应收:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已收:<span style="color:blue;font-weight:500;">{{ settleBillItem.recedMoney }}</span></div>
+        <div>
+          <PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
+        </div>
+    </div>
+    <div style="margin-bottom:20px">
 
+      <div style="font-weight:500;margin-bottom:20px">
+          开票状态:
+          <el-tag type="info" v-if="settleBillItem.openBillStatus==0">未开票</el-tag>
+          <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>
+        </div>
+        <!-- <div>最高可开票金额:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已开票:<span style="color:blue;font-weight:500;"></span></div> -->
+        <div>
+          <InvoiceRecordList :settleBillNo="settleBillNo"> </InvoiceRecordList>
+        </div>
+    </div>
 
  </div>
 </template>
diff --git a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
index 1420c3ec..c0f3123c 100644
--- a/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/emisSettleInvoiceRecordForm.vue
@@ -282,6 +282,10 @@ export default {
             this.form.applyDate = parseTime(new Date());
             addEmisSettleInvoiceRecord(this.form).then(response => {
                this.$modal.msgSuccess("新增成功");
+               let empName=this.$store.getters.empName;
+                let message=empName+" 提交了开票申请,请及时开票！";
+                this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message);
+
                this.$emit("on-changed");
             });
           }
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
index a32973f3..db71c0bd 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceDetailPanel.vue
@@ -1,42 +1,47 @@
 <template>
  <div>
-    <div>
+    <div v-if="emisSettleInvoiceRecord!=null">
       <el-descriptions title="" border :column="4">
                     <el-descriptions-item label="申请序号">{{ emisSettleInvoiceRecord.applySeqNo }}</el-descriptions-item>
-                    <el-descriptions-item label="申请时间">{{ emisSettleInvoiceRecord.applyDate }}</el-descriptions-item>
+                    <el-descriptions-item label="申请时间" span="3">{{ emisSettleInvoiceRecord.applyDate }}</el-descriptions-item>
                     <!-- <el-descriptions-item label="审核人">{{ emisSettleInvoiceRecord.applyManCode }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="审核站点">{{ emisSettleInvoiceRecord.applySiteCode }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="客户编码">{{ emisSettleInvoiceRecord.customerCode }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="客户名称">{{ emisSettleInvoiceRecord.customerName }}</el-descriptions-item> -->
-                    <el-descriptions-item label="账单编号">{{ emisSettleInvoiceRecord.settleBillNo }}</el-descriptions-item>
-                    <el-descriptions-item label="账单名称">{{ emisSettleInvoiceRecord.settleBillName }}</el-descriptions-item>
-                    <el-descriptions-item label="申请开票金额">{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
-                    <el-descriptions-item label="开票类型">{{ emisSettleInvoiceRecord.invoiceType }}</el-descriptions-item>
-                    <el-descriptions-item label="开票抬头">{{ emisSettleInvoiceRecord.companyName }}</el-descriptions-item>
-                    <el-descriptions-item label="开票税号">{{ emisSettleInvoiceRecord.companyTaxNo }}</el-descriptions-item>
-                    <el-descriptions-item label="开票电话">{{ emisSettleInvoiceRecord.companyTel }}</el-descriptions-item>
-                    <el-descriptions-item label="开票地址">{{ emisSettleInvoiceRecord.companyAddress }}</el-descriptions-item>
-                    <el-descriptions-item label="开户行">{{ emisSettleInvoiceRecord.bankName }}</el-descriptions-item>
-                    <el-descriptions-item label="开户账号">{{ emisSettleInvoiceRecord.bankAccNo }}</el-descriptions-item>
-                    <el-descriptions-item label="联系人">{{ emisSettleInvoiceRecord.contact }}</el-descriptions-item>
-                    <el-descriptions-item label="联系电话">{{ emisSettleInvoiceRecord.phone }}</el-descriptions-item>
-                    <!-- <el-descriptions-item label="税类型">{{ emisSettleInvoiceRecord.realTaxType }}</el-descriptions-item> -->
-                    <!-- <el-descriptions-item label="开票上限">{{ emisSettleInvoiceRecord.openMoneyMax }}</el-descriptions-item> -->
-                    <!-- <el-descriptions-item label="开票金额">{{ emisSettleInvoiceRecord.openMoney }}</el-descriptions-item> -->
-                    <!-- <el-descriptions-item label="发票号">{{ emisSettleInvoiceRecord.invoiceNo }}</el-descriptions-item> -->
-                    <el-descriptions-item label="开票状态">{{ emisSettleInvoiceRecord.invoiceStatus }}</el-descriptions-item>
-                    <el-descriptions-item label="开票异常描述">{{ emisSettleInvoiceRecord.invoiceStatusDesc }}</el-descriptions-item>
+                    <!-- <el-descriptions-item label="账单编号">{{ emisSettleInvoiceRecord.settleBillNo }}</el-descriptions-item> -->
+                    <el-descriptions-item label="账单名称" span="4">{{ emisSettleInvoiceRecord.settleBillName }}</el-descriptions-item>
+                    <el-descriptions-item label="开票抬头" span="4">
+                      {{ emisSettleInvoiceRecord.companyName }} {{ emisSettleInvoiceRecord.companyTaxNo }}
+                      {{ emisSettleInvoiceRecord.companyAddress }} {{ emisSettleInvoiceRecord.companyTel }}
+                      {{ emisSettleInvoiceRecord.bankName }} {{ emisSettleInvoiceRecord.bankAccNo }}
+
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票类型" span="1">
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='1'" type="success">增值税电子普通发票</el-tag>
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='2'" type="success">增值税普通发票</el-tag>
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceType=='3'" type="success">增值税专用发票</el-tag>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票金额" span="3">{{ emisSettleInvoiceRecord.applyMoney }}</el-descriptions-item>
+
+                    <el-descriptions-item label="开票状态" span="4">
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceStatus=='0'" type="info">未开票</el-tag>
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceStatus=='1'" type="warning">开票中</el-tag>
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceStatus=='2'" type="success">已开票</el-tag>
+                      <el-tag v-if="emisSettleInvoiceRecord.invoiceStatus=='3'" type="error">开票异常</el-tag>
+
+                      {{ emisSettleInvoiceRecord.invoiceStatusDesc }}
+                    </el-descriptions-item>
+                    <!-- <el-descriptions-item label="异常描述" span="3">{{ emisSettleInvoiceRecord.invoiceStatusDesc }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="纸质发票邮寄地址">{{ emisSettleInvoiceRecord.recieveAddress }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="邮箱">{{ emisSettleInvoiceRecord.email }}</el-descriptions-item> -->
-                    <!-- <el-descriptions-item label="发票下载路径">{{ emisSettleInvoiceRecord.filePath }}</el-descriptions-item> -->
-                    <el-descriptions-item label="开票备注">{{ emisSettleInvoiceRecord.remark }}</el-descriptions-item>
+                    <el-descriptions-item label="开票备注" span="4">{{ emisSettleInvoiceRecord.remark }}</el-descriptions-item>
                     <!-- <el-descriptions-item label="审核状态">{{ emisSettleInvoiceRecord.blAudit }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="审核日期">{{ emisSettleInvoiceRecord.auditDate }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="审核人">{{ emisSettleInvoiceRecord.auditManCode }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="审核站点">{{ emisSettleInvoiceRecord.auditSiteCode }}</el-descriptions-item> -->
-                    <el-descriptions-item label="操作人">{{ emisSettleInvoiceRecord.opManCode }}</el-descriptions-item>
+                    <el-descriptions-item label="操作人">{{ emisSettleInvoiceRecord.opManName }}</el-descriptions-item>
                     <el-descriptions-item label="操作时间">{{ emisSettleInvoiceRecord.opDate }}</el-descriptions-item>
-                    <el-descriptions-item label="操作站点">{{ emisSettleInvoiceRecord.opSiteCode }}</el-descriptions-item>
+                    <!-- <el-descriptions-item label="操作站点">{{ emisSettleInvoiceRecord.opSiteCode }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="开票渠道编号">{{ emisSettleInvoiceRecord.openChId }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="开票渠道状态">{{ emisSettleInvoiceRecord.openChStatus }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="开票渠道描述">{{ emisSettleInvoiceRecord.openChStatusDesc }}</el-descriptions-item> -->
@@ -47,12 +52,14 @@
                     <!-- <el-descriptions-item label="更新者">{{ emisSettleInvoiceRecord.updateBy }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="更新时间">{{ emisSettleInvoiceRecord.updateTime }}</el-descriptions-item> -->
                     <!-- <el-descriptions-item label="创建站点">{{ emisSettleInvoiceRecord.createSite }}</el-descriptions-item> -->
-                    <!-- <el-descriptions-item label="更新站点">{{ emisSettleInvoiceRecord.updateSite }}</el-descriptions-item> -->
+                    <!-- <el-descriptions-item label="更新站点">{{ emisSettleInvoiceRecord.updateSite }}</el-descriptions-item> -->、
+                    <!-- <el-descriptions-item label="发票下载路径">{{ emisSettleInvoiceRecord.filePath }}</el-descriptions-item> -->
+
 
               </el-descriptions>
     </div>
 
-    <div v-if="emisSettleInvoiceRecord">
+    <div v-if="emisSettleInvoiceRecord!=null">
       <InvoiceChRecordListReadOnly :applySeqNo="emisSettleInvoiceRecord.applySeqNo" > </InvoiceChRecordListReadOnly>
     </div>
 
diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
index e4224f0d..6face06d 100644
--- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
+++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue
@@ -2,8 +2,8 @@
   <div>
 
     <el-table v-loading="loading"
-           border stripe
-           size="small"
+           border
+           size="mini"
 
            storageName="emisSettleInvoiceRecordList_inv_dtl_s"
 
diff --git a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
index e5ea125d..24304808 100644
--- a/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
+++ b/src/views/emis/emisSettlePayRecord/panel/PayRecordList.vue
@@ -1,11 +1,9 @@
 <template>
   <div>
     <el-table v-loading="loading"
-           border stripe
+           border
            size="mini"
-
             storageName="emisSettlePayRecordList_pay_dtl_s"
-
            :data="emisSettlePayRecordList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index b959fbf7..65f75349 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -684,9 +684,7 @@ export default {
    this.getList();
  },
  methods: {
-
    initData(){
-    this.storageName="SubBillConfirmByMoneyList_main";
     this.queryParams.blConfirmCenter=0;
    },
    handleClick(tab, event) {
@@ -734,7 +732,10 @@ export default {
    initQueryParams(){
       this.queryParams.settleType=1;
      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate")
+     return this.queryParams;
    },
+
+
    getList() {
      this.loading = true;
 
@@ -1102,53 +1103,110 @@ export default {
      this.openForm = false;
    },
 
-   /** 导出按钮操作 */
-   handleExport() {
-   //   this.download('emis/emisSettleSubBill/export', {
-   //     ...this.queryParams
-   //   }, `emisSettleSubBill_${new Date().getTime()}.xlsx`)
-    const loadingInstance = this.$loading({
-           text: '正在导出...'
-       })
-      var qParam = {...this.queryParams};
-      qParam.pageNum=1;
-      qParam.pageSize=5000;
+    /** 导出按钮操作 */
+    handleExport() {
+      const loadingInstance = this.$loading({
+            text: '正在导出...'
+      })
 
-      listEmisSettleSubBill(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-       this.downloadLoading = false
-       if (response.code === 200) {
-               const curList = response.rows
-               import('@/vendor/Export2Excel').then(excel => {
-                 const tHeader = ['id','分账单号','父账单号','总结算账单号','运单号','出账时间','账单费用','费用币种','结算账单类型','是否已拆单','账单月份','月结编号','客户编码','客户名称','财务确认状态','财务确认日期','财务确认站点','财务确认人','站点确认状态','财务确认备注','站点确认日期','站点确认人','网点确认备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
-                 const filterVal = ['id','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]
-     }))
-   },
+      if(this.selectBillList&&this.selectBillList.length>0){
+        this.exportData(this.selectBillList,loadingInstance);
+      }
+      else{
+          let qExportParam=this.initQueryParams();
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=5000;
+
+          listEmisWaybill(qExportParam).then(response => {
+            if (response.code === 200) {
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam=this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '现金账单导出',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'kjlx') {
+          return v[j]['waybillDetail']['sendSiteName']+'--'+v[j]['waybillDetail']['dispatchUnderlingSiteName'];
+        }
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+        if (j === 'sendMobile') {
+          return "";
+        }
+        if (j === 'paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]['waybillDetail']['paymentStatus']);
+        }
+
+        if (j === 'pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        }
+        if (j === 'customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        }
+        if (j === 'customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        }
+        if (j === 'packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        }
+
+        if (j === 'dispatchMethod') {
+          if(v[j] == 1){
+            return '派送';
+          }else{
+            return '自提';
+          }
+        }
+        if (j === 'blMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blAcceptMessage') {
+          if(v[j] == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'blSign') {
+          if(v[j] == 1){
+            return '已签收';
+          }else{
+            return '未签收';
+          }
+        }
+        if (j === 'paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
+        }
+        return v[j]
+      }))
+    },
    /** 列索引函数  */
    getIndex($index) {
          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 48865299..86108228 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -1,17 +1,21 @@
 <template>
   <XdPageContainer class="app-container">
     <div slot="pageHeader">
-        <el-tabs    v-model="activeTab" class="center-tabs" @tab-click="handleClick">
-        <el-tab-pane label="全部" name="all" />
-        <el-tab-pane label="未确认" name="waitConfirm" />
-        <el-tab-pane label="已确认" name="hasConfirm" />
-        <el-tab-pane label="确认不出账" name="confirmNotBill" />
-        <el-tab-pane label="财务置账单异常" name="billError" />
-        <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
-      </el-tabs>
+        <el-tabs   v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+          <el-tab-pane label="全部" name="all" />
+          <el-tab-pane label="未确认" name="waitConfirm" />
+          <el-tab-pane label="已确认" name="hasConfirm" />
+          <el-tab-pane label="确认不出账" name="confirmNotBill" />
+          <el-tab-pane label="财务置账单异常" name="billError" />
+          <!-- <el-tab-pane label="业务置账单异常" name="siteBillError" /> -->
+        </el-tabs>
 
 
-      <SearchForm :model="queryParams" ref="queryForm"
+      <SearchForm
+
+      :model="queryParams"
+
+       ref="queryForm"
         size="mini" :maxShow="12"  label-width="100px"
         v-show="showSearch"
         @search="handleQuery"
@@ -150,11 +154,8 @@
           @queryTable="getList"
           @selection-change="handleSelectionChange"
 
-
           :row-style="tableRowClassName"
-
-            highlight-current-row
-
+          highlight-current-row
            show-summary :summary-method="getSummaries"
           >
 
@@ -682,7 +683,7 @@ export default {
    };
  },
  created() {
-   this.queryParams.blConfirmCenter='0';
+  //  this.queryParams.blConfirmCenter='0';
    this.actionType=this.$route.query.actionType;
 
    this.initData();
@@ -1130,6 +1131,12 @@ export default {
    handleConfirmBySite(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认').then(function() {
+
+      let empName=this.$store.getters.empName;
+      let message=empName+" 确认了出账明细，请及时出账单！";
+      this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message);
+
+
        return confirmBillBySite(ids);
      }).then(() => {
        this.getList();
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 97f1d038..5a4dd8ed 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -330,7 +330,7 @@
 
       <el-table-column :label="$t('快件跟踪')" align="left" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
-              <div  >{{scope.row.lastTraceInfo}}</div>
+              <div >{{scope.row.lastTraceInfo}}</div>
             </template>
       </el-table-column>
       <!-- class="link-type" @click="handleShowTraceInfo(scope.row)" class="link-type" @click="handleShowTraceInfo(scope.row)" class="link-type" @click="handleShowTraceInfo(scope.row)" -->
diff --git a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue
index 4532582d..f1e662e2 100644
--- a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue
+++ b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue
@@ -223,6 +223,11 @@ export default {
            this.form.jsonData=JSON.stringify(jsonData);
            addEmisWaybillAjustApply(this.form).then(response => {
                this.$modal.msgSuccess("申请成功");
+
+               let empName=this.$store.getters.empName;
+               let message=empName+" 提交了费用审核,请及时审批,单号:"+this.form.billCode;
+               this.noticeToEmpUser("padmin,88888042,88888047,88888034,88888059",message);
+
                this.$emit("on-changed");
            });
         }