story#7552 潜在服务商，服务类型(字段替换)

src/api/mine.js

@@ -18,6 +18,25 @@ export function saveVehicle(data){
         data
     })
 }
+/*车辆更改状态 /supplierAppV2/dispatchApp/user/enableVehicle*/
+export function enableVehicle(data){
+    return request({
+        url:'/supplierAppV2/dispatchApp/user/enableVehicle',
+        method:'POST',
+        contentType:'application/json',
+        data
+    })
+}
+
+//编辑车辆信息
+export function updateInsurance(data){
+    return request({
+        url:'/supplierAppV2/dispatchApp/user/updateInsurance',
+        method:'POST',
+        data
+    })
+}
+
 // 获取车辆信息（用于修改时回显的值,只需传vehicleId）
 export function getInfoById(data){
     return request({
@@ -50,6 +69,61 @@ export function supplierServiceTree(){
         method:'POST'
     })
 }
+
+// 服务商服务能力
+export function supplierServicePartTree(data){
+    return request({
+        url:'/supplier/approval/getSupplierServiceTree',
+        method:'POST',
+        data
+    })
+}
+
+// 申请加入
+export function saveSupplier(data){
+    return request({
+        url:'/supplier/potential/save',
+        method:'POST',
+        data
+    })
+}
+
+// 申请加入
+export function auditSupplier(data){
+    return request({
+        url:'/supplier/potential/audit',
+        method:'POST',
+        data
+    })
+}
+
+// 修改申请信息
+export function getSupplierInfo(key){
+    return request({
+        url:'/supplier/potential/getById',
+        method:'GET',
+        params:key
+    })
+}
+
+// 获取企微二维码
+export function getOrCodeInfo(data){
+    return request({
+        url:'/agg-api/wxcp/createContactQrCode',
+        method:'POST',
+        data
+    })
+}
+
+// 获取是否添加企微结果
+export function getContactQrCodeResult(data){
+    return request({
+        url:'/agg-api/wxcp/getContactQrCodeResult',
+        method:'POST',
+        data
+    })
+}
+
  //司机列表
 export function driverList(data){
     return request({
@@ -318,6 +392,14 @@ export function unifiedOCRWithCompress(data){
     })
 }
 
+export function getArea(data){
+    return request({
+        url:'/base/area/tree',
+        method:'POST',
+        data
+    })
+}
+
 // 服务商是否培训
 export function jumpPage(data){
     return request({

src/api/order.js

@@ -151,4 +151,11 @@ export function dealWithAlarm(data) {
   })
 }
 
-
+//获取当前任务信息
+export function getConfigByCode(data){
+  return request({
+    url: '/base/baseConfig/getConfigByCode',
+    method:'POST',
+    data
+  })
+}

src/router/index.js

@@ -19,6 +19,14 @@ const routes = [
             title: '信息录入',
         }
     },
+    {
+        path: '/supplierAddResult',
+        name: 'supplierAddResult',
+        component: () => import('@/views/index/supplierAddResult'),
+        meta:{
+            title: '审核中',
+        }
+    },
     {
         path: '/supplierInfo',
         name: 'supplierInfo',
@@ -164,6 +172,14 @@ const routes = [
             title: '车辆新增或修改'
         }
     },
+    {
+        path: "/continueInsurance",
+        name: 'continueInsurance',
+        component: () => import('@/views/index/continueInsurance'),
+        meta: {
+            title: '续保更新'
+        }
+    },
     {
         path: '/driverManage',
         name: 'driverManage',

src/utils/http.js

@@ -19,6 +19,7 @@ if( token ) {
 service.interceptors.request.use(
     config => {
       let reqUrl=config.url
+        console.log('config',config)
       config.data = config.contentType ? config.data : qs.stringify(config.data)
       if (config.testFlag) {
         config.data = qs.stringify(config.data, {arrayFormat: 'indices', allowDots: true})
@@ -27,12 +28,17 @@ service.interceptors.request.use(
       let token = localStorage.getItem('token');
       // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJBTkNIQU5HIiwidXNlcklkIjo0NTY3MSwibmFtZSI6IuWuieeVhSIsInVzZXJOYW1lIjoiQU5DSEFORyIsInN1cHBsaWVySWQiOjExMjgsImlzWmQiOjAsImV4cCI6MTc1NTQyMjUyNX0.xzDZhaANJFnbeViIHJA0SEtOyTv7Ja3rKmXqRKRuFkc'
       // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJTSEhQWEIiLCJ1c2VySWQiOjU0NzI2LCJuYW1lIjoiI-a1i-ivleWwj-eZveeZvSIsInVzZXJOYW1lIjoiU0hIUFhCIiwic3VwcGxpZXJJZCI6MTAwMDE2NSwiZXhwIjoxNzQ0NTEwNzkwfQ.JPk0OA7slYJN3FIi_uhW4Y0CiWRvl6R1dK8MRTbyhD8'
-       if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
+      //  if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
-         if(token) {
+        if (reqUrl=='/supplier/supplierTraining/trainingList' && config?.params?.type==1){
-           config.headers['Authorization'] = `${token}`;
+            console.log('司机app使用该请求不挂token')
-           config.headers['token'] = `${token}`;
+        } else {
-         }
+            if(token) {
-       }
+                config.headers['Authorization'] = `${token}`;
+                config.headers['token'] = `${token}`;
+            }
+        }
+
+       // }
       return config
     },
     error => {

src/views/documentView/docmentList.vue

@@ -94,6 +94,7 @@ export default {
       showEmpty:false,
       supplierId:'',
       driverId:'',
+      serviceTypeName:'',
     }
   },
   mounted() {
@@ -103,6 +104,7 @@ export default {
     if(this.driverId){
       this.keyword=urlParams.get('keyword') || ''
     }
+    this.serviceTypeName=urlParams.get('serviceTypeName') || ''
     this.getNormalList()
   },
   methods:{
@@ -128,6 +130,7 @@ export default {
         type:this.supplierId ? 2 : 1,
         id: this.supplierId ? this.supplierId : this.driverId,
         text:this.keyword || '',
+        serviceTypeName:this.serviceTypeName || ''
       })
       this.totalList=res.data.list
       let result=[]

src/views/index/continueInsurance.vue

@@ -0,0 +1,415 @@
+<template>
+<div class="wrap vehicleAdd">
+  <div class="navBar">
+    <van-nav-bar
+        title="续保更新"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="h5GoBack"
+    />
+  </div>
+<div class="addContentWrap">
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>有无投保救援职业责任险或货运险</span>
+    </div>
+    <div class="isJoin">
+      <van-radio-group v-model="hasLiabilityInsurance" @change="isChange"  class="joinWrap">
+        <van-radio :name="1" style="margin-right: 26px">
+          有
+          <img
+            slot="icon"
+            slot-scope="props"
+            :src="props.checked ? activeIcon : inactiveIcon"
+          >
+        </van-radio>
+        <van-radio :name="0">
+          无
+          <img
+            slot="icon"
+            slot-scope="props"
+            :src="props.checked ? activeIcon : inactiveIcon"
+          >
+        </van-radio>
+      </van-radio-group>
+    </div>
+  </div>
+  <span style="color: red">如有投保，选“有”，未投保选“无”，不必上传交强险或者商业险等其他保单</span>
+  <div class="lineBot"></div>
+  <template v-if="hasLiabilityInsurance == 1">
+    <div class="itemContent">
+      <div class="titleType">
+        <img class="startImg" src="@/assets/start.png" />
+        <span style="line-height: 20px">请上传救援职业责任险或货运险保单PDF或者关键信息页截图</span>
+      </div>
+      <van-uploader
+        v-model="insurancePictureFiles"
+        :after-read="insurancePictureFilesHandler"
+        max-count="1"
+        :preview-size="54"
+        accept="image "
+      />
+    </div>
+    <div class="lineBot"></div>
+    <div class="itemContent">
+      <div class="titleType">
+        <img class="startImg" src="@/assets/start.png" />
+        <span>承保保司</span>
+      </div>
+      <el-select
+        v-model="insuranceCorp"
+        value-key="name"
+        class="elSelect"
+        collapse-tags="collapse-tags"
+        placeholder="请选择"  style="width: 55%"
+      >
+        <el-option
+          v-for="item in insuranceOptions"
+          :key="item.name"
+          :label="item.name"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="lineBot"></div>
+    <div class="itemContent">
+      <div class="titleType">
+        <img class="startImg" src="@/assets/start.png" />
+        <span>保险有效期</span>
+      </div>
+      <el-input style="width: 55%" readonly @focus="showDatePicker = true"  v-model="dateVal"  placeholder="请选择发布日期" :class="{'customSel':true,'customInput':true , 'has-value': dateVal }" >
+        <template #suffix>
+          <i
+            v-if="dateVal"
+            class="el-icon-circle-close el-input__icon"
+            @click="dateVal = ''"
+          ></i>
+        </template>
+      </el-input>
+    </div>
+  </template>
+  <common-btn title="保存" @submitClick="submitBtn"/>
+  <van-calendar v-model="showDatePicker"  :min-date="minDate"
+                :max-date="maxDate" type="range" @confirm="onConfirm" />
+</div>
+</div>
+</template>
+
+<script>
+  import {Dialog} from "vant";
+import {myMixins} from "@/utils/myMixins"
+  import {formatDate1} from "@/utils/common"
+import { uploadImage, updateInsurance, getInfoById} from "@/api/mine"
+  import CommonBtn from "@/components/commonBtn.vue"
+export default {
+  name: "vehicleAdd",
+  mixins:[myMixins],
+  data(){
+    return{
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      minDate: new Date(1970, 0, 1),  // 设置最小可选日期（1970年1月1日）
+      maxDate: new Date(2099, 11, 31), // 设置最大可选日期（2099年12月31日）
+      showDatePicker: false,
+      dateVal: '',
+      hasLiabilityInsurance: 1,   // 有无责任险
+      activeIcon: require('@/assets/check.png'),
+      inactiveIcon: require('@/assets/uncheck.png'),
+      // result: [],
+      checked: true,
+      show:false,
+      imageUrl: require('@/assets/arr_right.png'),
+      insurancePictureFiles: [],
+      insurancePicturePhoto: '',    // 保单照片
+      isMultiple: false,     // 是否支持多选
+      insuranceCorp: '',
+      insuranceOptions: [{
+        name: '太平洋',
+        value: 1
+      }, {
+        name: '人保',
+        value: 2
+      }, {
+        name: '平安',
+        value: 3
+      }, {
+        name: '中华联合',
+        value: 4
+      }, {
+        name: '大地',
+        value: 5
+      }, {
+        name: '阳光',
+        value: 6
+      }, {
+        name: '太平',
+        value: 7
+      }, {
+        name: '人寿',
+        value: 8
+      }, {
+        name: '永安',
+        value: 9
+      }, {
+        name: '华安',
+        value: 10
+      }, {
+        name: '申能',
+        value: 11
+      }, {
+        name: '大家',
+        value: 12
+      }, {
+        name: '富德',
+        value: 13
+      }, {
+        name: '其他',
+        value: 14
+      }]
+    }
+  },
+  computed: {
+  },
+  watch:{
+
+  },
+
+  async mounted() {
+    this.id=this.$route.params?.id
+    if( this.id){
+      // await this.vehicleInfo()
+    }
+  },
+  methods:{
+    async vehicleInfo(){
+      let res= await  getInfoById({
+        vehicleId:this.id
+      })
+      let result=res.data;
+      this.id=result.vehicleId
+      this.insurancePicturePhoto = result.insurancePicturePhoto;
+      this.hasLiabilityInsurance = result.hasLiabilityInsurance
+      this.insuranceCorp = result.insuranceCorp;
+      if(this.insurancePicturePhoto) {
+        this.insurancePictureFiles = [{url: this.insurancePicturePhoto}]
+      }
+      if( result.liabilityInsuranceEndTime && result.liabilityInsuranceStartTime ) {
+        this.dateVal =  formatDate1(result.liabilityInsuranceStartTime) + ' - ' + formatDate1(result.liabilityInsuranceEndTime)
+      }
+    },
+    formatDate(date) {
+      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+    },
+    onConfirm(date) {
+      const [start, end] = date;
+      this.showDatePicker = false;
+      this.dateVal = `${this.formatDate(start)} - ${this.formatDate(end)}`;
+    },
+    formatDateTimeRange(str) {
+      const [startStr, endStr] = str.split(' - ').map(s => s.trim());
+      const startDate = new Date(startStr);
+      const startTime = `${startDate.getFullYear()}-${(startDate.getMonth() + 1).toString().padStart(2, '0')}-${startDate.getDate().toString().padStart(2, '0')} 00:00:00`;
+      const endDate = new Date(endStr);
+      const endTime = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')} 23:59:59`;
+      return {
+        startTime,
+        endTime
+      };
+    },
+    async insurancePictureFilesHandler(file) {
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData);
+      this.insurancePicturePhoto = res.data;
+    },
+    isChange(e){
+      this.hasLiabilityInsurance=e
+      if (e === 0) {
+        Dialog.confirm({
+          title: '提醒',
+          message: '有救援职业责任险车辆会提升案件聚合能力和接单能力。',
+          confirmButtonText: '我已知晓', // 确认按钮文字，默认为“确认”
+          showCancelButton: false // 是否显示取消按钮，默认为 true。如果不需要取消按钮，可以设置为 false。
+        })
+        .then(() => { /* 确认后的操作 */ })
+        .catch(() => { /* 取消后的操作 */ });
+      }
+    },
+    async submitBtn(){
+      if(this.hasLiabilityInsurance === null || this.hasLiabilityInsurance === undefined || this.hasLiabilityInsurance === '') {  // 有职业责任险，就需要有保单照片
+        this.$toast('救援职业责任险不能为空')
+        return
+      }
+      if(!this.insurancePicturePhoto && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+        this.$toast('保单照片不能为空')
+        return
+      }
+      if(!this.insuranceCorp && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+        this.$toast('承保保司不能为空')
+        return
+      }
+      if(!this.dateVal && this.hasLiabilityInsurance == 1) {  // 有职业责任险，就需要有保单照片
+        this.$toast('保单有效期不能为空')
+        return
+      }
+      let timeObj;
+      if(this.dateVal) {
+        timeObj = this.formatDateTimeRange(this.dateVal)
+      }
+      let params = {
+        id: this.id ? this.id : '',
+        renewInsureInfo: JSON.stringify({
+          hasLiabilityInsurance: this.hasLiabilityInsurance,
+          insurancePictureUrls: this.hasLiabilityInsurance == 1 ? this.insurancePicturePhoto : '',
+          insuranceCorp: this.hasLiabilityInsurance == 1 ? this.insuranceCorp : '',
+          liabilityInsuranceStartTime: this.hasLiabilityInsurance == 1 ? (timeObj?.startTime || '' ) : '',
+          liabilityInsuranceEndTime: this.hasLiabilityInsurance == 1 ? (timeObj?.endTime || '') : '',
+        })
+      }
+      await updateInsurance(params)
+        if(this.id){
+          this.$toast('修改成功')
+        }else{
+          this.$toast('添加成功')
+        }
+        setTimeout(()=>{
+          this.$router.back();
+        },2000)
+      }
+  },
+  components:{
+    CommonBtn
+  }
+}
+</script>
+
+<style>
+  .vehicleAdd .van-field__control:disabled {
+    color: #323643 !important;
+    -webkit-text-fill-color: #323643 !important;
+  }
+</style>
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+.mySelect{
+  @include fontWeightSize(bold,13px);
+  color: #323643;
+  appearance: none;
+  padding-right: 16px;
+  background: url('@/assets/arrow_bot.png') no-repeat right center / 15px 14px;
+}
+.checkbox-group {
+  display: none;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.wrap{
+@include wh(100%,100%);
+  overflow-y: auto;
+}
+.addContentWrap{
+  margin-left: 16px;
+  .item_content_btn {
+    padding-right: 25px;
+    text-align: right;
+    span {
+      display: inline-block;
+      background: #354D93;
+      padding: 5px 10px;
+      font-size: 12px;
+      font-weight: bold;
+      color: #fff;
+      border-radius: 4px;
+      margin-bottom: 5px;
+    }
+  }
+  .itemContent{
+    @include flexColBet;
+    line-height: 56px;
+    box-sizing: border-box;
+    padding-right: 25px;
+    .titleType{
+      @include fontWeightSize(bold,14px);
+      color: #323643;
+    }
+    .isJoin{
+      display: flex;
+      .joinWrap{
+        display: flex;
+      }
+      img{
+        @include widHeiMar(16px,16px,6px)
+      }
+    }
+    .startImg{
+      @include widHeiMar(6px,6px,3px);
+      vertical-align: super;
+    }
+    input{
+      border: none;
+      text-align: right;
+      @include fontWeightSize(bold,13px);
+      opacity: .5;
+    }
+  }
+  .lineBot{
+    @include wh(100%,1px);
+    background: #E9E9EA;
+    opacity: 0.6;
+  }
+  .serviceType{
+    @include fontWeightSize(bold,13px);
+    margin-left: 15px;
+    .trailerService{
+      margin-bottom: 10px;
+    }
+    .serviceline{
+      @include flexCenter;
+      margin-bottom: 10px;
+    }
+    .item{
+     margin: 20px 0;
+      @include flexCenter;
+    }
+    .radioWrap{
+      margin-left: 10px;
+    }
+    .service{
+      @include colorOpa(#323643,0.7);
+      line-height: 18px;
+      white-space: nowrap;
+    }
+    .line{
+      display: inline-block;
+      @include wh(240px,2px);
+      opacity: 0.16;
+      border-bottom: 1px solid;
+      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;
+    }
+    img{
+      @include widHeiMar(16px,16px,12px)
+    }
+  }
+  .btn{
+    width: 90%;
+    margin: 40px 0 30px 8px;
+  }
+}
+.elSelect ::v-deep .el-input__inner{
+  border: none !important;
+  text-align: right !important;
+}
+.disabled-tree {
+  pointer-events: none;
+  opacity: 0.6;
+}
+</style>

src/views/index/supplierAdd.vue

@@ -3,95 +3,101 @@
     <div class="top_banner">
       <img src="@/assets/supplier/topBg.png" alt="">
     </div>
-    <div class="content_wrap">
+    <van-form @submit="applyAdd">
-      <div class="credentials_info">
+      <div class="content_wrap">
-        <img class="title1" src="@/assets/supplier/title1.png" alt="">
+        <div class="credentials_info">
-        <div class="credentials_wrap">
+          <img class="title1" src="@/assets/supplier/title1.png" alt="">
-          <div class="credentials_item">
+          <div class="credentials_wrap">
-            <div class="credentials_title">1. 法人身份证正面</div>
+            <div class="credentials_item">
-            <van-uploader
+              <div class="credentials_title">1. 法人身份证正面</div>
-              accept="image/*"
+              <van-uploader
-              v-model="idFrontPhotoList"
+                accept="image/*"
-              :after-read="idFrontPhotoHandler"
+                v-model="idFrontPhotoList"
-              :max-size="5 * 1024 * 1024"
+                :after-read="idFrontPhotoHandler"
-              max-count="1">
+                :max-size="5 * 1024 * 1024"
-              <div class="custom-background">
+                max-count="1">
-                <img src="@/assets/supplier/idCardPerson.png" alt="">
+                <div class="custom-background">
-              </div>
+                  <img src="@/assets/supplier/idCardPerson.png" alt="">
-            </van-uploader>
+                </div>
-          </div>
+              </van-uploader>
-          <div class="credentials_item ml2">
+            </div>
-            <div class="credentials_title">2. 法人身份证反面</div>
+            <div class="credentials_item ml2">
-            <van-uploader
+              <div class="credentials_title">2. 法人身份证反面</div>
-              accept="image/*"
+              <van-uploader
-              v-model="idBackPhotoList"
+                accept="image/*"
-              :after-read="idBackPhotoHandler"
+                v-model="idBackPhotoList"
-              :max-size="5 * 1024 * 1024"
+                :after-read="idBackPhotoHandler"
-              max-count="1">
+                :max-size="5 * 1024 * 1024"
-              <div class="custom-background">
+                max-count="1">
-                <img src="@/assets/supplier/idCardBack.png" alt="">
+                <div class="custom-background">
-              </div>
+                  <img src="@/assets/supplier/idCardBack.png" alt="">
-            </van-uploader>
+                </div>
-          </div>
+              </van-uploader>
-          <div class="credentials_item ml2">
+            </div>
-            <div class="credentials_title">3. 营业执照</div>
+            <div class="credentials_item ml2">
-            <van-uploader
+              <div class="credentials_title">3. 营业执照</div>
-              accept="image/*"
+              <van-uploader
-              v-model="companyPhotoList"
+                accept="image/*"
-              :after-read="companyPhotoHandler"
+                v-model="companyPhotoList"
-              :max-size="5 * 1024 * 1024"
+                :after-read="companyPhotoHandler"
-              max-count="1">
+                :max-size="5 * 1024 * 1024"
-              <div class="custom-background">
+                max-count="1">
-                <img src="@/assets/supplier/companyPhoto.png" alt="">
+                <div class="custom-background">
-              </div>
+                  <img src="@/assets/supplier/companyPhoto.png" alt="">
-            </van-uploader>
+                </div>
+              </van-uploader>
+            </div>
           </div>
         </div>
-      </div>
+        <div class="company_info">
-      <div class="company_info">
+          <img class="title2" src="@/assets/supplier/title2.png" alt="">
-        <img class="title2" src="@/assets/supplier/title2.png" alt="">
+          <div class="company_wrap">
-        <div class="company_wrap">
+              <van-field :border="true" readonly v-model="form.name" class="required" name="name" label="服务商名称" placeholder="请输入"  :rules="[{ required: true, message: '请输入服务商名称' }]" />
-          <van-form>
+              <van-field :border="true" readonly v-model="form.areaName" class="required" name="areaName" label="注册地址" placeholder="请输入"  :rules="[{ required: true, message: '请输入注册地址' }]" />
-            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="服务商名称" placeholder="请输入"  :rules="[{ required: true, message: '请输入服务商名称' }]" />
+              <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.supplierName" class="required" name="supplierName" 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.supplierName" class="required" name="supplierName" 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.supplierName" class="required" name="supplierName" label="联系电话" placeholder="请输入"  :rules="[{ required: true, message: '请输入联系电话' }]" />
+              <van-field :border="true" class="required" name="serviceType" label="服务能力">
-            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="服务能力" placeholder="请输入"  :rules="[{ required: true, message: '请选择服务能力' }]" />
+                <template #input>
-            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="服务能力"  :rules="[{ required: true, message: '请选择服务能力' }]">
+                  <el-tree
-              <template #input>
+                    show-checkbox
-                <el-tree
+                    node-key="id"
-                  show-checkbox
+                    ref="tree"
-                  node-key="id"
+                    :highlight-current="true"
-                  ref="tree"
+                    :expand-on-click-node="false"
-                  :highlight-current="true"
+                    :data="bigServiceList"
-                  :expand-on-click-node="false"
+                    :props="defaultProps">
-                  :data="supplierServiceList"
+                  </el-tree>
-                  :props="defaultProps">
+                </template>
-                </el-tree>
+              </van-field>
-              </template>
+              <van-field :border="true" v-model="form.trailCount" name="trailCount" label="拖车数量" placeholder="请输入" />
-            </van-field>
+              <van-field :border="true" v-model="form.minorCount" name="minorCount" label="抢修车数量" placeholder="请输入" />
-            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="拖车数量" placeholder="请输入"  :rules="[{ required: true, message: '请输入拖车数量' }]" />
+              <van-field :border="true" class="required" label="服务区域" placeholder="请选择">
-            <van-field :border="true" v-model="form.supplierName" class="required" name="supplierName" label="抢修车数量" placeholder="请输入"  :rules="[{ required: true, message: '请输入抢修车数量' }]" />
+                <template #input>
-            <van-field name="supplierName" class="required" label="服务区域" placeholder="请选择"  :rules="[{ required: true, message: '请选择服务区域' }]">
+                  <el-cascader
-              <template #input>
+                    v-model="form.serviceAreaCode"
-                <span @click="areaShow = true">省/市/区</span>
+                    :options="areaList"
-              </template>
+                    :props="areaProps"
-            </van-field>
+                    ref="areaCascader"
-          </van-form>
+                    popper-class="responsive-cascader"
-          <div class="wei_code_wrap">
+                    :popper-append-to-body="false"
-            <div class="wei_title">请先添加企业微信，保证申请流程正常进行。</div>
+                    filterable
-            <div class="wei_code_bg">
+                    clearable></el-cascader>
-              <img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
+                </template>
+              </van-field>
+            <div class="wei_code_wrap" v-if="form.name && !id">
+              <div class="wei_title">请先添加企业微信，保证申请流程正常进行。</div>
+              <div class="wei_code_bg">
+                <img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
+              </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
+      <div class="btn_wrap">
-    <div class="btn_wrap">
+        <van-button class="btn" block type="info" :native-type="'submit'">提交申请</van-button>
-      <div class="btn">
-        提交申请
       </div>
-    </div>
+    </van-form>
     <van-popup
       v-model="areaShow"
       position="bottom"
@@ -103,15 +109,18 @@
 </template>
 
 <script>
+  import {leftCopy} from  "@/utils/common"
   import QRCode from 'qrcode'
-  import { uploadImage, supplierServiceTree } from "@/api/mine"
+  import { uploadImage, ocrHandler, unifiedOCRWithCompress, getArea, saveSupplier, getSupplierInfo, getOrCodeInfo, getContactQrCodeResult } from "@/api/mine"
   import {myMixins} from "@/utils/myMixins"
-  import {areaList} from "@vant/area-data";
+  import {Dialog} from "vant";
   export default {
     name: "supplierAdd",
     mixins:[myMixins],
     data() {
       return {
+        clickFlag: true,
+        phoneVerify: [{ required: true, message: '请输入联系电话' }, { validator: value => { return /^1[3456789]\d{9}$/.test(value) }, message: '联系电话格式不正确' }],
         id:'', //车辆Id
         idBackPhotoList: [],
         idBackPhoto: '',
@@ -120,28 +129,186 @@
         companyPhotoList: [],
         companyPhoto: '',
         form: {
-          supplierName: '',
+          name: '',
+          legalName: '',
+          areaName: '',
+          linkName: '',
+          linkPhone: '',
+          serviceType: '',
+          trailCount: '',
+          minorCount: '',
+          serviceAreaCode: [],
         },
         qrCodeUrl: '',
+        qrCode: '',
         areaShow: false,
-        areaList: areaList,
+        areaList: [],
-        region: [],
         supplierServiceList: [],
+        bigServiceList: [{
+          id: 1002,
+          title: '拖车服务'
+        }, {
+          id: 1003,
+          title: '抢修服务'
+        }, {
+          id: 1004,
+          title: '困境救援'
+        }],
         defaultProps: {
           children: 'children',
-          label: 'name'
+          label: 'title',
         },
+        areaProps: { multiple: true, checkStrictly: true,  value: 'id',label: 'title', emitPath: false, },
+        configId: '',
+        wechatId: '',
       }
     },
-    mounted() {
+    async mounted() {
-      this.getQrCode();
+      const urlParams = new URLSearchParams(window.location.search);
-      this.getSupplierServiceTree();
+      this.id = this.$route.query.id || urlParams.get('id');
+      await this.getAreaTree();
+      if(this.id) {
+        await this.getInfoHandler();
+      }
+
+      // await this.getSupplierServiceTree();
     },
     methods: {
-      async getSupplierServiceTree(){
+      async QrCodeHandler() {
-        let res = await supplierServiceTree();
+        await this.QrCodeInfo()
-        this.supplierServiceList=res.data
+        await this.getQrCode();
       },
+      async QrCodeInfo() {
+        let res = await getOrCodeInfo({
+          name: this.form.name
+        });
+        this.configId = res?.configId;
+        this.qrCode = res?.qrCode
+        console.log('idid', res);
+      },
+      async getInfoHandler() {
+        let res = await getSupplierInfo({
+          id: this.id
+        });
+        let _data = res?.data
+        leftCopy(this.form, {..._data})
+        this.idFrontPhoto = _data?.idCardFrontUrl;
+        this.idBackPhoto = _data?.idCardBackUrl;
+        this.companyPhoto = _data?.businessLicense;
+        this.wechatId = _data?.wechatId
+        if(this.idFrontPhoto) {
+          this.idFrontPhotoList = [{ url : this.idFrontPhoto }];
+        }
+        if(this.idBackPhoto) {
+          this.idBackPhotoList = [{ url : this.idBackPhoto }];
+        }
+        if(this.companyPhoto) {
+          this.companyPhotoList = [{ url : this.companyPhoto }];
+        }
+        if( _data.service ) {
+          this.$refs.tree.setCheckedKeys(_data.service.split(','))
+        }
+        if(_data?.serviceAreaCode) {
+          this.$set(this.form, 'serviceAreaCode', _data?.serviceAreaCode.split(',').map(item => Number(item)));
+          // this.form.serviceAreaCode = _data?.serviceAreaCode.split(',').map(item => Number(item));
+        }
+      },
+      async applyAdd() {
+        if( !this.idFrontPhoto ) {
+          this.$toast('法人身份证正面照未上传')
+          return
+        }
+        if( !this.idBackPhoto ) {
+          this.$toast('法人身份证反面照未上传')
+          return
+        }
+        if( !this.companyPhoto ) {
+          this.$toast('营业执照未上传')
+          return
+        }
+        if( !(this.form.serviceAreaCode.length > 0) ) {
+          this.$toast('服务区域不能为空')
+          return
+        }
+        if(!this.wechatId) {
+          await this.QrCodeResult();
+          if( !this.wechatId ) {
+            this.$toast('请先添加企微再申请')
+            return
+          }
+        }
+
+        if( this.$refs.tree.getCheckedKeys().length > 0 ) {
+          await this.saveHandler()
+        } else {
+          this.$toast('服务能力不能为空')
+          return
+        }
+      },
+      async QrCodeResult() {    //获取添加企微结果
+        let res = await getContactQrCodeResult({
+          configId: this.configId
+        });
+        console.log('resres', res)
+        this.wechatId = res?.data?.wechatId
+      },
+      async saveHandler() {
+        if( this.clickFlag ) {
+          try {
+            this.clickFlag = false
+            let _node = this.$refs.areaCascader.getCheckedNodes();
+            let checkArr = [];
+            _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,
+              idCardFrontUrl: this.idFrontPhoto,
+              idCardBackUrl: this.idBackPhoto,
+              businessLicense: this.companyPhoto,
+              service: this.$refs.tree.getCheckedKeys().join(',') ,
+              serviceAreaCode: checkArr.join(','),
+              wechatId: this.wechatId,
+            });
+            Dialog.alert({
+              title: '提示',
+              message: "操作成功"
+            }).then(async () => {
+              this.goPage('supplierAddResult', { id : res?.data })
+              this.clickFlag = true
+            });
+          } finally {
+            this.clickFlag = true
+          }
+        }
+      },
+      async getAreaTree() {
+        let res = await getArea();
+        this.areaList = res?.data;
+      },
+      /*async getSupplierServiceTree(){
+        let res = await supplierServicePartTree({
+          serviceTypes: '1002,1003,1004',
+          treeType: 2
+        });
+        this.supplierServiceList=res.data
+        this.bigServiceList = [];
+        res.data.map(item => {
+          let obj = {...item, children: null}
+          this.bigServiceList.push(obj)
+        })
+      },*/
       confirmHandle(val){
         this.region=[]
         val?.forEach(item => this.region.push(item.name))
@@ -152,7 +319,7 @@
       },
       async getQrCode() {
         try {
-          this.qrCodeUrl = await QRCode.toDataURL('123123', {
+          this.qrCodeUrl = await QRCode.toDataURL(this.qrCode, {
             width: 150,
             margin: 2,
             color: {
@@ -174,14 +341,37 @@
         const formData = new FormData();
         formData.append("file" , file.file);
         let res = await uploadImage(formData);
-        this.idFrontPhoto = res.data
+        this.idFrontPhoto = res.data;
+        await this.idCardOcrHandler();
+      },
+      async idCardOcrHandler() {    // 身份证正面 ocr识别
+        this.form.legalName = '';
+        let res = await ocrHandler({
+          ocrType: 1,
+          imageUrl: this.idFrontPhoto,
+          cardSide: 'FRONT'
+        })
+        this.form.legalName = res?.data?.name
       },
       async companyPhotoHandler(file) {
         const formData = new FormData();
         formData.append("file" , file.file);
         let res = await uploadImage(formData);
         this.companyPhoto = res.data
-      }
+        await this.companyOcrHandler()
+      },
+      async companyOcrHandler() {    // 营业照 ocr识别
+        this.form.name = '';
+        this.form.areaName = '';
+        let res = await unifiedOCRWithCompress({
+          ocrType: 7,
+          imageUrl: this.companyPhoto,
+          cardSide: 'FRONT'
+        })
+        this.form.name = res?.data?.name;
+        this.form.areaName = res?.data?.address
+        await this.QrCodeHandler();
+      },
     },
     computed: {
       regionText() {
@@ -258,6 +448,7 @@
   font-size: .3rem;
 }
   .wei_code_wrap {
+    margin-top: 10px;
     .wei_title {
       font-size: 15px;
       color: #FF553B;
@@ -295,5 +486,97 @@
       line-height: 46px;
     }
   }
+  /*::v-deep .el-cascader {
+    width: 100% !important;
+  }
+
+  ::v-deep .el-input__inner {
+    width: 100% !important;
+    border: none !important;
+    padding-left: 0 !important;
+    background: transparent !important;
+  }
+
+  ::v-deep .el-input {
+    width: 100% !important;
+  }
+
+  ::v-deep .el-input__suffix {
+    right: 0 !important;
+  }*/
+</style>
+<style>
+  .responsive-cascader .el-cascader-menu {
+    min-width: 100px !important;
+  }
+  .responsive-cascader .el-cascader-panel {
+    font-size: 12px !important;
+  }
+  .responsive-cascader .el-cascader-node {
+    padding-left: 5px !important;
+    padding-right: 4px !important;
+  }
+ /* !* 级联选择器下拉框样式 *!
+  .responsive-cascader {
+    width: 90vw !important;
+    max-width: 400px !important;
+    left: 50% !important;
+    transform: translateX(-50%) !important;
+  }
+
+  .responsive-cascader .el-cascader-panel {
+    display: flex !important;
+    width: 100% !important;
+    max-height: 60vh !important;
+  }
+
+
+
+  .responsive-cascader .el-cascader-node {
+    padding: 12px 16px !important;
+    font-size: 12px !important;
+    height: 20px !important;
+    !*min-height: 44px !important;*!
+    display: flex !important;
+    align-items: center !important;
+  }
+
+  .responsive-cascader .el-cascader-node__label {
+    font-size: 12px !important;
+    white-space: nowrap !important;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    flex: 1 !important;
+  }
+
+  !* 移动端触摸优化 *!
+  .responsive-cascader .el-cascader-node {
+    padding: 6px 6px !important;
+  }
+
+  !* 选中状态 *!
+  .responsive-cascader .el-cascader-node.in-active-path,
+  .responsive-cascader .el-cascader-node.is-active {
+    color: #1989fa !important;
+    background-color: #f2f8ff !important;
+  }
+
+  !* 移动端适配 *!
+  @media (max-width: 768px) {
+    .responsive-cascader {
+      width: 95vw !important;
+      max-width: none !important;
+    }
+
+    .responsive-cascader .el-cascader-menu {
+      width: 33.33% !important;
+      flex: none !important;
+    }
+
+    .responsive-cascader .el-cascader-node__label {
+      font-size: 13px !important;
+    }
+  }*/
+
 
 </style>

src/views/index/supplierAddResult.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="wrap">
+    <div class="top-wrap"></div>
+    <div class="center-info">
+      <img class="wait_icon" src="@/assets/supplier/successIcon.png" alt="">
+      <div class="info-tip">信息录入完成，请等待审核结果。</div>
+    </div>
+    <div class="btn_wrap">
+      <div class="btn" @click="searchInfo">信息查看</div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {myMixins} from "@/utils/myMixins"
+  export default {
+    name: "supplierAddResult",
+    mixins:[myMixins],
+    data() {
+      return {
+        id: '',
+      }
+    },
+    async mounted() {
+      const urlParams = new URLSearchParams(window.location.search);
+      this.id = this.$route.query.id || urlParams.get('id');
+    },
+    methods: {
+      searchInfo() {
+        this.goPage('supplierInfo', { id : this.id })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .wrap{
+    @include wh(100%,100%);
+    box-sizing: border-box;
+    padding-bottom: 100px;
+    overflow-y: auto;
+    background: linear-gradient( 180deg, #FBFDFE 0%, #F6FBFF 73%, #F0F7FF 100%);
+    backdrop-filter: blur(5.602678571428572px);
+  }
+  .top-wrap {
+    width: 100%;
+    height: 175px;
+    background: linear-gradient( 180deg, #DAECFF 0%, rgba(233,243,255,0) 100%);
+  }
+  .center-info {
+    text-align: center;
+    .wait_icon {
+      width: 54px;
+      height: 54px;
+      margin-bottom: 15px;
+    }
+    .info-tip {
+      font-size: 20px;
+      font-weight: 500;
+      color: #2C2A53;
+    }
+  }
+  .btn_wrap {
+    width: 100%;
+    padding: 15px 0;
+    position: fixed;
+    bottom: 10px;
+    z-index: 10000 !important;
+    .btn {
+      width: calc(100% - 80px);
+      margin-left: 40px;
+      height: 46px;
+      background: #0E76F4;
+      border-radius: 5px;
+      font-size: 15px;
+      color: #FFFFFF;
+      text-align: center;
+      line-height: 46px;
+    }
+  }
+</style>

src/views/index/supplierInfo.vue

@@ -1,25 +1,25 @@
 <template>
-  <div>
+  <div class="wrap">
-    <div class="nav_bar_bg status_danger">
+    <div class="nav_bar_bg" :class="{ 'status_wait': supplierInfo?.state == 0, 'status_danger': supplierInfo?.state == 99, 'status_success': supplierInfo?.state == 1 }">
-      <template v-if="false">
+      <template v-if="supplierInfo?.state == 0">
         <div class="status_wrap">
           <img class="wait_icon" src="@/assets/supplier/waitIcon.png" alt="">
           <span class="wait_status">审批中</span>
         </div>
       </template>
-      <template v-if="false">
+      <template v-if="supplierInfo?.state == 1">
         <div class="status_wrap">
           <img class="wait_icon" src="@/assets/supplier/successIcon.png" alt="">
           <span class="wait_status success_status">恭喜你，审核通过！</span>
         </div>
       </template>
-      <template>
+      <template v-if="supplierInfo?.state == 99">
         <div class="status_wrap">
           <img class="wait_icon" src="@/assets/supplier/failIcon.png" alt="">
           <span class="wait_status danger_status">审核不通过</span>
         </div>
         <div class="danger_tip">
-          不知道是多是少，就按照这样给字号了不知道不知道是多是少，就按照这样给字号了不知道不知道是多是少，就按照这样给字号了不知道
+          {{supplierInfo?.failReason}}
         </div>
       </template>
     </div>
@@ -29,15 +29,15 @@
         <div class="credentials_wrap">
           <div class="credentials_item">
             <div class="credentials_title">1. 法人身份证正面</div>
-            <img src="@/assets/supplier/idCardPerson.png" alt="">
+            <img :src="supplierInfo?.idCardFrontUrl" alt="">
           </div>
           <div class="credentials_item ml2">
             <div class="credentials_title">2. 法人身份证反面</div>
-            <img src="@/assets/supplier/idCardPerson.png" alt="">
+            <img :src="supplierInfo?.idCardBackUrl" alt="">
           </div>
           <div class="credentials_item ml2">
             <div class="credentials_title">3. 营业执照</div>
-            <img src="@/assets/supplier/idCardPerson.png" alt="">
+            <img :src="supplierInfo?.businessLicense" alt="">
           </div>
         </div>
       </div>
@@ -46,46 +46,88 @@
         <div class="info_wrap">
           <div class="info_item">
             <div class="label">服务商名称：</div>
-            <div class="content">苏州速道汽车服务有限公司</div>
+            <div class="content">{{supplierInfo?.name}}</div>
+          </div>
+          <div class="info_item" v-if="supplierInfo?.abbr">
+            <div class="label">服务商简称：</div>
+            <div class="content">{{supplierInfo?.abbr}}</div>
+          </div>
+          <div class="info_item" v-if="supplierInfo?.supplierCode">
+            <div class="label">服务商编号：</div>
+            <div class="content">{{supplierInfo?.supplierCode}}</div>
+          </div>
+          <div class="info_item" v-if="supplierInfo?.areaName">
+            <div class="label">注册地址：</div>
+            <div class="content">{{supplierInfo?.areaName}}</div>
           </div>
           <div class="info_item">
             <div class="label">法人姓名：</div>
-            <div class="content">666</div>
+            <div class="content">{{supplierInfo?.legalName}}</div>
           </div>
           <div class="info_item">
             <div class="label">联系人姓名：</div>
-            <div class="content">666</div>
+            <div class="content">{{supplierInfo?.linkName}}</div>
           </div>
           <div class="info_item">
             <div class="label">联系电话：</div>
-            <div class="content">666</div>
+            <div class="content">{{supplierInfo?.linkPhone}}</div>
           </div>
           <div class="info_item">
             <div class="label">服务能力：</div>
-            <div class="content service_color">拖车服务、抢修服务</div>
+            <div class="content service_color">{{supplierInfo?.serviceCategoryName}}</div>
           </div>
           <div class="info_item">
             <div class="label">拖车数量：</div>
-            <div class="content">23</div>
+            <div class="content">{{supplierInfo?.trailCount || ''}}</div>
           </div>
           <div class="info_item">
             <div class="label">抢修车数量：</div>
-            <div class="content">12</div>
+            <div class="content">{{supplierInfo?.minorCount || ''}}</div>
           </div>
           <div class="info_item">
             <div class="label">服务区域：</div>
-            <div class="content">省/市/区</div>
+            <div class="content">{{supplierInfo?.serviceAreaName}}</div>
           </div>
+          <template v-if="type == 'audit' && supplierInfo?.state != 1">
+            <div class="info_item">
+              <div class="label"><span style="color: red;margin-right: 2px">*</span>审批：</div>
+              <div class="content">
+                <van-radio-group v-model="form.state"  direction="horizontal" icon-size="18px">
+                  <van-radio name="1">审批通过</van-radio>
+                  <van-radio name="99">审批不通过</van-radio>
+                </van-radio-group>
+              </div>
+            </div>
+            <div class="info_item" v-if="form.state == 1">
+              <div class="label"><span style="color: red;margin-right: 2px">*</span>服务商简称：</div>
+              <div class="content">
+                <el-input style="width: 100%" v-model.trim="form.abbr" placeholder="请输入服务商简称"></el-input>
+              </div>
+            </div>
+            <div class="info_item" v-if="form.state == 99">
+              <div class="label"><span style="color: red;margin-right: 2px">*</span>不通过原因：</div>
+              <div class="content">
+                <textarea class="report_textarea" rows="4" maxlength="200" show-word-limit placeholder="点击这里输入不通过原因" v-model.trim="form.failReason"></textarea>
+              </div>
+            </div>
+          </template>
+
         </div>
       </div>
-      <div class="btn_wrap">
+
-        修改信息
+
+      <div class="btn_wrap" v-if="type == 'show' && supplierInfo?.state == 99 && origin != 'web'">
+        <div class="btn" @click="goModifyPage">修改信息</div>
+      </div>
+      <div class="btn_wrap" v-if="type == 'audit' && supplierInfo?.state != 1">
+        <div class="btn" v-if="type == 'audit'" @click="auditSupplier">保 存</div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+  import { getSupplierInfo, auditSupplier } from "@/api/mine"
   import {myMixins} from "@/utils/myMixins"
   export default {
     name: "supplierInfo",
@@ -93,12 +135,86 @@
     data() {
       return {
         id:'', //车辆Id
+        form: {
+          state: '',
+          abbr: '',
+          failReason: '',
+        },
+        supplierInfo: {},
+        type: 'show',
+        origin: '',
       }
+    },
+    async mounted() {
+      const urlParams = new URLSearchParams(window.location.search);
+      this.id=this.$route.query.id ||  urlParams.get('id');
+      this.type=this.$route.query.type || urlParams.get('type') || 'show';
+      this.origin = this.$route.query.origin || ''
+      await this.getInfoHandler();
+    },
+    methods: {
+      goModifyPage() {
+        this.goPage('supplierAdd', { id : this.id })
+      },
+      async auditSupplier() {
+        if( !this.form.state ) {
+          this.$toast('请选择审批结果')
+          return
+        }
+        if( this.form.state == 99 && !this.form.failReason ) {
+          this.$toast('请输入不通过原因')
+          return
+        }
+        if( this.form.state == 1 ) {
+          const reg = /^[\u4e00-\u9fa5]{2}$/;
+          if(!this.form.abbr) {
+            this.$toast('请输入服务商简称')
+            return
+          }
+          if(!(reg.test(this.form.abbr))) {
+            this.$toast('服务商简称请输入两位汉字')
+            return
+          }
+        }
+        try {
+          await auditSupplier({
+            id: this.id,
+            ...this.form,
+            wechatId: 'test',  // 参数将会被去掉
+          })
+        } finally {
+          this.closeParentDialog();
+        }
+      },
+      async getInfoHandler() {
+        let res = await getSupplierInfo({
+          id: this.id,
+        });
+        this.supplierInfo = res?.data;
+        console.log('res', res)
+      },
     }
   }
 </script>
 
 <style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .report_textarea {
+    width: 100%;
+    box-sizing: border-box;
+    border-radius: 6px;
+    min-height: 95px;
+    border: 1px solid #E2EAF6;
+    padding: 10px;
+    font-size: 13px;
+  }
+  .wrap{
+    @include wh(100%,100%);
+    box-sizing: border-box;
+    padding-bottom: 100px;
+    overflow-y: auto;
+  }
   .nav_bar_bg {
     width: 100%;
     height: 125px;
@@ -185,7 +301,7 @@
   }
   .company_info {
     margin-top: 20px;
-    .company_wrap {
+    /*.company_wrap {*/
       .info_wrap {
         margin-top: 10px;
         .info_item {
@@ -207,20 +323,28 @@
             color: rgba(230, 155, 11, 0.9);
           }
         }
-      }
+      /*}*/
     }
   }
   .btn_wrap {
-    width: calc(100% - 80px);
+    width: 100%;
-    height: 46px;
+    padding: 15px 0;
     position: fixed;
-    bottom: 20px;
+    bottom: 0;
-    left: 40px;
+    background: #F7F7F9;
-    background: #0E76F4;
+    box-shadow: 0px -7px 24px 0px rgba(0, 0, 0, 0.11);
-    border-radius: 5px;
+    z-index: 10000 !important;
-    font-size: 15px;
+    left: 0;
-    color: #FFFFFF;
+    .btn {
-    text-align: center;
+      width: calc(100% - 80px);
-    line-height: 46px;
+      margin-left: 40px;
+      height: 46px;
+      background: #0E76F4;
+      border-radius: 5px;
+      font-size: 15px;
+      color: #FFFFFF;
+      text-align: center;
+      line-height: 46px;
+    }
   }
 </style>

src/views/index/vehicleAdd.vue

@@ -215,10 +215,10 @@
   <div class="itemContent">
     <div class="titleType">
       <img class="startImg" src="@/assets/start.png" />
-      <span>救援职业责任险</span>
+      <span>有无投保救援职业责任险或货运险</span>
     </div>
     <div class="isJoin">
-      <van-radio-group v-model="hasLiabilityInsurance" @change="isChange"  class="joinWrap">
+      <van-radio-group v-model="hasLiabilityInsurance" @change="isChange" :disabled="disabledShow" class="joinWrap">
         <van-radio :name="1" style="margin-right: 26px">
           有
           <img
@@ -238,19 +238,24 @@
       </van-radio-group>
     </div>
   </div>
+  <div class="item_content_btn">
+    <span @click="goContinueInsurance">续保更新</span>
+  </div>
+  <span style="color: red">如有投保，选“有”，未投保选“无”，不必上传交强险或者商业险等其他保单</span>
   <div class="lineBot"></div>
   <template v-if="hasLiabilityInsurance == 1">
     <div class="itemContent">
       <div class="titleType">
         <img class="startImg" src="@/assets/start.png" />
-        <span>保单</span>
+        <span style="line-height: 20px">请上传救援职业责任险或货运险保单PDF或者关键信息页截图</span>
       </div>
       <van-uploader
         v-model="insurancePictureFiles"
         :after-read="insurancePictureFilesHandler"
+        :disabled="disabledShow"
+        :deletable="!disabledShow"
         max-count="1"
         :preview-size="54"
-        accept="image "
       />
     </div>
     <div class="lineBot"></div>
@@ -264,6 +269,7 @@
         value-key="name"
         class="elSelect"
         collapse-tags="collapse-tags"
+        :disabled="disabledShow"
         placeholder="请选择"  style="width: 55%"
       >
         <el-option
@@ -281,10 +287,10 @@
         <img class="startImg" src="@/assets/start.png" />
         <span>保险有效期</span>
       </div>
-      <el-input style="width: 55%" readonly @focus="showDatePicker = true"  v-model="dateVal"  placeholder="请选择发布日期" :class="{'customSel':true,'customInput':true , 'has-value': dateVal }" >
+      <el-input style="width: 55%" readonly @focus="showDateHandler"  v-model="dateVal"  placeholder="请选择发布日期" :class="{'customSel':true,'customInput':true , 'has-value': dateVal }" >
         <template #suffix>
           <i
-            v-if="dateVal"
+            v-if="dateVal && !disabledShow"
             class="el-icon-circle-close el-input__icon"
             @click="dateVal = ''"
           ></i>
@@ -336,7 +342,7 @@
   import {Dialog} from "vant";
   import {formatDate1} from "@/utils/common"
 import {myMixins} from "@/utils/myMixins"
-import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree, uploadImage, ocrHandler} from "@/api/mine"
+import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree, uploadImage, ocrHandler, userOperationPermissions} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup from "@/components/cellGroup.vue";
 export default {
@@ -358,6 +364,7 @@ export default {
       trailerService: '',//拖车服务
       isJoin:'',//是否参与
       hasLiabilityInsurance: '',   // 有无责任险
+      liabilityInsuranceAudit: '',
       activeIcon: require('@/assets/check.png'),
       inactiveIcon: require('@/assets/uncheck.png'),
       // result: [],
@@ -388,6 +395,7 @@ export default {
       vehicleFrontLicensePlate:'',//车头照车牌号码
       insuranceCorp: '',
       auditStatus: '',
+      permissonList:[],
       vehicleTypes:[{
         name: '小修车',
         value: 1
@@ -499,6 +507,13 @@ export default {
     vehicleInfoDisabled() {
       return [1,2].includes(this.auditStatus)
     },
+    disabledShow() {
+      if (this.id) {
+        return !this.permissonList.includes('hasInsuranceAudit') && [2,3].includes(this.liabilityInsuranceAudit)
+      } else {
+        return false
+      }
+    }
   },
   watch:{
     selectedOption(newVal){
@@ -543,6 +558,28 @@ export default {
     }
   },
   methods:{
+    showDateHandler() {
+      if( this.id ) {   // 修改
+        if( this.permissonList.includes('hasInsuranceAudit') ) {
+          this.showDatePicker = true
+        }
+      } else {
+        this.showDatePicker = true
+      }
+
+    },
+    async getPermissions(){
+      let res = await userOperationPermissions();
+      this.permissonList = res.data
+    },
+    goContinueInsurance() {
+      this.$router.push({
+        name:'continueInsurance',
+        params:{
+          id: this.id
+        }
+      })
+    },
     formatDate(date) {
       return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
     },
@@ -775,6 +812,7 @@ export default {
       this.vehicleFrontLicensePlate = result.vehicleFrontLicensePlate;
       this.hasLiabilityInsurance = result.hasLiabilityInsurance
       this.insuranceCorp = result.insuranceCorp;
+      this.liabilityInsuranceAudit = result.liabilityInsuranceAudit
       if(this.insurancePicturePhoto) {
         this.insurancePictureFiles = [{url: this.insurancePicturePhoto}]
       }
@@ -944,6 +982,20 @@ export default {
 }
 .addContentWrap{
   margin-left: 16px;
+  .item_content_btn {
+    padding-right: 25px;
+    text-align: right;
+    span {
+      display: inline-block;
+      background: #354D93;
+      padding: 5px 10px;
+      font-size: 12px;
+      font-weight: bold;
+      color: #fff;
+      border-radius: 4px;
+      margin-bottom: 5px;
+    }
+  }
   .itemContent{
     @include flexColBet;
     line-height: 56px;

src/views/index/vehicleManage.vue

@@ -76,14 +76,14 @@
         finished-text="没有更多了"
         @load="onLoad"
       >
-        <div class="carItem" v-for="(item,index) in vehicleList" :key="index" @click="updateVehicle(item)">
+        <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" v-if="item.vehicleStatus" :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus != 1}">{{ item.vehicleStatus == 1 ? '启用' : '停用' }} </span>
+              <span class="ml10" @click.stop="updateStatus(item)"  :class="{'insuranceSuccess': item.vehicleStatus == 1, 'insuranceDanger': item.vehicleStatus == 2 ,'insuranceGray': !item.vehicleStatus }">{{ item.vehicleStatus == 1 ? '启用' :( item.vehicleStatus == 2 ? '停用' : '无状态') }} </span>
             </div>
+
           </div>
           <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>
@@ -114,7 +114,7 @@
 <script>
   import {Dialog} from "vant";
 import { myMixins} from "@/utils/myMixins";
-import {supplierVehicleList,deleteVehicle,userOperationPermissions} from "@/api/mine"
+  import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle} from "@/api/mine"
 export default {
   name: "vehicleManage",
   mixins:[myMixins],
@@ -173,6 +173,12 @@ export default {
         },{
           name: '空',
           value: 6
+        },{
+          name: '原责任险过期',
+          value: 8
+        },{
+          name: '原货物险过期',
+          value: 9
         }],
     }
   },
@@ -202,6 +208,12 @@ export default {
         '未通过': {
           className: 'danger_cls'
         },
+        '原责任险过期': {
+          className: 'danger_cls'
+        },
+        '原货物险过期': {
+          className: 'danger_cls'
+        },
         '无': {
           className: 'default_cls'
         },
@@ -290,6 +302,25 @@ export default {
         // this.vehicleList = [];
         await this.getVehicleList();
     },
+    updateStatus(item){
+      if(item.vehicleStatus != 1){
+        return
+      }
+      Dialog.confirm({
+        message: '当前状态为启用，是否要改为停用?',
+      }).then(async () => {
+            // on confirm
+        await enableVehicle({
+          vehicleId:item.vehicleId,
+          vehicleStatus:2,
+        })
+        this.pageNum=1
+        await this.getVehicleList()
+        console.log("item",item)
+      }).catch(() => {
+            // on cancel
+      });
+    },
     updateVehicle(item){//修改
       if( this.permissonList.includes('vehicleModifyBtn') ) {
         this.$router.push({
@@ -440,6 +471,9 @@ export default {
   .insuranceDanger {
     color: red;
   }
+  .insuranceGray{
+    color: #aaa;
+  }
   .flex-between {
     display: flex;
     justify-content: space-between;

src/views/index/workOrderDetail.vue

@@ -1,12 +1,17 @@
 <template>
   <div class="wrap">
-    <div class="baseInfo common">
+    <div class="baseInfo common" :style="{'height':orderDetailInfo.contractParentId == 110 ? '300px' : '240px'}">
       <div class="title">基本信息:</div>
       <div class="line"></div>
       <div class="infoWrap fontColor">
         <div class="leftTitle">
           <div class="leftItem">工单编号:</div>
           <div class="leftItem">合同:</div>
+          <template v-if="orderDetailInfo.contractParentId == 110">
+            <div class="leftItem">机构名称:</div>
+            <div class="leftItem">销售人员:</div>
+            <div class="leftItem">司机号码:</div>
+          </template>
           <div class="leftItem">结算方式:</div>
           <div class="leftItem">客户姓名:</div>
           <div class="leftItem">客户电话:</div>
@@ -19,6 +24,11 @@
             <img @click="copyText" src="@/assets/copy.png" style="width: 35px;height: 15px;margin-left: 10px"/>
           </div>
           <div class="rightItem">{{ orderDetailInfo.contractName }}</div>
+          <template v-if="orderDetailInfo.contractParentId == 110">
+            <div class="rightItem">{{ orderDetailInfo.organizeName }}</div>
+            <div class="rightItem">{{ orderDetailInfo.saleName }}</div>
+            <div class="rightItem">{{ orderDetailInfo.driverPhone }}</div>
+          </template>
           <div class="rightItem">{{ orderDetailInfo.contractSettleType?.label }}</div>
           <div class="rightItem">{{ orderDetailInfo.userName }}</div>
           <div class="rightItem">{{ orderDetailInfo.userPhone }}</div>
@@ -36,6 +46,9 @@
         <div class="item">
           <span class="leftTitle fontColor">服务类型:</span><span class="rightContent">{{ orderDetailInfo.taskServiceName }}</span>
         </div>
+        <div class="item" v-if="orderDetailInfo?.userVehicleTypeString">
+          <span class="leftTitle fontColor">车辆类型:</span><span class="rightContent">{{ orderDetailInfo.userVehicleTypeString }}<van-icon class="icon" name="question" @click="showCarTypeShow = true" /></span>
+        </div>
         <div class="item">
           <span class="leftTitle fontColor">车辆位于:</span><span class="rightContent">{{ orderDetailInfo.positionEnvironment?.label }}</span>
         </div>
@@ -85,7 +98,15 @@
         </div>
       </div>
     </div>
-
+    <van-popup v-model="showCarTypeShow" round position="center" class="popupCenter">
+      <table v-for="(item, index) in carTypeList" :key="index">
+        <tr>
+          <td width="50">{{item.type}}:</td>
+          <td>{{item.abbr}}</td>
+        </tr>
+      </table>
+<!--      <div v-for="(item, index) in carTypeList" :key="index"><span style="margin-right: 5px">{{item.type}}:</span><span>{{item.abbr}}</span></div>-->
+    </van-popup>
     <div class="map" v-show="showPopup"   id="container">
       <img @click="showPopup = false"  src="@/assets/delKey.png" class="mapImg">
     </div>
@@ -93,7 +114,7 @@
 </template>
 <script>
 import {myMixins} from '@/utils/myMixins'
-import {getOrderDetail,showVehiclePositionInfo} from "@/api/order"
+import {getOrderDetail,showVehiclePositionInfo, getConfigByCode} from "@/api/order"
 import minePosition from '@/assets/minePosition.png';
 import vehiclePosition from '@/assets/vehiclePosition.png';
 import  desitationPosition from '@/assets/desitationPosition.png'
@@ -111,6 +132,8 @@ export default {
       map: '',
       driverPoiInfo:{},
       noClick:true,
+      showCarTypeShow: false,
+      carTypeList: []
     }
   },
   async mounted() {
@@ -121,6 +144,7 @@ export default {
     this.userOrderId = urlParams.get('userOrderId');
     this.orderCode=urlParams.get('orderCode');
     this.taskOrderId=urlParams.get('taskOrderId') ? urlParams.get('taskOrderId') : '';
+    await this.getConfigByCodeHandler();
     await this.getDetail();
     if(this.queryType == 5){
       await this.getDriverPoi();
@@ -131,6 +155,12 @@ export default {
 
   },
   methods:{
+    async getConfigByCodeHandler() {
+      let res = await getConfigByCode({
+        code: 'userVehicleTypeConfig'
+      });
+      this.carTypeList = res?.data?.userVehicleType
+    },
     async getDetail(){
       let result=await getOrderDetail({
         queryType:this.queryType,
@@ -263,7 +293,8 @@ export default {
   line-height: 24px;
 }
 .baseInfo{
-  @include wh(100%,260px);
+  width: 100%;
+  //@include wh(100%,260px);
   margin-bottom: 12px;
   .infoWrap{
     display: flex;
@@ -330,4 +361,8 @@ export default {
   margin: 7px 0;
   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;
 }
-</style>
+  .popupCenter {
+    padding: 20px 10px;
+    width: 80%;
+  }
+</style>

src/views/kpi/kpiIndex.vue

@@ -42,11 +42,10 @@
       <div v-if="isMobile && !([9,10, 11].includes(active))" class="tipArrow right">>>></div>
     </van-tabs>
     <div v-loading="loadingData" :class="{'contentWrap':true,'webcontentWrap':!isMobile}" v-if="active===0">
-      <div :class="{'reciceOrder':true,'webCom':!isMobile}">
+      <!--<div :class="{'reciceOrder':true,'webCom':!isMobile}">
         <div :class="{'title':true,'webTitle':!isMobile}">接单指标</div>
         <div class="reciceOrderIWrap">
           <div class="left common">
-<!--            indexData && -->
             <div class="num">{{ formatCurrency(indexData?.receiveOrderCount) }}</div>
             <div class="itemTitle">承接案件量</div>
           </div>
@@ -59,7 +58,7 @@
             <div class="itemTitle"  style="cursor: pointer">超时率 ></div>
           </div>
         </div>
-      </div>
+      </div>-->
       <div :class="{'reciceOrder':true,'webCom':!isMobile,'evaluate':isMobile}">
         <div class="title">客户评价</div>
         <div class="reciceOrderIWrap" v-if="indexData">
@@ -154,7 +153,7 @@
           <div v-if="active==1" style="width: 100%">
             <div id="chartWrap" style="width: 100%;height:300px"></div>
           </div>
-          <div v-if="activeIndex==3" class="selectWrap">
+          <div v-if="activeIndex==2" class="selectWrap">
             <el-select v-model="value" @change="changeHandle">
               <el-option
                   v-for="item in options"
@@ -166,7 +165,7 @@
           </div>
         </template>
         <template v-else>
-          <div v-if="[0,1,2].includes(activeIndex)">
+          <div v-if="[0,1].includes(activeIndex)">
             <div id="chartWrap" style="width: 100%;height:300px"></div>
           </div>
           <div v-else style="width: 100%;display: flex;justify-content: space-between">
@@ -283,9 +282,10 @@ export default {
         {name: '总览',value:0}, {name: '月/总'}, {name: '日/总'},{name: '月/师傅'}, {name: '日/师傅'},  {name: '拒单明细'},
         {name: '超时明细'}, {name: '催促明细'},{name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'} , {name: '聚合失败案件明细'}
       ],
-      list: [{name: '接单指标'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: ' 时效 '}],
+      list: [ {name: '服务评价'}, {name: 'APP使用情况'}, {name: ' 时效 '}],
       // driverList: [{name: '得分总览'},{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],
-      driverList: [{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],//story#7149,要求暂时隐藏得分总览
+    // {name: '接单情况'},
+    driverList: [{name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],//story#7149,要求暂时隐藏得分总览
 
       startMonthTime: '',
       startTime: '',
@@ -497,7 +497,7 @@ export default {
       let myChart = echarts.init(document.getElementById('chartWrap'))
       let option;
       //接单指标
-      let series1 = [{
+      /*let series1 = [{
         name: '派遣案件量',
         type: 'bar',
         data: this.v1?.map(item => Number(item?.toString()?.replace(/,/g, ''))),
@@ -536,19 +536,19 @@ export default {
             formatter: '{c}%'
           },
         },
-       /* {
+        // {
-          name: '客户取消率',
+        //   name: '客户取消率',
-          type: "line",
+        //   type: "line",
-          data: this.v4,
+        //   data: this.v4,
-          yAxisIndex: 1,
+        //   yAxisIndex: 1,
-          smooth: true,
+        //   smooth: true,
-          label: {
+        //   label: {
-            show: true,
+        //     show: true,
-            position: 'top',
+        //     position: 'top',
-            formatter: '{c}%'
+        //     formatter: '{c}%'
-          },
+        //   },
-        },*/
+        // },
-      ]
+      ]*/
       let series2 = [
         {
           name: '投诉率',
@@ -724,7 +724,7 @@ export default {
           },
         },
       ]
-      let yAxis1 = [
+      /*let yAxis1 = [
         {type: 'value'},
         {
           type: 'value',
@@ -732,7 +732,7 @@ export default {
             formatter: '{value}%'
           }
         },
-      ]
+      ]*/
       let yAxis2 = [
         {
           type: 'value',
@@ -763,16 +763,17 @@ export default {
       let series = []
       let yAxis = []
       if (this.active === 1) {
-        if (this.activeIndex === 0) {
+       /* if (this.activeIndex === 0) {
           series = series1
           yAxis = yAxis1
-        } else if (this.activeIndex === 1) {
+        } else*/
+          if (this.activeIndex === 0) {
           series = series2
           yAxis = yAxis2
-        } else if (this.activeIndex === 2) {
+        } else if (this.activeIndex === 1) {
           series = []
           yAxis = []
-        } else if (this.activeIndex === 3) {
+        } else if (this.activeIndex === 2) {
           if (this.value == 1) {
             series = series4
             yAxis = yAxis4
@@ -784,7 +785,7 @@ export default {
       }
       option = {
         title: {
-          text: this.isMobile ? this.getTitle(this.activeIndex) : (this.active === 1 && this.activeIndex === 2) ? '' : '师傅接单时效',
+          text: this.isMobile ? this.getTitle(this.activeIndex) : (this.active === 1 && this.activeIndex === 1) ? '' : '师傅接单时效',
           textStyle: {
             fontSize: 12
           },
@@ -796,7 +797,7 @@ export default {
           right: '1%',
           itemWidth: this.isMobile ? 10 : 18, // 设置图例图标的宽度，从而调整图标大小
           itemHeight: this.isMobile ? 6 : 10,
-          width: (this.active == 1 && this.activeIndex == 2) ? '60%' : '100%',
+          width: (this.active == 1 && this.activeIndex == 1) ? '60%' : '100%',
         },
         xAxis: {
           type: 'category',
@@ -1275,7 +1276,7 @@ export default {
         columnObj.label = 'KPI' //第一个标题名称
         columnObj.prop = 'month' //第一个标题名称对应的字段
         this.etlLabelList.push(columnObj)
-        if (this.activeIndex === 0) {//接单指标
+        /*if (this.activeIndex === 0) {//接单指标
           this.etlDetailList=[{ 'month': '派遣量' },{ 'month': '承接量' },{ 'month': '完成量' },
             { 'month': '拒单量' },{ 'month': '拒单率(%)' },{ 'month': '超时接单量' },{ 'month': '超时率(%)' },{ 'month': '客户取消率(%)' }]
           let props = 'prop' //自定义字段名称
@@ -1311,14 +1312,16 @@ export default {
             {label: '超时率(%)', prop: 'timeoutOrderRate'},
             {label: '取消率(%)', prop: 'cancelRate'},
           ]
-        } else if (this.activeIndex === 1) {
+        } else*/
-          this.etlDetailList=[{ 'month': '投诉量' },{ 'month': '投诉率(%)' },{ 'month': '平安好评量' }, { 'month': '平安好评率' }]
+          if (this.activeIndex === 0) {
+        // ,{ 'month': '平安好评量' }, { 'month': '平安好评率' }
+          this.etlDetailList=[{ 'month': '投诉量' },{ 'month': '投诉率(%)' }]
           let props = 'prop' //自定义字段名称
           this.detailList?.map((item,index) => {
             this.v1.push(item.complainOrderCount)
             this.v2.push(item.complainOrderRate?.replace('%', ''))
-            this.v3.push(item?.pinganFavorableCount)
+            // this.v3.push(item?.pinganFavorableCount)
-            this.v4.push(item.pinganFavorableRate?.replace('%', ''))
+            // this.v4.push(item.pinganFavorableRate?.replace('%', ''))
             const columnObj = {}
             columnObj.label = item.month // 每一列的标题的名称
             columnObj.prop = props + index //自定义每一列标题字段名称
@@ -1332,22 +1335,23 @@ export default {
             {label: '月份', prop: 'month'},
             {label: '投诉量', prop: 'complainOrderCount'},
             {label: '投诉率', prop: 'complainOrderRate'},
-            {label: '平安好评量', prop: 'pinganFavorableCount'},
-            {label: '平安好评率', prop: 'pinganFavorableRate'},
           ]
-        } else if (this.activeIndex === 2) {
+         /* {label: '平安好评量', prop: 'pinganFavorableCount'},
-          this.etlDetailList=[{ 'month': 'APP使用量' }, { 'month': 'APP使用率' }, { 'month': '平安聚合成功量' },{ 'month': '平安聚合成功率' },
+          {label: '平安好评率', prop: 'pinganFavorableRate'},*/
+        } else if (this.activeIndex === 1) {
+          // { 'month': '平安聚合成功量' },{ 'month': '平安聚合成功率' },
+          this.etlDetailList=[{ 'month': 'APP使用量' }, { 'month': 'APP使用率' },
             { 'month': '中华联合聚合成功量' }, { 'month': '中华联合聚合成功率' }, { 'month': '整体聚合成功量' }, { 'month': '整体聚合成功率' }]
           let props = 'prop' //自定义字段名称
           this.detailList?.map((item,index) => {
             this.v1.push(item.appUseCount)
             this.v2.push(item.appRate.replace('%', ''))
-            this.v3.push(item.pinganJuheSuccessCount)
+            /*this.v3.push(item.pinganJuheSuccessCount)
-            this.v4.push(item.pinganPolymerizationSuccessRate.replace('%', ''))
+            this.v4.push(item.pinganPolymerizationSuccessRate.replace('%', ''))*/
-            this.v5.push(item.zhonghuaPolymerizationSuccessCount)
+            this.v3.push(item.zhonghuaPolymerizationSuccessCount)
-            this.v6.push(item.zhonghuaPolymerizationSuccessRate.replace('%', ''))
+            this.v4.push(item.zhonghuaPolymerizationSuccessRate.replace('%', ''))
-            this.v7.push(item.wholeJuheSuccessCount)
+            this.v5.push(item.wholeJuheSuccessCount)
-            this.v7.push(item.wholeJuheSuccessRate.replace('%', ''))
+            this.v6.push(item.wholeJuheSuccessRate.replace('%', ''))
             const columnObj = {}
             columnObj.label = item.month // 每一列的标题的名称
             columnObj.prop = props + index //自定义每一列标题字段名称
@@ -1357,19 +1361,20 @@ export default {
               this.$set(this.etlDetailList[i], columnObj.prop, item[mappings[i]]);
             }
           })
+          /*{label: '平安聚合成功量', prop: 'pinganJuheSuccessCount'},
+          {label: '平安聚合成功率', prop: 'pinganPolymerizationSuccessRate'},*/
           this.labelList = [
             {label: '月份', prop: 'month'},
             {label: 'APP使用量', prop: 'appUseCount'},
             {label: 'APP使用率', prop: 'appRate'},
-            {label: '平安聚合成功量', prop: 'pinganJuheSuccessCount'},
-            {label: '平安聚合成功率', prop: 'pinganPolymerizationSuccessRate'},
             {label: '中华联合聚合成功量', prop: 'zhonghuaPolymerizationSuccessCount'},
             {label: '中华联合聚合成功率', prop: 'zhonghuaPolymerizationSuccessRate'},
             {label: '整体聚合成功量', prop: 'wholeJuheSuccessCount'},
             {label: '整体聚合成功率', prop: 'wholeJuheSuccessRate'},
           ]
-        } else if (this.activeIndex === 3) {
+        } else if (this.activeIndex === 2) {
-          this.etlDetailList=[{ 'month': '接单时效' },{ 'month': '3分钟联系客户率' },{ 'month': '到达时效' },{'month':'平安聚合成功到达时效'}]
+          // ,{'month':'平安聚合成功到达时效'}
+          this.etlDetailList=[{ 'month': '接单时效' },{ 'month': '3分钟联系客户率' },{ 'month': '到达时效' }]
           let props = 'prop' //自定义字段名称
           if (this.isMobile) {
             if (this.value == 1) {
@@ -1413,16 +1418,16 @@ export default {
               })
             }
           }
+            // {label: '平安聚合成功到达时效', prop: 'pinganJuheSuccessArriving'},
           this.labelList = [
             {label: '月份', prop: 'month'},
             {label: '接单时效', prop: 'receiving'},
             {label: '3分钟联系客户率', prop: 'threeMinutesContactRate'},
             {label: '到达时效', prop: 'arriving'},
-            {label: '平安聚合成功到达时效', prop: 'pinganJuheSuccessArriving'},
           ]
         }
       } else if (this.active === 2) {//日总
-        if (this.activeIndex === 0) {//接单指标
+        /*if (this.activeIndex === 0) {//接单指标
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '派单量', prop: 'dispatchOrderCount'},
@@ -1434,7 +1439,8 @@ export default {
             {label: '超时率', prop: 'timeoutOrderRate'},
             // {label: '客户取消率(%)', prop: 'cancelRate'},
           ]
-        } else if (this.activeIndex === 1) {
+        } else*/
+          if (this.activeIndex === 0) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '投诉量', prop: 'complainOrderCount'},
@@ -1442,9 +1448,9 @@ export default {
            /* {label: '好评量', prop: 'favorableCount'},
             {label: '好评率', prop: 'favorableRate'},*/
             {label: '平安评价率', prop: 'pinganEvaluateRate'},
-            {label: '平安好评率', prop: 'pinganFavorableRate'},
+            // {label: '平安好评率', prop: 'pinganFavorableRate'},
           ]
-        } else if (this.activeIndex === 2) {
+        } else if (this.activeIndex === 1) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: 'APP使用量', prop: 'appUseCount'},
@@ -1456,13 +1462,13 @@ export default {
             {label: '整体聚合成功量', prop: 'wholeJuheSuccessCount'},
             {label: '整体聚合成功率', prop: 'wholeJuheSuccessRate'},
           ]
-        } else if (this.activeIndex === 3) {
+        } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '接单时效(分)', prop: 'receiving'},
             {label: '3分钟联系客户率', prop: 'threeMinutesContactRate'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
+            // {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
           ]
         }
       } else if (this.active === 3) {//月师傅
@@ -1495,7 +1501,7 @@ export default {
             {label: '星级评分', prop: 'starRank'},
           ]
         }else*/
-          if (this.activeIndex === 0) {
+         /* if (this.activeIndex === 0) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '派单量', prop: 'dispatchOrderCount'},
@@ -1505,7 +1511,8 @@ export default {
             {label: '超时量', prop: 'timeoutOrderCount'},
             {label: '超时率(%)', prop: 'timeoutOrderRate'},
           ]
-        } else if (this.activeIndex === 1) {
+        } else */
+          if (this.activeIndex === 0) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             // {label: '承接案件量', prop: 'receiveOrderCount'},
@@ -1513,11 +1520,11 @@ export default {
             {label: '投诉率(%)', prop: 'complainOrderRate'},
             {label: '平安评价量', prop: 'pinganEvaluateCount'},
             {label: '平安评价率(%)', prop: 'pinganEvaluateRate'},
-            {label: '平安好评量', prop: 'pinganFavorableCount'},
+          /*  {label: '平安好评量', prop: 'pinganFavorableCount'},
-            {label: '平安好评率(%)', prop: 'pinganFavorableRate'},
+            {label: '平安好评率(%)', prop: 'pinganFavorableRate'},*/
             // {label: '催促率(%)', prop: 'urgeRate'},
           ]
-        } else if (this.activeIndex === 2) {
+        } else if (this.activeIndex === 1) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: 'App使用量', prop: 'appUseCount'},
@@ -1532,18 +1539,18 @@ export default {
             {label: '整体聚合成功率(%)', prop: 'wholeJuheSuccessRate'},
             // {label: '日均在线时长(h)', prop: 'onlineDuration'},
           ]
-        } else if (this.activeIndex === 3) {
+        } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '师傅姓名', prop: 'driverName'},
             {label: '接单时效(分)', prop: 'receiving'},
             {label: '3′联系客户率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
             // {label: '40′到达率(%)', prop: 'fortyMinutesArrivalRate'},
-            {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
+            // {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
           ]
         }
       } else if (this.active === 4) {//日师傅
-        if (this.activeIndex === 0) {//接单指标
+        /*if (this.activeIndex === 0) {//接单指标
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '师傅姓名', prop: 'driverName'},
@@ -1554,7 +1561,8 @@ export default {
             {label: '超时量', prop: 'timeoutOrderCount'},
             {label: '超时率(%)', prop: 'timeoutOrderRate'},
           ]
-        } else if (this.activeIndex === 1) {
+        } else */
+        if (this.activeIndex === 0) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '师傅姓名', prop: 'driverName'},
@@ -1562,10 +1570,10 @@ export default {
             {label: '投诉率(%)', prop: 'complainOrderRate'},
             {label: '平安评价量', prop: 'pinganEvaluateCount'},
             {label: '平安评价率(%)', prop: 'pinganEvaluateRate'},
-            {label: '平安好评量', prop: 'pinganFavorableCount'},
+            // {label: '平安好评量', prop: 'pinganFavorableCount'},
-            {label: '平安好评率(%)', prop: 'pinganFavorableRate'},
+            // {label: '平安好评率(%)', prop: 'pinganFavorableRate'},
           ]
-        } else if (this.activeIndex === 2) {
+        } else if (this.activeIndex === 1) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '师傅姓名', prop: 'driverName'},
@@ -1578,14 +1586,14 @@ export default {
             {label: '整体聚合成功量', prop: 'wholeJuheSuccessCount'},
             {label: '整体聚合成功率(%)', prop: 'wholeJuheSuccessRate'},
           ]
-        } else if (this.activeIndex === 3) {
+        } else if (this.activeIndex === 2) {
           this.labelList = [
             {label: '日', prop: 'date'},
             {label: '师傅姓名', prop: 'driverName'},
             {label: '接单时效(分)', prop: 'receiving'},
             {label: '3′联系客户率(%)', prop: 'threeMinutesReceivingRate'},
             {label: '到达时效(分)', prop: 'arriving'},
-            {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
+            // {label: '平安聚合成功到达时效(分)', prop: 'pinganJuheSuccessArriving'},
           ]
         }
       }