task#15348,服务商kpi搜索请求头字段更换

(cherry picked from commit 343bccdcfa)
task#15348,服务商kpi请求头字段更换
2024-10-21 09:50:31 +08:00 · 2024-10-17 10:29:30 +08:00 · 2024-10-17 10:29:29 +08:00 · 2024-10-15 11:33:22 +08:00 · 2024-10-14 17:35:51 +08:00 · 2024-10-14 17:35:04 +08:00
126 changed files with 480 additions and 20981 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,4 +22,3 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/yarn.lock
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -9,14 +9,10 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
-    "@vant/area-data": "^2.0.0",
    "amfe-flexible": "^2.2.1",
    "axios": "^1.4.0",
    "core-js": "^3.8.3",
-    "dayjs": "^1.8.14",
-    "decimal.js": "^10.4.3",
    "echarts": "^5.2.2",
-    "element-ui": "^2.15.9",
    "less": "^4.1.3",
    "less-loader": "^11.1.3",
    "qs": "^6.11.2",
@ -25,7 +21,9 @@
    "vant": "^2.13.2",
    "vue": "^2.6.14",
    "vue-router": "^3.0.7",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "element-ui": "^2.15.9",
+    "dayjs": "^1.8.14"
  },
  "devDependencies": {
    "@babel/core": "^7.12.16",
--- a/public/index.html
+++ b/public/index.html
@ -26,17 +26,16 @@
    <van-number-keyboard safe-area-inset-bottom />
    <script type="text/javascript">
        window._AMapSecurityConfig = {
-            // serviceHost: 'https://api.sinoassist.com/_AMapService',
-          securityJsCode:'91ab1ebc492d5479a68b11527bd73dc9',
+            serviceHost: 'https://api.sinoassist.com/_AMapService',
        }
    </script>
-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script>
+    <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></script>
 <!--    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>-->
    <script>
        // VConsole 默认会挂载到 `window.VConsole` 上
        // let vConsole = new window.VConsole();
        (function (doc, win) {
-            // console.log("==window.location.pathname===",window.location.pathname)
+            console.log("==window.location.pathname===",window.location.pathname)
            let docEl = doc.documentElement
            let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
            recalc = function () {
--- a/public/res/privacy.html
+++ b/public/res/privacy.html
@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>免责声明</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            line-height: 1.6;
-            /*margin: 20px;*/
-            padding: 0;
-            /*background-color: #f9f9f9;*/
-            color: #333;
-        }
-        h3 {
-            text-align: center;
-            /*font-size: 24px;*/
-            margin-bottom: 20px;
-        }
-        h4 {
-            /*font-size: 20px;*/
-            margin-top: 30px;
-            margin-bottom: 10px;
-            color: #555;
-        }
-        p {
-            margin: 10px 0;
-            text-indent: 2em;
-        }
-        ul {
-            margin: 10px 0;
-            padding-left: 40px;
-        }
-        li {
-            margin: 5px 0;
-        }
-        .container {
-            font-size: 14px;
-            padding-bottom: 20px;
-        }
-    </style>
-</head>
-<body>
-<div class="container">
-    <h3>声明</h3>
-    <p>本平台为二手拖车买卖双方提供免费信息发布服务。在您使用本平台之前，请仔细阅读并理解本免责声明。一旦使用本平台，即视为您已阅读、理解并同意接受本免责声明的所有条款。</p>
-
-    <h4>一、平台性质</h4>
-    <p>1. 本平台仅为信息发布平台，不参与任何二手拖车交易环节，包括但不限于交易洽谈、合同签订、款项支付、车辆交付等，实际交易价格由买卖双方自行协商确定。</p>
-    <p>2. 本平台不对发布信息的真实性、准确性、完整性、合法性进行任何形式的担保或保证，用户应自行判断信息的真实性并承担由此产生的风险。</p>
-
-    <h4>二、用户责任</h4>
-    <p>1. 用户应保证发布的信息真实、准确、完整、合法，并对其发布的信息承担全部责任。</p>
-    <p>2. 用户不得发布任何虚假、违法、侵权、违反公序良俗的信息，包括但不限于：</p>
-    <ul>
-        <li>虚假车源信息</li>
-        <li>事故车、水泡车、火烧车等存在重大安全隐患的车辆信息</li>
-        <li>盗抢车辆信息</li>
-        <li>侵犯他人知识产权或其他合法权益的信息</li>
-        <li>含有淫秽、色情、赌博、暴力、恐怖等内容的信息</li>
-        <li>其他违反法律法规或平台规则的信息</li>
-    </ul>
-
-    <h4>三、免责条款</h4>
-    <p>1. 因用户发布的信息引起的任何纠纷或损失，本平台不承担任何责任。</p>
-    <p>2. 因不可抗力、计算机病毒、黑客攻击、系统不稳定、用户所在位置、用户关机以及其他任何网络、技术、通信线路等原因造成的服务中断或不能满足用户要求的风险，本平台不承担任何责任。</p>
-    <p>3. 本平台不对用户之间的交易行为承担任何责任，用户应自行承担交易风险。</p>
-
-    <h4>四、其他</h4>
-    <p>1. 本平台有权根据法律法规的变化或平台运营的需要，随时修改本免责声明，并在平台上公布，修改后的内容自公布之日起生效。</p>
-    <p>2. 本免责声明的解释权归中道救援股份有限公司所有。</p>
-
-    <p>请您在使用本平台前务必仔细阅读并理解本免责声明。</p>
-    <p>如果您对本免责声明有任何疑问，请联系我们。</p>
-</div>
-</body>
-</html>
--- a/src/api/kpi.js
+++ b/src/api/kpi.js
@ -27,14 +27,6 @@ export function getDriverStatisticsKpi(data){
    data
  })
 }
-export function querySupplierDriverStatisticsScore(data){
-  return request({
-    url: '/supplier/supplierKPI/querySupplierDriverStatisticsScore',
-    method:'POST',
-    // contentType: 'application/json',
-    data
-  })
-}
 //   各种详情数据
 export function getKpiDetailsData(data){
  return request({
@ -44,24 +36,6 @@ export function getKpiDetailsData(data){
    data
  })
 }
-// 获取近12个月的服务商数据
-export function getRecentSupplierKpi(data){
-  return request({
-    url: '/supplier/supplierKPI/queryRecentSupplierStatisticsKpi',
-    method:'POST',
-    // contentType: 'application/json',
-    data
-  })
-}
-// 司机分数详情
-export function driverScoreDetail(data){
-  return request({
-    url: '/supplier/supplierKPI/querySupplierDriverStatisticsScore',
-    method:'POST',
-    // contentType: 'application/json',
-    data
-  })
-}
 // 关键词搜索服务商名称
 export function getSupplierId(key) {
  return request({
--- a/src/api/mine.js
+++ b/src/api/mine.js
@ -147,29 +147,21 @@ export function deleteImage(data){
 //开票通知列表
 export function notifyInvoiceList(data){
    return request({
-        url:'/order/taskInvoiceBatch/selectPageList',
+        url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceList',
        method:'POST',
+        contentType:'application/json',
        data
    })
 }
-// contentType:'application/json',
 //开票通知详情
 export function notifyInvoiceDetail(data){
    return request({
-        url:'/order/taskInvoiceBatch/selectById',
+        url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceDetail',
        method:'POST',
+        contentType:'application/json',
        data
    })
 }
-// 关联案件
-export function getOrderListByInvoice(data) {
-    return request({
-        url:'/order/taskOrderCostHisRecord/selectPageList',
-        method:'POST',
-        data
-    })
-}
-
 //  调度app获取新签列表
 export function pageList(data){
    return request({
@ -222,83 +214,6 @@ export function uploadImage(data){
    })
 }

-// 发票上传
-export function uploadInvoice(data){
-    return request({
-        url:'/order/taskInvoiceBatch/saveInvoiceImagesAndIdentify',
-        method:'POST',
-        contentType:'multipart/form-data',
-        data
-    })
-}
-
-// 删除发票
-export function deleteInvoice(data) {
-    return request({
-        url:'/order/taskInvoiceBatch/deleteInfo',
-        method:'POST',
-        contentType:'multipart/form-data',
-        data
-    })
-}
-
-// 生成财务批次
-export function createBatch(data) {
-    return request({
-        url:'/order/taskInvoiceBatch/supplierCreateFinanceBatch',
-        method:'POST',
-        contentType:'application/x-www-form-urlencoded',
-        data,
-        testFlag: true
-    })
-}
-
-// 开票信息列表
-export function getFinanceBatchList(data) {
-    return request({
-        url:'/order/taskInvoiceFinanceBatch/selectFinanceBatchPageList',
-        method:'POST',
-        data,
-    })
-}
-
-// 批次对应发票信息列表
-export function financeInvoiceList(data) {
-    return request({
-        url:'/order/taskInvoiceBatch/selectInvoicePageList',
-        method:'POST',
-        data,
-    })
-}
-
-// 查看发票
-export function selectInvoiceDetailInfo(data) {
-    return request({
-        url:'/order/taskInvoiceBatch/selectInvoiceDetailInfo',
-        method:'POST',
-        data,
-    })
-}
-
-// 填写快递
-export function saveBatchCourierNumber(data) {
-    return request({
-        url:'/order/taskInvoiceBatch/supplierSaveBatchCourierNumber',
-        method:'POST',
-        data,
-    })
-}
-
-// 获取服务商发票信息
-export function getBillingInfo(url, data) {
-    return request({
-          url: url,
-          method:'POST',
-          contentType:'multipart/form-data',
-          data
-    })
-}
-
 // ocr 识别
 export function ocrHandler(data){
    return request({
@ -308,12 +223,3 @@ export function ocrHandler(data){
        data
    })
 }
-///agg-api/tencent-ocr/unifiedOCRWithCompress
-export function unifiedOCRWithCompress(data){
-    return request({
-        url:'/agg-api/tencent-ocr/unifiedOCRWithCompress',
-        method:'POST',
-        contentType:'application/json',
-        data
-    })
-}
--- a/src/api/order.js
+++ b/src/api/order.js
@ -77,78 +77,3 @@ export function updateOrderSettlement(data){
    data
  })
 }
-// 电瓶数量列表
-export function batteryCountList(){
-  return request({
-    url:'/supplierAppV2/dispatchApp/battery/batteryCountList',
-    method:'POST',
-    contentType:'application/json',
-    // data
-  })
-}
-// 电瓶详情
-export function batteryDetailList (data){
-  return request({
-    url:'/supplierAppV2/dispatchApp/battery/batteryDetailList',
-    method:'POST',
-    contentType:'application/json',
-    data
-  })
-}
-
-// 查询未读告知函
-export function selectUnReadNotifyBySupplier() {
-  return request({
-    url: '/supplierManage/correction/notify/selectUnReadNotifyBySupplier',
-    method:'POST',
-  })
-}
-
-// 阅读告知函
-export function correctionHandle(data) {
-  return request({
-    url: '/supplierManage/correction/record/correctionHandle',
-    method:'POST',
-    data
-  })
-}
-
-
-// 获取报警列表
-export function getAlarmList(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/alarmList',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-
-// 获取报警数目
-export function getAlarmCount(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/alarmCount',
-    method:'POST',
-    data
-  })
-}
-
-// 获取报警详情
-export function getAlarmByCode(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/getAlarmByCode',
-    method:'POST',
-    data
-  })
-}
-
-// 处理报警
-export function dealWithAlarm(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/handAlarm',
-    method:'POST',
-    data
-  })
-}
-
-
--- a/src/api/report.js
+++ b/src/api/report.js
@ -1,37 +0,0 @@
-import request from '@/utils/http'
-// 根据订单 获取报备类型
-export function getReportListByOrder(key){
-  return request({
-    url: '/order/baseDriverReportConfigs/getByOrderId',
-    method:'GET',
-    params: key
-  })
-}
-
-// 添加报备
-export function newOrderReporting(data){
-  return request({
-    url: '/supplierAppV2/dispatchApp/order/newOrderReporting',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-
-// 获取报备列表
-export function reportHistory(data){
-  return request({
-    url: '/supplierAppV2/dispatchApp/order/reportHistory',
-    method:'POST',
-    data
-  })
-}
-
-// 获取订单信息
-export function getOrderInfo(data){
-  return request({
-    url: '/supplierAppV2/dispatchApp/order/reportOrderDetail',
-    method:'POST',
-    data
-  })
-}
--- a/src/api/secondHandCar.js
+++ b/src/api/secondHandCar.js
@ -1,96 +0,0 @@
-import request from '@/utils/http'
-// 车源/求购列表
-export function appPageList(data){
-  return request({
-    url: '/toc-user/car-app/appPageList',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-// 我的发布列表
-export function minePublishPageList(data){
-  return request({
-    url: '/toc-user/car-app/minePublishPageList',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-
-// 审核不通过数量
-export function auditFailCount (data){
-  return request({
-    url: '/toc-user/car-app/auditFailCount ',
-    method:'POST',
-    // contentType: 'application/json',
-    data
-  })
-}
-// 信息详情查询
-export function carInfoDetail(data){
-  return request({
-    url: '/toc-user/car-app/carInfoDetail',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-// 发布编辑信息
-export function publishCarInfo(data){
-  return request({
-    url: '/toc-user/car-app/publishCarInfo',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-// 用户信息反馈
-export function userFeedback(data){
-  return request({
-    url: '/toc-user/car-app/userFeedback',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-//二手拖车信息擦亮
-export function usedCarPolish(data){
-  return request({
-    url: `/toc-user/car-app/usedCarPolish/${data}`,
-    method:'POST',
-  })
-}
-//二手拖车信息下架
-export function usedCarRemove(data){
-  return request({
-    url: '/toc-user/car-app/usedCarRemove',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-//二手拖车信息重新上架
-export function usedCarReShelf(data){
-  return request({
-    url: `/toc-user/car-app/usedCarReShelf/${data}`,
-    method:'POST',
-  })
-}
-//审批信息
-export function auditCarInfo(data){
-  return request({
-    url: '/toc-user/car-admin/auditCarInfo',
-    method:'POST',
-    data
-  })
-}
-// 保存信息记录
-export function saveRecord(data){
-  return request({
-    url: '/toc-user/car-record/saveRecord',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
--- a/src/assets/alarm_check.png
+++ b/src/assets/alarm_check.png
--- a/src/assets/alarm_one.png
+++ b/src/assets/alarm_one.png
--- a/src/assets/alarm_repair.png
+++ b/src/assets/alarm_repair.png
--- a/src/assets/alarm_three.png
+++ b/src/assets/alarm_three.png
--- a/src/assets/alarm_tip.png
+++ b/src/assets/alarm_tip.png
--- a/src/assets/alarm_trailer.png
+++ b/src/assets/alarm_trailer.png
--- a/src/assets/alarm_two.png
+++ b/src/assets/alarm_two.png
--- a/src/assets/alarm_unCheck.png
+++ b/src/assets/alarm_unCheck.png
--- a/src/assets/icon_upload.png
+++ b/src/assets/icon_upload.png
--- a/src/assets/report/add_report_address.png
+++ b/src/assets/report/add_report_address.png
--- a/src/assets/report/add_report_arrow.png
+++ b/src/assets/report/add_report_arrow.png
--- a/src/assets/report/add_report_bg.png
+++ b/src/assets/report/add_report_bg.png
--- a/src/assets/report/add_report_close.png
+++ b/src/assets/report/add_report_close.png
--- a/src/assets/report/add_report_dot.png
+++ b/src/assets/report/add_report_dot.png
--- a/src/assets/report/add_report_time.png
+++ b/src/assets/report/add_report_time.png
--- a/src/assets/report/destMarker.png
+++ b/src/assets/report/destMarker.png
--- a/src/assets/report/report_address.png
+++ b/src/assets/report/report_address.png
--- a/src/assets/report/report_ai.png
+++ b/src/assets/report/report_ai.png
--- a/src/assets/report/report_cancel.png
+++ b/src/assets/report/report_cancel.png
--- a/src/assets/report/report_customer.png
+++ b/src/assets/report/report_customer.png
--- a/src/assets/report/report_delay.png
+++ b/src/assets/report/report_delay.png
--- a/src/assets/report/report_dispatch.png
+++ b/src/assets/report/report_dispatch.png
--- a/src/assets/report/report_driver.png
+++ b/src/assets/report/report_driver.png
--- a/src/assets/report/report_fee.png
+++ b/src/assets/report/report_fee.png
--- a/src/assets/report/report_line.png
+++ b/src/assets/report/report_line.png
--- a/src/assets/report/report_logo.png
+++ b/src/assets/report/report_logo.png
--- a/src/assets/report/report_other.png
+++ b/src/assets/report/report_other.png
--- a/src/assets/report/report_unconnect.png
+++ b/src/assets/report/report_unconnect.png
--- a/src/assets/secondHandCar/11.png
+++ b/src/assets/secondHandCar/11.png
--- a/src/assets/secondHandCar/45angle.png
+++ b/src/assets/secondHandCar/45angle.png
--- a/src/assets/secondHandCar/alreayXiajia.png
+++ b/src/assets/secondHandCar/alreayXiajia.png
--- a/src/assets/secondHandCar/arr_bot_blue.png
+++ b/src/assets/secondHandCar/arr_bot_blue.png
--- a/src/assets/secondHandCar/arr_bottom.png
+++ b/src/assets/secondHandCar/arr_bottom.png
--- a/src/assets/secondHandCar/arr_left.png
+++ b/src/assets/secondHandCar/arr_left.png
--- a/src/assets/secondHandCar/back.png
+++ b/src/assets/secondHandCar/back.png
--- a/src/assets/secondHandCar/bg.png
+++ b/src/assets/secondHandCar/bg.png
--- a/src/assets/secondHandCar/buyCar.png
+++ b/src/assets/secondHandCar/buyCar.png
--- a/src/assets/secondHandCar/checked.png
+++ b/src/assets/secondHandCar/checked.png
--- a/src/assets/secondHandCar/cheyuanBig.png
+++ b/src/assets/secondHandCar/cheyuanBig.png
--- a/src/assets/secondHandCar/cheyuanSmall.png
+++ b/src/assets/secondHandCar/cheyuanSmall.png
--- a/src/assets/secondHandCar/cheyuan_big.png
+++ b/src/assets/secondHandCar/cheyuan_big.png
--- a/src/assets/secondHandCar/delete.png
+++ b/src/assets/secondHandCar/delete.png
--- a/src/assets/secondHandCar/description.png
+++ b/src/assets/secondHandCar/description.png
--- a/src/assets/secondHandCar/description1.png
+++ b/src/assets/secondHandCar/description1.png
--- a/src/assets/secondHandCar/details.png
+++ b/src/assets/secondHandCar/details.png
--- a/src/assets/secondHandCar/expire.png
+++ b/src/assets/secondHandCar/expire.png
--- a/src/assets/secondHandCar/fabuing.png
+++ b/src/assets/secondHandCar/fabuing.png
--- a/src/assets/secondHandCar/icon_saled.png
+++ b/src/assets/secondHandCar/icon_saled.png
--- a/src/assets/secondHandCar/icon_zdOwner.png
+++ b/src/assets/secondHandCar/icon_zdOwner.png
--- a/src/assets/secondHandCar/jiashizheng.jpg
+++ b/src/assets/secondHandCar/jiashizheng.jpg
--- a/src/assets/secondHandCar/mine.png
+++ b/src/assets/secondHandCar/mine.png
--- a/src/assets/secondHandCar/mine_cheyuan.png
+++ b/src/assets/secondHandCar/mine_cheyuan.png
--- a/src/assets/secondHandCar/mine_qiugou.png
+++ b/src/assets/secondHandCar/mine_qiugou.png
--- a/src/assets/secondHandCar/noAudit.png
+++ b/src/assets/secondHandCar/noAudit.png
--- a/src/assets/secondHandCar/nopass.png
+++ b/src/assets/secondHandCar/nopass.png
--- a/src/assets/secondHandCar/one_cheyuan.png
+++ b/src/assets/secondHandCar/one_cheyuan.png
--- a/src/assets/secondHandCar/one_qiugou.png
+++ b/src/assets/secondHandCar/one_qiugou.png
--- a/src/assets/secondHandCar/polish.png
+++ b/src/assets/secondHandCar/polish.png
--- a/src/assets/secondHandCar/qiugouBig.png
+++ b/src/assets/secondHandCar/qiugouBig.png
--- a/src/assets/secondHandCar/qiugouSmall.png
+++ b/src/assets/secondHandCar/qiugouSmall.png
--- a/src/assets/secondHandCar/qiugou_big.png
+++ b/src/assets/secondHandCar/qiugou_big.png
--- a/src/assets/secondHandCar/reshangjia.png
+++ b/src/assets/secondHandCar/reshangjia.png
--- a/src/assets/secondHandCar/revise.png
+++ b/src/assets/secondHandCar/revise.png
--- a/src/assets/secondHandCar/search.png
+++ b/src/assets/secondHandCar/search.png
--- a/src/assets/secondHandCar/sellCar.png
+++ b/src/assets/secondHandCar/sellCar.png
--- a/src/assets/secondHandCar/suggest.png
+++ b/src/assets/secondHandCar/suggest.png
--- a/src/assets/secondHandCar/three.png
+++ b/src/assets/secondHandCar/three.png
--- a/src/assets/secondHandCar/two_desc.png
+++ b/src/assets/secondHandCar/two_desc.png
--- a/src/assets/secondHandCar/two_supply.png
+++ b/src/assets/secondHandCar/two_supply.png
--- a/src/assets/secondHandCar/uncheck.png
+++ b/src/assets/secondHandCar/uncheck.png
--- a/src/assets/secondHandCar/upload.png
+++ b/src/assets/secondHandCar/upload.png
--- a/src/assets/secondHandCar/wait_verify.png
+++ b/src/assets/secondHandCar/wait_verify.png
--- a/src/assets/secondHandCar/xiajia.png
+++ b/src/assets/secondHandCar/xiajia.png
--- a/src/assets/secondHandCar/车辆描述@2x.png
+++ b/src/assets/secondHandCar/车辆描述@2x.png
--- a/src/router/index.js
+++ b/src/router/index.js
@ -2,9 +2,6 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 Vue.use(VueRouter);
 import kpiRouter from './kpi-router'
-import invoiceRouter from "@/router/invoice-router";
-import secondHandRouter from "@/router/second-hand-router";
-import reportRouter from "@/router/report-router"
 const routes = [
    {
      path: '/',
@ -87,48 +84,15 @@ const routes = [
      name: 'invoicingNotify',
      component: () => import('@/views/index/invoicingNotify.vue'),
      meta: {
-        title: '工单批次'
+        title: '开票通知'
      }
    },
-    {
-        path: "/invoiceListInfo",
-        name: 'invoiceListInfo',
-        component: () => import('@/views/index/invoiceListInfo.vue'),
-        meta: {
-            title: '开票信息'
-        }
-    },
-    {
-        path: "/invoiceInfo",
-        name: 'invoiceInfo',
-        component: () => import('@/views/index/invoiceInfo.vue'),
-        meta: {
-            title: '开票信息'
-        }
-    },
    {
        path: "/invoicingDetail",
        name: 'invoicingDetail',
        component: () => import('@/views/index/invoicingDetail'),
        meta: {
-            title: '工单批次详情'
-        }
-    },
-    {
-        path: "/uploadInvoice",
-        name: 'uploadInvoice',
-        component: () => import('@/views/index/uploadInvoice.vue'),
-        meta: {
-            title: '上传发票',
-            cache: true
-        }
-    },
-    {
-        path: "/showInvoice",
-        name: 'showInvoice',
-        component: () => import('@/views/index/showInvoice.vue'),
-        meta: {
-            title: '查看发票'
+            title: '开票通知详情'
        }
    },
    {
@ -187,14 +151,6 @@ const routes = [
            title:'文档资料'
        }
    },
-    {
-        path: '/notificationList',
-        name: 'notificationList',
-        component:()=>import('@/views/index/notificationList'),
-        meta: {
-            title:'告知函'
-        }
-    },
    {
        path: '/caseList',
        name: 'caseList',
@ -251,22 +207,6 @@ const routes = [
            title:'车辆维保'
        }
    },
-    {
-        path: '/vehicleAlarmList',
-        name: 'vehicleAlarmList',
-        component:()=>import('@/views/vehicle-maintenance/vehicle-alarm-list.vue'),
-        meta: {
-            title:'车辆报警'
-        }
-    },
-    {
-        path: '/vehicleAlarmDetail',
-        name: 'vehicleAlarmDetail',
-        component:()=>import('@/views/vehicle-maintenance/vehicle-alarm-detail.vue'),
-        meta: {
-            title:'报警详情'
-        }
-    },
    {
        path: '/maintenanceApplication',
        name: 'maintenanceApplication',
@ -275,26 +215,7 @@ const routes = [
            title:'维保申请'
        }
    },
-    {
-        path: '/batteryList',
-        name: 'batteryList',
-        component:()=>import('@/views/battery/batteryList.vue'),
-        meta: {
-            title:'电瓶进销存'
-        }
-    },
-    {
-        path: '/batteryDetail',
-        name: 'batteryDetail',
-        component:()=>import('@/views/battery/batteryDetail.vue'),
-        meta: {
-            title:'电瓶详情'
-        }
-    },
    ...kpiRouter,
-    ...invoiceRouter,
-    ...secondHandRouter,
-    ...reportRouter
  ]

 const router = new VueRouter({
--- a/src/router/invoice-router.js
+++ b/src/router/invoice-router.js
@ -1,11 +0,0 @@
-const invoiceRouter = [
-    {
-        path: '/invoiceIndex',
-        name: 'invoiceIndex',
-        component: () => import('@/views/invoice/invoiceIndex'),
-        meta:{
-            title: '道路救援',
-        }
-    },
-]
-export default invoiceRouter
--- a/src/router/report-router.js
+++ b/src/router/report-router.js
@ -1,21 +0,0 @@
-const reportRouter = [
-  {
-    path: '/reportIndex',
-    name: 'reportIndex',
-    component: () => import('@/views/report/reportIndex'),
-    meta:{
-      title: '道路救援',
-      cache: true,
-      modalState: false,
-    }
-  },
-  {
-    path: '/addressMap',
-    name: 'addressMap',
-    component: () => import('@/views/report/addressMap'),
-    meta:{
-      title: '道路救援',
-    }
-  },
-]
-export default reportRouter
--- a/src/router/second-hand-router.js
+++ b/src/router/second-hand-router.js
@ -1,59 +0,0 @@
-const secondHandCar = [
-    {
-        path: '/indexList',
-        name: 'indexList',
-        component: () => import('@/views/secondHandCar/indexList.vue'),
-        meta:{
-            title: '首页列表',
-        }
-    },
-    {
-        path: '/carSource',
-        name: 'carSource',
-        component: () => import('@/views/secondHandCar/carSource.vue'),
-        meta:{
-            title: '车源发布',
-        }
-    },
-    {
-        path: '/wantBuy',
-        name: 'wantBuy',
-        component: () => import('@/views/secondHandCar/wantBuy.vue'),
-        meta:{
-            title: '求购发布',
-        }
-    },
-    {
-        path: '/forSale',
-        name: 'forSale',
-        component: () => import('@/views/secondHandCar/forSale.vue'),
-        meta:{
-            title: '查看车源',
-        }
-    },
-    {
-        path: '/wantBuySale',
-        name: 'wantBuySale',
-        component: () => import('@/views/secondHandCar/wantBuySale.vue'),
-        meta:{
-            title: '查看求购',
-        }
-    },
-    {
-        path: '/mineRelease',
-        name: 'mineRelease',
-        component: () => import('@/views/secondHandCar/mineRelease.vue'),
-        meta:{
-            title: '我的发布',
-        }
-    },
-    {
-        path: '/privacyComponent',
-        name: 'privacyComponent',
-        component: () => import('@/views/secondHandCar/privacy.vue'),
-        meta:{
-            title: '免责声明',
-        }
-    },
-]
-export default secondHandCar
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@ -45,6 +45,7 @@ select{
  margin-left: 0;
  font-weight: normal;
  font-size: 14px;
+  //@include fontWeightSize(400,14px);
  color: #000000;
 }

--- a/src/utils/http.js
+++ b/src/utils/http.js
@ -1,6 +1,7 @@
 import axios from "axios";
 import qs from 'qs'
 import { Toast } from 'vant'
+// console.log('process.env.VUE_APP_BASE_API', process.env.VUE_APP_BASE_API)

 const service = axios.create({
  baseURL: process.env.VUE_APP_BASE_API,
@ -10,32 +11,30 @@ const service = axios.create({
  timeout: 10000
 })
 const urlParams = new URLSearchParams(window.location.search);
-let token = urlParams.get('token');
-if( token ) {
-  localStorage.setItem('token', token);
-} else {
-  localStorage.setItem('token', '');
-}
+let token = urlParams.get('token') ;
+localStorage.setItem('token', token);
 service.interceptors.request.use(
    config => {
      let reqUrl=config.url
+        // console.log("reqUrl",reqUrl)
      config.data = config.contentType ? config.data : qs.stringify(config.data)
-      if (config.testFlag) {
-        config.data = qs.stringify(config.data, {arrayFormat: 'indices', allowDots: true})
-      }
      config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded'
      let token = localStorage.getItem('token');
-      // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJBTkNIQU5HIiwidXNlcklkIjo0NTY3MSwibmFtZSI6IuWuieeVhSIsInVzZXJOYW1lIjoiQU5DSEFORyIsInN1cHBsaWVySWQiOjExMjgsImlzWmQiOjAsImV4cCI6MTc1NTQyMjUyNX0.xzDZhaANJFnbeViIHJA0SEtOyTv7Ja3rKmXqRKRuFkc'
-      // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJTSEhQWEIiLCJ1c2VySWQiOjU0NzI2LCJuYW1lIjoiI-a1i-ivleWwj-eZveeZvSIsInVzZXJOYW1lIjoiU0hIUFhCIiwic3VwcGxpZXJJZCI6MTAwMDE2NSwiZXhwIjoxNzQ0NTEwNzkwfQ.JPk0OA7slYJN3FIi_uhW4Y0CiWRvl6R1dK8MRTbyhD8'
-       if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
-         if(token) {
-           config.headers['Authorization'] = `${token}`;
-           config.headers['token'] = `${token}`;
-         }
-       }
+      // let token='4099761587129c46b03c9316c9e866c9'
+      // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MTI0NTQ5NTMsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiJDLeS4iua1t-a1i-ivleacjeWKoeWVhiIsInN1cHBsaWVySWQiOjMzMDQxLCJzdXBwbGllclR5cGUiOjIsInVzZXJuYW1lIjoic29uZyIsInVzZXJUeXBlIjoicmVzY3VlQXBwIiwiZGV2aWNlSWQiOiIyMmI0OWNhMjBmOWI4MzMwZDk4NzIxNzNmMzllYTY4YmMiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTcxMjU0MTM1MywiaWF0IjoxNzEyNDU0OTUzfQ.sPU9_OD_TOWcTwqmlawEGyo4mCPrEaRYw2R02gnvYJw'
+      if (reqUrl.includes("/driverApp")) {
+          //  console.log("司机app")
+          config.headers['token'] = `${token}`;
+      } else if(reqUrl.includes("/supplierApp") || reqUrl.includes("/supplierKPI") || reqUrl.includes('/supplier/select')){
+          // console.log("调度app，服务商kpi")
+          config.headers['Authorization'] = `${token}`;
+      }else{
+          config.headers['token'] = `${token}`;
+      }
      return config
    },
    error => {
+      console.log(error)
      return Promise.reject(error)
    }
 )
@ -43,17 +42,27 @@ service.interceptors.request.use(
 service.interceptors.response.use(
    response => {
      const res = response.data
+      // return res //请求响应数据
+      // if(res.code === 401){
+      //     Toast('token不合法或过期')
+      // }else if(){
+      //
+      // }
      if ( res.code === 401 || res.code === 400  || res.code == 500) {
          Toast(res.msg || 'Error')
-          return Promise.reject(res.msg)
+          return Promise.reject(new Error(res.msg || 'Error'))
      } else {
          return res
+        // if( res.code === 200 ) {
+        //   return res.data
+        // } else {
+        //   return res.data
+        // }
      }
    },
    error => {
-        if(error.message != 'Network Error'){
-            Toast(error.message)
-        }
+      console.log('err' + error)
+      Toast(error.message)
      return Promise.reject(error)
    }
 )
--- a/src/utils/map.js
+++ b/src/utils/map.js
@ -36,7 +36,6 @@ export function getAddress(mapContext, lnglat) {
        } else {
          console.log(result)
          alert(JSON.stringify(result))
-          reject(result)
        }
      })
    })
@ -45,7 +44,7 @@ export function getAddress(mapContext, lnglat) {

 // 输入提示
 export function searchFun(mapContext, cityCode, keyword) {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
    mapContext.plugin('AMap.AutoComplete', function(){
      var autoOptions = {
        city: cityCode || '全国',
@ -58,7 +57,7 @@ export function searchFun(mapContext, cityCode, keyword) {
        if(result.info == 'OK') {
          resolve(result.tips)
        } else {
-          resolve([])
+          reject(result)
        }
      })
    })
@ -91,7 +90,6 @@ export function getRoad( mapContext, startLng, startLat, endLng, endLat ) {
 }


-/*
 function drawRoute(route, map) {
  let path = parseRouteToPath(route)

@ -108,4 +106,3 @@ function drawRoute(route, map) {

  map.add(routeLine);
 }
-*/
--- a/src/utils/myMixins.js
+++ b/src/utils/myMixins.js
@ -1,7 +1,9 @@
-
 export const myMixins = {
  data() {
    return {
+      touchStart: [],
+      touchEnd: [],
+      slideShow: true
    }
  },
  methods: {
@ -70,38 +72,12 @@ export const myMixins = {
          methods();
        }
        setTimeout(() => {
+          console.log("shengxiaoxi")
          that.noClick = true;
        }, 3000)
      } else {
        // 这里是重复点击的判断
      }
-    },
-    formatNumber(num) {
-      if (num < 10000) {
-        // 小于 5 位数，显示为 0.x 万
-        return `${(num / 10000).toFixed(1)}`;
-      } else {
-        // 大于或等于 5 位数，显示为 x 万，四舍五入到小数点后一位
-        return `${Math.round(num / 1000) / 10}`;
-      }
-    },
-    isWebFunc(){
-      let res=false
-      var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
-      if (!isMobile) {// 是移动端不变
-        res=true
-      }
-      return res
-    },
-    closeParentDialog() {
-      if (window.parent) {
-        const hasListener = window.parent.dispatchEvent(new Event('checkCloseDialog'));
-        if (hasListener) {
-          window.parent.postMessage('closeDialog', '*');
-        } else {
-          window.history.back();
-        }
-      }
-    },
+    }
  }
 }
--- a/src/views/battery/batteryDetail.vue
+++ b/src/views/battery/batteryDetail.vue
@ -1,138 +0,0 @@
-<template>
-  <div class="wrap" >
-    <div class="navBar">
-      <van-nav-bar
-          title="已售电瓶"
-          left-arrow
-          left-arrow-color="#FFFFFF"
-          :border="false"
-          :fixed="true"
-          :safe-area-inset-top="true"
-          @click-left="h5GoBack"
-      > </van-nav-bar>
-    </div>
-    <div class="container" v-if="batteryDetailList && batteryDetailList.length>0">
-      <div class="itemWrap" v-for="(item,index) in batteryDetailList" :key="index">
-        <div>
-          <span class="halfOpci">设备号</span>
-          <span class="allOpci">{{ item.productNo }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">品牌</span>
-          <span class="allOpci">{{ item.brand }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">型号</span>
-          <span class="allOpci">{{ item.model }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">售卖人员</span>
-          <span class="allOpci">{{ item.saleName }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">售卖时间</span>
-          <span class="allOpci">{{ item.createTime }}</span>
-        </div>
-      </div></div>
-  </div>
-</template>
-
-<script>
-
-import {myMixins} from "@/utils/myMixins"
-import {batteryDetailList} from  "@/api/order"
-export default {
-  name: "batteryDetail",
-  mixins:[myMixins],
-  data(){
-    return{
-      batteryDetailList:[],
-      isLoading: false,
-      loading: false,
-      brand: '',
-      model:'',
-    }
-  },
-  async mounted() {
-    this.brand = this.$route.params.brand;
-    this.model = this.$route.params.model;
-    await this.getDetailList()
-  },
-  methods:{
-    async getDetailList(){
-      let res = await batteryDetailList({
-        brand:this.brand,
-        model:this.model,
-      })
-      this.batteryDetailList=res.data.reverse();
-    },
-  }
-}
-</script>
-
-<style scoped lang="scss">
-@import '@/styles/mixin.scss';
-@import "@/styles/common.scss";
-
-.wrap {
-  background: #F4F5F7;
-  @include wh(100%, 100%);
-}
-.navBar{
-  margin-bottom: 46px;
-  .rightWrap{
-    @include wh(50px,20px);
-    border-radius: 10px;
-    opacity: 0.7;
-    border: 1px solid #FFFFFF;
-    @include flexTwoCenter;
-    img{
-      @include widHeiMar(9px,8px,4px);
-    }
-    .addTxt{
-      @include fontWeightSize(bolder,11px);
-      @include colorOpa( #FFFFFF,0.7);
-    }
-  }
-}
-.container{
-  @include wh(100%, calc(100% - 56px));
-  overflow-y: auto;
-  @include sizingPadding(13px,13px);
-}
-.itemWrap {
-  @include wh(100%, 104px);
-  @include radiusSizing(6px);
-  @include fontWeightSize(400, 12px);
-  @include flexBetween;
-  background: #FFFFFF;
-  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
-  margin-bottom: 10px;
-  padding: 11px 13px 9px 15px;
-  position: relative;
-  .halfOpci {
-    display: inline-block;
-    width: 60px;
-    opacity: .5;
-    margin-right: 5px;
-  }
-  .allOpci {
-    opacity: 1;
-  }
-  .statusNo {
-    color: #FF0000;
-  }
-  .statusYes {
-    color: #09B820
-  }
-  .img{
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    right: 10px;
-    top: 35%;
-    cursor: pointer;
-  }
-}
-
-</style>
--- a/src/views/battery/batteryList.vue
+++ b/src/views/battery/batteryList.vue
@ -1,171 +0,0 @@
-<template>
-  <div class="wrap" >
-    <div class="navBar">
-      <van-nav-bar
-          title="电瓶进销存"
-          left-arrow
-          left-arrow-color="#FFFFFF"
-          :border="false"
-          :fixed="true"
-          :safe-area-inset-top="true"
-          @click-left="goBack"
-      >
-      </van-nav-bar>
-    </div>
-    <van-field class="input" right-icon="search" v-model="keyword" placeholder="请输入品牌或型号"   @input="filterBatteryList"/>
-    <div class="container" v-if="batteryList && batteryList.length>0">
-      <div class="itemWrap" v-for="(item,index) in batteryList" :key="index">
-        <div>
-          <span class="halfOpci">品牌</span>
-          <span class="allOpci">{{ item.brand }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">型号</span>
-          <span class="allOpci">{{ item.model }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">总量</span>
-          <span class="allOpci">{{ item.totalNum }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">库存数量</span>
-          <span class="allOpci">{{ item.stockNum }}</span>
-        </div>
-        <div>
-          <span class="halfOpci">已售数量</span>
-          <span class="allOpci">{{ item.sellNum }}</span>
-        </div>
-        <img @click="goBatteryDetail(item)" class="img" src="@/assets/arrow_rht.png" />
-      </div>
-    </div>
-    <div class="bgEmptyImg" v-show="show" >
-      <img  src="@/assets/empty.png" />
-    </div>
-  </div>
-</template>
-
-<script>
-
-import {myMixins} from "@/utils/myMixins"
-import {batteryCountList} from  "@/api/order"
-export default {
-  name: "batteryList",
-  mixins:[myMixins],
-  data(){
-    return{
-      batteryList:[],
-      isLoading: false,
-      keyword:'',
-    }
-  },
-  computed:{
-    show() {
-      return (this.batteryList.length < 0 || this.batteryList.length == 0); // 判断数组长度是否大于 0
-    },
-  },
-  mounted() {
-    this.getList()
-  },
-  methods:{
-    async filterBatteryList(){
-      await this.getList()
-      this.batteryList = this.batteryList.filter(item =>
-          item.brand.includes(this.keyword) || item.model.includes(this.keyword)
-      );
-    },
-    goBatteryDetail(item){//电瓶详情
-      this.$router.push({
-        name: "batteryDetail",
-        params: {
-          brand: item.brand,
-          model: item.model,
-        }
-      })
-    },
-    async getList(){
-      let res = await batteryCountList()
-      this.batteryList=res.data
-    },
-  }
-}
-</script>
-
-<style scoped lang="scss">
-@import '@/styles/mixin.scss';
-@import "@/styles/common.scss";
-
-.wrap {
-  background: #F4F5F7;
-  @include wh(100%, 100%);
-}
-.navBar{
-  margin-bottom: 46px;
-  .rightWrap{
-    @include wh(50px,20px);
-    border-radius: 10px;
-    opacity: 0.7;
-    border: 1px solid #FFFFFF;
-    @include flexTwoCenter;
-    img{
-      @include widHeiMar(9px,8px,4px);
-    }
-    .addTxt{
-      @include fontWeightSize(bolder,11px);
-      @include colorOpa( #FFFFFF,0.7);
-    }
-  }
-}
-.input{
-  //@include sizingPadding(13px,13px);
-  //margin: 13px 0;
-}
-.container{
-  @include sizingPadding(13px,13px);
-  overflow-y: auto;
-  @include wh(100%, calc(100% - 96px));
-}
-
-.itemWrap {
-  @include wh(100%, 104px);
-  @include radiusSizing(6px);
-  @include fontWeightSize(400, 12px);
-  @include flexBetween;
-  background: #FFFFFF;
-  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
-  margin-bottom: 10px;
-  padding: 11px 13px 9px 15px;
-  position: relative;
-  //margin-top: 10px;
-  .halfOpci {
-    display: inline-block;
-    width: 60px;
-    opacity: .5;
-    margin-right: 5px;
-  }
-  .allOpci {
-    opacity: 1;
-  }
-  .statusNo {
-    color: #FF0000;
-  }
-  .statusYes {
-    color: #09B820
-  }
-  .img{
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    right: 10px;
-    top: 35%;
-    cursor: pointer;
-  }
-}
-.bgEmptyImg{
-  @include flexTwoCenter;
-  height: 90% ;
-  background-color: #FAFAFA;
-  img{
-    width: 100%;
-  }
-}
-</style>
--- a/src/views/documentView/diverTrainDocment.vue
+++ b/src/views/documentView/diverTrainDocment.vue
@ -101,7 +101,6 @@ export default {
    const urlParams = new URLSearchParams(window.location.search);
    this.driverId = urlParams.get('driverId');
    this.time=timeFormat(Date.now())
-    this.keyword=urlParams.get('keyWord') || ''
    this.getTrainingList();
    document.addEventListener('visibilitychange', async (  ) => {
      let state = document.visibilityState
--- a/src/views/documentView/docmentList.vue
+++ b/src/views/documentView/docmentList.vue
@ -103,9 +103,6 @@ export default {
    const urlParams = new URLSearchParams(window.location.search);
    this.supplierId = urlParams.get('supplierId');
    this.driverId = urlParams.get('driverId');
-    if(this.driverId){
-      this.keyword=urlParams.get('keyWord') || ''
-    }
    this.getNormalList()
  },
  methods:{
--- a/src/views/index/invoiceInfo.vue
+++ b/src/views/index/invoiceInfo.vue
@ -1,344 +0,0 @@
-<template>
-  <div class="wrap">
-    <div class="navBar">
-      <van-nav-bar
-        title="开票信息"
-        left-arrow
-        left-arrow-color="#FFFFFF"
-        :border="false"
-        :fixed="true"
-        :safe-area-inset-top="true"
-        @click-left="h5GoBack"
-      />
-    </div>
-    <div class="contentWrap">
-      <div class="content_tab">
-        <div class="tab_title">批次信息</div>
-        <div class="tab_content">
-          <div class="item_wrap">
-            <div class="item_label">财务编号</div>
-            <div class="item_content">
-              <span id="copyText">{{invoiceInfo.financeBatchCode}}</span>
-              <img class="copyIcon" @click="copyHandler(invoiceInfo.financeBatchCode)" src="@/assets/copy.png" />
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">工单数量</div>
-            <div class="item_content">
-              {{invoiceInfo.orderNum}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">总金额</div>
-            <div class="item_content">
-              {{invoiceInfo.totalMoney}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">扣款</div>
-            <div class="item_content">
-              {{invoiceInfo.cutMoney || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">税额扣款</div>
-            <div class="item_content">
-              {{invoiceInfo.taxCutMoney || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">开票金额</div>
-            <div class="item_content">
-              {{invoiceInfo.invoiceMoney || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">备注</div>
-            <div class="item_content">
-              {{invoiceInfo.remark || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">失败原因</div>
-            <div class="item_content">
-              {{invoiceInfo.failRemark || ''}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">创建时间</div>
-            <div class="item_content">
-              {{invoiceInfo.createTime}}
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_label">对账状况</div>
-            <div class="item_content">
-              {{ statusStr(invoiceInfo.status, invoiceInfo.createTime) }}
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="content_tab mt10">
-        <div class="tab_title">发票信息</div>
-        <div class="itemWrap" v-for="(item,index) in invoiceList" :key="index">
-          <div class="item line1">
-            <div class="title own_title">{{item.accountName}}</div>
-            <div class="checkBtn" @click="goShowInvoice(item)">查看</div>
-          </div>
-          <div class="item">
-            <span class="title">发票号码:</span>
-            <span class="content">{{item.financeBatchCode}}</span>
-          </div>
-          <div class="item">
-            <span class="title">发票金额:</span>
-            <span class="content">￥{{item.invoiceMoney}}元</span>
-          </div>
-          <div class="item">
-            <span class="title">开票日期:</span>
-            <span class="content">{{ item.invoiceDate }}</span>
-          </div>
-        </div>
-      </div>
-
-      <div class="content_tab mt10">
-        <div class="tab_title">快递信息</div>
-        <div class="itemWrap bg_cls pd_cls">
-          <div class="item mb10">
-            <span class="title width_cls">发票类型:</span>
-            <span class="content">
-              <van-radio-group v-model="invoiceType" disabled direction="horizontal">
-                <van-radio :name="1" icon-size="16px">电子发票</van-radio>
-                <van-radio :name="2" icon-size="16px">纸质发票</van-radio>
-              </van-radio-group>
-            </span>
-          </div>
-          <div class="item">
-            <span class="title width_cls">补录快递单号:</span>
-            <span class="content" style="flex: 1">
-              <van-field v-model="courierNumber" label="" />
-            </span>
-          </div>
-        </div>
-      </div>
-
-      <div class="invoice_btn_wrap">
-        <div class="btn" @click="saveHandler">保存</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {myMixins} from "@/utils/myMixins"
-  import { financeInvoiceList, selectInvoiceDetailInfo, saveBatchCourierNumber } from  "@/api/mine"
-  import {Dialog} from "vant";
-  export default {
-    name: "invoiceInfo",
-    mixins: [ myMixins ],
-    data() {
-      return {
-        invoiceInfo: {},
-        invoiceList: [],
-        invoiceType: '',
-        courierNumber: '',
-        id: ''
-      }
-    },
-    async mounted() {
-      let showItemInfo = localStorage.getItem('showItemInfo');
-      this.invoiceInfo = showItemInfo ? JSON.parse(showItemInfo) : {};
-      console.log('this.invoiceInfo', this.invoiceInfo)
-      this.invoiceType = this.invoiceInfo.invoiceType
-      this.id = this.$route.query.id;
-      await this.getInvoiceHandler()
-    },
-    methods: {
-      async saveHandler() {
-        await saveBatchCourierNumber({
-          invoiceBatchId: this.id,
-          courierNumber: this.courierNumber,
-        })
-        Dialog.alert({
-          title: '提示',
-          message: '操作成功!',
-        }).then(() => {
-          this.h5GoBack()
-        });
-      },
-      async goShowInvoice(item) {
-        let res = await selectInvoiceDetailInfo({
-          id: item.id
-        })
-        localStorage.setItem('invoiceDetail', JSON.stringify(res.data));
-        this.goPage('showInvoice')
-      },
-      statusStr(status,date) {
-        if(new Date('2024-01-01 00:00:00') > new Date(date)){
-          return ''
-        }
-        if( status == 1 ) {
-          return '待审核'
-        } else if( [2 ,3].includes(status)) {
-          return '审核通过'
-        } else if( status == 7 ) {
-          return '审核失败'
-        } else if( status == 4 ) {
-          return '已打款'
-        } else if( status == 8 ) {
-          return '打款中'
-        } else {
-          return ''
-        }
-      },
-      async getInvoiceHandler() {
-        let res = await financeInvoiceList({
-          current: 1,
-          pageSize: 1000,
-          total: 0,
-          pageNum: 1,
-          invoiceBatchId: this.id
-        });
-        this.invoiceList = res.data;
-        console.log('current', res)
-      },
-      copyHandler(copyText){
-        let inputNode = document.createElement('input')  // 创建input
-        inputNode.value = copyText // 赋值给 input 值
-        document.body.appendChild(inputNode) // 插入进去
-        inputNode.select() // 选择对象
-        document.execCommand('Copy') // 原生调用执行浏览器复制命令
-        inputNode.className = 'oInput'
-        inputNode.style.display = 'none' // 隐藏
-        this.$toast('复制成功')
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  @import "@/styles/mixin.scss";
-  @import "@/styles/common.scss";
-  .wrap{
-    @include wh(100%,100%);
-    background-color: #F4F5F7;
-    overflow-y: auto;
-    box-sizing: border-box;
-  }
-  .navBar{
-    margin-bottom: 46px;
-  }
-
-  .contentWrap{
-    .content_tab {
-      background-color: #fff;
-      width: 100%;
-      padding: 15px 15px;
-      box-sizing: border-box;
-      .tab_title {
-        font-size: 14px;
-        font-weight: bold;
-        margin-bottom: 5px;
-      }
-      .tab_content {
-        .item_wrap {
-          display: flex;
-          align-items: center;
-          line-height: 26px;
-          font-size: 12px;
-          .item_label {
-            color: rgba(0,0,0,0.5);
-            margin-right: 5px;
-            width: 60px;
-          }
-          .item_content {
-            display: flex;
-            align-items: center;
-          }
-        }
-      }
-    }
-  }
-  .copyIcon {
-    width: 35px;
-    height: 15px;
-    margin-left: 10px
-  }
-
-  .itemWrap{
-    /*background: #FFFFFF;*/
-    background-color: #EBF2F7;
-    padding: 10px 20px;
-    border: 1px solid #EBF2F7;
-    border-radius: 4px;
-    position: relative;
-    width: 100%;
-    box-sizing: border-box;
-    line-height: 26px;
-    @include flexBetween;
-    margin-bottom: 10px;
-    .line1{
-      width: 100%;
-      @include flexColBet;
-      .checkBtn{
-        @include bgFontColor(#FFFFFF,#354D93);
-        @include wh(48px,18px);
-        border-radius: 3px;
-        line-height: 18px;
-        text-align: center;
-      }
-    }
-  }
-  .item{
-    display: flex;
-    @include fontWeightSize(400,12px);
-    span{
-      display: inline-block;
-    }
-    .title{
-      opacity: 0.5;
-      margin-right: 5px;
-    }
-    .own_title {
-      font-weight: bold;
-      font-size: 14px;
-      opacity: 1;
-    }
-  }
-  .mt10 {
-    margin-top: 10px;
-  }
-  .bg_cls {
-    background-color: #fff;
-  }
-  .pd_cls {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-  ::v-deep .van-cell {
-    padding: 0;
-    border: 1px solid #EBF2F7;
-  }
-  .width_cls {
-    width: 80px;
-  }
-  .invoice_btn_wrap {
-    width: 100%;
-    padding: 20px;
-    box-sizing: border-box;
-    background-color: #fff;
-    .btn {
-      width: 100%;
-      background-color: #2C395F;
-      color: #fff;
-      padding: 15px 0;
-      text-align: center;
-      border-radius: 6px;
-    }
-  }
-  .mb10 {
-    margin-bottom: 10px;
-  }
-  ::v-deep .van-radio__icon {
-    margin-right: 10px;
-  }
-</style>
--- a/src/views/index/invoiceListInfo.vue
+++ b/src/views/index/invoiceListInfo.vue
@ -1,262 +0,0 @@
-<template>
-  <div class="wrap">
-    <div class="navBar">
-      <van-nav-bar
-        title="开票信息"
-        left-arrow
-        left-arrow-color="#FFFFFF"
-        :border="false"
-        :fixed="true"
-        :safe-area-inset-top="true"
-        @click-left="goBack"
-      />
-    </div>
-    <div class="search_wrap">
-      <div class="search_left">
-        <el-select v-model="form.statusValue" size="mini" clearable placeholder="请选择审核状态">
-          <el-option
-            v-for="item in statusValueOptions"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </div>
-      <div class="search_right">
-        <van-search
-          v-model="form.financeBatchCode"
-          show-action
-          placeholder="请输入搜索关键词"
-          @search="onSearch"
-        >
-          <template #action>
-            <div @click="onSearch">搜索</div>
-          </template>
-        </van-search>
-      </div>
-    </div>
-    <div class="contentWrap">
-      <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-        <van-list
-          v-model="loading"
-          :finished="finished"
-          finished-text="没有更多了"
-          @load="getMore"
-        >
-          <div class="itemWrap" v-for="(item,index) in invoiceList" :key="index">
-            <div class="item line1">
-              <div class="itemTime">
-                <span class="title">开票编号:</span>
-                <span class="content">{{ item.financeBatchCode }}</span>
-              </div>
-              <div class="checkBtn" @click="getInvoiceInfo(item)">查看</div>
-            </div>
-            <div class="item">
-              <span class="title">工单数量:</span>
-              <span class="content">{{ item.orderNum }}</span>
-            </div>
-            <div class="item">
-              <span class="title">开票金额:</span>
-              <span class="content">{{ item.invoiceMoney || 0 }}元</span>
-            </div>
-            <div class="item">
-              <span class="title">创建时间:</span>
-              <span class="content">{{ item.createTime }}</span>
-            </div>
-            <div class="item">
-              <span class="title">对账状态:</span>
-              <span class="content">{{ statusStr(item.status, item.createTime) }}</span>
-            </div>
-          </div>
-        </van-list>
-      </van-pull-refresh>
-
-    </div>
-  </div>
-</template>
-
-<script>
-  import { myMixins } from "@/utils/myMixins"
-  import { getFinanceBatchList } from  "@/api/mine"
-  export default {
-    name: "invoiceListInfo",
-    mixins: [ myMixins ],
-    data() {
-      return {
-        form: {
-          statusValue: '',
-          financeBatchCode: '',
-          statusList: [],
-        },
-        invoiceList: [],
-        isLoading: false,
-        loading: false,
-        finished: false,
-        page: {
-          current: 1,
-          pageSize: 10,
-          total: 0,
-          pageNum: 1,
-        },
-        supplierId: '',
-        statusValueOptions:[{name:'待审核',value:1},{name:'审核通过待打款',value: 2},{name:'审核失败',value: 3},{name:'打款中',value: 4},{name:'已打款',value: 5}],
-      }
-    },
-    watch:{
-      async 'form.statusValue' (){
-        if( this.form.statusValue == 1 ) {
-          this.form.statusList = [1]
-        } else if( this.form.statusValue == 2 ) {
-          this.form.statusList = [2, 3]
-        } else if( this.form.statusValue == 3 ) {
-          this.form.statusList = [7]
-        } else if( this.form.statusValue == 4 ) {
-          this.form.statusList = [8]
-        } else if( this.form.statusValue == 5 ) {
-          this.form.statusList = [4]
-        } else {
-          this.form.statusList = []
-        }
-      }
-    },
-    async mounted() {
-      this.supplierId = this.$route.query.supplierId;
-    },
-    methods: {
-      async onSearch() {
-        this.page.pageNum=1;
-        await this.getList()
-      },
-      onRefresh() {
-        this.page.pageNum=1;
-        this.getList();
-        setTimeout(() => {
-          this.$toast('刷新成功');
-          this.isLoading = false;
-        }, 1000);
-      },
-      async getMore(){
-        await this.getList()
-        this.page.pageNum++;
-        // 加载状态结束
-        this.loading = false;
-        // 数据全部加载完成
-        if (this.invoiceList.length >= this.page.total) {
-          this.finished = true;
-        }
-      },
-      async getList() {
-        let res = await getFinanceBatchList({
-          ...this.page,
-          ...this.form,
-          supplierId: this.supplierId
-        });
-        if(res.code == 200){
-          this.page.total = res.total;
-          if(this.page.pageNum == 1){
-            this.invoiceList = res.data;
-          }else{
-            let preList = this.invoiceList;
-            let arr = res.data;
-            this.invoiceList = preList.concat(arr)
-          }
-          if (this.invoiceList.length === 0) {
-            this.show=true
-          }else{
-            this.show=false
-          }
-        }
-      },
-      getInvoiceInfo(item) {
-        localStorage.setItem('showItemInfo', JSON.stringify(item));
-        this.goPage('invoiceInfo', {
-          id: item.id
-        })
-      },
-      statusStr(status,date) {
-        if(new Date('2024-01-01 00:00:00') > new Date(date)){
-          return ''
-        }
-        if( status == 1 ) {
-          return '待审核'
-        } else if( [2 ,3].includes(status)) {
-          return '审核通过'
-        } else if( status == 7 ) {
-          return '审核失败'
-        } else if( status == 4 ) {
-          return '已打款'
-        } else if( status == 8 ) {
-          return '打款中'
-        } else {
-          return ''
-        }
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  @import "@/styles/mixin.scss";
-  @import "@/styles/common.scss";
-  .wrap{
-    @include wh(100%,100%);
-    background-color: #F4F5F7;
-    overflow-y: auto;
-    box-sizing: border-box;
-  }
-  .navBar{
-    margin-bottom: 46px;
-  }
-  .contentWrap {
-    background-color: #F4F5F7;
-    width: 100%;
-    box-sizing: border-box;
-    padding: 10px;
-  }
-  .search_wrap {
-    display: flex;
-    align-items: center;
-    padding-left: 10px;
-    background-color: #fff;
-    .search_left {
-      width: 100px;
-      font-size: 12px;
-    }
-    .search_right {
-      flex: 1;
-    }
-  }
-
-  .itemWrap{
-    background: #FFFFFF;
-    position: relative;
-    width: 100%;
-    box-sizing: border-box;
-    padding: 15px;
-    border-radius: 6px;
-    line-height: 26px;
-    @include flexBetween;
-    margin-bottom: 10px;
-    .item{
-      @include fontWeightSize(400,12px);
-      span{
-        display: inline-block;
-      }
-      .title{
-        opacity: .5;
-        margin-right: 5px;
-      }
-    }
-    .line1{
-      width: 100%;
-      @include flexColBet;
-      .checkBtn{
-        @include bgFontColor(#FFFFFF,#354D93);
-        @include wh(48px,18px);
-        border-radius: 3px;
-        line-height: 18px;
-        text-align: center;
-      }
-    }
-  }
-</style>
--- a/src/views/index/invoicingDetail.vue
+++ b/src/views/index/invoicingDetail.vue
@ -2,7 +2,7 @@
 <div class="wrap">
  <div class="navBar">
    <van-nav-bar
-        title="工单批次详情"
+        title="开票通知详情"
        left-arrow
        left-arrow-color="#FFFFFF"
        :border="false"
@ -12,143 +12,52 @@
    />
  </div>
  <div class="contentWrap">
-    <div class="content_tab">
-      <div class="tab_title">批次详情</div>
-      <div class="tab_content">
-        <div class="item_wrap">
-          <div class="item_label">批次编号</div>
-          <div class="item_content">
-            <span id="copyText">{{invoiceInfo.batchCode}}</span>
-            <img class="copyIcon" @click="copyHandler(invoiceInfo.batchCode)" src="@/assets/copy.png" />
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">财务编号</div>
-          <div class="item_content">
-            <span id="copyText2">{{invoiceInfo.financeBatchCode}}</span>
-            <img class="copyIcon" @click="copyHandler(invoiceInfo.financeBatchCode)" src="@/assets/copy.png" />
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">工单数量</div>
-          <div class="item_content">
-            {{invoiceInfo.orderNum}}
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">总金额</div>
-          <div class="item_content">
-            {{invoiceInfo.orderNum}}
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">扣款</div>
-          <div class="item_content">
-            {{invoiceInfo.cutMoney || ''}}
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">税额扣款</div>
-          <div class="item_content">
-            {{invoiceInfo.taxCutMoney || ''}}
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">开票金额</div>
-          <div class="item_content">
-            {{invoiceInfo.invoiceMoney || ''}}
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">备注</div>
-          <div class="item_content">
-            {{invoiceInfo.remark || ''}}
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">创建时间</div>
-          <div class="item_content">
-            {{invoiceInfo.createTime}}
-          </div>
-        </div>
-        <div class="item_wrap">
-          <div class="item_label">对账状况</div>
-          <div class="item_content">
-            {{invoiceInfo.statusString}}
-          </div>
-        </div>
+      <div class="item" v-for="(item,index) in detailList" :key="index">
+        <div class="itemContent">
+          <span> {{ item.orderCode }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <span>{{ item.serviceName }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <span> {{item.settleAmount}}元</span>
+            </div>
+        <div class="line"></div>
      </div>
-    </div>
-    <div class="content_tab mt_cls">
-      <div class="tab_title">关联案件</div>
-      <table>
-        <tr>
-          <th class="text_left">案件编号</th>
-          <th>服务类型</th>
-          <th>结算类型</th>
-        </tr>
-        <tr v-for="(item, index) in orderList" :key="index">
-          <td class="text_left">
-            {{item.orderCode}}
-            <img class="copyIcon" @click="copyHandler(item.orderCode)" src="@/assets/copy.png" />
-          </td>
-          <td>{{item.serviceType || ''}}</td>
-          <td>{{item.settleAmount || ''}}</td>
-        </tr>
-      </table>
-    </div>
  </div>
 </div>
 </template>

 <script>
 import {myMixins} from "@/utils/myMixins"
-import { notifyInvoiceDetail, getOrderListByInvoice } from  "@/api/mine"
+import {notifyInvoiceDetail} from "@/api/mine"
 export default {
  name: "invoicingDetail",
  mixins:[myMixins],
  data(){
    return{
-      batchCode: '',
-      id: '',
-      invoiceInfo: {},
-      orderList: [],
+      pageNum:1,
+      pageSize:10,
+      detailList:[],
+      form:{
+        batchCode:'',
+        startTime:'',
+        overTime:'',
+      }
    }
  },
  async mounted() {
-    this.batchCode = this.$route.query?.batchCode;
-    this.id = this.$route.query?.id;
+    // console.log(this.$route.query?.id)
+    this.form.batchCode=this.$route.query?.id;
+    this.form.startTime=this.$route.query?.startTime;
+    this.form.overTime=this.$route.query?.overTime;
    await this.getDetail()
-    await this.getOrderList();
  },
  methods:{
-    copyHandler(copyText){
-      let inputNode = document.createElement('input')  // 创建input
-      inputNode.value = copyText // 赋值给 input 值
-      document.body.appendChild(inputNode) // 插入进去
-      inputNode.select() // 选择对象
-      document.execCommand('Copy') // 原生调用执行浏览器复制命令
-      inputNode.className = 'oInput'
-      inputNode.style.display = 'none' // 隐藏
-      this.$toast('复制成功')
-    },
-    async getOrderList() {
-      let res = await getOrderListByInvoice({
-        batchCode: this.batchCode,
-        pageSize: 1000,
-        pageNum: 1,
-        createTime: this.invoiceInfo.startTime
-      })
-      this.orderList = res.data;
-      console.log('rerere', res);
-    },
-    async getDetail(){
-      let res = await notifyInvoiceDetail({
-        id: this.id
-      })
-      this.invoiceInfo = res.data
-      console.log('rerere', res)
-    }
+      async getDetail(){
+        let res=await notifyInvoiceDetail({
+          pageNum:this.pageNum,
+          pageSize:this.pageSize,
+         ...this.form,
+        })
+        this.detailList=res.data
+      }
  }
 }
 </script>
@ -158,62 +67,26 @@ export default {
@import "@/styles/common.scss";
 .wrap{
  @include wh(100%,100%);
-  background-color: #F4F5F7;
 }
 .navBar{
  height: 46px;
 }
 .contentWrap{
-  .mt_cls {
-    margin-top: 10px;
-  }
-  .content_tab {
-    background-color: #fff;
+  @include wh(100%,400px);
+  margin-left: 27px;
+  .item{
    width: 100%;
-    padding: 15px 15px;
-    box-sizing: border-box;
-    .tab_title {
-      font-size: 14px;
-      font-weight: bold;
-      margin-bottom: 5px;
+    @include all-height(47px);
+    .itemContent{
+      margin-left: 5px;
+      color: #323643;
+      @include fontWeightSize(400,13px);
    }
-    .tab_content {
-      .item_wrap {
-        display: flex;
-        align-items: center;
-        line-height: 30px;
-        font-size: 12px;
-        .item_label {
-          color: rgba(0,0,0,0.5);
-          margin-right: 5px;
-          width: 60px;
-        }
-        .item_content {
-          display: flex;
-          align-items: center;
-        }
-      }
-    }
-    table {
-      line-height: 30px;
-      width: 100%;
-      .text_left {
-        text-align: left;
-        width: 50%;
-      }
-      th {
-        color: rgba(0, 0, 0, 0.5);
-      }
-      td {
-        text-align: center;
-      }
+    .line{
+      @include wh(100%,1px);
+      @include bgcolorOpa(#E9E9EA,0.6);
    }
  }
 }
-  .copyIcon {
-    width: 35px;
-    height: 15px;
-    margin-left: 10px
-  }

-</style>
+</style>
--- a/src/views/index/invoicingNotify.vue
+++ b/src/views/index/invoicingNotify.vue
@ -2,7 +2,7 @@
 <div class="wrap">
  <div class="navBar">
    <van-nav-bar
-        title="工单批次"
+        title="开票通知"
        left-arrow
        left-arrow-color="#FFFFFF"
        :border="false"
@ -11,74 +11,41 @@
        @click-left="goBack"
    />
  </div>
-  <van-tabs v-model="active" sticky @click="changeTabHandler" background="#2C395F" color="#ffffff" title-active-color="#ffffff" title-inactive-color="#BDC1CD">
-    <van-tab title="全部" name="1"></van-tab>
-    <van-tab title="未开票" name="2"></van-tab>
-    <van-tab title="已开票" name="3"></van-tab>
-  </van-tabs>
-  <div class="content_wrap" :class="{ 'pd_cls': active == 2 }">
-    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-      <van-list
-        v-model="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="getMore"
-      >
-        <van-search
-          v-model="batchCode"
-          show-action
-          placeholder="请输入批次号或开票编号"
-        >
-          <template #action>
-            <div @click="onSearch">搜索</div>
-          </template>
-        </van-search>
-        <van-checkbox-group v-model="checkList">
-          <div class="itemWrap" v-for="(item,index) in notifyList" :key="index" @click="toggle(index)">
-            <div class="item line1">
-              <div class="itemTime">
-                <span class="title">批次号:</span>
-                <span class="content">{{ item.batchCode }}</span>
-              </div>
-              <div class="orderNum">
-                <span class="title">总案件数:</span>
-                <span class="content">{{ item?.orderNum || '' }}</span>
-              </div>
-              <div class="checkBtn" @click="goPage('invoicingDetail',{id:item.id, batchCode: item.batchCode})">查看</div>
-            </div>
-            <div class="item">
-              <span class="title">开票月份:</span>
-              <span class="content">{{ getMonth(item) }}</span>
-            </div>
-            <div class="item">
-              <span class="title">结算总金额:</span>
-              <span class="content">{{ item?.totalMoney ? item.totalMoney : 0 }}元</span>
-            </div>
-            <div class="item">
-              <span class="title">扣款金额:</span>
-              <span class="content">{{ item?.cutMoney || 0 }}元</span>
-            </div>
-            <div class="item">
-              <span class="title">扣款原因:</span>
-              <span class="content" style="color: #FF8F37;">{{ item.remark }}</span>
-            </div>
-            <div class="item">
-              <span class="title">最终开票金额:</span>
-              <span class="content">{{ item?.invoiceMoney || 0 }}元</span>
-            </div>
-            <van-checkbox class="checkbox_cls" v-if="active == 2" :name="item" ref="checkboxes" />
-          </div>
-        </van-checkbox-group>
-      </van-list>
-    </van-pull-refresh>
-  </div>
-  <div class="invoice_btn_wrap" v-if="active == 2 && totalCount > 0">
-    <div class="invoice_btn_info">
-      <span class="invoice_btn_title">开票总金额</span>
-      <span class="invoice_btn_money">￥{{totalCount}}</span>
+  <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+    <div class="itemWrap" v-for="(item,index) in notifyList" :key="index" >
+      <div class="item line1">
+        <div class="itemTime">
+          <span class="title">开票月份:</span>
+          <span class="content">{{ item.invoiceMonth }}</span>
+        </div>
+        <div class="orderNum">
+          <span class="title">总案件数:</span>
+          <span class="content">{{ item.orderNum }}</span>
+        </div>
+        <div class="checkBtn" @click="goPage('invoicingDetail',{id:item.batchCode,startTime:item.startTime,overTime:item.overTime})">查看 </div>
+      </div>
+      <div class="item">
+        <span class="title">批次号:</span>
+        <span class="content">{{ item.batchCode }}</span>
+      </div>
+      <div class="item">
+        <span class="title">结算总金额:</span>
+        <span class="content">{{ item.totalMoney + '元' }}</span>
+      </div>
+      <div class="item">
+        <span class="title">扣款金额:</span>
+        <span class="content">{{ item.cutMoney + '元'}}</span>
+      </div>
+      <div class="item">
+        <span class="title">扣款原因:</span>
+        <span class="content"  style="color: #FF8F37;">{{ item.remark }}</span>
+      </div>
+      <div class="item">
+        <span class="title">最终开票金额:</span>
+        <span class="content">{{ item.invoiceMoney+ '元' }}</span>
+      </div>
    </div>
-    <div class="btn" @click="goUploadPage">去开票</div>
-  </div>
+  </van-pull-refresh>
  <div v-show="show" class="bgShow">
    <img src="@/assets/empty.png">
  </div>
@ -86,7 +53,6 @@
 </template>

 <script>
-import { Decimal } from 'decimal.js';
 import {myMixins} from "@/utils/myMixins"
 import {notifyInvoiceList} from  "@/api/mine"
 export default {
@ -97,89 +63,14 @@ export default {
      notifyList:[],
      pageNum:1,
      pageSize:10,
-      total: 0,
      show:false,
      isLoading: false,
-      loading: false,
-      active: 1,
-      status: '',
-      dispatchAppSearchInvoiced: '',
-      batchCode: '',
-      finished: false,
-      checkList: [],
-      supplierId: '',
    }
  },
-  computed: {
-   /* totalCount () {
-      let total = 0;
-      this.checkList.map(item => {
-        total += item.invoiceMoney
-      })
-      return total
-    },*/
-    totalCount() {
-      // 使用 Decimal 来计算总金额
-      let total = new Decimal(0);
-
-      this.checkList.forEach(item => {
-        total = total.plus(new Decimal(item.invoiceMoney));
-      });
-
-      // 返回总金额，保留两位小数
-      return total.toNumber()
-    },
-  },
  mounted() {
-    this.supplierId = this.$route.query?.supplierId;
+      this.getNotifyList()
  },
  methods:{
-    goUploadPage() {
-      localStorage.setItem('list', JSON.stringify(this.checkList));
-      this.goPage('uploadInvoice', { supplierId : this.supplierId })
-    },
-    async onSearch() {
-      this.pageNum=1
-      await this.getNotifyList()
-    },
-    async getMore(){
-      if ( this.active != 2 ) {
-        await this.getNotifyList()
-        this.pageNum++;
-        // 加载状态结束
-        this.loading = false;
-        // 数据全部加载完成
-        if (this.notifyList.length >= this.total) {
-          this.finished = true;
-        }
-      }
-    },
-    changeTabHandler() {
-      this.pageNum = 1;
-      this.notifyList = [];
-      this.checkList = [];
-      if (this.active == 1) {   // 全部， 需要分页
-        this.status = '';
-        this.dispatchAppSearchInvoiced = '';
-        this.pageSize = 10;
-      } else if(this.active == 2) {   // 未开票, 不需要分页
-        this.status = 2;
-        this.dispatchAppSearchInvoiced = '';
-        this.pageSize = 10000
-      } else if(this.active == 3) {   // 已开票，需要分页
-        this.status = '';
-        this.dispatchAppSearchInvoiced = 1;
-        this.pageSize = 10
-      }
-      this.getNotifyList()
-    },
-    getMonth(item) {
-      let str = '';
-      let startTime = new Date(item.createTime);
-      let endTime = new Date(item.overTime);
-      str = startTime.getFullYear() + '年' + (startTime.getMonth() + 1 ) + '月 - ' + endTime.getFullYear() + '年' + (endTime.getMonth() + 1) + '月'
-      return str
-    },
    onRefresh() {
      this.pageNum=1
      this.getNotifyList()
@ -190,34 +81,19 @@ export default {
    },
    async getNotifyList(){
      let res =  await notifyInvoiceList({
-        pageNum:this.pageNum,
-        pageSize:this.pageSize,
-        status: this.status,
-        dispatchAppSearchInvoiced: this.dispatchAppSearchInvoiced,
-        total: this.total,
-        batchCode: this.batchCode,
-        supplierId: this.supplierId,
-        current: 1,
+          pageNum:this.pageNum,
+          pageSize:this.pageSize
      })
-      if(res.code == 200){
-        this.total=res.total
-        if(this.pageNum == 1){
-          this.notifyList=res.data;
-        }else{
-          let preList = this.notifyList;
-          let arr = res.data;
-          this.notifyList = preList.concat(arr)
-        }
-        if (this.notifyList.length === 0) {
-          this.show=true
+      // if(res.code === 0){
+        this.notifyList=res.data;
+        console.log(this.notifyList)
+        if(this.notifyList.length === 0){
+              this.show=true
        }else{
          this.show=false
        }
      }
-    },
-    toggle(index) {
-      this.$refs.checkboxes[index].toggle();
-    },
+    // },
  }
 }
 </script>
@ -225,11 +101,6 @@ export default {
 <style scoped lang="scss">
@import "@/styles/mixin.scss";
@import "@/styles/common.scss";
-.van-checkbox {
-  position: absolute;
-  bottom: 20px;
-  right: 15px;
-}
 .wrap{
  @include wh(100%,100%);
  background-color: #F4F5F7;
@ -242,7 +113,6 @@ export default {
 }
 .itemWrap{
  background: #FFFFFF;
-  position: relative;
  @include wh(100%,194px);
  box-sizing: border-box;
  padding: 14px 25px 18px 29px;
@ -255,7 +125,6 @@ export default {
    }
    .title{
      opacity: .5;
-      margin-right: 5px;
    }
  }
  .line1{
@ -272,52 +141,10 @@ export default {
 }
 .bgShow{
  @include flexTwoCenter;
-  /*height:calc(100% - 46px);*/
+  height:calc(100% - 46px);
  background-color: #FAFAFA;
  img{
    width: 100%;
  }
 }
-.van-tabs {
-  position: fixed;
-  width: 100%;
-  background-color: #2c395f;
-  z-index: 1000000 !important;
-}
-  .content_wrap {
-    padding-top: 1.17333rem;
-  }
-  .invoice_btn_wrap {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    padding: 20px;
-    box-sizing: border-box;
-    background-color: #fff;
-    .invoice_btn_info {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .invoice_btn_title {
-        font-size: 14px;
-        font-weight: bold;
-      }
-      .invoice_btn_money {
-        font-size: 26px;
-        color: red;
-      }
-    }
-    .btn {
-      width: 100%;
-      background-color: #2C395F;
-      color: #fff;
-      padding: 15px 0;
-      text-align: center;
-      border-radius: 6px;
-    }
-  }
-
-  .pd_cls {
-    padding-bottom: 40px;
-  }
-</style>
+</style>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zhouxueli	c6fd1bc162	task#15348,服务商kpi搜索请求头字段更换 (cherry picked from commit `343bccdcfa`)	2024-10-21 09:50:31 +08:00
zhouxueli	5618ad989e	task#15348,服务商kpi请求头字段更换 (cherry picked from commit `fcce91b6b5`)	2024-10-17 10:29:30 +08:00
zhouxueli	a8cea5fb6a	task#15348,服务商kpi请求头字段更换 (cherry picked from commit `baf25587a8`)	2024-10-17 10:29:29 +08:00
zhouxueli	4017cf9520	task#15348,ios培训文档跳转参数加1000000 (cherry picked from commit `b0fd520316`)	2024-10-15 11:33:22 +08:00
zhouxueli	789f1fa396	task#15348,删除vconsole	2024-10-14 17:35:51 +08:00
zhouxueli	374a5182db	task#15348,ios培训参数转换为int,去除Vscole	2024-10-14 17:35:04 +08:00
zhouxueli	f83e646547	task#15348,添加vconsole (cherry picked from commit `532b8d439b`)	2024-10-14 17:25:07 +08:00