diff --git a/src/layout/components/TopNotice/index.vue b/src/layout/components/TopNotice/index.vue
index 4a617eaa..5aa5f3d5 100644
--- a/src/layout/components/TopNotice/index.vue
+++ b/src/layout/components/TopNotice/index.vue
@@ -159,7 +159,8 @@ export default {
         message: messageBody,
         position: 'bottom-right',
         // type: 'success',
-        // customClass:'notify-success',
+        customClass:'notify-success',
+        duration: 0,
         onClick: function () {
           //self.warnDetailByWarnid(messageBody.warnId); //自定义回调,message为传的参数
           // 点击跳转的页面
@@ -385,8 +386,8 @@ export default {
 }
 
 .notify-success {
-    top: 1.7rem !important;
-    height: 8rem !important;
+    // top: 1.7rem !important;
+    // height: 8rem !important;
     background: #fff !important;
     border-radius: 0.04rem 0px 0px 0.04rem !important;
     border: 2px solid red !important;
@@ -395,7 +396,7 @@ export default {
     }
 }
 .notify-error{
-    top: 2.7rem !important;
+    // top: 2.7rem !important;
     // right: 0.32rem !important;
     // width: 2rem !important;
     // height: 0.96rem !important;
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
index 65f75349..025ec4de 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
@@ -1134,7 +1134,7 @@ export default {
         excel.export_json_to_excel({
           header: tHeader,
           data,
-          filename: '现金账单导出',
+          filename: '账单导出',
           autoWidth: true
         })
         loadingInstance.close()
@@ -1144,65 +1144,160 @@ export default {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
 
+        console.log("===>1111===>",v);
+
         if (j === 'index') {
           return ++index
         }
         if (j === 'kjlx') {
-          return v[j]['waybillDetail']['sendSiteName']+'--'+v[j]['waybillDetail']['dispatchUnderlingSiteName'];
+          return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
         }
         if (j === 'fjr') {
           return v['sendName']+'--'+v['receiveName'];
         }
-        if (j === 'sendMobile') {
+
+        if (j === 'waybillDetail.sendSiteName') {
+          return  v['waybillDetail']['sendSiteName'];
+        }
+
+
+        if (j === 'waybillDetail.sendDate') {
+          return  v['waybillDetail']['sendDate'];
+        }
+
+        if (j === 'waybillDetail.sendCompany') {
+          return  v['waybillDetail']['sendCompany'];
+        }
+
+        if (j === 'waybillDetail.transLineTypeName') {
+          return  v['waybillDetail']['transLineTypeName'];
+        }
+
+        if (j === 'waybillDetail.productTypeName') {
+          return  v['waybillDetail']['productTypeName'];
+        }
+
+
+        if (j === 'waybillDetail.sendName') {
+          return  v['waybillDetail']['sendName'];
+        }
+
+        if (j === 'waybillDetail.parcelQty') {
+          return  v['waybillDetail']['parcelQty'];
+        }
+
+        if (j === 'waybillDetail.billWeight') {
+          return  v['waybillDetail']['billWeight'];
+        }
+
+        if (j === 'waybillDetail.volumeWeight') {
+          return  v['waybillDetail']['volumeWeight'];
+        }
+
+        if (j === 'waybillDetail.totalVolume') {
+          return  v['waybillDetail']['totalVolume'];
+        }
+
+        if (j === 'waybillDetail.settlementWeight') {
+          return  v['waybillDetail']['settlementWeight'];
+        }
+
+        if (j === 'waybillDetail.freight') {
+          return  v['waybillDetail']['freight'];
+        }
+
+        if (j === 'waybillDetail.realFee') {
+          return  v['waybillDetail']['realFee'];
+        }
+
+        if (j === 'waybillDetail.remark') {
+          return  v['waybillDetail']['remark'];
+        }
+
+        if (j === 'waybillDetail.feeRemark') {
+          return  v['waybillDetail']['feeRemark'];
+        }
+
+        if (j === 'waybillDetail.salesmen') {
+          return  v['waybillDetail']['salesmen'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.problemTypeName') {
+          return  v['waybillDetail']['problemTypeName'];
+        }
+
+        if (j === 'waybillDetail.problemCause') {
+          return  v['waybillDetail']['problemCause'];
+        }
+
+        if (j === 'waybillDetail.sendMobile') {
           return "";
         }
-        if (j === 'paymentStatus') {
-          return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]['waybillDetail']['paymentStatus']);
+
+        if (j === 'waybillDetail.calcFeeType') {
+          return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
         }
 
-        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 === 'waybillDetail.paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
         }
 
-        if (j === 'dispatchMethod') {
-          if(v[j] == 1){
+        if (j === 'waybillDetail.pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
+        }
+        if (j === 'waybillDetail.customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
+        }
+        if (j === 'waybillDetail.customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
+        }
+        if (j === 'waybillDetail.packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
+        }
+
+        if (j === 'waybillDetail.dispatchMethod') {
+          if(v['waybillDetail']['dispatchMethod'] == 1){
             return '派送';
           }else{
             return '自提';
           }
         }
-        if (j === 'blMessage') {
-          if(v[j] == 1){
+
+
+
+
+
+        if (j === 'waybillDetail.blMessage') {
+          if(v['waybillDetail']['blMessage']  == 1){
             return '发送';
           }else{
             return '不发送';
           }
         }
-        if (j === 'blAcceptMessage') {
-          if(v[j] == 1){
+        if (j === 'waybillDetail.blAcceptMessage') {
+          if(v['waybillDetail']['blAcceptMessage']   == 1){
             return '发送';
           }else{
             return '不发送';
           }
         }
-        if (j === 'blSign') {
-          if(v[j] == 1){
+        if (j === 'waybillDetail.blSign') {
+          if(v['waybillDetail']['blSign'] == 1){
             return '已签收';
           }else{
             return '未签收';
           }
         }
-        if (j === 'paymentType') {
-          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
+        if (j === 'waybillDetail.paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
         return v[j]
       }))
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 0d83ec21..efabed26 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -47,12 +47,13 @@
               <el-option key="0" label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="确认状态"  prop="confirmStatus">
-          <el-select  clearable v-model="queryParams.confirmStatus" placeholder="">
-              <el-option key="1" label="财务未确认" value="1"></el-option>
-              <el-option key="2" label="业务未确认" value="2"></el-option>
-          </el-select>
+        <el-form-item label="业务确认状态"  prop="blConfirmSite">
+              <el-select  clearable v-model="queryParams.blConfirmSite" placeholder="">
+                  <el-option key="0" label="业务未确认" value="0"></el-option>
+                  <el-option key="1" label="业务已确认" value="1"></el-option>
+              </el-select>
         </el-form-item>
+
         <el-form-item label="线路" prop="params.transLineType">
                   <TransLinePicker v-model="queryParams.params.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
         </el-form-item>
@@ -1185,53 +1186,205 @@ 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 => {
+
+        console.log("===>1111===>",v);
+
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'kjlx') {
+          return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
+        }
+        if (j === 'fjr') {
+          return v['sendName']+'--'+v['receiveName'];
+        }
+
+        if (j === 'waybillDetail.sendSiteName') {
+          return  v['waybillDetail']['sendSiteName'];
+        }
+
+
+        if (j === 'waybillDetail.sendDate') {
+          return  v['waybillDetail']['sendDate'];
+        }
+
+        if (j === 'waybillDetail.sendCompany') {
+          return  v['waybillDetail']['sendCompany'];
+        }
+
+        if (j === 'waybillDetail.transLineTypeName') {
+          return  v['waybillDetail']['transLineTypeName'];
+        }
+
+        if (j === 'waybillDetail.productTypeName') {
+          return  v['waybillDetail']['productTypeName'];
+        }
+
+
+        if (j === 'waybillDetail.sendName') {
+          return  v['waybillDetail']['sendName'];
+        }
+
+        if (j === 'waybillDetail.parcelQty') {
+          return  v['waybillDetail']['parcelQty'];
+        }
+
+        if (j === 'waybillDetail.billWeight') {
+          return  v['waybillDetail']['billWeight'];
+        }
+
+        if (j === 'waybillDetail.volumeWeight') {
+          return  v['waybillDetail']['volumeWeight'];
+        }
+
+        if (j === 'waybillDetail.totalVolume') {
+          return  v['waybillDetail']['totalVolume'];
+        }
+
+        if (j === 'waybillDetail.settlementWeight') {
+          return  v['waybillDetail']['settlementWeight'];
+        }
+
+        if (j === 'waybillDetail.freight') {
+          return  v['waybillDetail']['freight'];
+        }
+
+        if (j === 'waybillDetail.realFee') {
+          return  v['waybillDetail']['realFee'];
+        }
+
+        if (j === 'waybillDetail.remark') {
+          return  v['waybillDetail']['remark'];
+        }
+
+        if (j === 'waybillDetail.feeRemark') {
+          return  v['waybillDetail']['feeRemark'];
+        }
+
+        if (j === 'waybillDetail.salesmen') {
+          return  v['waybillDetail']['salesmen'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.problemTypeName') {
+          return  v['waybillDetail']['problemTypeName'];
+        }
+
+        if (j === 'waybillDetail.problemCause') {
+          return  v['waybillDetail']['problemCause'];
+        }
+
+        if (j === 'waybillDetail.sendMobile') {
+          return "";
+        }
+
+        if (j === 'waybillDetail.calcFeeType') {
+          return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
+        }
+
+        if (j === 'waybillDetail.paymentStatus') {
+          return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
+        }
+
+        if (j === 'waybillDetail.pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
+        }
+        if (j === 'waybillDetail.customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
+        }
+        if (j === 'waybillDetail.customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
+        }
+        if (j === 'waybillDetail.packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
+        }
+
+        if (j === 'waybillDetail.dispatchMethod') {
+          if(v['waybillDetail']['dispatchMethod'] == 1){
+            return '派送';
+          }else{
+            return '自提';
+          }
+        }
+
+
+
+
+
+        if (j === 'waybillDetail.blMessage') {
+          if(v['waybillDetail']['blMessage']  == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'waybillDetail.blAcceptMessage') {
+          if(v['waybillDetail']['blAcceptMessage']   == 1){
+            return '发送';
+          }else{
+            return '不发送';
+          }
+        }
+        if (j === 'waybillDetail.blSign') {
+          if(v['waybillDetail']['blSign'] == 1){
+            return '已签收';
+          }else{
+            return '未签收';
+          }
+        }
+        if (j === 'waybillDetail.paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
+        }
+        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 c883d97f..4909e8e9 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -62,6 +62,7 @@
           <el-select  clearable v-model="queryParams.blConfirmCenter" placeholder="">
               <el-option key="0" label="财务未确认" value="0"></el-option>
               <el-option key="1" label="财务已确认" value="1"></el-option>
+              <el-option key="3" label="财务置账单异常" value="3"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="线路" prop="params.transLineType">
@@ -767,18 +768,18 @@ export default {
 
      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
-      }
+      // 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;
+      return this.queryParams;
     },
 
 
@@ -1229,7 +1230,7 @@ export default {
         excel.export_json_to_excel({
           header: tHeader,
           data,
-          filename: '现金账单导出',
+          filename: '账单导出',
           autoWidth: true
         })
         loadingInstance.close()
@@ -1250,56 +1251,149 @@ export default {
         if (j === 'fjr') {
           return v['sendName']+'--'+v['receiveName'];
         }
-        if (j === 'sendMobile') {
+
+        if (j === 'waybillDetail.sendSiteName') {
+          return  v['waybillDetail']['sendSiteName'];
+        }
+
+
+        if (j === 'waybillDetail.sendDate') {
+          return  v['waybillDetail']['sendDate'];
+        }
+
+        if (j === 'waybillDetail.sendCompany') {
+          return  v['waybillDetail']['sendCompany'];
+        }
+
+        if (j === 'waybillDetail.transLineTypeName') {
+          return  v['waybillDetail']['transLineTypeName'];
+        }
+
+        if (j === 'waybillDetail.productTypeName') {
+          return  v['waybillDetail']['productTypeName'];
+        }
+
+
+        if (j === 'waybillDetail.sendName') {
+          return  v['waybillDetail']['sendName'];
+        }
+
+        if (j === 'waybillDetail.parcelQty') {
+          return  v['waybillDetail']['parcelQty'];
+        }
+
+        if (j === 'waybillDetail.billWeight') {
+          return  v['waybillDetail']['billWeight'];
+        }
+
+        if (j === 'waybillDetail.volumeWeight') {
+          return  v['waybillDetail']['volumeWeight'];
+        }
+
+        if (j === 'waybillDetail.totalVolume') {
+          return  v['waybillDetail']['totalVolume'];
+        }
+
+        if (j === 'waybillDetail.settlementWeight') {
+          return  v['waybillDetail']['settlementWeight'];
+        }
+
+        if (j === 'waybillDetail.freight') {
+          return  v['waybillDetail']['freight'];
+        }
+
+        if (j === 'waybillDetail.realFee') {
+          return  v['waybillDetail']['realFee'];
+        }
+
+        if (j === 'waybillDetail.remark') {
+          return  v['waybillDetail']['remark'];
+        }
+
+        if (j === 'waybillDetail.feeRemark') {
+          return  v['waybillDetail']['feeRemark'];
+        }
+
+        if (j === 'waybillDetail.salesmen') {
+          return  v['waybillDetail']['salesmen'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.payee') {
+          return  v['waybillDetail']['payee'];
+        }
+
+        if (j === 'waybillDetail.problemTypeName') {
+          return  v['waybillDetail']['problemTypeName'];
+        }
+
+        if (j === 'waybillDetail.problemCause') {
+          return  v['waybillDetail']['problemCause'];
+        }
+
+        if (j === 'waybillDetail.sendMobile') {
           return "";
         }
-        if (j === 'paymentStatus') {
+
+        if (j === 'waybillDetail.calcFeeType') {
+          return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
+        }
+
+        if (j === 'waybillDetail.paymentStatus') {
           return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
         }
 
-        if (j === 'pickupMethod') {
-          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
+        if (j === 'waybillDetail.pickupMethod') {
+          return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
         }
-        if (j === 'customsEclaration') {
-          return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
+        if (j === 'waybillDetail.customsEclaration') {
+          return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
         }
-        if (j === 'customsClear') {
-          return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
+        if (j === 'waybillDetail.customsClear') {
+          return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
         }
-        if (j === 'packType') {
-          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
+        if (j === 'waybillDetail.packType') {
+          return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
         }
 
-        if (j === 'dispatchMethod') {
-          if(v[j] == 1){
+        if (j === 'waybillDetail.dispatchMethod') {
+          if(v['waybillDetail']['dispatchMethod'] == 1){
             return '派送';
           }else{
             return '自提';
           }
         }
-        if (j === 'blMessage') {
-          if(v[j] == 1){
+
+
+
+
+
+        if (j === 'waybillDetail.blMessage') {
+          if(v['waybillDetail']['blMessage']  == 1){
             return '发送';
           }else{
             return '不发送';
           }
         }
-        if (j === 'blAcceptMessage') {
-          if(v[j] == 1){
+        if (j === 'waybillDetail.blAcceptMessage') {
+          if(v['waybillDetail']['blAcceptMessage']   == 1){
             return '发送';
           }else{
             return '不发送';
           }
         }
-        if (j === 'blSign') {
-          if(v[j] == 1){
+        if (j === 'waybillDetail.blSign') {
+          if(v['waybillDetail']['blSign'] == 1){
             return '已签收';
           }else{
             return '未签收';
           }
         }
-        if (j === 'paymentType') {
-          return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
+        if (j === 'waybillDetail.paymentType') {
+          return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
         return v[j]
       }))
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 5a4dd8ed..38434b57 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -337,14 +337,15 @@
       <el-table-column :label="$t('跟踪预警')" align="center" prop="traceWaring" min-width="100" :show-overflow-tooltip="true" >
         <template slot-scope="scope">
               <div v-if="scope.row.blSign=='1'" >
-                {{calcDeliveryTime(scope.row.sendDate,scope.row.scanDate)}}天
+                {{calcDeliveryTime(scope.row.sendDate,scope.row.lastScanRecord.scanDate)}} 天
               </div>
               <div v-else >
-                  <span v-if="calcDeliveryTime(new Date(),scope.row.scanDate)>2" style="color: red" >
-                        轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.scanDate)}}天
+                {{scope.row.lastScanRecord.scanDate}}
+                  <span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
+                        轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
                   </span>
                   <span v-else  >
-                    {{calcDeliveryTime(new Date(),scope.row.scanDate)}}天
+                    {{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}}天
                   </span>
               </div>
          </template>