kpi修改

This reverts commit 5a56d4fe1c.

.idea/misc.xml

@@ -3,7 +3,4 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="WebPackConfiguration">
-    <option name="mode" value="DISABLED" />
-  </component>
 </project>

public/res/year-statistic/README.md

@@ -1,160 +0,0 @@
-# 年终总结看板 Dashboard
-
-道路救援服务年终数据可视化看板项目。
-
-## 项目结构
-
-```
-dashboard-demo/
-├── index.html              # 主看板页面（支持URL参数动态加载数据）
-├── data/
-│   ├── 供应商年度KPI.xlsx    # 服务商KPI数据（主数据源）
-│   ├── 师傅案件top3.xlsx     # 案件量TOP3师傅数据
-│   ├── 师傅在线top3.xlsx     # 在线时长TOP3师傅数据
-│   ├── 拒单率最高地区.xlsx    # 拒单率最高地区数据
-│   └── 拒单率最高时段.xlsx    # 拒单率最高时段数据
-└── README.md               # 项目说明
-```
-
-## 功能特性
-
-- 深色主题数据可视化看板
-- **直接读取Excel文件**，无需转换为JSON
-- 支持通过URL参数 `?providerId=XXX` 切换不同服务商
-- 右上角下拉框可实时切换服务商（自动从Excel读取服务商列表）
-- 使用 Chart.js 实现饼状图和雷达图
-- 使用 SheetJS (xlsx) 解析Excel文件
-- 响应式布局，支持不同屏幕尺寸
-- 数据与页面分离，便于维护
-
-## 数据指标
-
-看板展示以下数据指标：
-
-1. **总案件量分布**（饼状图）
-   - 小修、困境、拖车三类案件占比
-
-2. **年度聚合案件量**
-
-3. **案件量TOP3师傅**
-
-4. **车辆平均总在线时长**
-
-5. **在线时长TOP3师傅**
-
-6. **拒单率最高地区**
-
-7. **拒单率最高时段**
-
-8. **APP使用率**
-   - 年度APP使用率展示
-
-## Excel数据结构
-
-### 1. 供应商年度KPI.xlsx
-
-| 列名 | 说明 |
-|------|------|
-| 服务商id | 服务商唯一标识 |
-| 服务商 | 服务商名称 |
-| 完成案件量 | 总案件数量 |
-| 拖车完成量 | 拖车案件数 |
-| 小修完成量 | 小修案件数 |
-| 困境完成量 | 困境案件数 |
-| 聚合案件量 | 聚合案件数量 |
-| APP使用率. | APP使用率（小数形式，如0.998） |
-| 年度车辆平均总在线时长（小时） | 车辆平均在线时长 |
-
-### 2. 师傅案件top3.xlsx
-
-| 列名 | 说明 |
-|------|------|
-| 服务商id | 服务商唯一标识 |
-| 服务商 | 服务商名称 |
-| 服务人员工号 | 师傅姓名/工号 |
-| 完成案件量 | 该师傅完成的案件数 |
-
-### 3. 师傅在线top3.xlsx
-
-| 列名 | 说明 |
-|------|------|
-| 服务商名称 | 服务商名称 |
-| 司机姓名 | 师傅姓名 |
-| 年度总在线时长（小时） | 在线时长 |
-
-### 4. 拒单率最高地区.xlsx
-
-| 列名 | 说明 |
-|------|------|
-| 供应商名称 | 服务商名称 |
-| 地区 | 拒单率最高的地区 |
-| 拒单率 | 拒单率（小数形式） |
-
-### 5. 拒单率最高时段.xlsx
-
-| 列名 | 说明 |
-|------|------|
-| 供应商名称 | 服务商名称 |
-| 时段 | 拒单率最高的时段 |
-| 拒单率 | 拒单率（小数形式） |
-
-## 使用方式
-
-### 1. 启动本地服务器
-
-由于页面使用 `fetch` 加载JSON数据，需要通过HTTP服务器访问：
-
-```bash
-cd C:\Users\Administrator\dashboard-demo
-
-# 使用 Python
-python -m http.server 8080
-
-# 或使用 Node.js
-npx serve .
-
-# 或使用 PHP
-php -S localhost:8080
-```
-
-### 2. 访问页面
-
-- 默认服务商：`http://localhost:8080`（自动加载第一个服务商）
-- 指定服务商：`http://localhost:8080?providerId=1128`（使用服务商id）
-- 切换服务商：使用页面右上角的下拉框
-
-### 3. 更新数据
-
-直接替换 `data/` 目录下的Excel文件即可，页面会自动读取最新数据。
-服务商列表从Excel自动生成，无需手动配置。
-
-## 技术栈
-
-- HTML5 / CSS3
-- JavaScript (ES6+)
-- Chart.js - 图表库（饼图、雷达图）
-- SheetJS (xlsx) - Excel文件解析
-- CSS Grid / Flexbox - 布局
-
-## 后续优化方向
-
-- [ ] 添加更多图表类型（柱状图、折线图等）
-- [ ] 支持时间范围筛选
-- [ ] 添加数据导出功能
-- [ ] 移动端适配优化
-- [ ] 添加数据加载骨架屏
-- [ ] 支持主题切换（深色/浅色）
-
-## 更新日志
-
-### 2025-01-21
-- 改为直接读取Excel文件，无需JSON转换
-- 服务商列表从Excel自动生成
-- 将"AB段里程对比"改为"APP使用率"展示
-- 新增服务商选择下拉框
-
-### 2025-01-20
-- 初始版本
-- 实现基础看板布局
-- 支持URL参数切换服务商
-- 数据JSON化，与页面分离

public/res/year-statistic/data/SP001.json

@@ -1,47 +0,0 @@
-{
-  "serviceProviderId": "SP001",
-  "serviceProviderName": "上海道路救援服务中心",
-  "year": 2025,
-  "summary": {
-    "totalCases": 100,
-    "caseBreakdown": {
-      "minorRepair": 20,
-      "predicament": 20,
-      "towing": 60
-    },
-    "aggregatedCases": 15
-  },
-  "topMastersByCases": [
-    { "rank": 1, "name": "小王", "cases": 18 },
-    { "rank": 2, "name": "小张", "cases": 16 },
-    { "rank": 3, "name": "小李", "cases": 12 }
-  ],
-  "onlineHours": {
-    "averageTotal": 2920,
-    "topMasters": [
-      { "rank": 1, "name": "小王", "hours": 3230 },
-      { "rank": 2, "name": "小张", "hours": 3028 },
-      { "rank": 3, "name": "小李", "hours": 2996 }
-    ]
-  },
-  "rejectionRate": {
-    "highestRegion": {
-      "name": "崇明",
-      "rate": 21.2
-    },
-    "highestTimeSlot": {
-      "period": "18:00-22:00",
-      "description": "晚高峰时段"
-    }
-  },
-  "abMileage": {
-    "highest": {
-      "region": "崇明",
-      "distance": 62
-    },
-    "lowest": {
-      "region": "黄浦",
-      "distance": 6
-    }
-  }
-}

public/res/year-statistic/data/SP002.json

@@ -1,47 +0,0 @@
-{
-  "serviceProviderId": "SP002",
-  "serviceProviderName": "浦东汽车救援有限公司",
-  "year": 2025,
-  "summary": {
-    "totalCases": 156,
-    "caseBreakdown": {
-      "minorRepair": 35,
-      "predicament": 41,
-      "towing": 80
-    },
-    "aggregatedCases": 22
-  },
-  "topMastersByCases": [
-    { "rank": 1, "name": "老陈", "cases": 28 },
-    { "rank": 2, "name": "大刘", "cases": 24 },
-    { "rank": 3, "name": "阿强", "cases": 19 }
-  ],
-  "onlineHours": {
-    "averageTotal": 3150,
-    "topMasters": [
-      { "rank": 1, "name": "老陈", "hours": 3580 },
-      { "rank": 2, "name": "大刘", "hours": 3420 },
-      { "rank": 3, "name": "阿强", "hours": 3210 }
-    ]
-  },
-  "rejectionRate": {
-    "highestRegion": {
-      "name": "奉贤",
-      "rate": 18.5
-    },
-    "highestTimeSlot": {
-      "period": "07:00-09:00",
-      "description": "早高峰时段"
-    }
-  },
-  "abMileage": {
-    "highest": {
-      "region": "金山",
-      "distance": 55
-    },
-    "lowest": {
-      "region": "静安",
-      "distance": 8
-    }
-  }
-}

public/res/year-statistic/data/package-lock.json

@@ -1,119 +0,0 @@
-{
-  "name": "data",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "data",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "xlsx": "^0.18.5"
-      }
-    },
-    "node_modules/adler-32": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
-      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/cfb": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
-      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "adler-32": "~1.3.0",
-        "crc-32": "~1.2.0"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/codepage": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
-      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/crc-32": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
-      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-      "license": "Apache-2.0",
-      "bin": {
-        "crc32": "bin/crc32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/frac": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
-      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/ssf": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
-      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "frac": "~1.1.2"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/wmf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
-      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/word": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
-      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/xlsx": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
-      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "adler-32": "~1.3.0",
-        "cfb": "~1.2.1",
-        "codepage": "~1.15.0",
-        "crc-32": "~1.2.1",
-        "ssf": "~0.11.2",
-        "wmf": "~1.0.1",
-        "word": "~0.3.0"
-      },
-      "bin": {
-        "xlsx": "bin/xlsx.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    }
-  }
-}

public/res/year-statistic/data/package.json

@@ -1,16 +0,0 @@
-{
-  "name": "data",
-  "version": "1.0.0",
-  "description": "",
-  "main": "read-excel.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "type": "commonjs",
-  "dependencies": {
-    "xlsx": "^0.18.5"
-  }
-}

public/res/year-statistic/data/read-excel.js

@@ -1,30 +0,0 @@
-const XLSX = require('xlsx');
-const fs = require('fs');
-const path = require('path');
-
-// Excel文件路径
-const excelPath = 'C:\\Users\\chenhaid\\Documents\\WXWork\\1688858118476511\\Cache\\File\\2026-02\\供应商年度KPIv5.xlsx';
-
-// 输出JSON文件路径
-const outputPath = path.join(__dirname, 'kpi.json');
-
-// 读取Excel文件
-const workbook = XLSX.readFile(excelPath);
-
-// 获取第一个工作表名称
-const sheetName = workbook.SheetNames[0];
-console.log('工作表列表:', workbook.SheetNames);
-
-// 获取工作表
-const worksheet = workbook.Sheets[sheetName];
-
-// 转换为JSON
-const jsonData = XLSX.utils.sheet_to_json(worksheet);
-
-console.log('读取到', jsonData.length, '条数据');
-console.log('第一条数据示例:', JSON.stringify(jsonData[0], null, 2));
-
-// 写入JSON文件
-fs.writeFileSync(outputPath, JSON.stringify(jsonData, null, 2), 'utf8');
-
-console.log('已保存到:', outputPath);

src/api/authentication.js

@@ -69,52 +69,4 @@ export function driverRealName( data) {
     method:'POST',
     contentType: 'application/json'
   })
-}
-//获取需要确认的人员信息列表
-export function getConfirmPerson(key){
-  return request({
-    url: '/supplierAppV2/dispatchApp/wechat/getNeedConfirmPersonInfo',
-    method:'GET',
-    params: key
-  })
-}
-//微信相关 获取联系我 二维码
-export function getQrCode(key){
-  return request({
-    url: '/supplierAppV2/dispatchApp/wechat/getQrCode',
-    method:'GET',
-    params: key
-  })
-}
-//获取服务商的确认状态
-export function getConfirmStatus(key){
-  return request({
-    url: '/supplierAppV2/dispatchApp/wechat/getSupplier',
-    method:'GET',
-    params: key
-  })
-}
-//确认已添加微信按钮
-export function confirmAddWechat(key){
-  return request({
-    url: '/supplierAppV2/dispatchApp/wechat/confirmAddWechat',
-    method:'GET',
-    params: key
-  })
-}
-//确认无误
-export function confirm(key){
-  return request({
-    url: '/supplierAppV2/dispatchApp/wechat/confirm',
-    method:'GET',
-    params: key
-  })
-}
-//提交审批
-export function submitConfirm( data) {
-  return request('/supplierAppV2/dispatchApp/wechat/submitConfirm', {
-    data: data,
-    method:'POST',
-    contentType: 'application/json'
-  })
 }

src/api/order.js

@@ -23,7 +23,7 @@ export function toDoAudit(data){
     data
   })
 }
-//
+// 工单详情
 export function getOrderDetail(data){
   return request({
     url:'/supplierAppV2/dispatchApp/order/getOrderDetail',
@@ -77,15 +77,6 @@ export function updateOrderSettlement(data){
     data
   })
 }
-// 获取司机信息
-export function getDriverInfo(data){
-  return request({
-    url:'/supplierAppV2/dispatchApp/order/getDriverInfo',
-    method:'POST',
-    contentType:'application/json',
-    data
-  })
-}
 // 电瓶数量列表
 export function batteryCountList(){
   return request({
@@ -168,32 +159,3 @@ export function getConfigByCode(data){
     data
   })
 }
-
-//获取最新版本
-export function getNewVersion(key){
-  return request({
-    url: '/driverApp/app/updateVersion',
-    method:'GET',
-    params: key
-  })
-}
-
-export function getLog(data){
-  // 添加log
-  return request({
-    url: '/ureport/pageView/save',
-    method:'POST',
-    contentType:'application/json',
-    data
-  })
-}
-
-
-//获取最新版本
-export function getUserBO(){
-  return request({
-    url: '/base/user/getUserBO',
-    method:'POST',
-  })
-}
-

src/api/secondHandCar.js

@@ -54,7 +54,7 @@ export function userFeedback(data){
     data
   })
 }
-//擦亮
+//二手拖车信息擦亮
 export function usedCarPolish(data){
   return request({
     url: `/toc-user/car-app/usedCarPolish/${data}`,

src/router/authentication-router.js

@@ -39,13 +39,5 @@ const authenticationRouter = [
             title: '银行卡信息认证',
         }
     },
-    {
-        path: '/personList',
-        name: 'personList',
-        component: () => import('@/views/mine/personList.vue'),
-        meta:{
-            title: '人员信息',
-        }
-    },
 ]
 export default authenticationRouter

src/router/index.js

@@ -324,14 +324,6 @@ const routes = [
             title:'电瓶详情'
         }
     },
-    {
-        path: '/goToApp',
-        name: 'goToApp',
-        component:()=>import('@/views/goToApp/goToApp.vue'),
-        meta: {
-            title:'电瓶详情'
-        }
-    },
     ...kpiRouter,
     ...invoiceRouter,
     ...secondHandRouter,

src/utils/http.js

@@ -29,7 +29,7 @@ service.interceptors.request.use(
       // 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 ((reqUrl=='/supplier/supplierTraining/trainingList' || reqUrl=='/supplier/supplierTraining/normalList') && config?.params?.type==1){
+        if (reqUrl=='/supplier/supplierTraining/trainingList' && config?.params?.type==1){
             console.log('司机app使用该请求不挂token')
         } else {
             if(token) {
@@ -48,7 +48,6 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
     response => {
-        console.log('response', response.data)
       const res = response.data
       if ( res.code === 401 || res.code === 400  || res.code == 500) {
           Toast(res.msg || 'Error')

src/utils/myMixins.js

@@ -1,6 +1,3 @@
-import { getLog } from "@/api/order"
-
-let _setLogTimer = null
 
 export const myMixins = {
   data() {
@@ -8,11 +5,6 @@ export const myMixins = {
     }
   },
   methods: {
-    setLogHandler(data) {
-      if (_setLogTimer) return
-      _setLogTimer = setTimeout(() => { _setLogTimer = null }, 1000)
-      getLog(data)
-    },
     showFun() {
       if( localStorage.getItem('infoVerify') == 8 || localStorage.getItem('infoVerify') == 12  ) {
         return false
@@ -102,7 +94,6 @@ export const myMixins = {
     isWebFunc(){
       let res=false
       var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
-      console.log('isMobile',isMobile)
       if (!isMobile) {// 是移动端不变
         res=true
       }

src/views/documentView/docmentList.vue

@@ -154,7 +154,7 @@ export default {
       this.isLoading = false
     },
     initShow(){
-      this.keyword= ''
+      this.keyword= '',
       this.getNormalList()
     }
 }

src/views/goToApp/goToApp.vue

@@ -1,73 +0,0 @@
-<template>
-  <div class="wrap">
-    <div class="content">
-      <div class="goToBtn" @click="goAppHandler">立即打开</div>
-      <div class="content_tip">
-        <div class="font_cls">如未安装请点击下载</div>
-        <div class="font_cls">如已安装未自动跳转，请 <span @click="downLoadHandler">立即下载</span></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getNewVersion } from "@/api/order"
-export default {
-  name: "goToApp",
-  methods: {
-    goAppHandler() {
-      window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
-    },
-    async downLoadHandler() {
-      getNewVersion({
-        appType: 5
-      }).then((res) => {
-        window.location.href = res?.result?.path
-      }).catch(() => {
-        this.$message.error('请求版本失败，请重试');
-      });
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.wrap {
-  width: 100%;
-  height: 100vh;
-  background-image: url('@/assets/toAppBg.png');
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-}
-.content  {
-  width: 100%;
-  position: fixed;
-  top: 74vh;
-}
-.goToBtn {
-  width: 70%;
-  height: 45px;
-  margin-left: 15%;
-  background: linear-gradient( 270deg, #2347C0 0%, #72A3FF 100%);
-  border-radius: 23px;
-  //font-weight: bold;
-  font-size: 17px;
-  color: #FFFFFF;
-  letter-spacing: 2px;
-  line-height: 45px;
-  text-align: center;
-}
-.content_tip {
-  width: 100%;
-  margin-top: 15px;
-  .font_cls {
-    font-size: 14px;
-    color: #808080;
-    line-height: 20px;
-    text-align: center;
-    span {
-      color: #007BE9;
-    }
-  }
-}
-</style>

src/views/index/continueInsurance.vue

@@ -8,7 +8,7 @@
         :border="false"
         :fixed="true"
         :safe-area-inset-top="true"
-        @click-left="back"
+        @click-left="h5GoBack"
     />
   </div>
 <div class="addContentWrap">
@@ -92,57 +92,6 @@
         </template>
       </el-input>
     </div>
-    <div class="lineBot" v-if="permissonList?.includes('hasInsuranceAudit')"></div>
-    <div class="itemContent" v-if="permissonList?.includes('hasInsuranceAudit')" style="align-items: center">
-      <div class="titleType" style="width: 60px">
-        <img class="startImg" src="@/assets/start.png" />
-        <span>保费</span>
-      </div>
-      <van-field
-          type="number"
-          class="vanIpt"
-          v-model="liabilityInsuranceAmount"
-          input-align="right"
-      >
-        <template slot="right-icon" >
-          <span style="white-space: nowrap;">元</span>
-        </template>
-      </van-field>
-    </div>
-    <div class="lineBot" v-if="permissonList?.includes('hasInsuranceAudit')"></div>
-    <div class="itemContent" v-if="permissonList?.includes('hasInsuranceAudit')">
-      <div class="titleType">
-        <img class="startImg" src="@/assets/start.png" />
-        <span>保额</span>
-      </div>
-      <div style="display:flex;align-items: center;justify-content: flex-end">
-        <el-select
-            v-model="liabilityInsuranceQuota"
-            value-key="name"
-            class="elSelect"
-            collapse-tags="collapse-tags"
-            placeholder="请选择"  style="width: 55%"
-        >
-          <el-option
-              v-for="item in liabilityQuotaOptions"
-              :key="item.value"
-              :label="item.value"
-              :value="item.value"
-          >
-          </el-option>
-        </el-select><span style="margin-right: 16px;opacity: .5;">万元</span>
-      </div>
-      <!--      <van-field
-                type="number"
-                class="vanIpt"
-                v-model="liabilityInsuranceQuota"
-                input-align="right"
-            >
-              <template slot="right-icon" >
-                <span style="white-space: nowrap;">万元 </span>
-              </template>
-            </van-field>-->
-    </div>
   </template>
   <common-btn title="保存" @submitClick="submitBtn"/>
   <van-calendar v-model="showDatePicker"  :min-date="minDate"
@@ -155,7 +104,7 @@
   import {Dialog} from "vant";
 import {myMixins} from "@/utils/myMixins"
   import {formatDate1} from "@/utils/common"
-import { uploadImage, updateInsurance, getInfoById,userOperationPermissions} from "@/api/mine"
+import { uploadImage, updateInsurance, getInfoById} from "@/api/mine"
   import CommonBtn from "@/components/commonBtn.vue"
 export default {
   name: "vehicleAdd",
@@ -166,7 +115,6 @@ export default {
         children: 'children',
         label: 'name'
       },
-      liabilityQuotaOptions:[{value:10},{value:20},{value:30},{value:50},{value:70},{value:80},{value:100},{value:200}],
       minDate: new Date(1970, 0, 1),  // 设置最小可选日期（1970年1月1日）
       maxDate: new Date(2099, 11, 31), // 设置最大可选日期（2099年12月31日）
       showDatePicker: false,
@@ -182,9 +130,6 @@ export default {
       insurancePicturePhoto: '',    // 保单照片
       isMultiple: false,     // 是否支持多选
       insuranceCorp: '',
-      liabilityInsuranceAmount:'',
-      liabilityInsuranceQuota:'',
-      permissonList:[],
       insuranceOptions: [{
         name: '太平洋',
         value: 1
@@ -238,24 +183,11 @@ export default {
 
   async mounted() {
     this.id=this.$route.params?.id
-    await this.getPermissions()
     if( this.id){
       // await this.vehicleInfo()
     }
   },
   methods:{
-    back() {
-      this.$router.push({
-        name:'vehicleAdd',
-        params:{
-          id: this.id
-        }
-      })
-    },
-    async getPermissions(){
-      let res = await userOperationPermissions();
-      this.permissonList = res.data
-    },
     async vehicleInfo(){
       let res= await  getInfoById({
         vehicleId:this.id
@@ -327,14 +259,6 @@ export default {
         this.$toast('保单有效期不能为空')
         return
       }
-      if(this.hasLiabilityInsurance == 1 && this.permissonList?.includes('hasInsuranceAudit') && !this.liabilityInsuranceAmount && this.liabilityInsuranceAmount!=0){
-        this.$toast('保费不能为空')
-        return
-      }
-      if(this.hasLiabilityInsurance == 1 && !this.liabilityInsuranceQuota && this.permissonList?.includes('hasInsuranceAudit')){
-        this.$toast('保额不能为空')
-        return
-      }
       let timeObj;
       if(this.dateVal) {
         timeObj = this.formatDateTimeRange(this.dateVal)
@@ -347,8 +271,6 @@ export default {
           insuranceCorp: this.hasLiabilityInsurance == 1 ? this.insuranceCorp : '',
           liabilityInsuranceStartTime: this.hasLiabilityInsurance == 1 ? (timeObj?.startTime || '' ) : '',
           liabilityInsuranceEndTime: this.hasLiabilityInsurance == 1 ? (timeObj?.endTime || '') : '',
-          liabilityInsuranceQuota:this.liabilityInsuranceQuota || '',
-          liabilityInsuranceAmount:this.liabilityInsuranceAmount || '',
         })
       }
       await updateInsurance(params)
@@ -358,8 +280,7 @@ export default {
           this.$toast('添加成功')
         }
         setTimeout(()=>{
-          // this.$router.back();
-          this.back()
+          this.$router.back();
         },2000)
       }
   },

src/views/index/driverAdd.vue

@@ -67,7 +67,7 @@
       accept="image "
     />
   </div>
-<!--  <div class="lineBot"></div>
+  <div class="lineBot"></div>
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
@@ -80,12 +80,11 @@
       :preview-size="54"
       accept="image "
     />
-  </div>-->
+  </div>
   <div class="lineBot"></div>
   <div class="itemContent">
     <div class="titleType">
-      <img class="startImg" src="@/assets/start.png" />
-      <span>免冠正面照</span>
+      <span>头像</span>
     </div>
     <van-uploader
       v-model="iconList"
@@ -308,7 +307,7 @@ export default {
       let res = await uploadImage(formData)
       this.drivingLicenceContrary = res.data;
     },
-    async iconListHandler(file) {           // 上传免冠正面照
+    async iconListHandler(file) {           // 上传头像
       const formData = new FormData();
       formData.append("file" , file.file);
       let res = await uploadImage(formData)
@@ -400,14 +399,10 @@ export default {
         this.$toast('驾驶证首页未上传')
         return
       }
-     /* if(!this.drivingLicenceContrary) {
+      if(!this.drivingLicenceContrary) {
         this.$toast('驾驶证副页未上传')
         return
-      }*/
-       if(!this.icon) {
-       this.$toast('免冠正面照未上传')
-       return
-     }
+      }
       let drivingLicenceName=this.drivingLicenceName.replace(/[^\u4e00-\u9fff]+/g, '');
       let driverName=this.driverName.replace(/[^\u4e00-\u9fff]+/g, '');
 

src/views/index/driverManage.vue

@@ -18,109 +18,51 @@
         </template>
       </van-nav-bar>
     </div>
-    <van-search
-        v-model="searchVal"
-        show-action
-        placeholder="请输入司机姓名、电话、身份证号"
-        @search="resetHandler"
-    >
-      <template #action>
-        <div @click="resetHandler">搜索</div>
-      </template>
-    </van-search>
-    <div class="filterWrap">
-      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="idCardStatusList" placeholder="身份证录入状态" :class="{'customSel':true , 'has-value': idCardStatusList }" clearable>
-        <el-option
-            v-for="item in idCardStatusListOptions"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value">
-        </el-option>
-      </el-select>
-      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="driverLicenseStatusList" placeholder="驾驶证录入状态" :class="{'customSel':true , 'has-value': driverLicenseStatusList }" clearable>
-        <el-option
-            v-for="item in driverLicenseStatusListOptions"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value">
-        </el-option>
-      </el-select>
-      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="authStatusList" placeholder="认证状态" :class="{'customSel':true , 'has-value': authStatusList }" clearable>
-        <el-option
-            v-for="item in authStatesOptions"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value">
-        </el-option>
-      </el-select>
-    </div>
-    <div class="wrap_cls">
-      <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-        <van-list
-            v-model="loading"
-            :finished="finished"
-            finished-text="没有更多了"
-            @load="onLoad"
-        >
-          <div class="itemWrap" v-for="(item,index) in driverList" :key="index" @click.stop="updateDriver(item)">
-            <div class="name-status">
-              <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}
-                <span style="margin-left: 10px" :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
-              </div>
-              <div class="twoBtn">
-<!--               只有启用状态下才展示停用按钮-->
-                <button v-if="permissonList.includes('driverModifyBtn') && item.states?.code==1" class="del" @click.stop="handleStatus(item)">停用</button>
-                <!--              <button v-if="permissonList.includes('driverModifyBtn')" class="revise" @click="updateDriver(item)">修改</button>-->
-              </div>
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+      <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+      >
+        <div class="itemWrap" v-for="(item,index) in driverList" :key="index">
+          <div class="name-status">
+            <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}</div>
+            <div class="twoBtn">
+              <button v-if="permissonList.includes('driverModifyBtn')" class="del" @click="handleStatus(item)">{{ item.states?.label == '启用'  ? '停用' : '启用' }}</button>
+              <button v-if="permissonList.includes('driverModifyBtn')" class="revise" @click="updateDriver(item)">修改</button>
             </div>
-            <div class="juhe flex-between">
-              <span class="zdJuhe">录入状态</span>
-              <span class="flex-right">
-            <span class="common_cls" v-if="item.idCardStatusStr" :class="getClass(item.idCardStatus)?.className">{{item.idCardStatusStr}}</span>
-            <span class="common_cls" v-if="item.driverLicenseStatusStr" :class="getClass(item.driverLicenseStatus)?.className">{{item.driverLicenseStatusStr}}</span>
-          </span>
-<!--              <span class="flex-right" v-if="item.idCardStatusStr">
-                <span class="common_cls" :class="getClass(item.idCardStatus)?.className">{{item.idCardStatusStr}}</span>
-              </span>-->
-            </div>
-            <div class="juhe flex-between">
-              <span class="zdJuhe">认证状态</span>
-              <span class="flex-right" v-if="item.authStatusStr">
-                <span class="common_cls"  :class="getClass(item.authStatusStr)?.className">{{item.authStatusStr}}</span>
-              </span>
-            </div>
-            <div class="" style="display: flex">
-              <div class="sex" style="margin-right: 40px">
-                <span class="halfOpci">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
-                <span class="allOpci">{{item.sex?.label}}</span>
-              </div>
-              <div class="carType">
-                <span class="halfOpci">准驾车型:</span>
-                <span class="allOpci">{{item.drivingModel}}</span>
-              </div>
-            </div>
-            <div>
-              <span class="halfOpci">身份证号:</span>
-              <span class="allOpci">{{ item.identityCardNumber }}</span>
-            </div>
-            <van-icon class="arrow_position" v-if="permissonList.includes('driverModifyBtn')" name="arrow" />
-<!--            <div>
-              <span class="halfOpci">状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态:</span>
-              <span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
-            </div>-->
           </div>
-        </van-list>
-      </van-pull-refresh>
+          <div class="" style="display: flex">
+            <div class="sex" style="margin-right: 40px">
+              <span class="halfOpci">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
+              <span class="allOpci">{{item.sex?.label}}</span>
+            </div>
+            <div class="carType">
+              <span class="halfOpci">准驾车型:</span>
+              <span class="allOpci">{{item.drivingModel}}</span>
+            </div>
+          </div>
+          <div>
+            <span class="halfOpci">身份证号:</span>
+            <span class="allOpci">{{ item.identityCardNumber }}</span>
+          </div>
+          <div>
+            <span class="halfOpci">状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态:</span>
+            <span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
+          </div>
+        </div>
+
+      </van-list>
+  </van-pull-refresh>
 
-    </div>
   </div>
 </template>
 
 <script>
 
 import {myMixins} from "@/utils/myMixins"
-import {driverList, enableAction, userOperationPermissions} from "@/api/mine"
-import {Dialog} from "vant";
+import {driverList,enableAction,userOperationPermissions} from  "@/api/mine"
 export default {
   name: "driverManage",
   mixins:[myMixins],
@@ -137,40 +79,6 @@ export default {
       loading: false,
       finished: false,
       permissonList:[],
-      searchVal:'',
-      idCardStatusList:[],
-      driverLicenseStatusList:[],
-      authStatusList:[],
-      idCardStatusListOptions: [{
-        name: '身份证未录入',
-        value: 0
-      },{
-        name: '身份证核验通过',
-        value: 1
-      },{
-        name: '身份证核验不通过',
-        value: 2
-      }],
-      authStatesOptions: [{
-        name: '免冠正面照未录入',
-        value: 1
-      },{
-        name: '免冠正面照认证通过',
-        value: 3
-      },{
-        name: '免冠正面照认证不通过',
-        value: 2
-      }],
-      driverLicenseStatusListOptions: [{
-        name: '驾驶证未录入',
-        value: 0
-      },{
-        name: '驾驶证认证通过',
-        value: 1
-      },{
-        name: '驾驶证认证不通过',
-        value: 2
-      }],
     }
   },
   mounted() {
@@ -180,41 +88,9 @@ export default {
     // this.getDriverList()
   },
   methods:{
-    getClass(id) {
-      const ids = String(id)
-      const steps = {
-        0: {
-          className: 'default_cls'
-        },
-        1: {
-          className: 'success_cls'
-        },
-        2: {
-          className: 'danger_cls'
-        },
-        '免冠正面照未录入': {
-          className: 'default_cls'
-        },
-        '免冠正面照认证通过': {
-          className: 'success_cls'
-        },
-        '免冠正面照认证不通过': {
-          className: 'danger_cls'
-        },
-      }
-      return steps[ids] || { className: 'default_cls' }
-    },
-    async resetHandler() {
-      this.pageNum=1
-      this.finished = false;
-      this.total = 0;
-      await this.getDriverList();
-    },
     async onLoad(){
       await this.getDriverList()
-      if (this.total>10){
-        this.pageNum++;
-      }
+      this.pageNum++;
       // 加载状态结束
       this.loading = false;
       // 数据全部加载完成
@@ -242,11 +118,7 @@ export default {
     async getDriverList(){
         let res = await  driverList({
           pageNum:this.pageNum,
-          pageSize:this.pageSize,
-          searchVal: this.searchVal,
-          idCardStatusList: this.idCardStatusList,
-          driverLicenseStatusList: this.driverLicenseStatusList,
-          authStatusList: this.authStatusList,
+          pageSize:this.pageSize
         });
         if(res.code == 200){
           this.total=res.total
@@ -258,11 +130,12 @@ export default {
             this.driverList = preList.concat(arr)
           }
         }
-      console.log('this.driverList',this.driverList)
      },
     async getPermissions(){
       let res = await userOperationPermissions();
       this.permissonList = res.data
+      // console.log("司机管理",this.permissonList.includes('driverAddBtn'))
+
     },
     async handleStatus(item){
         if(item.states.code === 0){
@@ -270,23 +143,14 @@ export default {
         }else{
           this.states = 0
         }
-      Dialog.confirm({
-        message: '当前状态为启用，是否要改为停用?',
-      }).then(async () => {
-        await enableAction({
-          driverId:item.driverId,
-          states:this.states
-        })
-        this.pageNum = 1;
-        await this.getDriverList();
-      }).catch(() => {
-      });
-
+       await enableAction({
+         driverId:item.driverId,
+         states:this.states
+       })
+      this.pageNum = 1;
+      await this.getDriverList();
     },
     updateDriver(item){
-      if(!this.permissonList.includes('driverModifyBtn')){//有权限才能修改
-        return
-      }
       // 在当前组件中进行路由跳转并传递参数对象
       this.$router.push({
         name: 'driverAdd',  // 目标路由的名称
@@ -321,7 +185,7 @@ export default {
 
 .wrap {
   background: #F4F5F7;
-  //@include sizingPadding(13px,13px);
+  @include sizingPadding(13px,13px);
   @include wh(100%, 100%);
   overflow-y: auto;
 }
@@ -344,7 +208,7 @@ export default {
 }
 
 .itemWrap {
-  @include wh(100%, 140px);
+  @include wh(100%, 104px);
   @include radiusSizing(6px);
   @include fontWeightSize(400, 12px);
   @include flexBetween;
@@ -352,7 +216,6 @@ export default {
   box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
   margin-bottom: 10px;
   padding: 11px 13px 9px 15px;
-  position: relative;
   .halfOpci {
     opacity: .5;
     margin-right: 5px;
@@ -361,15 +224,15 @@ export default {
     opacity: 1;
   }
   .statusNo {
-    color: red;
+    color: #FF0000;
   }
   .statusYes {
-    color: green
+    color: #09B820
   }
 }
 
 .name-status {
-  @include flexBetCen;
+  @include flexColBet;
   .namephone {
     @include fontWeightSize(bold, 14px)
   }
@@ -393,128 +256,6 @@ export default {
       margin-left: 15px;
     }
   }
-}
-.filterWrap {
-  width: 100%;
-  padding-right: 13px;
-  padding-left: 13px;
-  display: flex;
-  overflow-x: auto; /* 允许横向滚动 */
-  white-space: nowrap; /* 防止子元素换行 */
-  padding-bottom: 10px;
-  -webkit-overflow-scrolling: touch; /* 在iOS上平滑滚动 */
-  scrollbar-width: none; /* Firefox */
-  padding-bottom: 10px;
-  /*padding: 10px;*/
-  margin-bottom: 10px;
-  background-color: #fff;
-  box-sizing: border-box;
-  &::-webkit-scrollbar {
-    display: none; /* Chrome/Safari */
-  }
-  .customSel {
-    flex: 0 0 auto; /* 防止子元素被压缩 */
-    width: calc(33% - 5px);
-    /*width: 100%;*/
-    height: 25px;
-    background: #F5F5F5;
-    border-radius: 4px;
-    font-size: 10px;
-    color: #323233;
-    margin-right: 5px;
-    ::v-deep .el-input__inner{
-      padding: 0 2px;
-      height: 25px;
-      font-size: 10px;
-      background: #F5F5F5;
-      border-radius: 4px;
-      border: none;
-    }
-    ::v-deep .el-input__icon{
-      line-height: 25px;
-      font-size: 10px;
-      width: 18px;
-      color: #2A5094;
-    }
-    ::v-deep .el-input__suffix{
-      right: 2px;
-    }
-  }
-  .customInput{
-    /*width: 49%;*/
-    width: 130px;
-  }
-  .has-value  ::v-deep .el-input__inner{
-    background: #F1F6FF ;
-    color: #007BE9;
-    font-weight: bold;
-    padding-left: 8px;
-  }
-  .has-value ::v-deep .el-input__icon{
-    color: #007BE9;
-  }
-  .priceSel{
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    color: #C0C4CC;
-    .iconSpan{
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      font-size: 8px;
-    }
-  }
-  .has-price{
-    color: #007BE9 !important;
-  }
-}
-.wrap_cls {
-  width: 100%;
-  padding-left: 13px;
-  padding-right: 13px;
-  box-sizing: border-box;
-}
-.common_cls {
-  color: #fff;
-  padding: 4px 8px;
-  border-radius: 3px;
-  margin-right: 6px;
-}
-.default_cls {
-  background-color: #B0BEC5;
-}
-.danger_cls {
-  background-color: red;
-}
-.success_cls {
-  background-color: #4CAF50;
-}
-.info_cls {
-  background-color: #FF9800;
-}
-.main_cls {
-  background-color: #6C9BFF;
-}
-.arrow_position {
-  position: absolute;
-  right: 5px;
-  top: 50px;
-  font-size: 20px;
-  opacity: 0.6;
-}
-.carType,.zdJuhe{
-  opacity: .7;
-  @include fontWeightSize(400,12px);
-  margin-right: 8px;
-}
-/*.zdJuhe {
-  width: 80px;
-  text-align: right;
-  margin-left: -10px;
-}*/
-.flex-between{
-  line-height: 24px;
+
 }
 </style>

src/views/index/invoicingNotify.vue

@@ -153,17 +153,12 @@ export default {
         if (this.notifyList.length >= this.total) {
           this.finished = true;
         }
-      } else {
-        // 未开票不需要分页，直接标记加载完成
-        this.loading = false;
-        this.finished = true;
       }
     },
     async changeTabHandler() {
       this.pageNum = 1;
       this.notifyList = [];
       this.checkList = [];
-      this.finished = false;
       if (this.active == 1) {   // 全部， 需要分页
         this.status = '';
         this.dispatchAppSearchInvoiced = '';

src/views/index/supplierAdd.vue

@@ -9,7 +9,7 @@
           <img class="title1" src="@/assets/supplier/title1.png" alt="">
           <div class="credentials_wrap">
             <div class="credentials_item">
-              <div class="credentials_title">1.法人身份证人像页</div>
+              <div class="credentials_title">1. 法人身份证正面</div>
               <van-uploader
                 accept="image/*"
                 v-model="idFrontPhotoList"
@@ -22,7 +22,7 @@
               </van-uploader>
             </div>
             <div class="credentials_item ml2">
-              <div class="credentials_title">2.法人身份证国徽页</div>
+              <div class="credentials_title">2. 法人身份证反面</div>
               <van-uploader
                 accept="image/*"
                 v-model="idBackPhotoList"
@@ -35,7 +35,7 @@
               </van-uploader>
             </div>
             <div class="credentials_item ml2">
-              <div class="credentials_title">3.营业执照</div>
+              <div class="credentials_title">3. 营业执照</div>
               <van-uploader
                 accept="image/*"
                 v-model="companyPhotoList"
@@ -47,19 +47,6 @@
                 </div>
               </van-uploader>
             </div>
-            <div class="credentials_item">
-              <div class="credentials_title">4.开户许可证/基本存款账户信息</div>
-              <van-uploader
-                  accept="image/*"
-                  v-model="licensePhotoList"
-                  :after-read="licensePhotoHandler"
-                  :max-size="5 * 1024 * 1024"
-                  max-count="1">
-                <div class="custom-background">
-                  <img src="@/assets/supplier/licensePhoto.png" alt="">
-                </div>
-              </van-uploader>
-            </div>
           </div>
         </div>
         <div class="company_info">
@@ -70,7 +57,6 @@
               <van-field :border="true" readonly v-model="form.legalName" class="required" name="legalName" label="法人姓名" placeholder="请输入"  :rules="[{ required: true, message: '请输入法人姓名' }]" />
               <van-field :border="true" v-model="form.linkName" class="required" name="linkName" label="联系人姓名" placeholder="请输入"  :rules="[{ required: true, message: '请输入联系人姓名' }]" />
               <van-field :border="true" v-model="form.linkPhone" class="required" name="linkPhone" label="联系电话" placeholder="请输入"  :rules="phoneVerify" />
-              <van-field :border="true" v-model="form.linkEmail" class="required" name="linkEmail" label="邮箱" placeholder="请输入"  :rules="emailVerify" />
               <van-field :border="true" class="required" name="serviceType" label="服务能力">
                 <template #input>
                   <el-tree
@@ -135,16 +121,13 @@
       return {
         clickFlag: true,
         phoneVerify: [{ required: true, message: '请输入联系电话' }, { validator: value => { return /^1[3456789]\d{9}$/.test(value) }, message: '联系电话格式不正确' }],
-        emailVerify: [{ required: true, message: '请输入邮箱' }, { validator: value => { return  /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value) }, message: '邮箱格式不正确' }],
         id:'', //车辆Id
         idBackPhotoList: [],
         idBackPhoto: '',
         idFrontPhotoList: [],
         idFrontPhoto: '',
         companyPhotoList: [],
-        licensePhotoList: [],
         companyPhoto: '',
-        licensePhoto:'',
         form: {
           name: '',
           legalName: '',
@@ -155,24 +138,6 @@
           trailCount: '',
           minorCount: '',
           serviceAreaCode: [],
-          linkEmail:'',
-          person:'',
-          accountInfoDTO:{
-            dutyParagraph:'',
-            accountNumber:'',
-            accountName:'',
-            accountType:'',
-            invoiceType:'',
-            settlementType:'',
-            shouldRate:'',
-            realRate:'',
-            unitName:'',
-            bankNo:'',
-            billingPhone:'',
-            billingAddress:'',
-            billHead:'',
-            companyType:'',
-          }
         },
         qrCodeUrl: '',
         qrCode: '',
@@ -230,7 +195,6 @@
         this.idFrontPhoto = _data?.idCardFrontUrl;
         this.idBackPhoto = _data?.idCardBackUrl;
         this.companyPhoto = _data?.businessLicense;
-        this.licensePhoto = _data?.accountUrl;
         this.wechatId = _data?.wechatId
         if(this.idFrontPhoto) {
           this.idFrontPhotoList = [{ url : this.idFrontPhoto }];
@@ -241,9 +205,6 @@
         if(this.companyPhoto) {
           this.companyPhotoList = [{ url : this.companyPhoto }];
         }
-        if(this.licensePhoto){
-          this.licensePhotoList= [{ url : this.licensePhoto }];
-        }
         if( _data.service ) {
           this.$refs.tree.setCheckedKeys(_data.service.split(','))
         }
@@ -254,30 +215,21 @@
       },
       async applyAdd() {
         if( !this.idFrontPhoto ) {
-          this.$toast('法人身份证人像页未上传')
+          this.$toast('法人身份证正面照未上传')
           return
         }
         if( !this.idBackPhoto ) {
-          this.$toast('法人身份证国徽页未上传')
+          this.$toast('法人身份证反面照未上传')
           return
         }
         if( !this.companyPhoto ) {
           this.$toast('营业执照未上传')
           return
         }
-        if(this.form.person != this.form.legalName){
-          this.$toast('身份证法人姓名和营业执照法人不一致')
-          return
-        }
-        if( !this.licensePhoto ) {
-          this.$toast('开户许可证未上传')
-          return
-        }
         if( !(this.form.serviceAreaCode.length > 0) ) {
           this.$toast('服务区域不能为空')
           return
         }
-        // this.wechatId='wmOTNXBwAABrvKkE_Fh8ZN8Xm2S9v2wQ'
         if(!this.wechatId) {
           await this.QrCodeResult();
           if( !this.wechatId ) {
@@ -285,6 +237,7 @@
             return
           }
         }
+
         if( this.$refs.tree.getCheckedKeys().length > 0 ) {
           await this.saveHandler()
         } else {
@@ -308,15 +261,22 @@
             _node.map(item => {
               checkArr.push(item.data.id)
             })
+
+           /* let treeArr = this.$refs.tree.getCheckedKeys();
+            let childrenTreeArr = [];
+            treeArr.map(item => {
+              let _arr = this.supplierServiceList.filter(_item => _item.id == item) || []   // 获取对应的大类
+              _arr[0]?.children?.map(childItem => {
+                childrenTreeArr?.push(childItem?.id)
+              })
+            })
+            let allArr = [...treeArr, ...childrenTreeArr]*/
             let res = await saveSupplier({
               id: this.id,
               ...this.form,
-              accountInfoJson:JSON.stringify(this.form.accountInfoDTO),
-              accountInfoDTO:{},
               idCardFrontUrl: this.idFrontPhoto,
               idCardBackUrl: this.idBackPhoto,
               businessLicense: this.companyPhoto,
-              accountUrl:this.licensePhoto,
               service: this.$refs.tree.getCheckedKeys().join(',') ,
               serviceAreaCode: checkArr.join(','),
               wechatId: this.wechatId,
@@ -403,7 +363,6 @@
           imageUrl: this.idFrontPhoto,
           cardSide: 'FRONT'
         })
-        // 身份证法人名称
         this.form.legalName = res?.data?.name
       },
       async companyPhotoHandler(file) {
@@ -423,28 +382,8 @@
         })
         this.form.name = res?.data?.name;
         this.form.areaName = res?.data?.address
-        this.form.accountInfoDTO.dutyParagraph=res?.data?.regNum
-        this.form.accountInfoDTO.unitName = res?.data?.name
-        this.form.accountInfoDTO.companyType=res?.data?.type
-        // 营业执照法人名称
-        this.form.person = res?.data?.person
         await this.QrCodeHandler();
       },
-      async licensePhotoHandler(file){// 开户许可证
-        const formData = new FormData();
-        formData.append("file" , file.file);
-        let res = await uploadImage(formData);
-        this.licensePhoto = res.data
-        await this.licenseOcrHandler()
-      },
-      async licenseOcrHandler(){// 开户许可证ocr识别
-        let res = await ocrHandler({
-          ocrType: 15,
-          imageUrl: this.licensePhoto,
-        })
-        this.form.accountInfoDTO.accountNumber=res?.data?.accountNumber
-        this.form.accountInfoDTO.accountName = res?.data?.accountBank
-      },
     },
     computed: {
       regionText() {
@@ -474,13 +413,12 @@
   padding: 0 20px;
 }
 .credentials_info {
-  //height: 170px;
+  height: 170px;
 }
 .credentials_wrap {
   display: flex;
   width: 100%;
   margin-top: 10px;
-  flex-wrap: wrap;
   .credentials_item {
     width: 32%;
     text-align: center;

src/views/index/supplierInfo.vue

@@ -28,22 +28,17 @@
         <div class="common_title">证件照信息</div>
         <div class="credentials_wrap">
           <div class="credentials_item">
-            <div class="credentials_title">1.法人身份证人像页</div>
+            <div class="credentials_title">1. 法人身份证正面</div>
             <img :src="supplierInfo?.idCardFrontUrl" alt="">
           </div>
           <div class="credentials_item ml2">
-            <div class="credentials_title">2.法人身份证国徽页</div>
+            <div class="credentials_title">2. 法人身份证反面</div>
             <img :src="supplierInfo?.idCardBackUrl" alt="">
           </div>
           <div class="credentials_item ml2">
-            <div class="credentials_title">3.营业执照</div>
+            <div class="credentials_title">3. 营业执照</div>
             <img :src="supplierInfo?.businessLicense" alt="">
           </div>
-          <div class="credentials_item">
-            <div class="credentials_title">4.开户许可证/基本存款账户信息</div>
-            <img v-if="supplierInfo?.accountUrl"  :src="supplierInfo?.accountUrl" alt="">
-            <div v-else class="empty"></div>
-          </div>
         </div>
       </div>
       <div class="company_info">
@@ -77,10 +72,6 @@
             <div class="label">联系电话：</div>
             <div class="content">{{supplierInfo?.linkPhone}}</div>
           </div>
-          <div class="info_item">
-            <div class="label">邮箱：</div>
-            <div class="content">{{supplierInfo?.linkEmail}}</div>
-          </div>
           <div class="info_item">
             <div class="label">服务能力：</div>
             <div class="content service_color">{{supplierInfo?.serviceCategoryName}}</div>
@@ -200,6 +191,7 @@
           id: this.id,
         });
         this.supplierInfo = res?.data;
+        console.log('res', res)
       },
     }
   }
@@ -267,7 +259,7 @@
     margin-top: 5px;
   }
   .supplier_content {
-    padding: 0 20px;
+    padding: 0 24px;
     width: 100%;
     box-sizing: border-box;
   }
@@ -290,7 +282,6 @@
     display: flex;
     width: 100%;
     margin-top: 10px;
-    flex-wrap: wrap;
     .credentials_item {
       width: 32%;
       text-align: center;
@@ -299,14 +290,10 @@
         color: #4A4A4A;
         padding: 10px 0;
       }
-      img,.empty{
+      img {
         width: 97px;
         height: 64px;
       }
-      .empty{
-        border: 1px solid silver;
-        margin-left: 8px;
-      }
     }
     .ml2 {
       margin-left: 2%;

src/views/index/vehicleAdd.vue

@@ -8,7 +8,7 @@
         :border="false"
         :fixed="true"
         :safe-area-inset-top="true"
-        @click-left="back"
+        @click-left="h5GoBack"
     />
   </div>
   <div class="addContentWrap">
@@ -198,7 +198,7 @@
     </div>
     <div class="isJoin">
       <van-radio-group v-model="vehicleStatus"  :class="{ 'disabled-tree': vehicleInfoDisabled }" :disabled="vehicleInfoDisabled" @change="isVehicleChange"  class="joinWrap">
-        <van-radio :name="1" style="margin-right: 14px">
+        <van-radio :name="1" style="margin-right: 26px">
           启用
           <img
             slot="icon"
@@ -206,7 +206,7 @@
             :src="props.checked ? activeIcon : inactiveIcon"
           >
         </van-radio>
-        <van-radio :name="2" style="margin-right: 14px">
+        <van-radio :name="2">
           停用
           <img
             slot="icon"
@@ -214,14 +214,6 @@
             :src="props.checked ? activeIcon : inactiveIcon"
           >
         </van-radio>
-        <van-radio :name="12" disabled>
-          否-服务商停用
-          <img
-              slot="icon"
-              slot-scope="props"
-              :src="props.checked ? activeIcon : inactiveIcon"
-          >
-        </van-radio>
       </van-radio-group>
     </div>
   </div>
@@ -269,7 +261,6 @@
         :deletable="!disabledShow"
         max-count="1"
         :preview-size="54"
-        @click-preview="clickPreview"
       />
     </div>
     <div class="lineBot"></div>
@@ -311,83 +302,9 @@
         </template>
       </el-input>
     </div>
-    <div class="lineBot" v-if="permissonList?.includes('hasInsuranceAudit')"></div>
-    <div class="itemContent" v-if="permissonList?.includes('hasInsuranceAudit')">
-      <div class="titleType">
-        <img class="startImg" src="@/assets/start.png" />
-        <span>保费</span>
-      </div>
-      <van-field
-          type="number"
-          class="vanIpt"
-          v-model="liabilityInsuranceAmount"
-          input-align="right"
-      >
-        <template slot="right-icon" >
-          <span style="white-space: nowrap;">元</span>
-        </template>
-      </van-field>
-    </div>
-    <div class="lineBot" v-if="permissonList?.includes('hasInsuranceAudit')"></div>
-    <div class="itemContent" v-if="permissonList?.includes('hasInsuranceAudit')">
-      <div class="titleType">
-        <img class="startImg" src="@/assets/start.png" />
-        <span>保额</span>
-      </div>
-      <div style="display:flex;align-items: center;justify-content: flex-end">
-        <el-select
-            v-model="liabilityInsuranceQuota"
-            value-key="name"
-            class="elSelect"
-            collapse-tags="collapse-tags"
-            placeholder="请选择"  style="width: 55%"
-        >
-          <el-option
-              v-for="item in liabilityQuotaOptions"
-              :key="item.value"
-              :label="item.value"
-              :value="item.value"
-          >
-          </el-option>
-        </el-select><span style="margin-right: 16px;opacity: .5;">万元</span>
-      </div>
-<!--      <van-field
-          type="number"
-          class="vanIpt"
-          v-model="liabilityInsuranceQuota"
-          input-align="right"
-      >
-        <template slot="right-icon" >
-          <span style="white-space: nowrap;">万元 </span>
-        </template>
-      </van-field>-->
-    </div>
-
-    <!--    <div class="lineBot"></div>
-    <div class="itemContent">
-      <div class="titleType">
-        <img class="startImg" src="@/assets/start.png" />
-        <span>保单号(救援)</span>
-      </div>
-      <van-field
-          class="vanIpt"
-          style="width: 72%"
-          v-model="insuranceCode"
-          input-align="right"
-      >  </van-field>
-    </div>
-    <div class="lineBot"></div>
-    <div class="itemContent">
-      <div class="titleType"> <span>保单号(中道物流)</span> </div>
-      <van-field
-          class="vanIpt"
-          style="width: 65%"
-          v-model="insuranceCodeZd"
-          input-align="right"
-      >  </van-field>
-    </div>
-    <div class="lineBot"></div>-->
   </template>
+
+
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
@@ -418,7 +335,7 @@
         </div>
       </div>-->
   </div>
-  <two-common-btn class="btn" @cancelClick="back" @submitClick="submitBtn" />
+  <two-common-btn class="btn" @cancelClick="h5GoBack" @submitClick="submitAuditHandle" />
   <van-calendar v-model="showDatePicker"  :min-date="minDate"
                 :max-date="maxDate" type="range" @confirm="onConfirm" />
 
@@ -614,7 +531,6 @@ export default {
         name: '其他',
         value: 14
       }],
-      liabilityQuotaOptions:[{value:10},{value:20},{value:30},{value:50},{value:70},{value:80},{value:100},{value:200}],
       approvalForm:{
         type:2,
         supplierId:'',
@@ -632,10 +548,7 @@ export default {
       vehicleInfoChange:false,
       insuranceChange:false,
       loading: false,
-      liabilityInsuranceAmount:'',
-      liabilityInsuranceQuota:'',
-      insuranceCode:'',
-      insuranceCodeZd:'',
+
     }
   },
   computed: {
@@ -819,19 +732,11 @@ export default {
       this.vehicleFrontPhoto = res.data;
       await this.ocrCarFrontHandler()
     },
-    clickPreview(){
-      console.log(' this.insurancePicturePhoto', this.insurancePicturePhoto)
-      if(this.insurancePicturePhoto && this.insurancePicturePhoto.indexOf('.pdf') !== -1){
-        let url=this.insurancePicturePhoto?.split(',')[0]
-        window.open(url.replace("http://", "https://"))
-      }
-    },
     async insurancePictureFilesHandler(file) {
       const formData = new FormData();
       formData.append("file" , file.file);
       let res = await uploadImage(formData);
       this.insurancePicturePhoto = res.data;
-      console.log('insurancePictureFilesHandler',this.insurancePictureFiles)
     },
     async ocrCarFrontHandler() {     // 车辆正面 orc 识别
       let res = await ocrHandler({
@@ -981,9 +886,8 @@ export default {
       this.insuranceCorp = result.insuranceCorp;
       this.liabilityInsuranceAudit = result.liabilityInsuranceAudit
       if(this.insurancePicturePhoto) {
-        this.insurancePictureFiles = [{url: this.insurancePicturePhoto?.split(',')[0]}]
+        this.insurancePictureFiles = [{url: this.insurancePicturePhoto}]
       }
-      console.log('this.insurancePictureFiles',this.insurancePictureFiles)
       if( this.vehicleLicenseFront ) {
         this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
       }
@@ -1030,7 +934,7 @@ export default {
     isVehicleChange(e) {
       this.vehicleStatus=e
     },
-/*    async submitAuditHandle(){//提交审核
+    async submitAuditHandle(){//提交审核
       let urls=[]
       this.insurancePictureFiles?.forEach(item => urls.push(item.url))
       let time =this.dateVal ? this.formatDateTimeRange(this.dateVal) : ''
@@ -1100,15 +1004,14 @@ export default {
         }
       }
       if((this.vehicleInfoChange || this.insuranceChange) && this.id){
-        // this.approvalDialogShow=true
-        this.submitApprovalHandle()
+        this.approvalDialogShow=true
         console.log('11111',this.approvalForm.serviceChange)
         console.log('2222',this.approvalForm.insuranceChange)
       }else {
         this.approvalDialogShow=false
        await this.submitBtn();
       }
-    },*/
+    },
     async submitApprovalHandle(){//提交审批-走接口
       if(this.vehicleInfoChange){
         if(!(this.selectedOption.length > 0)){
@@ -1127,10 +1030,10 @@ export default {
           this.$toast('车辆状态不能为空')
           return
         }
-       /* if(!this.approvalForm.serviceRemark){
+        if(!this.approvalForm.serviceRemark){
           this.$toast('车辆和服务备注不能为空')
           return
-        }*/
+        }
       }
       if(this.insuranceChange){
         if(this.hasLiabilityInsurance === null || this.hasLiabilityInsurance === undefined || this.hasLiabilityInsurance === '') {  // 有职业责任险，就需要有保单照片
@@ -1153,10 +1056,10 @@ export default {
           this.$toast('保单有效期不能为空')
           return
         }
-       /* if(!this.approvalForm.insuranceRemark){
+        if(!this.approvalForm.insuranceRemark){
           this.$toast('保单备注不能为空')
           return
-        }*/
+        }
       }
       try {
         this.loading = true;
@@ -1211,14 +1114,6 @@ export default {
       this.vehicleInfoChange=false
       this.insuranceChange=false
     },
-    back() {
-      this.$router.push({
-        name:'vehicleManage',
-        params:{
-          id: this.id
-        }
-      })
-    },
     async submitBtn(){
       if( !this.vehicleLicenseFront ) {
         this.$toast('行驶证主页照片不能为空')
@@ -1280,27 +1175,11 @@ export default {
         this.$toast('保单有效期不能为空')
         return
       }
-      if( this.hasLiabilityInsurance == 1){
-        if(this.permissonList.includes('hasInsuranceAudit') && !this.liabilityInsuranceAmount && this.liabilityInsuranceAmount!=0){
-          this.$toast('保费不能为空')
-          return
-        }
-        if(this.permissonList.includes('hasInsuranceAudit') && !this.liabilityInsuranceQuota){
-          this.$toast('保额不能为空')
-          return
-        }
-       /* if(!this.insuranceCode){
-          this.$toast('保单号(救援)不能为空')
-          return
-        }*/
-      }
       let timeObj;
       if(this.dateVal) {
         timeObj = this.formatDateTimeRange(this.dateVal)
       }
       this.serviceIds = this.$refs.tree.getCheckedKeys(true)
-      // console.log('1122',this.vehicleStatus)
-      // return
       await saveVehicle({
           vehicleId:this.id ? this.id : '',
           plateNumber:this.carNum ? this.carNum :'',
@@ -1320,12 +1199,6 @@ export default {
           liabilityInsuranceStartTime: this.hasLiabilityInsurance == 1 ? (timeObj?.startTime || '' ) : '',
           liabilityInsuranceEndTime: this.hasLiabilityInsurance == 1 ? (timeObj?.endTime || '') : '',
           virtualVehicle: this.virtualVehicle,
-          canSubmitApproval:true,
-          vehicleStatus:this.vehicleStatus,
-          liabilityInsuranceAmount:this.liabilityInsuranceAmount,
-          liabilityInsuranceQuota:this.liabilityInsuranceQuota,
-          insuranceCode:this.insuranceCode,
-          insuranceCodeZd:this.insuranceCodeZd,
         })
         if(this.id){
           this.$toast('修改成功')
@@ -1531,12 +1404,4 @@ export default {
     transform: translate(-50%, -50%) rotate(360deg);
   }
 }
-.vanIpt{
-  width: 80%;
-  display: flex;
-  align-items: center;
-}
-.vanIpt1{
-  width: 72%;
-}
 </style>

src/views/index/vehicleManage.vue

@@ -21,7 +21,7 @@
   <van-search
     v-model="searchVal"
     show-action
-    placeholder="请输入车辆名称、车牌号、车架号"
+    placeholder="车辆名称/车牌号/车架号"
     @search="resetHandler"
   >
     <template #action>
@@ -39,14 +39,6 @@
           ></i>
         </template>
       </el-input>-->
-    <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="authStates" placeholder="认证状态" :class="{'customSel':true , 'has-value': authStates }" clearable>
-      <el-option
-          v-for="item in authStatesOptions"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value">
-      </el-option>
-    </el-select>
       <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="inputStatusList" placeholder="录入状态" :class="{'customSel':true , 'has-value': inputStatusList }" clearable>
         <el-option
           v-for="item in inputStatusListOptions"
@@ -57,6 +49,14 @@
       </el-select>
 <!--    </div>-->
 <!--    <div>-->
+      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="authStates" placeholder="认证状态" :class="{'customSel':true , 'has-value': authStates }" clearable>
+        <el-option
+          v-for="item in authStatesOptions"
+          :key="item.value"
+          :label="item.name"
+          :value="item.value">
+        </el-option>
+      </el-select>
       <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="liabilityInsuranceAuditList" placeholder="职业责任险" :class="{'customSel':true , 'has-value': liabilityInsuranceAuditList }" clearable>
         <el-option
           v-for="item in insuresOptions"
@@ -79,12 +79,11 @@
         <div class="carItem" v-for="(item,index) in vehicleList" :key="index" @click.stop="updateVehicle(item)">
           <div class="carCode">
             <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}
-              <span class="ml10"  :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus == 2 ,'insuranceGray': !item.vehicleStatus }">{{ item.vehicleStatus == 1 ? '启用' :( item.vehicleStatus == 2 ? '停用' : ( item.vehicleStatus == 12 ? '否-服务商停用' : '无状态')) }} </span>
+              <span class="ml10" @click.stop="updateStatus(item)"  :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus == 2 ,'insuranceGray': !item.vehicleStatus }">{{ item.vehicleStatus == 1 ? '启用' :( item.vehicleStatus == 2 ? '停用' : '无状态') }} </span>
             </div>
-            <div class="codeRight" v-if="item.vehicleStatus == 1" @click.stop="updateStatus(item)">停用</div>
+
           </div>
           <div class="juhe flex-between">
-            <span class="zdJuhe">核验认证</span>
             <span class="flex-right">
             <span class="common_cls" v-if="item.inputStatusString" :class="getClass(item.inputStatusString)?.className">{{item.inputStatusString}}</span>
             <span class="common_cls" v-if="item.authStateString" :class="getClass(item.authStateString)?.className">{{item.authStateString}}</span>
@@ -96,12 +95,12 @@
             <span class="common_cls" @click.stop="showTip(item.liabilityInsuranceAuditMsg)" :class="getClass(item.rescueInsurance)?.className">{{item.rescueInsurance}}</span>
           </span>
           </div>
-<!--          <div class="juhe flex-between">
+          <div class="juhe flex-between">
             <span class="zdJuhe">车辆信息</span>
             <span class="flex-right" v-if="item.auditStatusStr">
             <span class="common_cls" @click.stop="showTip(item.auditMsg)" :class="getClass(item.auditStatusStr)?.className">{{item.auditStatusStr}}</span>
           </span>
-          </div>-->
+          </div>
           <div class="juhe flex-between">
             <span class="zdJuhe">最近登录时间</span>
             <span class="flex-right">{{item.lastLoginTime}}</span>
@@ -250,9 +249,7 @@ export default {
     },
     async onLoad(){
       await this.getVehicleList()
-      if(this.total>10){
-        this.pageNum++;
-      }
+      this.pageNum++;
       // 加载状态结束
       this.loading = false;
       // 数据全部加载完成
@@ -415,12 +412,6 @@ export default {
     .codeLeft{
       @include fontWeightSize(bold,14px)
     }
-    .codeRight{
-      padding: 2px 8px;
-      border: 1px solid #DDDDDD;
-      border-radius: 3px;
-      font-weight: bold;
-    }
     .twoBtn{
       display: flex;
       align-items: center;

src/views/index/workOrderDetail.vue

@@ -1,57 +1,41 @@
 <template>
   <div class="wrap">
-    <div class="baseInfo common">
+    <div class="baseInfo common" :style="{'height':orderDetailInfo.contractParentId == 110 ? '300px' : '240px'}">
       <div class="title">基本信息:</div>
       <div class="line"></div>
       <div class="infoWrap fontColor">
-        <div class="infoRow">
-          <span class="leftItem">工单编号:</span>
-          <span class="rightItem" style="display: flex;align-items: center;">
+        <div class="leftTitle">
+          <div class="leftItem">工单编号:</div>
+          <div class="leftItem">合同:</div>
+          <template v-if="orderDetailInfo.contractParentId == 110">
+            <div class="leftItem">机构名称:</div>
+            <div class="leftItem">销售人员:</div>
+            <div class="leftItem">司机号码:</div>
+          </template>
+          <div class="leftItem">结算方式:</div>
+          <div class="leftItem">客户姓名:</div>
+          <div class="leftItem">客户电话:</div>
+          <div class="leftItem">车牌号:</div>
+          <div class="leftItem">车型品牌:</div>
+        </div>
+        <div class="rightContent">
+          <div class="rightItem" style="display: flex;align-items: center;">
             <span id="copyText">{{orderDetailInfo.orderCode}}</span>
             <img @click="copyText" src="@/assets/copy.png" style="width: 35px;height: 15px;margin-left: 10px"/>
-          </span>
-        </div>
-        <div class="infoRow" v-if="!([7,9,11,12].includes(Number(queryType)))">
-          <span class="leftItem">合同:</span>
-          <span class="rightItem">{{ orderDetailInfo.contractName }}</span>
-        </div>
-        <template v-if="orderDetailInfo.contractParentId == 110">
-          <div class="infoRow">
-            <span class="leftItem">机构名称:</span>
-            <span class="rightItem">{{ orderDetailInfo.organizeName }}</span>
           </div>
-          <div class="infoRow">
-            <span class="leftItem">销售人员:</span>
-            <span class="rightItem">{{ orderDetailInfo.saleName }}</span>
-          </div>
-          <div class="infoRow">
-            <span class="leftItem">司机号码:</span>
-            <span class="rightItem">{{ orderDetailInfo.driverPhone ? orderDetailInfo.driverPhone : '  '}}</span>
-          </div>
-        </template>
-        <div class="infoRow">
-          <span class="leftItem">结算方式:</span>
-          <span class="rightItem">{{ orderDetailInfo.contractSettleType?.label }}</span>
-        </div>
-        <div class="infoRow">
-          <span class="leftItem">客户姓名:</span>
-          <span class="rightItem">{{ [7,9,11,12].includes(Number(queryType)) ? maskName(orderDetailInfo.userName) : orderDetailInfo.userName }}</span>
-        </div>
-        <div class="infoRow">
-          <span class="leftItem">客户电话:</span>
-          <span class="rightItem">{{ maskPhone(orderDetailInfo.userPhone) }}</span>
-        </div>
-        <div class="infoRow">
-          <span class="leftItem">车牌号:</span>
-          <span class="rightItem">{{ [7,9,11,12].includes(Number(queryType)) ? maskPlate(orderDetailInfo.plateNumber) : orderDetailInfo.plateNumber }}</span>
-        </div>
-        <div class="infoRow">
-          <span class="leftItem">车型品牌:</span>
-          <span class="rightItem">{{orderDetailInfo.model}}{{ orderDetailInfo.brand }}</span>
-        </div>
-        <div class="infoRow" v-if="!([7,9,11,12].includes(Number(queryType)))">
-          <span class="leftItem">车架号:</span>
-          <span class="rightItem">{{orderDetailInfo.vinNo}}</span>
+          <div class="rightItem">{{ orderDetailInfo.contractName }}</div>
+          <template v-if="orderDetailInfo.contractParentId == 110">
+            <div class="rightItem">{{ orderDetailInfo.organizeName }}</div>
+            <div class="rightItem">{{ orderDetailInfo.saleName }}</div>
+            <div class="rightItem">{{ orderDetailInfo.driverPhone ? orderDetailInfo.driverPhone : '  '}}</div>
+          </template>
+          <div class="rightItem">{{ orderDetailInfo.contractSettleType?.label }}</div>
+          <div class="rightItem">{{ orderDetailInfo.userName }}</div>
+          <div class="rightItem">{{ orderDetailInfo.userPhone }}</div>
+          <div class="rightItem">{{ orderDetailInfo.plateNumber }}</div>
+<!--          <div class="rightItem" >理想智动LXA6500SHEVM理想智动LXA6500SHEVM</div>-->
+          <div class="rightItem" >{{orderDetailInfo.model}}{{ orderDetailInfo.brand }}</div>
+
         </div>
       </div>
     </div>
@@ -90,10 +74,9 @@
         <div class="item">
           <span class="leftTitle fontColor">服务师傅:</span><span class="rightContent">{{ orderDetailInfo.driverName }} {{orderDetailInfo.drivePhone ? '/' : ''}} {{orderDetailInfo.drivePhone }}
            <span v-if="queryType == 5" class="driverPoiBtn" @click="noMultipleClicks(showMap)">查看司机位置</span>
-           <span v-if="orderDetailInfo.driverName && orderDetailInfo.proprietary?.code==1" class="driverPoiBtn" @click="noMultipleClicks(createDriverInfo)">生成司机信息</span>
           </span>
         </div>
-        <div class="item" v-if="queryType == 9 || queryType ==11  || queryType ==12 || queryType ==5">
+        <div class="item" v-if="queryType == 9 || queryType ==11  || queryType ==12">
           <span class="leftTitle fontColor">工单照片:</span><span class="rightContent">
            <span  class="driverPoiBtn" @click="checkPhoto">查看照片</span>
           </span>
@@ -131,7 +114,7 @@
 </template>
 <script>
 import {myMixins} from '@/utils/myMixins'
-import {getOrderDetail,showVehiclePositionInfo, getConfigByCode,getDriverInfo} from "@/api/order"
+import {getOrderDetail,showVehiclePositionInfo, getConfigByCode} from "@/api/order"
 import minePosition from '@/assets/minePosition.png';
 import vehiclePosition from '@/assets/vehiclePosition.png';
 import  desitationPosition from '@/assets/desitationPosition.png'
@@ -169,7 +152,7 @@ export default {
     this.$nextTick(() => {
       this.initMap();
     });
-    console.log('queryType', this.queryType)
+
   },
   methods:{
     async getConfigByCodeHandler() {
@@ -178,26 +161,6 @@ export default {
       });
       this.carTypeList = res?.data?.userVehicleType
     },
-    async getDriverInfo(){
-      let result=await getDriverInfo({
-        driverId:this.orderDetailInfo.driverId
-      })
-      if(result.data){
-        // console.log('--result--',result.data)
-        let params=`姓名：${this.orderDetailInfo.driverName}\n身份证：${result.data.identityCardNumber}\n车牌：${this.orderDetailInfo.vehiclePlateNumber}\n手机：${this.orderDetailInfo.driverPhone}`
-        // console.log('params',params)
-        let data = {"action":"copyToClipboard","params":params}
-        var u = navigator.userAgent;
-        var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
-        if(isiOS){
-          window.webkit.messageHandlers.nativeObject.postMessage(data);
-        }else {
-          window.android.copyToClipboard(params);
-        }
-      }else {
-        this.$toast('未获取到司机信息')
-      }
-    },
     async getDetail(){
       let result=await getOrderDetail({
         queryType:this.queryType,
@@ -213,9 +176,6 @@ export default {
       this.showPopup = true;
       this.mapMarkers();
     },
-    async createDriverInfo(){//生成司机信息
-      await this.getDriverInfo()
-    },
     checkPhoto(){
       let isAllowImage = this.queryType == 9 ? 0 : 1
       let data = {
@@ -278,21 +238,6 @@ export default {
       this.map.add(marker2);
       this.map.setFitView([marker,marker1,marker2])
     },
-    maskName(name) {
-      if (!name) return '';
-      return name.slice(0, 1) + '*'.repeat(name.length - 1);
-    },
-    maskPhone(phone) {
-      if (!phone) return '';
-      const str = String(phone);
-      if (str.length <= 7) return str;
-      return str.slice(0, 3) + '*'.repeat(str.length - 7) + str.slice(-4);
-    },
-    maskPlate(plate) {
-      if (!plate) return '';
-      if (plate.length <= 2) return plate;
-      return plate.slice(0, 1) + '*'.repeat(plate.length - 2) + plate.slice(-1);
-    },
     async getDriverPoi(){
       let res=await showVehiclePositionInfo({
         userOrderId:this.userOrderId,
@@ -349,25 +294,21 @@ export default {
 }
 .baseInfo{
   width: 100%;
+  //@include wh(100%,260px);
   margin-bottom: 12px;
   .infoWrap{
-    .infoRow{
-      display: flex;
-      align-items: center;
-      min-height: 24px;
-      .leftItem{
-        width: 60px;
-        flex-shrink: 0;
-        margin-left: 5px;
-        margin-right: 6px;
-        opacity: .5;
-      }
+    display: flex;
+    .leftTitle{
+      margin-left: 5px;
+      margin-right: 6px;
+      @include wh(60px,189px);
+      opacity: .5;
+    }
+    .rightContent{
+      height: 189px;
+      width: calc(100% - 60px);
       .rightItem{
-        flex: 1;
-        min-width: 0;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+        height: 24px;
       }
     }
   }

src/views/kpi/kpiIndex.vue

@@ -263,7 +263,6 @@ import {
   getDriverName,getDriverStatisticsKpi,
   getRecentSupplierKpi,
 } from "@/api/kpi.js"
-import { getUserBO } from "@/api/order"
 // querySupplierDriverStatisticsScore
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@@ -331,10 +330,6 @@ export default {
       showScoreChart:true,
       continueMonthKpi:[],
       isBtn:false,//是否有信息变更申请按钮权限
-      source: 'App',
-      currentSupplierId: '',
-      userId: '',
-      enterTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     }
   },
   created() {
@@ -343,41 +338,13 @@ export default {
     this.isZd = urlParams?.get('isZd') || ''
     this.supplierId = urlParams?.get('supplierId') || ''
     this.isBtn= Number(urlParams?.get('isBtn'))
-    this.source = urlParams?.get('source') || 'App'
   },
   async mounted() {
     await this.checkMobile();
     await this.initDate();
     await this.selectSupplierNameHandle();
-    await this.getUserInfo();
-    document.addEventListener('visibilitychange', async (  ) => {
-      let state = document.visibilityState
-      if (state == 'hidden') {  // 用户离开了
-        if( this.source == 'App' ) {
-          this.setLogHandler({
-            supplierId: this.currentSupplierId,      // 服务商 id
-            userId: this.userId,              // userId
-            source: '服务商KPI',
-            event: this.source,               // 区分 App 还是 system
-            openTime: this.enterTime,   // log 时间，其中 阅读时长是由 enter 和 leave 的时间计算而来
-            leaveTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-          });
-        }
-      }
-      if (state == 'visible') {
-        this.enterTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      }
-    });
-
-
   },
   methods: {
-    async getUserInfo() {
-      let res = await getUserBO();
-      this.userId = res.data.id;
-      this.currentSupplierId = res.data.supplierId
-      console.log('getUserBO', res)
-    },
     applicateHandle() {
       if (window.parent) {
         const hasListener = window.parent.dispatchEvent(new Event('checkCloseDialog'));
@@ -1180,8 +1147,8 @@ export default {
               {label: '服务车辆', prop: 'vehicleName'},
               {label: '服务完成状况', prop: 'orderStatusString'},
               {label: '案件完成时间', prop: 'finishTime'},
-              {label: '省(B)', prop: 'bprovince'},
-              {label: '市(B)', prop: 'bcity'},
+              {label: '省(B)', prop: 'bProvince'},
+              {label: '市(B)', prop: 'bCity'},
               {label: '区(B)', prop: 'area'},
             ]
           } else if (this.active === 6) {//投诉明细
@@ -1659,13 +1626,13 @@ export default {
     getTitle(type) {
       switch (type) {
         case 0:
-          return '客户评价';
+          return '接单时效';
         case 1:
-          return 'APP使用';
+          return '客户评价';
         case 2:
+          return 'APP使用';
+        case 3:
           return '时效';
-       /* case 3:
-          return '时效';*/
       }
     },
   }

src/views/liabilityInsurance/insuredPage.vue

@@ -13,20 +13,23 @@
     </div>
     <div class="contentWrap">
       <div>
-        为降低日常救援工作中的不可预期的车损赔付带来的运营风险和资金压力，减少由此衍生而来的投诉，顺应行业服务标准不断增长的局势，中道救援自有车辆已全部投保了救援职业责任险。
+        为降低日常救援工作中的不可预期的车损赔付带来的运营风险和资金压力，减少由此衍生而来的可能投诉，顺应行业服务标准不断增长的局势，中道救援自有车辆已全部投保了救援职业责任险。
       </div>
       <div>
-        通过交流了解，我们的合作服务商日常运营中会遇到责任险或者货物险的“投保难、理赔难”的问题，为此我们与保司沟通协调，特为与中道救援合作紧密的服务商，提供救援职业责任险参保渠道，解决大家的实际困难，实现共同进步。
+        通过日常的交流了解，此险种对于服务商而言，投保相对较难，很多服务商在无投保渠道的情况下选择了对于我们救援场景保障能力稍弱、不太匹配的货物险，从而从形成了现在很多救援车无保障、或者特殊场景货物险理赔难的局面。
+      </div>
+      <div>
+        为此中道救援经过与保司沟通协调，特为与中道救援合作紧密的服务商，提供救援职业责任险参保渠道，提升服务商服务能力，降低运营风险，实现共同进步。
       </div>
       <div>一、救援职业责任险简介：</div>
-      <div> 1、保额有50万和100万两套方案可选。</div>
+      <div> 1、综合保额100万元（其中救援责任50万元，物流责任50万元），可全方位覆盖我们日常的经营活动。</div>
       <div> 2、保费支付可采用救援服务费抵扣的方式，降低资金压力。</div>
-      <div> 3、其他详情如需了解，请与辖区区域经理联系。</div>
-      <div> 二、如有好的建议需要交流，请与18621558505曲仁杰联系。</div>
-      <div> 三、如有参保需要，请点击下方“参保”按钮，我们会与您联系。</div>
+      <div> 3、详细保险条款、保费和其他问题，如需了解，请与辖区区域经理联系。</div>
+      <div> 二、其他意见建议如需交流，请与18621558505曲仁杰联系。</div>
+      <div> 三、如确认参保，请点击下方“参保”按钮，会有专人与贵司联系。</div>
     </div>
     <div class="upload_btn_wrap">
-      <div class="btn_save" :style="{'backgroundColor':used ? '#cccccc' : '#354D93'}" @click="showPoup = true">我想咨询</div>
+      <div class="btn_save" :style="{'backgroundColor':used ? '#cccccc' : '#354D93'}" @click="showPoup = true">参保</div>
     </div>
     <div class="poupCommon" v-if="showPoup">
       <div class="showPoupContainer">
@@ -34,10 +37,12 @@
         <img class="insure" src="@/assets/insured.png">
         <div class="con">
           <template v-if="used">
-            <div class="title">咨询已收到，我们会与您联系。</div>
+            <div class="title">您已成功申请参保，请等待</div>
+            <div class="title">专人与贵司联系。</div>
           </template>
           <template v-else>
-            <div class="title">请确认咨询</div>
+            <div class="title">请确认</div>
+            <div class="title">是否参保救援职业责任险</div>
           </template>
           <div class="btnWrap">
             <div v-if="used" class="btn confirmBtn" @click="showPoup = false">确认</div>

src/views/mine/personList.vue

@@ -1,453 +0,0 @@
-<template>
-  <div class="wrap">
-    <div class="navBar">
-      <van-nav-bar
-          title="人员信息"
-          :left-arrow="Boolean(!isWebFunc())"
-          left-arrow-color="#FFFFFF"
-          :border="false"
-          :fixed="true"
-          :safe-area-inset-top="true"
-          @click-left="goBack"
-      />
-    </div>
-    <div :class="{'tipWrap':true,'yelBg':type==3,'greBg':type==4}">
-      <img v-show="[1,2].includes(type)" src="@/assets/unpass.png" />
-      <img v-show="[3].includes(type)" src="@/assets/yelTip.png" />
-      <img v-show="[4].includes(type)" src="@/assets/greTip.png" />
-      <span v-if="type==1">请立即核对或修改以下信息：姓名/身份/电话/微信号/邮箱</span>
-      <span v-else-if="type==2">“角色”无法修改，如需修改“角色”请联系区域经理。提交审批后请到【管理人员】模块进行查看。</span>
-      <span v-else-if="type==3">当前信息正在确认中，如需调整请联系区域经理。</span>
-      <span v-else-if="type==4">当前信息已确认，如需调整请联系区域经理。</span>
-    </div>
-    <van-loading v-show="personList.length<=0"  class="loadingWrap"  type="spinner" color="#1989fa" />
-    <div class="contentWrap" v-show="personList.length>0"
-         :style="{'height':([1,2].includes(type) && isMaster) ? 'calc(100% - 160px)' : 'calc(100% - 90px)'}">
-        <div class="itemWrap" v-for="(item,index) in personList" :key="index">
-          <div class="opaCol">人员{{(index+1)}}:</div>
-          <div class="line"></div>
-          <div class="item">
-            <div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>姓名：</span></div>
-            <div class="right">
-              <van-field  :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model="item.name" placeholder="请输入" />
-            </div>
-          </div>
-          <div class="item">
-            <div class="left opaCol"><span class="star" style="opacity: 0">*</span><span>角色：</span></div>
-            <div class="right" :class="{'opaCol':type==2}">
-              <van-field  :input-align="type==2 ? 'right' : 'left'" readonly v-model="item.roleName" placeholder="请输入" />
-            </div>
-          </div>
-          <div class="item">
-            <div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>电话1：</span></div>
-            <div class="right">
-              <van-field  :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model.number="item.phone1" placeholder="请输入" @blur="blurHandle" />
-            </div>
-          </div>
-          <div class="item">
-            <div class="left" :class="{'opaCol':type!=2}"><span class="star"  style="opacity: 0">*</span><span>电话2：</span></div>
-            <div class="right">
-              <van-field  :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model.number="item.phone2"  @blur="blurHandle" placeholder="请输入" />
-            </div>
-          </div>
-          <div class="item">
-            <div class="left" :class="{'opaCol':type!=2}"><span class="star">*</span><span>微信号：</span></div>
-            <div class="right wechatRight">
-              <span class="reviseBtn" v-show="type==2" @click="wechatRevise(item,index)">修改</span>
-              <van-field  :input-align="type==2 ? 'right' : 'left'" readonly v-model="item.wechatName"  />
-            </div>
-          </div>
-          <div class="item">
-            <div class="left" :class="{'opaCol':type!=2}"><span class="star"  style="opacity: 0">*</span><span>邮箱：</span></div>
-            <div class="right">
-              <van-field  :input-align="type==2 ? 'right' : 'left'" :readonly="type!=2" v-model="item.email" placeholder="请输入" />
-            </div>
-          </div>
-        </div>
-    </div>
-    <div class="btnWrap" v-if="isMaster && [1,2].includes(type)">
-      <div v-show="type==2" class="audit common" @click="auditHandle">提交审批</div>
-      <div v-show="type==1" class="revise common" @click="reviseHandle">立即修改</div>
-      <div v-show="type==1" class="confirm common" @click="confirmHandle">确认信息无误</div>
-    </div>
-    <van-dialog v-model="dialogShow" title="请将此二维码发送至相应人员进行添加，成功添加后将更新微信号。" show-cancel-button
-                confirmButtonText="确认已添加" confirmButtonColor="#354E93" className="customDialog"
-                @confirm="wechatConfirm" @cancel="cancelHandle">
-      <img v-if="wechatInfo?.qrCode" :src="wechatInfo.qrCode"  style="width: 83%"/>
-    </van-dialog>
- </div>
-</template>
-
-<script>
-
-import {myMixins} from "@/utils/myMixins"
-import {getConfirmPerson,getConfirmStatus,getQrCode,confirmAddWechat,confirm,submitConfirm} from "@/api/authentication";
-import { Dialog } from 'vant';
-export default {
-  name: "personList",
-  mixins:[myMixins],
-  data(){
-    return{
-      noClick:true,
-      id:'',
-      type:'',//1确认信息 2修改 3审批中 4已确认
-      personList:[],
-      dialogShow:false,
-      reviseIndex:-1,
-      supplierId:'',
-      wechatInfo:'',
-      personInfoId:'',
-      personInfo:'',
-      isMaster:false,
-    }
-  },
-  async mounted() {
-    window.addEventListener('message', (event) => {
-      if (event.data === 'dialogClosed') {
-        // console.log('Dialog 已关闭 // 执行关闭后的逻辑');
-      }
-    });
-    // console.log('isWebFunc()',this.isWebFunc())
-    const urlParams = new URLSearchParams(window.location.search);
-    this.id=this.$route.query.id ||  urlParams.get('id');
-    this.supplierId=this.$route.query.supplierId ||  urlParams.get('supplierId');
-    // this.supplierId=1128
-    console.log('1111',this.supplierId)
-    await this.getPersonList()
-  },
-  methods:{
-    blurHandle(e){
-      let val= e.target.value || ''
-      let flag=this.validatePhone(val)
-      // console.log('flag',flag)
-      if(!flag){
-        this.$toast('电话号码格式不正确')
-      }
-    },
-    validatePhone(val) {
-      console.log('val',val)
-      if(!val){
-        return true
-      }
-      const purePhone = String(val).trim()
-      const mobileReg = /^1[3-9]\d{9}$/ // 大陆手机号正则表达式
-      const hkMobileReg = /^[569]\d{3}[\s-]?\d{4}$/ // 香港手机号正则表达式，允许使用空格或 "-" 分隔
-      const macauMobileReg = /^6\d{3}[\s-]?\d{4}$/ // 澳门手机号正则表达式，允许使用空格或 "-" 分隔
-      const telReg = /^(0\d{2,3})([\s-])?\d{7,8}$/ // 大陆座机号正则表达式，允许区号和座机号用空格或 "-" 分开
-      const hkTelReg = /^\(?\d{2,4}\)?[\s-]?\d{4}[\s-]?\d{4}$/ // 香港座机号正则表达式，允许使用空格或 "-" 分隔
-      const macauTelReg = /^\(?\d{2,4}\)?[\s-]?\d{4}[\s-]?\d{4}$/ // 澳门座机号正则表达式，允许使用空格或 "-" 分隔
-      const phone400Reg = /^400[\s-]?\d{3}[\s-]?\d{4}$/ // 以 "400" 开头的号码正则表达式，允许使用空格或 "-" 分隔
-      // 情况1：12位且首位是0、第二位是1 → 去0后按大陆手机号校验
-      if (/^01[0-9]{10}$/.test(purePhone)) {
-        return true
-      }
-      // 匹配任意一种格式即为合法
-      if (mobileReg.test(purePhone) || hkMobileReg.test(purePhone) || macauMobileReg.test(purePhone) ||
-          telReg.test(purePhone) || hkTelReg.test(purePhone) || macauTelReg.test(purePhone) ||
-          phone400Reg.test(purePhone)) {
-        return true
-      }
-      // 其他情况 → 不合法
-      return false
-    },
-    async getPersonList(){
-      let result=await getConfirmStatus({supplierId:this.supplierId})
-      if(result.data?.wechatConfirmStatus==2){
-        this.type=3
-      }else if(result.data?.wechatConfirmStatus==3){
-        this.type=4
-      }else if(!result.data?.wechatConfirmStatus || result.data?.wechatConfirmStatus==1){
-        this.type=1
-      }
-      this.isMaster=result.data.isMaster
-      // this.type=2
-      let res=await getConfirmPerson({supplierId:this.supplierId})
-      if(res.data && res.data.length>0){
-        this.personList=res.data
-      }else{
-        this.personList=[]
-      }
-    },
-    async wechatConfirm(){//确认已添加微信按钮
-      Dialog.confirm({
-        message:'请确认相关人员是否已添加该二维码。',
-        confirmButtonText:'确认',
-        cancelButtonText:'取消',
-        confirmButtonColor:'#354E93',
-      }).then(async() => {
-        let res=await confirmAddWechat({supplierId:this.supplierId,supplierPersonInfoId:this.personInfoId})
-        console.log('res',this.personInfo,res.data?.name,this.personInfo.wechatName)
-        if((res.data?.name == this.personInfo.wechatName) || (!res.data && this.personInfo.wechatName)){
-          console.log('11111111')
-          this.$set(this.personList[this.reviseIndex],'isChange',false)
-        }else {
-          console.log('2222222')
-          this.$set(this.personList[this.reviseIndex],'isChange',true)
-        }
-        console.log('this.personList',this.personList)
-        let flagRevise=this.personList.some(item => 'isChange' in item && !item.isChange)
-        console.log('存在未修改',flagRevise)
-        if(res.data){
-          this.personList[this.reviseIndex].wechatId=res.data?.externalUserId
-          this.personList[this.reviseIndex].wechatName=res.data?.name
-        }
-        await this.cancelHandle()
-      }).catch(async () => {
-        await this.cancelHandle()
-
-      });
-    },
-    cancelHandle(){
-      this.dialogShow=false
-      this.wechatInfo=''
-      this.reviseIndex=-1
-      this.personInfoId=''
-    },
-    async wechatRevise(item,index){
-      console.log('item,index',item,index)
-      // console.log('item',item)
-      this.personInfoId=item.id
-      this.reviseIndex=index
-      this.personInfo=item
-      await this.getCode()
-      this.dialogShow=true
-    },
-    async getCode(){//获取二维码
-      let res = await getQrCode({supplierId:this.supplierId,supplierPersonInfoId:this.personInfoId})
-      // console.log('res--getCode',res)
-      this.wechatInfo=res.data || ''
-    },
-    async auditHandle(){//提交审批
-      let flag=this.personList.every(item => item.name && item.phone1 && item.wechatId && item.wechatName)
-      if(!flag){
-        this.$toast('必填项不可为空')
-        return
-      }
-      console.log('----',this.personList)
-      let flagRevise=this.personList.some(item => 'isChange' in item && !item.isChange)
-      console.log('存在未修改',flagRevise)
-      if(flagRevise){
-        this.$toast('您仍未修改微信号，请先修改再提交审批。')
-        return
-      }
-      let phone1Flag= this.personList.every(item => this.validatePhone(item.phone1))
-      let phone2Flag= this.personList.every(item => (item.phone2 && this.validatePhone(item.phone2) || !item.phone2))
-      console.log('phone1Flag',phone1Flag)
-      console.log('phone2Flag',phone2Flag)
-      if(!phone1Flag || !phone2Flag){
-        this.$toast('电话号码格式不正确')
-        return
-      }
-      await submitConfirm({supplierId:this.supplierId,infos:this.personList})
-      this.$toast('操作成功')
-      if(this.isWebFunc()){
-        setTimeout(()=>{
-          this.closeParentDialog()
-        },1500)
-      }else{
-        setTimeout(()=>{
-          this.goBack()
-        },1500)
-      }
-    },
-    async reviseHandle(){//修改
-      this.type=2
-    },
-    async confirmHandle(){//确认信息无误
-      let flag=this.personList.every(item => item.name && item.phone1 && item.wechatId && item.wechatName)
-      if(!flag){
-        this.$toast('必填项不可为空，请点击“立即修改”将信息补充完整')
-        return
-      }
-      Dialog.confirm({
-        message:'请务必仔细确认信息是否无误。',
-        confirmButtonText:'确认无误',
-        cancelButtonText:'返回',
-        confirmButtonColor:'#354E93',
-      }).then(async() => {
-        // console.log('确认无误')
-        await confirm({supplierId:this.supplierId})
-        this.$toast('操作成功')
-        if(this.isWebFunc()){
-          setTimeout(()=>{
-            this.closeParentDialog()
-          },1500)
-        }else{
-          setTimeout(()=>{
-            this.goBack()
-          },1500)
-        }
-      }).catch(() => {
-      });
-    },
-  }
-}
-</script>
-<style lang="scss">
-.customDialog {
- .van-dialog__content{
-    text-align: center !important;
-  }
-  .van-dialog__header {
-    box-sizing: border-box;
-    padding: 12px;
-  }
-}
-</style>
-<style scoped lang="scss">
-@import "@/styles/common.scss";
-@import '@/styles/mixin.scss';
-.wrap {
-  @include wh(100%, 100%);
-  position: relative;
-  background-color: #F6F6F6;
-}
-.navBar{
-  margin-bottom: 46px;
-}
-.tipWrap{
-  width: 100%;
-  box-sizing: border-box;
-  padding: 8px 8px 8px 18px;
-  margin-bottom: 10px;
-  display: flex;
-  background-color: #FFF6F2;
-  img{
-    width: 14px;
-    height: 14px;
-    //vertical-align: middle;
-    margin-right: 5px;
-    margin-top: 2px;
-  }
-  span{
-    color: #FC3C06;
-  }
-}
-.yelBg{
-  background-color: #FFFFED ;
-  span{
-    color: #F36708;
-  }
-}
-.greBg{
-  background-color: #E8FFF3;
-  span{
-    color: #19AC43;
-  }
-}
-/*.headerWrap{
-  width: 100%;
-  box-sizing: border-box;
-  padding: 15px 16px;
-  position: relative;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .back{
-    @include wh(15px,15px);
-  }
-  span{
-    font-weight: bold;
-    font-size: 16px;
-    color: #203152;
-  }
-}*/
-.loadingWrap{
-  width: 100%;
-  height: calc(100% - 90px);
-  text-align: center;
-  line-height: 200px;
-}
-.contentWrap{
-  //height: calc(100% - 160px);
-  //height: calc(100% - 90px);//没有按钮时
-  overflow-y: auto;
-  .itemWrap{
-    font-size: 14px;
-    width: 100%;
-    margin-bottom: 10px;
-    background-color: #FFFFFF;
-    box-sizing: border-box;
-    padding:10px 15px 10px 20px;
-    .line{
-      width: 100%;
-      text-align: center;
-      border-bottom: 2px solid;
-      opacity: 0.16;
-      margin-top: 10px;
-      border-image: linear-gradient(270deg, rgba(217, 217, 217, 0.6), rgba(178, 178, 178, 1), rgba(178, 178, 178, 1), rgba(217, 217, 217, 0.6)) 1 1;
-    }
-    .item{
-      //line-height: 36px;
-      display: flex;
-      align-items: center;
-      .left{
-        width: 66px;
-      }
-      .right{
-        flex: 1;
-      }
-      .wechatRight{
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        .reviseBtn{
-          display: inline-block;
-          width: 60px;
-          text-align: center;
-          border-radius: 4px;
-          background-color: #354D93;
-          color: #FFFFFF;
-          box-sizing: border-box;
-          padding: 2px 0;
-        }
-      }
-    }
-    .opaCol{
-      color: #323643;
-      opacity: .65;
-    }
-    .star{
-      font-weight: bold;
-      font-size: 13px;
-      color: #FF0808;
-    }
-  }
-}
-.btnWrap{
-  width: 100%;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  box-sizing: border-box;
-  padding: 10px 19px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  background-color: #F6F6F6;
-  .common{
-    background: #354D93;
-    height: 48px;
-    line-height: 48px;
-    text-align: center;
-    border-radius: 5px;
-    font-weight: 500;
-    font-size: 14px;
-    color: #FFFFFF;
-    cursor: pointer;
-  }
-  .audit{
-    width: 100%;
-  }
-  .revise{
-    width: 30%;
-    background-color: #FFFFFF;
-    color: #354D93;
-    box-sizing: border-box;
-    border: 1px solid #354D93;
-  }
-  .confirm{
-    width: 67%;
-  }
-}
-</style>

src/views/secondHandCar/carSource.vue

@@ -478,21 +478,6 @@ export default {
           otherPhoto:this.otherImgSrc?.join(',')
         })
         this.clearStorageFormInfo()
-        if(res.code == 200 && !res.msg){
-          this.$toast('发布成功')
-          if(this.isWebFunc()){
-            setTimeout(()=>{
-              this.closeParentDialog()
-            },1000)
-          }else{
-            setTimeout(()=>{
-              this.$router.push({ name: "mineRelease"})
-              sessionStorage.setItem('mineActiveTab',String(1) )
-            },1000)
-          }
-        }else{
-          this.$toast(res.msg)
-        }
         console.log("车源发布publishCarInfo",res)
       } catch (e){
         console.log('e',e)

src/views/secondHandCar/indexList.vue

@@ -16,7 +16,7 @@
       <img class="mine" src="@/assets/secondHandCar/mine.png" @click="goMine" />
       <el-input
           @blur="getList"
-          placeholder="牌照|车辆类型|落板|排放|品牌|描述|底座|刹车|自营"
+          placeholder="请输入"
           v-model.trim="topSearch">
         <img slot="suffix" class="search" src="@/assets/secondHandCar/search.png"/>
       </el-input>
@@ -99,11 +99,6 @@
           ></i>
         </template>
       </el-input>
-      <div class="customSel wantSourceSel" @click.stop="toggleWantSource">
-        <img v-if="wantSource === 1" class="checkIcon" src="@/assets/secondHandCar/checked.png" />
-        <img v-else class="checkIcon" src="@/assets/secondHandCar/uncheck.png" />
-        <span :class="{'has-price': wantSource === 1}">想要的车源</span>
-      </div>
     </div>
     <div class="contentWrap" v-show="!show">
       <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
@@ -228,7 +223,6 @@ export default {
       showDatePicker: false,
       areaShow:false,
       isClearing:false,
-      wantSource: 0,
       minDate: new Date(1970, 0, 1),  // 设置最小可选日期（1970年1月1日）
       maxDate: new Date(2099, 11, 31) // 设置最大可选日期（2099年12月31日）
     }
@@ -273,10 +267,6 @@ export default {
       this.setSearchVal();
       this.getList()
     },
-    wantSource(){
-      this.setSearchVal();
-      this.getList()
-    },
   },
   mounted() {
     this.getSearchVal();
@@ -291,9 +281,6 @@ export default {
     });
   },
   methods:{
-    toggleWantSource(){
-      this.wantSource = this.wantSource === 1 ? 0 : 1;
-    },
     confirmHandle(val){
       if(val[0].name.includes('市')){
         this.areaName=val[0].name
@@ -369,7 +356,6 @@ export default {
       sessionStorage.setItem('dateVal',this.dateVal);
       sessionStorage.setItem('brandModel',this.brandModel);
       sessionStorage.setItem('underpanBrand',this.underpanBrand);
-      sessionStorage.setItem('wantSource',String(this.wantSource));
     },
     getSearchVal(){
       this.activeTab = Number(sessionStorage.getItem('indexActiveTab')) || 0;
@@ -385,7 +371,6 @@ export default {
       this.dateVal=sessionStorage.getItem('dateVal') || '';
       this.brandModel=sessionStorage.getItem('brandModel') || '';
       this.underpanBrand=sessionStorage.getItem('underpanBrand') || '';
-      this.wantSource=Number(sessionStorage.getItem('wantSource')) || 0;
     },
     goMine(){//我的发布
       this.$router.push({ name: "mineRelease"})
@@ -449,7 +434,6 @@ export default {
         endTime:this.endTime,
         brandModel:this.brandModel,
         underpanBrand:this.underpanBrand,
-        wantSource:this.wantSource,
       })
       this.total=res.total
       if(this.pageNum == 1){// 第一页直接赋值
@@ -542,9 +526,6 @@ export default {
     border-radius: 20px;
     border: 2px solid #264B94;
   }
-  ::v-deep .el-input__inner::placeholder{
-    font-size: 10px;
-  }
   ::v-deep .el-input__suffix{
     top: 12px;
     right: 10px;
@@ -641,22 +622,6 @@ export default {
   .has-price{
     color: #007BE9 !important;
   }
-  .wantSourceSel{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 3px;
-    width: 68px;
-    cursor: pointer;
-    .checkIcon{
-      width: 13px;
-      height: 13px;
-    }
-    span{
-      font-size: 10px;
-      color: #323233;
-    }
-  }
 }
 .contentWrap{
   width: 100%;