数据处理

src/api/authentication.js

@@ -69,4 +69,52 @@ 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/mine.js

@@ -18,6 +18,15 @@ export function saveVehicle(data){
         data
     })
 }
+//提交审批车辆信息
+export function saveSupplierApproval(data){
+    return request({
+        url:'/supplier/approval/saveSupplierDriverVehicleApproval',
+        method:'POST',
+        contentType:'application/json',
+        data
+    })
+}
 /*车辆更改状态 /supplierAppV2/dispatchApp/user/enableVehicle*/
 export function enableVehicle(data){
     return request({

src/api/order.js

@@ -159,3 +159,12 @@ export function getConfigByCode(data){
     data
   })
 }
+
+//获取最新版本
+export function getNewVersion(key){
+  return request({
+    url: '/driverApp/app/updateVersion',
+    method:'GET',
+    params: key
+  })
+}

src/router/authentication-router.js

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

src/router/index.js

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

src/utils/http.js

@@ -48,6 +48,7 @@ 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

@@ -94,6 +94,7 @@ 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/goToApp/goToApp.vue

@@ -0,0 +1,73 @@
+<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/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,10 +400,14 @@ 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,51 +18,109 @@
         </template>
       </van-nav-bar>
     </div>
-    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+    <van-search
-      <van-list
+        v-model="searchVal"
-          v-model="loading"
+        show-action
-          :finished="finished"
+        placeholder="请输入司机姓名、电话、身份证号"
-          finished-text="没有更多了"
+        @search="resetHandler"
-          @load="onLoad"
+    >
-      >
+      <template #action>
-        <div class="itemWrap" v-for="(item,index) in driverList" :key="index">
+        <div @click="resetHandler">搜索</div>
-          <div class="name-status">
+      </template>
-            <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}</div>
+    </van-search>
-            <div class="twoBtn">
+    <div class="filterWrap">
-              <button v-if="permissonList.includes('driverModifyBtn')" class="del" @click="handleStatus(item)">{{ item.states?.label == '启用'  ? '停用' : '启用' }}</button>
+      <el-select @change="resetHandler" multiple :collapse-tags="true" v-model="idCardStatusList" placeholder="身份证录入状态" :class="{'customSel':true , 'has-value': idCardStatusList }" clearable>
-              <button v-if="permissonList.includes('driverModifyBtn')" class="revise" @click="updateDriver(item)">修改</button>
+        <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>
             </div>
-          </div>
+            <div class="juhe flex-between">
-          <div class="" style="display: flex">
+              <span class="zdJuhe">录入状态</span>
-            <div class="sex" style="margin-right: 40px">
+              <span class="flex-right">
-              <span class="halfOpci">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
+            <span class="common_cls" v-if="item.idCardStatusStr" :class="getClass(item.idCardStatus)?.className">{{item.idCardStatusStr}}</span>
-              <span class="allOpci">{{item.sex?.label}}</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="carType">
+            <div class="juhe flex-between">
-              <span class="halfOpci">准驾车型:</span>
+              <span class="zdJuhe">认证状态</span>
-              <span class="allOpci">{{item.drivingModel}}</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>
-          <div>
+        </van-list>
-            <span class="halfOpci">身份证号:</span>
+      </van-pull-refresh>
-            <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 {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()
-      this.pageNum++;
+      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
         }
-       await enableAction({
+      Dialog.confirm({
-         driverId:item.driverId,
+        message: '当前状态为启用，是否要改为停用?',
-         states:this.states
+      }).then(async () => {
-       })
+        await enableAction({
-      this.pageNum = 1;
+          driverId:item.driverId,
-      await this.getDriverList();
+          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,11 +253,11 @@
       },
       async applyAdd() {
         if( !this.idFrontPhoto ) {
-          this.$toast('法人身份证正面照未上传')
+          this.$toast('法人身份证人像页未上传')
           return
         }
         if( !this.idBackPhoto ) {
-          this.$toast('法人身份证反面照未上传')
+          this.$toast('法人身份证国徽页未上传')
           return
         }
         if( !this.companyPhoto ) {
@@ -230,6 +268,7 @@
           this.$toast('服务区域不能为空')
           return
         }
+        // this.wechatId='wmOTNXBwAABrvKkE_Fh8ZN8Xm2S9v2wQ'
         if(!this.wechatId) {
           await this.QrCodeResult();
           if( !this.wechatId ) {
@@ -237,7 +276,6 @@
             return
           }
         }
-
         if( this.$refs.tree.getCheckedKeys().length > 0 ) {
           await this.saveHandler()
         } else {
@@ -261,22 +299,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 +413,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 +462,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,21 @@
         <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 :src="supplierInfo?.accountUrl" alt="">
+          </div>
         </div>
       </div>
       <div class="company_info">
@@ -72,6 +76,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 +199,6 @@
           id: this.id,
         });
         this.supplierInfo = res?.data;
-        console.log('res', res)
       },
     }
   }
@@ -259,7 +266,7 @@
     margin-top: 5px;
   }
   .supplier_content {
-    padding: 0 24px;
+    padding: 0 20px;
     width: 100%;
     box-sizing: border-box;
   }
@@ -282,6 +289,7 @@
     display: flex;
     width: 100%;
     margin-top: 10px;
+    flex-wrap: wrap;
     .credentials_item {
       width: 32%;
       text-align: center;

src/views/index/vehicleAdd.vue

@@ -11,7 +11,7 @@
         @click-left="h5GoBack"
     />
   </div>
-<div class="addContentWrap">
+  <div class="addContentWrap">
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
@@ -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: 26px">
+        <van-radio :name="1" style="margin-right: 14px">
           启用
           <img
             slot="icon"
@@ -206,7 +206,7 @@
             :src="props.checked ? activeIcon : inactiveIcon"
           >
         </van-radio>
-        <van-radio :name="2">
+        <van-radio :name="2" style="margin-right: 14px">
           停用
           <img
             slot="icon"
@@ -214,6 +214,14 @@
             :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>
@@ -243,7 +251,7 @@
       </van-radio-group>
     </div>
   </div>
-  <div class="item_content_btn">
+  <div class="item_content_btn" v-if="[2,3].includes(this.liabilityInsuranceAudit)">
     <span @click="goContinueInsurance">续保更新</span>
   </div>
   <span style="color: red">如有投保，选“有”，未投保选“无”，不必上传交强险或者商业险等其他保单</span>
@@ -261,6 +269,7 @@
         :deletable="!disabledShow"
         max-count="1"
         :preview-size="54"
+        @click-preview="clickPreview"
       />
     </div>
     <div class="lineBot"></div>
@@ -338,7 +347,30 @@
   <two-common-btn class="btn" @cancelClick="h5GoBack" @submitClick="submitBtn" />
   <van-calendar v-model="showDatePicker"  :min-date="minDate"
                 :max-date="maxDate" type="range" @confirm="onConfirm" />
+
 </div>
+  <van-popup ref="success"  v-model="approvalDialogShow">
+    <div class="pop_wrap">
+      <div class="pop_title">车辆提交审批</div>
+      <div class="pop_content">
+        <div class="iptWrap" v-if="vehicleInfoChange">
+          <div>车辆和服务备注</div>
+          <el-input placeholder="请输入车辆和服务备注" type="textarea" show-word-limit maxlength="200"
+                    v-model="approvalForm.serviceRemark"></el-input>
+        </div>
+        <div  class="iptWrap" v-if="insuranceChange">
+          <div>保单备注</div>
+          <el-input placeholder="请输入保单备注" type="textarea" show-word-limit maxlength="200"
+                    v-model="approvalForm.insuranceRemark"></el-input>
+        </div>
+      </div>
+      <div class="tip_button_wrap">
+        <div class="continue close" @click="closeApproval">取消</div>
+        <div class="continue" :class="{'loading': loading}" @click="submitApprovalHandle">提交审批</div>
+      </div>
+    </div>
+  </van-popup>
+
 </div>
 </template>
 
@@ -347,7 +379,8 @@
   import {Dialog} from "vant";
   import {formatDate1} from "@/utils/common"
 import {myMixins} from "@/utils/myMixins"
-import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree, uploadImage, ocrHandler, userOperationPermissions} from "@/api/mine"
+import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree, uploadImage, ocrHandler,
+  userOperationPermissions,saveSupplierApproval} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup from "@/components/cellGroup.vue";
 export default {
@@ -378,6 +411,7 @@ export default {
       typeList:[],//车辆类型列表
       selectedOption:[],//车辆类型
       id:'',//车辆Id
+      supplierId:'',//服务商Id
       serviceIds:[],//车辆服务种类,
       supplierServiceList:[],
       oldSupplierServiceList:[],
@@ -505,7 +539,25 @@ export default {
       }, {
         name: '其他',
         value: 14
-      }]
+      }],
+      approvalForm:{
+        type:2,
+        supplierId:'',
+        vehicleId:'',
+        serviceChange:null,
+        serviceRemark:'',
+        insuranceChange:null,
+        insuranceRemark:'',
+        vehicleOtherChange:null,
+        vehicleOtherRemark:'',
+      },
+      originData:{},//记录更改之前的数据
+      changedFields: [], // 用于存储变更过的字段
+      approvalDialogShow:false,
+      vehicleInfoChange:false,
+      insuranceChange:false,
+      loading: false,
+
     }
   },
   computed: {
@@ -553,13 +605,25 @@ export default {
       this.setDefault();
     },
   },
-
   async mounted() {
     this.id=this.$route.params?.id
+    this.approvalForm.supplierId=this.$route.params?.supplierId
     await this.getSupplierServiceTree();
     await this.getTypeList();
     if( this.id){
       await this.vehicleInfo()
+    }else{
+      this.originData={
+        vehicleType:'',
+        vehicleStatus:'',
+        virtualVehicle:'',
+        serviceIds:[],
+        hasLiabilityInsurance:'',
+        insuranceCorp:'',
+        liabilityInsuranceStartTime:'',
+        liabilityInsuranceEndTime:'',
+        insurancePicturePhoto:''
+      }
     }
   },
   methods:{
@@ -592,6 +656,10 @@ export default {
       const [start, end] = date;
       this.showDatePicker = false;
       this.dateVal = `${this.formatDate(start)} - ${this.formatDate(end)}`;
+      console.log('this.dateVal',this.dateVal)
+      let timeObj = this.formatDateTimeRange(this.dateVal)
+      console.log('timeObj',timeObj)
+
     },
     formatDateTimeRange(str) {
       const [startStr, endStr] = str.split(' - ').map(s => s.trim());
@@ -673,11 +741,19 @@ 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({
@@ -805,6 +881,7 @@ export default {
       let result=res.data;
       console.log("result",result)
       this.id=result.vehicleId
+      this.approvalForm.vehicleId=this.id
       this.carNum=result.plateNumber
       this.isJoin=result.hasPolymerization.code
       this.selectedOption=result.vehicleType?.split(',').map((item)=>{
@@ -826,8 +903,9 @@ export default {
       this.insuranceCorp = result.insuranceCorp;
       this.liabilityInsuranceAudit = result.liabilityInsuranceAudit
       if(this.insurancePicturePhoto) {
-        this.insurancePictureFiles = [{url: this.insurancePicturePhoto}]
+        this.insurancePictureFiles = [{url: this.insurancePicturePhoto?.split(',')[0]}]
       }
+      console.log('this.insurancePictureFiles',this.insurancePictureFiles)
       if( this.vehicleLicenseFront ) {
         this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
       }
@@ -846,6 +924,17 @@ export default {
       if( result.liabilityInsuranceEndTime && result.liabilityInsuranceStartTime ) {
         this.dateVal =  formatDate1(result.liabilityInsuranceStartTime) + ' - ' + formatDate1(result.liabilityInsuranceEndTime)
       }
+      this.originData={
+        vehicleType:result.vehicleType,
+        vehicleStatus:result.vehicleStatus,
+        virtualVehicle:result.virtualVehicle,
+        serviceIds:result.serviceIds,
+        hasLiabilityInsurance:result.hasLiabilityInsurance,
+        insuranceCorp:result.insuranceCorp,
+        liabilityInsuranceStartTime:result.liabilityInsuranceStartTime,
+        liabilityInsuranceEndTime:result.liabilityInsuranceEndTime,
+        insurancePicturePhoto:result.insurancePicturePhoto
+      }
     },
     isChange(e){
       this.hasLiabilityInsurance=e
@@ -863,11 +952,192 @@ export default {
     isVehicleChange(e) {
       this.vehicleStatus=e
     },
-    async submitBtn(){
+    async submitAuditHandle(){//提交审核
-        if( !this.vehicleLicenseFront ) {
+      let urls=[]
-          this.$toast('行驶证主页照片不能为空')
+      this.insurancePictureFiles?.forEach(item => urls.push(item.url))
+      let time =this.dateVal ? this.formatDateTimeRange(this.dateVal) : ''
+      // let time1=time.endTime?.split(' ')
+      let newFormValue={
+        vehicleStatus:this.vehicleStatus,
+        virtualVehicle:this.virtualVehicle,
+        serviceIds:this.$refs.tree.getCheckedKeys(true) || [],
+        vehicleType:this.selectedOption?.join(',') || '',
+        hasLiabilityInsurance:this.hasLiabilityInsurance,
+        insuranceCorp:this.insuranceCorp,
+        insurancePicturePhoto:urls?.join(','),
+        // liabilityInsuranceStartTime:time.startTime ? time.startTime : '',
+        liabilityInsuranceEndTime:time.endTime ? time.endTime  : '',
+      }
+      console.log('newFormValue',newFormValue)
+      let oldFormValue={...this.originData,}
+      console.log('oldFormValue',oldFormValue)
+
+      this.compareObjects(newFormValue,oldFormValue);
+      if( this.changedFields &&  this.changedFields.length>0){
+        const arr1Set = new Set(this.changedFields);
+        const change1=['vehicleStatus','virtualVehicle','vehicleType','serviceIds']
+        const change2=['hasLiabilityInsurance','insurancePicturePhoto','insuranceCorp','liabilityInsuranceStartTime','liabilityInsuranceEndTime']
+        const serviceChangeItems = change1.filter(item => arr1Set.has(item));
+        console.log('serviceChangeItems',serviceChangeItems)
+        if(serviceChangeItems?.length>0){
+          this.vehicleInfoChange=true
+          this.approvalForm.serviceChange={}
+          change1.forEach(key => {
+            this.approvalForm.serviceChange[key] = this[key];
+            if(key=='serviceIds'){
+              this.approvalForm.serviceChange[key]=this.$refs.tree.getCheckedKeys(true)
+            }
+            if(key=='vehicleType'){
+              this.approvalForm.serviceChange[key]=this.selectedOption?.join(',') || ''
+            }
+          });
+        }else {
+          this.vehicleInfoChange=false
+          this.approvalForm.serviceChange=null
+        }
+        const insuranceChangeItems = change2.filter(item => arr1Set.has(item));
+        console.log('insuranceChangeItems',insuranceChangeItems)
+        if(insuranceChangeItems?.length>0){
+          this.insuranceChange=true
+          this.approvalForm.insuranceChange={}
+          change2.forEach(key => {
+            this.approvalForm.insuranceChange[key] =this[key];
+            let time =this.dateVal ? this.formatDateTimeRange(this.dateVal) : ''
+            if(key=='liabilityInsuranceStartTime' && time && time.startTime){
+              this.approvalForm.insuranceChange[key]=time.startTime
+            }
+            if(key=='liabilityInsuranceEndTime' && time && time.endTime){
+              // let time1=time.endTime?.split(' ')
+              this.approvalForm.insuranceChange[key]= time.endTime
+            }
+            if(key=='insurancePicturePhoto' && this.insurancePictureFiles?.length>0){
+              let urls=[]
+              this.insurancePictureFiles?.forEach(item => urls.push(item.url))
+              this.approvalForm.insuranceChange[key]=urls?.join(',')
+            }
+          });
+        }else {
+          this.insuranceChange=false
+          this.approvalForm.insuranceChange=null
+        }
+      }
+      if((this.vehicleInfoChange || this.insuranceChange) && this.id){
+        // this.approvalDialogShow=true
+        this.submitApprovalHandle()
+        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)){
+          this.$toast('车辆类别不能为空')
           return
         }
+        let res = this.checkDisabledItems();
+        if(!res) {
+          return false
+        }
+        if( !this.virtualVehicle ) {
+          this.$toast('车辆属性不能为空')
+          return
+        }
+        if( !this.vehicleStatus ) {
+          this.$toast('车辆状态不能为空')
+          return
+        }
+       /* if(!this.approvalForm.serviceRemark){
+          this.$toast('车辆和服务备注不能为空')
+          return
+        }*/
+      }
+      if(this.insuranceChange){
+        if(this.hasLiabilityInsurance === null || this.hasLiabilityInsurance === undefined || this.hasLiabilityInsurance === '') {  // 有职业责任险，就需要有保单照片
+          this.$toast('救援职业责任险不能为空')
+          return
+        }
+        if(!this.insurancePicturePhoto && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+          this.$toast('保单照片不能为空')
+          return
+        }
+        if(this.selectedOption?.length==1 && this.selectedOption.includes(1)){//选择小修车时需清除原本的拖车服务类型
+          let data=this.oldSupplierServiceList.filter(item => item.name ==='拖车服务')
+          this.serviceIds = this.serviceIds.filter(item => !data[0].children.some(obj => obj.id === item));
+        }
+        if(!this.insuranceCorp && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+          this.$toast('承保保司不能为空')
+          return
+        }
+        if(!this.dateVal && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+          this.$toast('保单有效期不能为空')
+          return
+        }
+       /* if(!this.approvalForm.insuranceRemark){
+          this.$toast('保单备注不能为空')
+          return
+        }*/
+      }
+      try {
+        this.loading = true;
+        await saveSupplierApproval({...this.approvalForm})
+      } finally {
+        this.loading = false;
+      }
+      this.$toast('提交审批成功')
+      this.closeApproval()
+      setTimeout(()=>{
+        this.$router.back();
+      },2000)
+    },
+    compareObjects(newObj, oldObj) {
+      this.changedFields=[]
+      for (let key in newObj) {
+        if( Array.isArray(newObj[key])){
+          if(newObj[key]?.length != oldObj[key]?.length){
+            this.changedFields.push(key);
+          }else {
+            // console.log('newObj[key]',newObj[key])
+            if(newObj[key][0]?.id){
+              let flag=newObj[key].every((item, index) => item.id == oldObj[key][index]?.id);
+              // console.log('flag',flag)
+              if(!flag){
+                this.changedFields.push(key);
+              }
+            }else{
+              let flag=newObj[key].every((value, index) => value == oldObj[key][index]);
+              if(!flag){
+                this.changedFields.push(key);
+              }
+            }
+          }
+        }else{
+          let isEqual = (
+              (newObj[key] == null && oldObj[key] == 0) ||
+              (newObj[key] == 0 && oldObj[key] == null) ||
+              (newObj[key] == oldObj[key])
+          );
+          if (!isEqual) {
+            this.changedFields.push(key);
+          }
+        }
+      }
+    },
+    closeApproval(){
+      this.approvalForm.serviceRemark=''
+      this.approvalForm.insuranceRemark=''
+      this.approvalForm.vehicleOtherRemark=''
+      this.approvalDialogShow=false
+      this.vehicleInfoChange=false
+      this.insuranceChange=false
+    },
+    async submitBtn(){
+      if( !this.vehicleLicenseFront ) {
+        this.$toast('行驶证主页照片不能为空')
+        return
+      }
       if( !this.vehicleLicenseBack ) {
         this.$toast('行驶证副页照片不能为空')
         return
@@ -929,6 +1199,8 @@ export default {
         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 :'',
@@ -948,6 +1220,8 @@ export default {
           liabilityInsuranceStartTime: this.hasLiabilityInsurance == 1 ? (timeObj?.startTime || '' ) : '',
           liabilityInsuranceEndTime: this.hasLiabilityInsurance == 1 ? (timeObj?.endTime || '') : '',
           virtualVehicle: this.virtualVehicle,
+          canSubmitApproval:true,
+          vehicleStatus:this.vehicleStatus
         })
         if(this.id){
           this.$toast('修改成功')
@@ -1088,4 +1362,69 @@ export default {
   pointer-events: none;
   opacity: 0.6;
 }
+.pop_wrap {
+  width: 340px;
+  box-sizing: border-box;
+  padding: 10px 15px;
+  position: relative;
+  .pop_title {
+    font-size: 14px;
+    font-weight: 500;
+  }
+  .pop_content {
+    width: 304px;
+    font-size: 14px;
+    color: #4C5361;
+    margin-left: 6px;
+    line-height: 25px;
+    .iptWrap{
+      margin: 10px 0;
+    }
+  }
+  .tip_button_wrap {
+    display: flex;
+    justify-content: flex-end;
+    .close {
+      border: 1px solid #ccc;
+      color: black;
+      background-color: #FFFFFF;
+    }
+    .continue {
+      padding: 6px 10px;
+      border-radius: 4px;
+    }
+    div:last-child{
+      background-color: #3266be;
+      color: #FFFFFF;
+      margin-left: 8px;
+      margin-right: 4px;
+    }
+  }
+}
+.loading {
+  position: relative;
+}
+
+.loading::after{
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 20px;
+  height: 20px;
+  border: 2px solid #000;
+  border-top-color: transparent;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+  100% {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
 </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 ? '停用' : '无状态') }} </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,6 +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">
+            <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 class="juhe flex-between">
             <span class="zdJuhe">最近登录时间</span>
             <span class="flex-right">{{item.lastLoginTime}}</span>
@@ -243,7 +250,9 @@ export default {
     },
     async onLoad(){
       await this.getVehicleList()
-      this.pageNum++;
+      if(this.total>10){
+        this.pageNum++;
+      }
       // 加载状态结束
       this.loading = false;
       // 数据全部加载完成
@@ -326,7 +335,8 @@ export default {
         this.$router.push({
           name:'vehicleAdd',
           params:{
-            id:item.vehicleId
+            id:item.vehicleId,
+            supplierId:item.supplierId
           }
         })
       }
@@ -405,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/kpi/kpiIndex.vue

@@ -1327,7 +1327,8 @@ export default {
             columnObj.label = item.month // 每一列的标题的名称
             columnObj.prop = props + index //自定义每一列标题字段名称
             this.etlLabelList.push(columnObj)
-            let mappings = [ 'complainOrderCount', 'complainOrderRate', 'pinganFavorableCount','pinganFavorableRate' ];
+            // 'pinganFavorableCount','pinganFavorableRate'
+            let mappings = [ 'complainOrderCount', 'complainOrderRate' ];
             for (let i = 0; i < mappings.length; i++) {
               this.$set(this.etlDetailList[i], columnObj.prop, item[mappings[i]]);
             }
@@ -1625,13 +1626,13 @@ export default {
     getTitle(type) {
       switch (type) {
         case 0:
-          return '接单时效';
-        case 1:
           return '客户评价';
-        case 2:
+        case 1:
           return 'APP使用';
-        case 3:
+        case 2:
           return '时效';
+       /* case 3:
+          return '时效';*/
       }
     },
   }

src/views/mine/personList.vue

@@ -0,0 +1,443 @@
+<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 = val
+      // 情况1：11位且1开头 → 合法
+      if (/^1[0-9]{10}$/.test(purePhone)) {
+        return true
+      }
+      // 情况2：12位且首位是0、第二位是1 → 去0后合法
+      if (/^01[0-9]{10}$/.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){
+        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/report/components/report-list-item.vue

@@ -43,8 +43,8 @@ export default {
     margin-top: 20px;
     text-align: center;
     .report_icon {
-      width: 45px;
+      width: 60px;
-      height: 45px;
+      height: 60px;
     }
     .report_title {
       color: rgba(53, 53, 53, 0.67);

src/views/report/reportIndex.vue

@@ -263,10 +263,10 @@
             data.lat = this.lat;
             data.lng = this.lng;
           }
-          if( !this.remark ) {
+          /*if( !this.remark ) {
             Toast('备注内容不能为空')
             return
-          }
+          }*/
           this.clickFlag = false;
           try {
             await newOrderReporting(data)