车辆管理，有责任险审核权限的展示‘保额’且必填

This reverts commit dc94c6d261.

public/res/year-statistic/README.md

@@ -0,0 +1,160 @@
+# 年终总结看板 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

@@ -0,0 +1,47 @@
+{
+  "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

@@ -0,0 +1,47 @@
+{
+  "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
+    }
+  }
+}

src/api/order.js

@@ -77,6 +77,15 @@ 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({

src/views/index/continueInsurance.vue

@@ -8,7 +8,7 @@
         :border="false"
         :fixed="true"
         :safe-area-inset-top="true"
-        @click-left="h5GoBack"
+        @click-left="back"
     />
   </div>
 <div class="addContentWrap">
@@ -92,6 +92,57 @@
         </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"
@@ -104,7 +155,7 @@
   import {Dialog} from "vant";
 import {myMixins} from "@/utils/myMixins"
   import {formatDate1} from "@/utils/common"
-import { uploadImage, updateInsurance, getInfoById} from "@/api/mine"
+import { uploadImage, updateInsurance, getInfoById,userOperationPermissions} from "@/api/mine"
   import CommonBtn from "@/components/commonBtn.vue"
 export default {
   name: "vehicleAdd",
@@ -115,6 +166,7 @@ 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,
@@ -130,6 +182,9 @@ export default {
       insurancePicturePhoto: '',    // 保单照片
       isMultiple: false,     // 是否支持多选
       insuranceCorp: '',
+      liabilityInsuranceAmount:'',
+      liabilityInsuranceQuota:'',
+      permissonList:[],
       insuranceOptions: [{
         name: '太平洋',
         value: 1
@@ -183,11 +238,24 @@ 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
@@ -259,6 +327,14 @@ 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)
@@ -271,6 +347,8 @@ 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)
@@ -280,7 +358,8 @@ export default {
           this.$toast('添加成功')
         }
         setTimeout(()=>{
-          this.$router.back();
+          // this.$router.back();
+          this.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,11 +80,12 @@
       :preview-size="54"
       accept="image "
     />
-  </div>
+  </div>-->
   <div class="lineBot"></div>
   <div class="itemContent">
     <div class="titleType">
-      <span>头像</span>
+      <img class="startImg" src="@/assets/start.png" />
+      <span>免冠正面照</span>
     </div>
     <van-uploader
       v-model="iconList"
@@ -307,7 +308,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)
@@ -399,9 +400,13 @@ 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,6 +18,43 @@
         </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"
@@ -25,13 +62,32 @@
             finished-text="没有更多了"
             @load="onLoad"
         >
-        <div class="itemWrap" v-for="(item,index) in driverList" :key="index">
+          <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 }}</div>
+              <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}
-            <div class="twoBtn">
+                <span style="margin-left: 10px" :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
-              <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="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>
+            </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">
@@ -47,22 +103,24 @@
               <span class="halfOpci">身份证号:</span>
               <span class="allOpci">{{ item.identityCardNumber }}</span>
             </div>
-          <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>
-        </div>
-
         </van-list>
       </van-pull-refresh>
 
     </div>
+  </div>
 </template>
 
 <script>
 
 import {myMixins} from "@/utils/myMixins"
-import {driverList,enableAction,userOperationPermissions} from  "@/api/mine"
+import {driverList, enableAction, userOperationPermissions} from "@/api/mine"
+import {Dialog} from "vant";
 export default {
   name: "driverManage",
   mixins:[myMixins],
@@ -79,6 +137,40 @@ 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() {
@@ -88,9 +180,41 @@ 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.loading = false;
       // 数据全部加载完成
@@ -118,7 +242,11 @@ export default {
     async getDriverList(){
         let res = await  driverList({
           pageNum:this.pageNum,
-          pageSize:this.pageSize
+          pageSize:this.pageSize,
+          searchVal: this.searchVal,
+          idCardStatusList: this.idCardStatusList,
+          driverLicenseStatusList: this.driverLicenseStatusList,
+          authStatusList: this.authStatusList,
         });
         if(res.code == 200){
           this.total=res.total
@@ -130,12 +258,11 @@ 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){
@@ -143,14 +270,23 @@ 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(() => {
+      });
+
     },
     updateDriver(item){
+      if(!this.permissonList.includes('driverModifyBtn')){//有权限才能修改
+        return
+      }
       // 在当前组件中进行路由跳转并传递参数对象
       this.$router.push({
         name: 'driverAdd',  // 目标路由的名称
@@ -185,7 +321,7 @@ export default {
 
 .wrap {
   background: #F4F5F7;
-  @include sizingPadding(13px,13px);
+  //@include sizingPadding(13px,13px);
   @include wh(100%, 100%);
   overflow-y: auto;
 }
@@ -208,7 +344,7 @@ export default {
 }
 
 .itemWrap {
-  @include wh(100%, 104px);
+  @include wh(100%, 140px);
   @include radiusSizing(6px);
   @include fontWeightSize(400, 12px);
   @include flexBetween;
@@ -216,6 +352,7 @@ 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;
@@ -224,15 +361,15 @@ export default {
     opacity: 1;
   }
   .statusNo {
-    color: #FF0000;
+    color: red;
   }
   .statusYes {
-    color: #09B820
+    color: green
   }
 }
 
 .name-status {
-  @include flexColBet;
+  @include flexBetCen;
   .namephone {
     @include fontWeightSize(bold, 14px)
   }
@@ -256,6 +393,128 @@ 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/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,6 +47,19 @@
                 </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">
@@ -57,6 +70,7 @@
               <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
@@ -121,13 +135,16 @@
       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: '',
@@ -138,6 +155,23 @@
           trailCount: '',
           minorCount: '',
           serviceAreaCode: [],
+          linkEmail:'',
+          accountInfoDTO:{
+            dutyParagraph:'',
+            accountNumber:'',
+            accountName:'',
+            accountType:'',
+            invoiceType:'',
+            settlementType:'',
+            shouldRate:'',
+            realRate:'',
+            unitName:'',
+            bankNo:'',
+            billingPhone:'',
+            billingAddress:'',
+            billHead:'',
+            companyType:'',
+          }
         },
         qrCodeUrl: '',
         qrCode: '',
@@ -195,6 +229,7 @@
         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 }];
@@ -205,6 +240,9 @@
         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(','))
         }
@@ -215,21 +253,26 @@
       },
       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.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 ) {
@@ -237,7 +280,6 @@
             return
           }
         }
-
         if( this.$refs.tree.getCheckedKeys().length > 0 ) {
           await this.saveHandler()
         } else {
@@ -261,22 +303,15 @@
             _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,
@@ -382,8 +417,26 @@
         })
         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
         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() {
@@ -413,12 +466,13 @@
   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,17 +28,22 @@
         <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">
@@ -72,6 +77,10 @@
             <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>
@@ -191,7 +200,6 @@
           id: this.id,
         });
         this.supplierInfo = res?.data;
-        console.log('res', res)
       },
     }
   }
@@ -259,7 +267,7 @@
     margin-top: 5px;
   }
   .supplier_content {
-    padding: 0 24px;
+    padding: 0 20px;
     width: 100%;
     box-sizing: border-box;
   }
@@ -282,6 +290,7 @@
     display: flex;
     width: 100%;
     margin-top: 10px;
+    flex-wrap: wrap;
     .credentials_item {
       width: 32%;
       text-align: center;
@@ -290,10 +299,14 @@
         color: #4A4A4A;
         padding: 10px 0;
       }
-      img {
+      img,.empty{
         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="h5GoBack"
+        @click-left="back"
     />
   </div>
   <div class="addContentWrap">
@@ -311,9 +311,83 @@
         </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" />
@@ -344,7 +418,7 @@
         </div>
       </div>-->
   </div>
-  <two-common-btn class="btn" @cancelClick="h5GoBack" @submitClick="submitBtn" />
+  <two-common-btn class="btn" @cancelClick="back" @submitClick="submitBtn" />
   <van-calendar v-model="showDatePicker"  :min-date="minDate"
                 :max-date="maxDate" type="range" @confirm="onConfirm" />
 
@@ -540,6 +614,7 @@ 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:'',
@@ -557,7 +632,10 @@ export default {
       vehicleInfoChange:false,
       insuranceChange:false,
       loading: false,
-
+      liabilityInsuranceAmount:'',
+      liabilityInsuranceQuota:'',
+      insuranceCode:'',
+      insuranceCodeZd:'',
     }
   },
   computed: {
@@ -952,7 +1030,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) : ''
@@ -1030,7 +1108,7 @@ export default {
         this.approvalDialogShow=false
        await this.submitBtn();
       }
-    },
+    },*/
     async submitApprovalHandle(){//提交审批-走接口
       if(this.vehicleInfoChange){
         if(!(this.selectedOption.length > 0)){
@@ -1133,6 +1211,14 @@ 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('行驶证主页照片不能为空')
@@ -1194,12 +1280,26 @@ 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)
+      // console.log('1122',this.vehicleStatus)
       // return
       await saveVehicle({
           vehicleId:this.id ? this.id : '',
@@ -1221,7 +1321,11 @@ export default {
           liabilityInsuranceEndTime: this.hasLiabilityInsurance == 1 ? (timeObj?.endTime || '') : '',
           virtualVehicle: this.virtualVehicle,
           canSubmitApproval:true,
-          vehicleStatus:this.vehicleStatus
+          vehicleStatus:this.vehicleStatus,
+          liabilityInsuranceAmount:this.liabilityInsuranceAmount,
+          liabilityInsuranceQuota:this.liabilityInsuranceQuota,
+          insuranceCode:this.insuranceCode,
+          insuranceCodeZd:this.insuranceCodeZd,
         })
         if(this.id){
           this.$toast('修改成功')
@@ -1427,4 +1531,12 @@ 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,6 +39,14 @@
           ></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"
@@ -49,14 +57,6 @@
       </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,11 +79,12 @@
         <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" @click.stop="updateStatus(item)"  :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"  :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus == 2 ,'insuranceGray': !item.vehicleStatus }">{{ item.vehicleStatus == 1 ? '启用' :( item.vehicleStatus == 2 ? '停用' : ( item.vehicleStatus == 12 ? '否-服务商停用' : '无状态')) }} </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>
@@ -95,12 +96,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>
@@ -249,7 +250,9 @@ export default {
     },
     async onLoad(){
       await this.getVehicleList()
+      if(this.total>10){
         this.pageNum++;
+      }
       // 加载状态结束
       this.loading = false;
       // 数据全部加载完成
@@ -412,6 +415,12 @@ 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

@@ -74,6 +74,7 @@
         <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">
@@ -114,7 +115,7 @@
 </template>
 <script>
 import {myMixins} from '@/utils/myMixins'
-import {getOrderDetail,showVehiclePositionInfo, getConfigByCode} from "@/api/order"
+import {getOrderDetail,showVehiclePositionInfo, getConfigByCode,getDriverInfo} from "@/api/order"
 import minePosition from '@/assets/minePosition.png';
 import vehiclePosition from '@/assets/vehiclePosition.png';
 import  desitationPosition from '@/assets/desitationPosition.png'
@@ -161,6 +162,30 @@ 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,
+          '身份证：':result.data.identityCardNumber,
+          '车牌：':this.orderDetailInfo.plateNumber,
+          '手机:':this.orderDetailInfo.driverPhone,
+        }
+        let data = {"action":"copyToClipboard","params":JSON.stringify(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(JSON.stringify(params));
+        }
+      }else {
+        this.$toast('未获取到司机信息')
+      }
+    },
     async getDetail(){
       let result=await getOrderDetail({
         queryType:this.queryType,
@@ -176,6 +201,9 @@ export default {
       this.showPopup = true;
       this.mapMarkers();
     },
+    async createDriverInfo(){//生成司机信息
+      await this.getDriverInfo()
+    },
     checkPhoto(){
       let isAllowImage = this.queryType == 9 ? 0 : 1
       let data = {

src/views/kpi/kpiIndex.vue

@@ -1147,8 +1147,8 @@ export default {
               {label: '服务车辆', prop: 'vehicleName'},
               {label: '服务完成状况', prop: 'orderStatusString'},
               {label: '案件完成时间', prop: 'finishTime'},
-              {label: '省(B)', prop: 'bProvince'},
+              {label: '省(B)', prop: 'bprovince'},
-              {label: '市(B)', prop: 'bCity'},
+              {label: '市(B)', prop: 'bcity'},
               {label: '区(B)', prop: 'area'},
             ]
           } else if (this.active === 6) {//投诉明细

src/views/mine/personList.vue

@@ -121,7 +121,7 @@ export default {
       let flag=this.validatePhone(val)
       // console.log('flag',flag)
       if(!flag){
-        this.$toast('手机号格式不正确')
+        this.$toast('电话号码格式不正确')
       }
     },
     validatePhone(val) {
@@ -129,13 +129,22 @@ export default {
       if(!val){
         return true
       }
-      const purePhone = val
+      const purePhone = String(val).trim()
-      // 情况1：11位且1开头 → 合法
+      const mobileReg = /^1[3-9]\d{9}$/ // 大陆手机号正则表达式
-      if (/^1[0-9]{10}$/.test(purePhone)) {
+      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
       }
-      // 情况2：12位且首位是0、第二位是1 → 去0后合法
+      // 匹配任意一种格式即为合法
-      if (/^01[0-9]{10}$/.test(purePhone)) {
+      if (mobileReg.test(purePhone) || hkMobileReg.test(purePhone) || macauMobileReg.test(purePhone) ||
+          telReg.test(purePhone) || hkTelReg.test(purePhone) || macauTelReg.test(purePhone) ||
+          phone400Reg.test(purePhone)) {
         return true
       }
       // 其他情况 → 不合法
@@ -226,6 +235,7 @@ export default {
       console.log('phone1Flag',phone1Flag)
       console.log('phone2Flag',phone2Flag)
       if(!phone1Flag || !phone2Flag){
+        this.$toast('电话号码格式不正确')
         return
       }
       await submitConfirm({supplierId:this.supplierId,infos:this.personList})

src/views/secondHandCar/carSource.vue

@@ -478,6 +478,21 @@ 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)