工单详情，‘生成司机信息’操作车牌号字段更换

src/api/damagePhoto.js

@@ -1,14 +0,0 @@
-import request from '@/utils/http'
-
-/**
- * 查询 H5 损伤照片
- * @param {Object} data - { userOrderId, taskOrderId }
- */
-export function getDamagePhotos(data) {
-  return request({
-    url: '/api/h5-interface/damagePhotos',
-    method: 'POST',
-    contentType: 'application/json',
-    data
-  })
-}

src/api/environmentPhoto.js

@@ -1,10 +0,0 @@
-import request from '@/utils/http'
-
-export function getBeforeDispatchImage(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/order/getBeforeDispatchImage',
-    method: 'POST',
-    contentType: 'application/json',
-    data
-  })
-}

src/api/mine.js

@@ -72,12 +72,10 @@ export function vehicleTypeList(){
     })
 }
  // 服务商服务能力
-export function supplierServiceTree(data){
+export function supplierServiceTree(){
-    console.log('ddddddd0', data)
     return request({
         url:'/supplierAppV2/dispatchApp/user/supplierServiceTree',
-        method:'POST',
+        method:'POST'
-        data
     })
 }
 
@@ -117,15 +115,6 @@ export function getSupplierInfo(key){
     })
 }
 
-// 根据id查询潜在服务商
-export function supplierSelectById(params){
-    return request({
-        url:'/supplier/potential/supplierSelectById',
-        method:'GET',
-        params
-    })
-}
-
 // 获取企微二维码
 export function getOrCodeInfo(data){
     return request({
@@ -144,15 +133,6 @@ export function getContactQrCodeResult(data){
     })
 }
 
-// 添加企微
-export function updateWechatId(data){
-    return request({
-        url:'/supplier/potential/updateWechatId',
-        method:'POST',
-        data
-    })
-}
-
  //司机列表
 export function driverList(data){
     return request({

src/api/order.js

@@ -177,23 +177,3 @@ export function getNewVersion(key){
     params: key
   })
 }
-
-export function getLog(data){
-  // 添加log
-  return request({
-    url: '/ureport/pageView/save',
-    method:'POST',
-    contentType:'application/json',
-    data
-  })
-}
-
-
-//获取最新版本
-export function getUserBO(){
-  return request({
-    url: '/base/user/getUserBO',
-    method:'POST',
-  })
-}
-

src/router/index.js

@@ -27,14 +27,6 @@ const routes = [
             title: '审核中',
         }
     },
-    {
-        path: '/addWechat',
-        name: 'addWechat',
-        component: () => import('@/views/index/addWechat'),
-        meta:{
-            title: '添加微信',
-        }
-    },
     {
         path: '/supplierInfo',
         name: 'supplierInfo',
@@ -164,22 +156,6 @@ const routes = [
             title: '查看发票'
         }
     },
-    {
-        path: '/damagePhotos',
-        name: 'damagePhotoList',
-        component: () => import('@/views/damagePhoto/damagePhotoList.vue'),
-        meta: {
-            title: '损伤照片'
-        }
-    },
-    {
-        path: '/environmentPhotos',
-        name: 'environmentPhotoList',
-        component: () => import('@/views/environmentPhoto/environmentPhotoList.vue'),
-        meta: {
-            title: '环境照片'
-        }
-    },
     {
         path: "/vehicleManage",
         name: 'vehicleManage',
@@ -353,7 +329,7 @@ const routes = [
         name: 'goToApp',
         component:()=>import('@/views/goToApp/goToApp.vue'),
         meta: {
-            title:'小板运输司机端'
+            title:'电瓶详情'
         }
     },
     ...kpiRouter,

src/utils/http.js

@@ -29,7 +29,7 @@ service.interceptors.request.use(
       // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJBTkNIQU5HIiwidXNlcklkIjo0NTY3MSwibmFtZSI6IuWuieeVhSIsInVzZXJOYW1lIjoiQU5DSEFORyIsInN1cHBsaWVySWQiOjExMjgsImlzWmQiOjAsImV4cCI6MTc1NTQyMjUyNX0.xzDZhaANJFnbeViIHJA0SEtOyTv7Ja3rKmXqRKRuFkc'
       // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJTSEhQWEIiLCJ1c2VySWQiOjU0NzI2LCJuYW1lIjoiI-a1i-ivleWwj-eZveeZvSIsInVzZXJOYW1lIjoiU0hIUFhCIiwic3VwcGxpZXJJZCI6MTAwMDE2NSwiZXhwIjoxNzQ0NTEwNzkwfQ.JPk0OA7slYJN3FIi_uhW4Y0CiWRvl6R1dK8MRTbyhD8'
       //  if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
-        if ((reqUrl=='/supplier/supplierTraining/trainingList' || reqUrl=='/supplier/supplierTraining/normalList') && config?.params?.type==1){
+        if (reqUrl=='/supplier/supplierTraining/trainingList' && config?.params?.type==1){
             console.log('司机app使用该请求不挂token')
         } else {
             if(token) {

src/utils/myMixins.js

@@ -1,6 +1,3 @@
-import { getLog } from "@/api/order"
-
-let _setLogTimer = null
 
 export const myMixins = {
   data() {
@@ -8,11 +5,6 @@ export const myMixins = {
     }
   },
   methods: {
-    setLogHandler(data) {
-      if (_setLogTimer) return
-      _setLogTimer = setTimeout(() => { _setLogTimer = null }, 1000)
-      getLog(data)
-    },
     showFun() {
       if( localStorage.getItem('infoVerify') == 8 || localStorage.getItem('infoVerify') == 12  ) {
         return false

src/views/damagePhoto/damagePhotoList.vue

@@ -1,312 +0,0 @@
-<template>
-  <div class="wrap damage-photo-wrap">
-    <div class="navBar">
-      <van-nav-bar
-        title="损伤照片"
-        left-arrow
-        left-arrow-color="#FFFFFF"
-        :border="false"
-        :fixed="true"
-        :safe-area-inset-top="true"
-        @click-left="h5GoBack"
-      />
-    </div>
-
-    <div class="content-wrap" v-if="loaded">
-      <!-- 案件信息 -->
-      <div class="info-card">
-        <div class="info-item">
-          <span class="info-label">案件号</span>
-          <span class="info-value">{{ info.caseNo || '-' }}</span>
-        </div>
-        <div class="info-item">
-          <span class="info-label">车辆标识</span>
-          <span class="info-value">{{ info.vehicleIdentity || '-' }}</span>
-        </div>
-        <div class="info-item">
-          <span class="info-label">起止路线</span>
-          <span class="info-value">{{ info.route || '-' }}</span>
-        </div>
-      </div>
-
-      <!-- 照片列表 -->
-      <div class="photo-list" v-if="photoList.length">
-        <div class="photo-card" v-for="(item, index) in photoList" :key="index">
-          <div class="photo-title">
-            <span>{{ item.title || '-' }}</span>
-            <span
-              v-if="item.replaced || (item.historyList && item.historyList.length)"
-              class="replaced-tag"
-              @click="showHistory(item)"
-            >被替换</span>
-          </div>
-          <div class="photo-image" @click="previewCurrent(item.currentUrl)">
-            <van-image
-                :src="item.currentUrl"
-                fit="cover"
-                width="100%"
-                height="160"
-                :error-icon="defaultImg"
-                error-icon-size="48"
-            />
-          </div>
-        </div>
-      </div>
-
-      <!-- 空态 -->
-      <div class="empty-state" v-else>
-        <van-empty description="暂无损伤照片" />
-      </div>
-    </div>
-
-    <!-- 历史照片弹框 -->
-    <van-popup
-      v-model="historyShow"
-      position="bottom"
-      round
-      closeable
-      :style="{ height: '70%' }"
-      @closed="currentHistory = []"
-    >
-      <div class="history-popup">
-        <div class="history-title">历史照片</div>
-        <div class="history-list" v-if="currentHistory.length">
-          <div
-            class="history-item"
-            v-for="(item, index) in currentHistory"
-            :key="index"
-            @click="previewHistory(item.url)"
-          >
-            <van-image
-              :src="item.url"
-              fit="cover"
-              width="100%"
-              height="120"
-              :error-icon="defaultImg"
-              error-icon-size="48"
-            />
-            <div class="history-time" v-if="item.replaceTime">替换时间：{{ item.replaceTime }}</div>
-          </div>
-        </div>
-        <div class="history-empty" v-else>
-          <van-empty description="暂无历史照片" />
-        </div>
-      </div>
-    </van-popup>
-  </div>
-</template>
-
-<script>
-import { getDamagePhotos } from '@/api/damagePhoto'
-import { myMixins } from '@/utils/myMixins'
-import { ImagePreview, Toast } from 'vant'
-
-export default {
-  name: 'damagePhotoList',
-  mixins: [myMixins],
-  data() {
-    return {
-      loaded: false,
-      info: {
-        caseNo: '',
-        vehicleIdentity: '',
-        route: ''
-      },
-      photoList: [],
-      historyShow: false,
-      currentHistory: [],
-      defaultImg: require('@/assets/empty.png')
-    }
-  },
-  async mounted() {
-    await this.fetchDamagePhotos()
-  },
-  methods: {
-    async fetchDamagePhotos() {
-      const userOrderId = this.$route.query.userOrderId
-      const taskOrderId = this.$route.query.taskOrderId
-      if (!userOrderId || !taskOrderId) {
-        Toast('缺少必要参数')
-        this.loaded = true
-        return
-      }
-      Toast.loading({
-        message: '加载中...',
-        forbidClick: true,
-        duration: 0
-      })
-      try {
-        const res = await getDamagePhotos({
-          userOrderId: Number(userOrderId),
-          taskOrderId: Number(taskOrderId)
-        })
-        this.info = {
-          caseNo: res.data?.caseNo || '',
-          vehicleIdentity: res.data?.vehicleIdentity || '',
-          route: res.data?.route || ''
-        }
-        this.photoList = Array.isArray(res.data?.photos) ? res.data.photos : []
-      } finally {
-        Toast.clear()
-        this.loaded = true
-      }
-    },
-    previewCurrent(url) {
-      if (!url) return
-      ImagePreview({
-        images: [url],
-        startPosition: 0,
-        closeable: true
-      })
-    },
-    showHistory(item) {
-      this.currentHistory = Array.isArray(item.historyList) ? item.historyList : []
-      this.historyShow = true
-    },
-    previewHistory(url) {
-      if (!url) return
-      ImagePreview({
-        images: [url],
-        startPosition: 0,
-        closeable: true
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-@import "@/styles/mixin.scss";
-@import "@/styles/common.scss";
-
-.wrap {
-  @include wh(100%, 100%);
-  background-color: #F4F5F7;
-  overflow-y: auto;
-}
-
-.navBar {
-  height: 46px;
-  ::v-deep .van-nav-bar--fixed {
-    z-index: 9999 !important;
-  }
-}
-
-.content-wrap {
-  padding: 10px 15px 20px;
-}
-
-.info-card {
-  background: #fff;
-  border-radius: 8px;
-  padding: 15px;
-  margin-bottom: 10px;
-
-  .info-item {
-    display: flex;
-    line-height: 24px;
-    font-size: 13px;
-
-    &:not(:last-child) {
-      margin-bottom: 8px;
-    }
-
-    .info-label {
-      color: rgba(0, 0, 0, 0.5);
-      width: 70px;
-      flex-shrink: 0;
-    }
-
-    .info-value {
-      color: #323643;
-      flex: 1;
-      word-break: break-all;
-    }
-  }
-}
-
-.photo-list {
-  .photo-card {
-    background: #fff;
-    border-radius: 8px;
-    padding: 12px 12px 15px;
-    margin-bottom: 10px;
-
-    .photo-title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      font-size: 14px;
-      font-weight: bold;
-      color: #323643;
-      margin-bottom: 10px;
-
-      .replaced-tag {
-        font-size: 12px;
-        font-weight: normal;
-        color: #fff;
-        background-color: #ee0a24;
-        padding: 2px 8px;
-        border-radius: 4px;
-      }
-    }
-
-    .photo-image {
-      width: 100%;
-      border-radius: 4px;
-      overflow: hidden;
-    }
-  }
-}
-
-.empty-state {
-  margin-top: 30px;
-}
-
-.history-popup {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .history-title {
-    font-size: 16px;
-    font-weight: bold;
-    color: #323643;
-    text-align: center;
-    padding: 15px 0;
-    border-bottom: 1px solid #E9E9EA;
-  }
-
-  .history-list {
-    flex: 1;
-    overflow-y: auto;
-    padding: 15px;
-
-    .history-item {
-      margin-bottom: 15px;
-      border-radius: 4px;
-      overflow: hidden;
-
-      .history-time {
-        font-size: 12px;
-        color: rgba(0, 0, 0, 0.5);
-        margin-top: 6px;
-      }
-    }
-  }
-
-  .history-empty {
-    flex: 1;
-  }
-}
-</style>
-
-<style>
-/* 确保图片预览及其遮罩层级高于底部弹框 */
-.van-image-preview {
-  z-index: 10000000003 !important;
-}
-.van-overlay.van-image-preview__overlay {
-  z-index: 10000000002 !important;
-}
-</style>

src/views/documentView/docmentList.vue

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

src/views/environmentPhoto/environmentPhotoList.vue

@@ -1,118 +0,0 @@
-<template>
-  <div class="wrap environment-photo-wrap">
-    <div v-if="loaded && photoList.length === 0" class="empty-tip">暂无环境照片</div>
-    <div v-for="(item, index) in photoList" :key="index" class="photo-item">
-      <div class="media-wrap">
-        <video
-          v-if="item.tag && item.tag.includes('video')"
-          :src="item.imageUrl"
-          controls
-          playsinline
-          class="media"
-        />
-        <img
-          v-else-if="item.tag && item.tag.includes('img')"
-          :src="item.imageUrl"
-          class="media"
-          @click="previewImage(index)"
-        />
-      </div>
-      <p v-if="item.title" class="photo-name">{{ item.title }}</p>
-    </div>
-  </div>
-</template>
-
-<script>
-import { Toast, ImagePreview } from 'vant'
-import { getBeforeDispatchImage } from '@/api/environmentPhoto'
-
-export default {
-  name: 'EnvironmentPhotoList',
-  data() {
-    return {
-      photoList: [],
-      loaded: false
-    }
-  },
-  async mounted() {
-    await this.fetchPhotos()
-  },
-  methods: {
-    async fetchPhotos() {
-      const userOrderId = this.$route.query.userOrderId
-      if (!userOrderId) {
-        Toast('缺少必要参数')
-        this.loaded = true
-        return
-      }
-      Toast.loading({
-        message: '加载中...',
-        forbidClick: true,
-        duration: 0
-      })
-      try {
-        const res = await getBeforeDispatchImage({ userOrderId: Number(userOrderId) })
-        this.photoList = Array.isArray(res.data) ? res.data : []
-      } finally {
-        Toast.clear()
-        this.loaded = true
-      }
-    },
-    previewImage(index) {
-      const urls = this.photoList
-        .filter(item => item.tag && item.tag.includes('img'))
-        .map(item => item.imageUrl)
-      ImagePreview({ images: urls, startPosition: index })
-    }
-  }
-}
-</script>
-
-<style scoped>.wrap {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #F4F5F7;
-  overflow-y: auto;
-  -webkit-overflow-scrolling: touch;
-}
-
-.environment-photo-wrap {
-  padding: 12px;
-}
-.empty-tip {
-  text-align: center;
-  color: #999;
-  margin-top: 60px;
-  font-size: 14px;
-}
-.photo-item {
-  background: #fff;
-  border-radius: 6px;
-  margin-bottom: 12px;
-  overflow: hidden;
-}
-.media-wrap {
-  position: relative;
-  width: 100%;
-  padding-top: 56.25%;
-}
-.photo-item img,
-.photo-item video {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  display: block;
-  object-fit: cover;
-}
-.photo-name {
-  font-size: 13px;
-  color: #333;
-  padding: 8px 10px;
-  margin: 0;
-}
-</style>

src/views/goToApp/goToApp.vue

@@ -3,57 +3,22 @@
     <div class="content">
       <div class="goToBtn" @click="goAppHandler">立即打开</div>
       <div class="content_tip">
-        <div class="font_cls">如未安装，请点击 <span @click="downLoadHandler">立即下载</span></div>
+        <div class="font_cls">如未安装请点击下载</div>
+        <div class="font_cls">如已安装未自动跳转，请 <span @click="downLoadHandler">立即下载</span></div>
       </div>
     </div>
-
-    <!-- 微信内置浏览器引导 -->
-    <div v-if="showGuide" class="guide-mask" @click.self="closeGuide">
-      <img class="guide-img" src="@/assets/sucai.png" alt="引导在浏览器打开" />
-      <div class="guide-btn" @click="closeGuide">我知道了</div>
-    </div>
   </div>
 </template>
 
 <script>
-import { getNewVersion, getLog } from "@/api/order"
+import { getNewVersion } from "@/api/order"
 export default {
   name: "goToApp",
-  data() {
-    return {
-      showGuide: false
-    }
-  },
-  mounted() {
-    getLog({
-      source: 'App下载页',
-      event: '页面浏览',
-      page: '/h5/supplier/dispatch/goToApp'
-    })
-    this.showGuide = this.isWeixin()
-  },
   methods: {
-    isWeixin() {
-      const ua = navigator.userAgent.toLowerCase()
-      return ua.indexOf('micromessenger') !== -1
-    },
-    closeGuide() {
-      this.showGuide = false
-    },
     goAppHandler() {
-      getLog({
-        source: 'App下载页',
-        event: '直接打开',
-        page: '/h5/supplier/dispatch/goToApp'
-      })
       window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
     },
     async downLoadHandler() {
-      getLog({
-        source: 'App下载页',
-        event: '立即下载',
-        page: '/h5/supplier/dispatch/goToApp'
-      });
       getNewVersion({
         appType: 5
       }).then((res) => {
@@ -105,32 +70,4 @@ export default {
     }
   }
 }
-.guide-mask {
+</style>
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 999;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  background: rgba(0, 0, 0, 0.85);
-}
-.guide-img {
-  width: 90%;
-  margin-top: 0;
-  object-fit: contain;
-}
-.guide-btn {
-  width: 140px;
-  height: 40px;
-  margin-top: 40px;
-  border: 1px solid #FFFFFF;
-  border-radius: 20px;
-  font-size: 15px;
-  color: #FFFFFF;
-  line-height: 40px;
-  text-align: center;
-}
-</style>

src/views/index/addWechat.vue

@@ -1,180 +0,0 @@
-<template>
-  <div class="wrap">
-    <div class="top-wrap"></div>
-    <div class="center-info">
-      <div class="wei_code_wrap">
-        <div class="wei_title">请先添加企业微信，保证申请流程正常进行。</div>
-        <div class="wei_code_bg">
-          <img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
-        </div>
-      </div>
-    </div>
-    <div class="btn_wrap">
-      <div class="btn" @click="nextStep">下一步</div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import QRCode from 'qrcode'
-  import {getOrCodeInfo, getContactQrCodeResult, saveSupplier} from "@/api/mine"
-  import {myMixins} from "@/utils/myMixins"
-  import {Toast, Dialog} from "vant";
-  export default {
-    name: "addWechat",
-    mixins: [myMixins],
-    data() {
-      return {
-        name: '',
-        potentialFlag: '',
-        formPayload: null,
-        qrCodeUrl: '',
-        qrCode: '',
-        configId: '',
-        wechatId: '',
-        clickFlag: true,
-      }
-    },
-    async mounted() {
-      const urlParams = new URLSearchParams(window.location.search);
-      this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
-      const cached = localStorage.getItem('supplierAddForm');
-      if (cached) {
-        this.formPayload = JSON.parse(cached);
-        this.name = this.formPayload.name;
-      }
-      if (this.name) {
-        await this.QrCodeHandler();
-      }
-    },
-    methods: {
-      async QrCodeHandler() {
-        await this.QrCodeInfo();
-        await this.getQrCode();
-      },
-      async QrCodeInfo() {
-        let res = await getOrCodeInfo({ name: this.name });
-        this.configId = res?.configId;
-        this.qrCode = res?.qrCode;
-      },
-      async getQrCode() {
-        try {
-          this.qrCodeUrl = await QRCode.toDataURL(this.qrCode, {
-            width: 150,
-            margin: 2,
-            color: { dark: '#000000', light: '#FFFFFF' },
-          });
-        } catch (error) {
-          console.error('生成二维码失败:', error);
-        }
-      },
-      async nextStep() {
-        if (!this.clickFlag) return;
-        let res = await getContactQrCodeResult({ configId: this.configId });
-        this.wechatId = res?.data?.wechatId;
-        if (!this.wechatId) {
-          Toast('请先添加企微再继续');
-          return;
-        }
-        try {
-          this.clickFlag = false;
-          const res = await saveSupplier({
-            ...this.formPayload,
-            wechatId: this.wechatId,
-          });
-          if (res?.noToast) {
-            if (res?.code != 0) {
-              Dialog.alert({ title: '提示', message: '该服务商已存在，查看信息' }).then(() => {
-                localStorage.removeItem('supplierAddForm');
-                const target = { name: 'supplierInfo', query: { id: res?.code, potentialFlag: this.potentialFlag } };
-                localStorage.setItem('lastRoute', JSON.stringify(target));
-                this.goPage('supplierInfo', { id: res?.code, potentialFlag: this.potentialFlag });
-              });
-            } else {
-              Toast('该服务商已存在');
-            }
-          } else {
-            localStorage.removeItem('supplierAddForm');
-            const supplierId = res?.data;
-            const potentialFlag = this.potentialFlag;
-            const target = { name: 'supplierAddResult', query: { id: supplierId, potentialFlag } };
-            localStorage.setItem('lastRoute', JSON.stringify(target));
-            Dialog.confirm({
-              title: '提示',
-              message: '添加车辆和驾驶员会加快审核进度，是否去添加？',
-              confirmButtonText: '去添加',
-              cancelButtonText: '取消',
-            }).then(() => {
-              localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId, potentialFlag } }));
-              this.goPage('vehicleManage', { id: supplierId, potentialFlag });
-            }).catch(() => {
-              localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: supplierId, potentialFlag } }));
-              this.goPage('supplierAddResult', { id: supplierId, potentialFlag });
-            });
-          }
-        } catch (e) {
-          Toast(e?.message || '提交失败');
-        } finally {
-          setTimeout(() => { this.clickFlag = true; }, 1000);
-        }
-      }
-    }
-  }
-</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;
-  }
-  .wei_code_wrap {
-    margin-top: 10px;
-    .wei_title {
-      font-size: 15px;
-      color: #FF553B;
-      text-align: center;
-    }
-    .wei_code_bg {
-      width: 163px;
-      height: 173px;
-      background-image: url("~@/assets/supplier/weiCodeBg.png");
-      background-size: 100% 100%;
-      margin: 8px auto;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-  .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/driverAdd.vue

@@ -122,7 +122,7 @@
       <span>司机状态</span>
     </div>
     <div class="isJoin">
-      <van-radio-group v-model="states" @change="isUse" :disabled="statesDisabled" :class="{ 'disabled-tree': statesDisabled }" class="joinWrap">
+      <van-radio-group v-model="states" @change="isUse"  class="joinWrap">
         <van-radio :name="1" style="margin-right: 26px" class="item">
           启用
           <img
@@ -163,7 +163,6 @@ export default {
       // baseURL:'',
       // licenseOcrInfo:'',
       id:'',
-      supplierId: '',
       driverName:"",
       driverPhone:"",
       identityCardNumber:"",
@@ -185,7 +184,6 @@ export default {
       iconList: [],
       driverInfo: {},
       drivingLicenceName: '',
-      potentialFlag: '',
       idCardAuthority:'',
       idCardValidStartTime:'',
       idCardValidEndTime:'',
@@ -206,7 +204,6 @@ export default {
     let token=localStorage.getItem('token')
     this.authorization.Authorization=token;*/
     this.id = this.$route.params?.id;
-    this.supplierId = this.$route.params?.supplierId || '';
     this.driverName = this.$route.params?.name;
     this.driverPhone = this.$route.params?.phone;
     this.drivingModel = this.$route.params?.drivingModel;
@@ -223,11 +220,6 @@ export default {
     this.identityCardFront = this.$route.params?.identityCardFront;
     this.driverInfo.lssueDate = this.$route.params?.lssueDate;
     this.drivingLicenceName =  this.$route.params?.drivingLicenceName;
-    this.potentialFlag = this.$route.params?.potentialFlag || '';
-    console.log('this.potentialFlagthis.potentialFlag', this.potentialFlag)
-    if(!this.id && this.potentialFlag === '1') {
-      this.states = 0;
-    }
     if( this.identityCardFront ) {
       this.identityCardFrontList = [{ url : this.identityCardFront }];
     }
@@ -248,7 +240,7 @@ export default {
       const selectedValue = selectElement.value;
       this.drivingModel=selectedValue
     });
-    console.log('statesDisabled', this.statesDisabled)
+
   },
   methods:{
     isUse(e){
@@ -434,7 +426,6 @@ export default {
       }
        await saveDriver({
          driverId:this.id ? this.id : '',
-         supplierId: this.supplierId || undefined,
          driverName:this.driverName ,
          driverPhone:this.driverPhone,
          identityCardNumber:this.identityCardNumber,
@@ -462,11 +453,6 @@ export default {
         },2000)
       },
   },
-  computed: {
-    statesDisabled() {
-      return !this.id && this.potentialFlag === '1';
-    }
-  },
   components:{
     TwoCommonBtn,
     CellGroup

src/views/index/driverManage.vue

@@ -3,14 +3,14 @@
     <div class="navBar">
       <van-nav-bar
           title="司机管理"
-          :left-arrow="!supplierId"
+          left-arrow
           left-arrow-color="#FFFFFF"
           :border="false"
           :fixed="true"
           :safe-area-inset-top="true"
           @click-left="goBack"
       >
-        <template slot="right" v-if="permissonList.includes('driverAddBtn') || supplierId">
+        <template slot="right" v-if="permissonList.includes('driverAddBtn')">
           <div class="rightWrap" @click="addDriver" >
             <img src="@/assets/addImg.png" />
             <span class="addTxt">添加</span>
@@ -62,14 +62,14 @@
             finished-text="没有更多了"
             @load="onLoad"
         >
-          <div class="itemWrap" v-for="(item,index) in driverList" :key="index" @click.stop="!isMiniProgram(item) && updateDriver(item)">
+          <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="!isMiniProgram(item) && permissonList.includes('driverModifyBtn') && item.states?.code==1" class="del" @click.stop="handleStatus(item)">停用</button>
+                <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>
@@ -103,7 +103,7 @@
               <span class="halfOpci">身份证号:</span>
               <span class="allOpci">{{ item.identityCardNumber }}</span>
             </div>
-            <van-icon class="arrow_position" v-if="!isMiniProgram(item) && permissonList.includes('driverModifyBtn')" name="arrow" />
+            <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>
@@ -113,9 +113,6 @@
       </van-pull-refresh>
 
     </div>
-    <div class="btn_wrap" v-if="supplierId">
-      <div class="btn" @click="nextToResult">下一步</div>
-    </div>
   </div>
 </template>
 
@@ -134,10 +131,6 @@ export default {
       total:'',
       driverList:[],
       states:'',
-      supplierId: '',
-      routeId: '',
-      initialized: false,
-      potentialFlag: '',
       supplierType:'',
       count: 0,
       isLoading: false,
@@ -183,24 +176,10 @@ export default {
   mounted() {
     const urlParams = new URLSearchParams(window.location.search);
     this.supplierType = urlParams.get('supplierType');
-    const rawId = this.$route.query.id || urlParams.get('id');
+    this.getPermissions();
-    this.supplierId = rawId ? Number(rawId) : '';
-    const potentialId = this.$route.query.potentialId || urlParams.get('potentialId');
-    this.routeId = potentialId;
-    this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
-    if(!rawId) {
-      this.getPermissions();
-    }
     // this.getDriverList()
   },
   methods:{
-    nextToResult() {
-      localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.routeId, potentialFlag: this.potentialFlag } }));
-      this.goPage('supplierAddResult', { id: this.routeId, potentialFlag: this.potentialFlag });
-    },
-    isMiniProgram(item) {
-      return item.registerFrom === '小程序' || (item.jobNumber && item.jobNumber.includes('小程序'))
-    },
     getClass(id) {
       const ids = String(id)
       const steps = {
@@ -257,7 +236,6 @@ export default {
       }else{
         this.$router.push({
           name: 'driverAdd',
-          params: { supplierId: this.supplierId || undefined, potentialFlag: this.potentialFlag || undefined }
         })
       }
     },
@@ -269,7 +247,6 @@ export default {
           idCardStatusList: this.idCardStatusList,
           driverLicenseStatusList: this.driverLicenseStatusList,
           authStatusList: this.authStatusList,
-          supplierId: this.supplierId || undefined,
         });
         if(res.code == 200){
           this.total=res.total
@@ -540,22 +517,4 @@ export default {
 .flex-between{
   line-height: 24px;
 }
-.btn_wrap {
-  width: 100%;
-  padding: 15px 0;
-  position: fixed;
-  bottom: 10px;
-  z-index: 10000;
-  .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/supplierAdd.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="wrap">
-    <div class="error_bar" v-if="errorMsg">{{ errorMsg }}</div>
     <div class="top_banner">
       <img src="@/assets/supplier/topBg.png" alt="">
     </div>
@@ -85,8 +84,8 @@
                   </el-tree>
                 </template>
               </van-field>
-              <van-field :border="true" v-model="form.trailCount" type="digit" class="required" name="trailCount" label="拖车数量" placeholder="请输入" :rules="countVerify" />
+              <van-field :border="true" v-model="form.trailCount" name="trailCount" label="拖车数量" placeholder="请输入" />
-              <van-field :border="true" v-model="form.minorCount" type="digit" class="required" name="minorCount" label="抢修车数量" placeholder="请输入" :rules="countVerify" />
+              <van-field :border="true" v-model="form.minorCount" name="minorCount" label="抢修车数量" placeholder="请输入" />
               <van-field :border="true" class="required" label="服务区域" placeholder="请选择">
                 <template #input>
                   <el-cascader
@@ -100,12 +99,12 @@
                     clearable></el-cascader>
                 </template>
               </van-field>
-<!--            <div class="wei_code_wrap" v-if="form.name && !id">
+            <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>
@@ -135,10 +134,8 @@
     data() {
       return {
         clickFlag: true,
-        errorMsg: '',
         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: '邮箱格式不正确' }],
-        countVerify: [{ required: true, message: '请输入数量' }, { validator: value => /^\d+$/.test(value) && Number(value) >= 0, message: '请输入大于等于0的整数' }],
         id:'', //车辆Id
         idBackPhotoList: [],
         idBackPhoto: '',
@@ -203,14 +200,7 @@
     },
     async mounted() {
       const urlParams = new URLSearchParams(window.location.search);
-      const lastRoute = localStorage.getItem('lastRoute');
       this.id = this.$route.query.id || urlParams.get('id');
-      if (lastRoute && !this.id) {
-        const { name, query } = JSON.parse(lastRoute);
-        this.$router.replace({ name, query });
-        return;
-      }
-
       await this.getAreaTree();
       if(this.id) {
         await this.getInfoHandler();
@@ -229,6 +219,7 @@
         });
         this.configId = res?.configId;
         this.qrCode = res?.qrCode
+        console.log('idid', res);
       },
       async getInfoHandler() {
         let res = await getSupplierInfo({
@@ -240,11 +231,7 @@
         this.idBackPhoto = _data?.idCardBackUrl;
         this.companyPhoto = _data?.businessLicense;
         this.licensePhoto = _data?.accountUrl;
-        this.wechatId = _data?.wechatId;
+        this.wechatId = _data?.wechatId
-        this.form.person = _data.legalName;
-        if( _data.failReason ) {
-          this.showError(_data.failReason)
-        }
         if(this.idFrontPhoto) {
           this.idFrontPhotoList = [{ url : this.idFrontPhoto }];
         }
@@ -262,65 +249,54 @@
         }
         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));
         }
       },
-      showError(msg) {
-        this.errorMsg = msg;
-      },
       async applyAdd() {
-        this.errorMsg = '';
         if( !this.idFrontPhoto ) {
-          this.showError('法人身份证人像页未上传')
+          this.$toast('法人身份证人像页未上传')
           return
         }
         if( !this.idBackPhoto ) {
-          this.showError('法人身份证国徽页未上传')
+          this.$toast('法人身份证国徽页未上传')
           return
         }
         if( !this.companyPhoto ) {
-          this.showError('营业执照未上传')
+          this.$toast('营业执照未上传')
           return
         }
         if(this.form.person != this.form.legalName){
-          this.showError('身份证法人姓名和营业执照法人不一致')
+          this.$toast('身份证法人姓名和营业执照法人不一致')
           return
         }
         if( !this.licensePhoto ) {
-          this.showError('开户许可证未上传')
+          this.$toast('开户许可证未上传')
-          return
-        }
-        if( !(this.$refs.tree.getCheckedKeys().length > 0) ) {
-          this.showError('服务能力不能为空')
           return
         }
         if( !(this.form.serviceAreaCode.length > 0) ) {
-          this.showError('服务区域不能为空')
+          this.$toast('服务区域不能为空')
           return
         }
+        // this.wechatId='wmOTNXBwAABrvKkE_Fh8ZN8Xm2S9v2wQ'
+        if(!this.wechatId) {
+          await this.QrCodeResult();
+          if( !this.wechatId ) {
+            this.$toast('请先添加企微再申请')
+            return
+          }
+        }
         if( this.$refs.tree.getCheckedKeys().length > 0 ) {
-          let _node = this.$refs.areaCascader.getCheckedNodes();
+          await this.saveHandler()
-          let checkArr = [];
+        } else {
-          _node.map(item => { checkArr.push(item.data.id) });
+          this.$toast('服务能力不能为空')
-          const payload = {
+          return
-            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(','),
-          };
-          localStorage.setItem('supplierAddForm', JSON.stringify(payload));
-          this.goPage('addWechat', { potentialFlag: 1 });
         }
       },
       async QrCodeResult() {    //获取添加企微结果
         let res = await getContactQrCodeResult({
           configId: this.configId
         });
+        console.log('resres', res)
         this.wechatId = res?.data?.wechatId
       },
       async saveHandler() {
@@ -343,38 +319,17 @@
               accountUrl:this.licensePhoto,
               service: this.$refs.tree.getCheckedKeys().join(',') ,
               serviceAreaCode: checkArr.join(','),
+              wechatId: this.wechatId,
+            });
+            Dialog.alert({
+              title: '提示',
+              message: "操作成功"
+            }).then(async () => {
+              this.goPage('supplierAddResult', { id : res?.data })
+              setTimeout(() => {
+                this.clickFlag = true
+              }, 1000)
             });
-            console.log('rererere', res)
-            if( res?.noToast ) {    // 服务商已存在
-              this.showError('当前服务商已存在')
-              if( res?.code != 0 ) {
-                Dialog.alert({
-                  title: '提示',
-                  message: "该服务商已存在，查看信息"
-                }).then(async () => {
-                  const target = { name: 'supplierAddResult', query: { id: res?.code } };
-                  localStorage.setItem('lastRoute', JSON.stringify(target));
-                  this.goPage('supplierAddResult', { id : res?.code })
-                  setTimeout(() => {
-                    this.clickFlag = true
-                  }, 1000)
-                });
-              }
-            } else {
-              Dialog.alert({
-                title: '提示',
-                message: "操作成功"
-              }).then(async () => {
-                const target = { name: 'supplierAddResult', query: { id: res?.data } };
-                localStorage.setItem('lastRoute', JSON.stringify(target));
-                this.goPage('supplierAddResult', { id : res?.data })
-                setTimeout(() => {
-                  this.clickFlag = true
-                }, 1000)
-              });
-            }
-          } catch (e) {
-            this.showError(e)
           } finally {
             setTimeout(() => {
               this.clickFlag = true
@@ -473,7 +428,7 @@
         this.form.accountInfoDTO.companyType=res?.data?.type
         // 营业执照法人名称
         this.form.person = res?.data?.person
-        // await this.QrCodeHandler();
+        await this.QrCodeHandler();
       },
       async licensePhotoHandler(file){// 开户许可证
         const formData = new FormData();
@@ -487,8 +442,8 @@
           ocrType: 15,
           imageUrl: this.licensePhoto,
         })
-        this.form.accountInfoDTO.accountNumber=res?.data?.accountNumber || ''
+        this.form.accountInfoDTO.accountNumber=res?.data?.accountNumber
-        this.form.accountInfoDTO.accountName = res?.data?.accountBank || ''
+        this.form.accountInfoDTO.accountName = res?.data?.accountBank
       },
     },
     computed: {
@@ -508,17 +463,6 @@
     padding-bottom: 100px;
     overflow-y: auto;
   }
-  .error_bar {
-    position: sticky;
-    top: 0;
-    z-index: 9999;
-    background-color: #e53935;
-    color: #ffffff;
-    font-size: 14px;
-    padding: 10px 16px;
-    text-align: center;
-    line-height: 1.5;
-  }
 .top_banner {
   width: 100%;
   img {

src/views/index/supplierAddResult.vue

@@ -19,26 +19,15 @@
     data() {
       return {
         id: '',
-        potentialFlag: '',
-        name: '',
-        qrCodeUrl: '',
-        qrCode: '',
-        configId: '',
-        wechatId: '',
       }
     },
     async mounted() {
       const urlParams = new URLSearchParams(window.location.search);
       this.id = this.$route.query.id || urlParams.get('id');
-      this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
-      if (this.id) {
-        localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.id, potentialFlag: this.potentialFlag } }));
-      }
     },
     methods: {
-      async searchInfo() {
+      searchInfo() {
-        localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierInfo', query: { id: this.id, potentialFlag: this.potentialFlag } }));
+        this.goPage('supplierInfo', { id : this.id })
-        this.goPage('supplierInfo', { id: this.id, potentialFlag: this.potentialFlag })
       }
     }
   }
@@ -91,23 +80,4 @@
       line-height: 46px;
     }
   }
-
-  .wei_code_wrap {
-    margin-top: 10px;
-    .wei_title {
-      font-size: 15px;
-      color: #FF553B;
-      text-align: center;
-    }
-    .wei_code_bg {
-      width: 163px;
-      height: 173px;
-      background-image: url("~@/assets/supplier/weiCodeBg.png");
-      background-size: 100% 100%;
-      margin: 8px auto;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
 </style>

src/views/index/supplierInfo.vue

@@ -87,11 +87,11 @@
           </div>
           <div class="info_item">
             <div class="label">拖车数量：</div>
-            <div class="content">{{supplierInfo.trailCount>=0 ? supplierInfo.trailCount : ''}}</div>
+            <div class="content">{{supplierInfo?.trailCount || ''}}</div>
           </div>
           <div class="info_item">
             <div class="label">抢修车数量：</div>
-            <div class="content">{{supplierInfo.minorCount >= 0 ?  supplierInfo.minorCount : ''}}</div>
+            <div class="content">{{supplierInfo?.minorCount || ''}}</div>
           </div>
           <div class="info_item">
             <div class="label">服务区域：</div>
@@ -124,9 +124,7 @@
         </div>
       </div>
 
-<!--      <div class="btn_wrap" style="margin-bottom: 5px">
+
-        <div class="btn" @click="goAddVehicle">完善信息</div>
-      </div>-->
       <div class="btn_wrap" v-if="type == 'show' && supplierInfo?.state == 99 && origin != 'web'">
         <div class="btn" @click="goModifyPage">修改信息</div>
       </div>
@@ -154,7 +152,6 @@
         supplierInfo: {},
         type: 'show',
         origin: '',
-        potentialFlag: '',
       }
     },
     async mounted() {
@@ -162,15 +159,9 @@
       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 || ''
-      this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
       await this.getInfoHandler();
     },
     methods: {
-      goAddVehicle() {
-        const supplierId = this.id
-        localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId, potentialFlag: this.potentialFlag } }));
-        this.goPage('vehicleManage', { id: supplierId, potentialFlag: this.potentialFlag });
-      },
       goModifyPage() {
         this.goPage('supplierAdd', { id : this.id })
       },

src/views/index/uploadInvoice.vue

@@ -287,10 +287,10 @@
               if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
                 conList.every(a => {
                   let items = a.itemName.split("*")
-                  return (!items[1].includes("生产生活服务") && !items[1].includes("交通运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
+                  return (!items[1].includes("现代服务") && !items[1].includes("运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
                 })
               ){
-                errorStr = errorStr + "分类必须包含：生产生活服务/交通运输服务，服务名称必须包含：拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
+                errorStr = errorStr + "分类必须包含：现代服务/运输服务，服务名称必须包含：拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
               }
 
               if( !flag ) {

src/views/index/vehicleAdd.vue

@@ -20,7 +20,8 @@
     <van-uploader
       v-model="vehicleLicenseFrontList"
       :after-read="vehicleLicenseFrontHandler"
-      @delete="vehicleLicenseFrontDelete"
+      @oversize="onOversize"
+      :max-size="5 * 1024 * 1024"
       max-count="1"
       :preview-size="54"
       accept="image "
@@ -34,7 +35,8 @@
     <van-uploader
       v-model="vehicleLicenseBackList"
       :after-read="vehicleLicenseBackHandler"
-      @delete="vehicleLicenseBackDelete"
+      @oversize="onOversize"
+      :max-size="5 * 1024 * 1024"
       max-count="1"
       :preview-size="54"
       accept="image "
@@ -48,7 +50,8 @@
     <van-uploader
       v-model="vehicleLicenseCarPhotoList"
       :after-read="vehicleLicenseCarHandler"
-      @delete="vehicleLicenseCarPhotoDelete"
+      @oversize="onOversize"
+      :max-size="5 * 1024 * 1024"
       max-count="1"
       :preview-size="54"
       accept="image "
@@ -62,7 +65,8 @@
     <van-uploader
       v-model="vehicleFrontPhotoList"
       :after-read="vehicleFrontPhotoHandler"
-      @delete="vehicleFrontPhotoDelete"
+      @oversize="onOversize"
+      :max-size="5 * 1024 * 1024"
       max-count="1"
       :preview-size="54"
       accept="image "
@@ -100,7 +104,6 @@
         value-key="name"
         class="elSelect"
         collapse-tags="collapse-tags"
-        :popper-append-to-body="false"
         placeholder="请选择"  style="width: 55%"
     >
       <el-option
@@ -194,7 +197,7 @@
       <span>车辆状态</span>
     </div>
     <div class="isJoin">
-      <van-radio-group v-model="vehicleStatus"  :class="{ 'disabled-tree': vehicleInfoDisabled || vehicleStatusDisabled }" :disabled="vehicleInfoDisabled || vehicleStatusDisabled" @change="isVehicleChange"  class="joinWrap">
+      <van-radio-group v-model="vehicleStatus"  :class="{ 'disabled-tree': vehicleInfoDisabled }" :disabled="vehicleInfoDisabled" @change="isVehicleChange"  class="joinWrap">
         <van-radio :name="1" style="margin-right: 14px">
           启用
           <img
@@ -467,8 +470,7 @@ export default {
       maxDate: new Date(2099, 11, 31), // 设置最大可选日期（2099年12月31日）
       checkList: [],
       virtualVehicle: '',
-      potentialFlag: new URLSearchParams(window.location.search).get('potentialFlag') || '',
+      vehicleStatus: '',
-      vehicleStatus: new URLSearchParams(window.location.search).get('potentialFlag') === '1' ? 2 : '',
       showDatePicker: false,
       dateVal: '',
       trailerService: '',//拖车服务
@@ -646,9 +648,6 @@ export default {
       } else {
         return false
       }
-    },
-    vehicleStatusDisabled() {
-      return !this.id && this.potentialFlag === '1';
     }
   },
   watch:{
@@ -687,9 +686,6 @@ export default {
   async mounted() {
     this.id=this.$route.params?.id
     this.approvalForm.supplierId=this.$route.params?.supplierId
-    const urlParams = new URLSearchParams(window.location.search);
-    const rawId = this.$route.query.supplierId || urlParams.get('supplierId');
-    this.supplierId = rawId ? Number(rawId) : '';
     await this.getSupplierServiceTree();
     await this.getTypeList();
     if( this.id){
@@ -795,166 +791,33 @@ export default {
     onOversize() {
       this.$toast(`文件大小不能超过5M`)
     },
-    blobToDataURL(blob) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onload = (e) => resolve(e.target.result);
-        reader.onerror = () => reject(new Error('读取压缩图片失败'));
-        reader.readAsDataURL(blob);
-      });
-    },
-    compressImage(file, maxSize = 5 * 1024 * 1024) {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onload = (e) => {
-          const img = new Image();
-          img.onload = () => {
-            const canvas = document.createElement('canvas');
-            const ctx = canvas.getContext('2d');
-            const originWidth = img.width;
-            const originHeight = img.height;
-
-            const tryQuality = (quality = 0.9) => {
-              canvas.width = originWidth;
-              canvas.height = originHeight;
-              ctx.clearRect(0, 0, originWidth, originHeight);
-              ctx.drawImage(img, 0, 0, originWidth, originHeight);
-              canvas.toBlob((blob) => {
-                if (!blob) return reject(new Error('压缩失败'));
-                if (blob.size <= maxSize || quality <= 0.1) {
-                  if (blob.size <= maxSize) {
-                    resolve(blob);
-                  } else {
-                    tryResolution();
-                  }
-                  return;
-                }
-                tryQuality(quality - 0.1);
-              }, 'image/jpeg', quality);
-            };
-
-            const tryResolution = (scale = 0.9, quality = 0.8) => {
-              const width = Math.floor(originWidth * scale);
-              const height = Math.floor(originHeight * scale);
-              canvas.width = width;
-              canvas.height = height;
-              ctx.clearRect(0, 0, width, height);
-              ctx.drawImage(img, 0, 0, width, height);
-              canvas.toBlob((blob) => {
-                if (!blob) return reject(new Error('压缩失败'));
-                if (blob.size <= maxSize || scale <= 0.1) {
-                  if (blob.size <= maxSize) {
-                    resolve(blob);
-                  } else {
-                    reject(new Error('超过5M'));
-                  }
-                  return;
-                }
-                tryResolution(scale - 0.1, quality);
-              }, 'image/jpeg', quality);
-            };
-
-            tryQuality();
-          };
-          img.onerror = () => reject(new Error('图片加载失败'));
-          img.src = e.target.result;
-        };
-        reader.onerror = () => reject(new Error('文件读取失败'));
-        reader.readAsDataURL(file);
-      });
-    },
-    async compressFileItem(fileItem, maxSize = 5 * 1024 * 1024) {
-      const rawFile = fileItem.file;
-      if (rawFile.size <= maxSize) return rawFile;
-      const blob = await this.compressImage(rawFile, maxSize);
-      if (blob.size > maxSize) {
-        throw new Error('超过5M');
-      }
-      const fileName = rawFile.name.replace(/\.[^.]+$/, '') + '.jpg';
-      const compressedFile = new File([blob], fileName, { type: 'image/jpeg' });
-      fileItem.file = compressedFile;
-      fileItem.size = compressedFile.size;
-      fileItem.content = await this.blobToDataURL(blob);
-      const mb1 = (compressedFile.size / 1024 / 1024).toFixed(2);
-      console.log(`压缩后为：${mb1}M`)
-      return compressedFile;
-    },
     async vehicleLicenseFrontHandler(file) {    // 上传 行驶证首页
-      try {
+      const formData = new FormData();
-        const uploadFile = await this.compressFileItem(file);
+      formData.append("file" , file.file);
-        if (uploadFile.size > 5 * 1024 * 1024) {
+      let res = await uploadImage(formData)
-          this.onOversize();
+      this.vehicleLicenseFront = res.data;
-          return;
+      await this.vehicleOcrHandler();
-        }
-        const formData = new FormData();
-        formData.append("file" , uploadFile);
-        let res = await uploadImage(formData)
-        this.vehicleLicenseFront = res.data;
-        await this.vehicleOcrHandler();
-      } catch (e) {
-        this.onOversize();
-      }
     },
     async vehicleLicenseBackHandler(file) {     // 上传 行驶证副页
-      try {
+      this.vehicleLicenseBackOcrFlag = true;
-        this.vehicleLicenseBackOcrFlag = true;
+      const formData = new FormData();
-        const uploadFile = await this.compressFileItem(file);
+      formData.append("file" , file.file);
-        if (uploadFile.size > 5 * 1024 * 1024) {
+      let res = await uploadImage(formData);
-          this.onOversize();
+      this.vehicleLicenseBack = res.data;
-          return;
+      await this.vehicleBackOcrHandler();
-        }
-        const formData = new FormData();
-        formData.append("file" , uploadFile);
-        let res = await uploadImage(formData);
-        this.vehicleLicenseBack = res.data;
-        await this.vehicleBackOcrHandler();
-      } catch (e) {
-        this.onOversize();
-      }
     },
     async vehicleLicenseCarHandler(file) {     // 上传 行驶证车辆照片
-      try {
+      const formData = new FormData();
-        const uploadFile = await this.compressFileItem(file);
+      formData.append("file" , file.file);
-        if (uploadFile.size > 5 * 1024 * 1024) {
+      let res = await uploadImage(formData);
-          this.onOversize();
+      this.vehicleLicenseCarPhoto = res.data;
-          return;
-        }
-        const formData = new FormData();
-        formData.append("file" , uploadFile);
-        let res = await uploadImage(formData);
-        this.vehicleLicenseCarPhoto = res.data;
-      } catch (e) {
-        this.onOversize();
-      }
     },
     async vehicleFrontPhotoHandler(file) {     // 上传 车头照
-      try {
+      const formData = new FormData();
-        const uploadFile = await this.compressFileItem(file);
+      formData.append("file" , file.file);
-        if (uploadFile.size > 5 * 1024 * 1024) {
+      let res = await uploadImage(formData);
-          this.onOversize();
+      this.vehicleFrontPhoto = res.data;
-          return;
+      await this.ocrCarFrontHandler()
-        }
-        const formData = new FormData();
-        formData.append("file" , uploadFile);
-        let res = await uploadImage(formData);
-        this.vehicleFrontPhoto = res.data;
-        await this.ocrCarFrontHandler()
-      } catch (e) {
-        this.onOversize();
-      }
-    },
-    vehicleLicenseFrontDelete() {              // 删除 行驶证首页
-      this.vehicleLicenseFront = '';
-    },
-    vehicleLicenseBackDelete() {               // 删除 行驶证副页
-      this.vehicleLicenseBack = '';
-      this.vehicleLicenseBackOcrFlag = false;
-    },
-    vehicleLicenseCarPhotoDelete() {           // 删除 行驶证车辆照片
-      this.vehicleLicenseCarPhoto = '';
-    },
-    vehicleFrontPhotoDelete() {                // 删除 车头照
-      this.vehicleFrontPhoto = '';
     },
     clickPreview(){
       console.log(' this.insurancePicturePhoto', this.insurancePicturePhoto)
@@ -1005,7 +868,7 @@ export default {
         this.vehicleLicenseInfo.address = frontInfo?.address;
         this.vehicleLicenseInfo.useNature = frontInfo?.useCharacter;
         this.vehicleLicenseInfo.model = frontInfo?.model;
-        this.vehicleLicenseInfo.vinCode = String(frontInfo?.vin || '').toUpperCase().replace(/O/g, '0');
+        this.vehicleLicenseInfo.vinCode = frontInfo?.vin;
         this.vehicleLicenseInfo.engineNumber = frontInfo?.engineNo;
         this.vehicleLicenseInfo.registrationDate = frontInfo?.registerDate;
         this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
@@ -1085,7 +948,7 @@ export default {
         }
     },
     async getSupplierServiceTree(){
-      let res = await supplierServiceTree({ supplierId: this.supplierId });
+      let res = await supplierServiceTree();
       this.supplierServiceList=res.data
       this.oldSupplierServiceList=this.supplierServiceList
     },
@@ -1349,65 +1212,14 @@ export default {
       this.insuranceChange=false
     },
     back() {
-      this.$router.back();
+      this.$router.push({
-      /*if( this.supplierId ) {
+        name:'vehicleManage',
-        this.$router.back();
+        params:{
-      } else {
+          id: this.id
-        this.$router.push({
-          name:'vehicleManage',
-          params:{
-            id: this.id
-          }
-        })
-      }*/
-
-    },
-    validatePlateNumber(value) {
-      if (!value) {
-        return { valid: false, message: '请输入车牌号' }
-      }
-      const provinceList = ['京','津','冀','晋','蒙','辽','吉','黑','沪','苏','浙','皖','闽','赣','鲁','豫','鄂','湘','粤','桂','琼','渝','川','贵','云','藏','陕','甘','青','宁','新']
-      const firstChar = value.charAt(0)
-      if (!provinceList.includes(firstChar)) {
-        return { valid: false, message: '车牌号首位必须是省级简称（京/沪/津/渝/冀/晋/辽/吉/黑/苏/浙/皖/闽/赣/鲁/豫/鄂/湘/粤/琼/川/贵/云/陕/甘/青/蒙/桂/藏/宁/新）' }
-      }
-      if (!/^[\u4e00-\u9fa5][A-Z0-9]+$/.test(value)) {
-        return { valid: false, message: '车牌号只能包含汉字、字母和数字' }
-      }
-      if (![7, 8].includes(value.length)) {
-        return { valid: false, message: `车牌号必须为 7 位或 8 位（当前 ${value.length} 位）` }
-      }
-      return { valid: true, message: '' }
-    },
-    validateVinNo(value) {
-      const normalizedValue = String(value || '').toUpperCase()
-      if (!normalizedValue) {
-        return { valid: false, message: '车架号识别错误，请重新拍照上传。' }
-      }
-      if (!/^[A-NP-Z0-9]{17}$/.test(normalizedValue)) {
-        if (normalizedValue.includes('O')) {
-          return { valid: false, message: '车架号识别错误，请重新拍照上传。' }
         }
-        if (!/^[A-NP-Z0-9]+$/.test(normalizedValue)) {
+      })
-          return { valid: false, message: '车架号识别错误，请重新拍照上传。' }
-        }
-        return { valid: false, message: `车架号识别错误，请重新拍照上传。` }
-      }
-      return { valid: true, message: '' }
     },
     async submitBtn(){
-      const plateResult = this.validatePlateNumber(this.carNum)
-      if (!plateResult.valid) {
-        Dialog.alert({ message: plateResult.message })
-        return
-      }
-      const vinCode = String(this.vehicleLicenseInfo.vinCode || '')
-      const vinResult = this.validateVinNo(vinCode)
-      if (!vinResult.valid) {
-        Dialog.alert({ message: vinResult.message })
-        return
-      }
-      this.vehicleLicenseInfo.vinCode = vinCode
       if( !this.vehicleLicenseFront ) {
         this.$toast('行驶证主页照片不能为空')
         return
@@ -1491,7 +1303,6 @@ export default {
       // return
       await saveVehicle({
           vehicleId:this.id ? this.id : '',
-          supplierId: this.supplierId || undefined,
           plateNumber:this.carNum ? this.carNum :'',
           vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
           // hasPolymerization:this.isJoin,
@@ -1554,9 +1365,6 @@ export default {
 }
 .navBar{
   margin-bottom: 46px;
-  ::v-deep .van-nav-bar--fixed {
-    z-index: 9999 !important;
-  }
 }
 .wrap{
 @include wh(100%,100%);

src/views/index/vehicleManage.vue

@@ -3,15 +3,15 @@
   <div class="navBar">
     <van-nav-bar
         title="车辆管理"
-        :left-arrow="!supplierId"
+        left-arrow
         left-arrow-color="#FFFFFF"
         :border="false"
         :fixed="true"
         :safe-area-inset-top="true"
         @click-left="goBack"
     >
-      <template slot="right" v-if="permissonList.includes('vehicleAddBtn') || supplierId">
+      <template slot="right" v-if="permissonList.includes('vehicleAddBtn')">
-        <div class="rightWrap" @click="goPage('vehicleAdd', supplierId ? { supplierId, potentialFlag } : {})">
+        <div class="rightWrap" @click="goPage('vehicleAdd')">
               <img src="@/assets/addImg.png" />
               <span class="addTxt">添加</span>
         </div>
@@ -71,7 +71,6 @@
   <div class="wrap_cls">
     <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
       <van-list
-        v-if="initialized"
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
@@ -115,9 +114,6 @@
   </div>
 
   <van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
-  <div class="btn_wrap" v-if="supplierId">
-    <div class="btn" @click="nextToDriver">下一步</div>
-  </div>
 </div>
 
 </template>
@@ -125,7 +121,7 @@
 <script>
   import {Dialog} from "vant";
 import { myMixins} from "@/utils/myMixins";
-  import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle, supplierSelectById} from "@/api/mine"
+  import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle} from "@/api/mine"
 export default {
   name: "vehicleManage",
   mixins:[myMixins],
@@ -134,9 +130,6 @@ export default {
       vehicleList:[],
       show:false,
       id:'',
-      supplierId: '',
-      routeId: '',
-      initialized: false,
       pageNum:1,
       pageSize:10,
       total:'',
@@ -149,7 +142,6 @@ export default {
       searchVal: '',
       authStates: [],
       liabilityInsuranceAuditList: [],
-      potentialFlag: '',
       inputStatusListOptions: [{
         name: '行驶证未录入',
         value: 0
@@ -197,31 +189,10 @@ export default {
         }],
     }
   },
-  async mounted() {
+  mounted() {
-    const urlParams = new URLSearchParams(window.location.search);
+    this.getPermissions();
-    const rawId = this.$route.query.id || urlParams.get('id');
-    this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
-    if (rawId) {
-      this.routeId = rawId;
-      await this.getSupplierById(Number(rawId));
-    } else {
-      this.initialized = true;
-    }
-    let _token = localStorage.getItem('token')
-    if( _token ) {
-      this.getPermissions();
-    }
   },
   methods:{
-    nextToDriver() {
-      localStorage.setItem('lastRoute', JSON.stringify({ name: 'driverManage', query: { id: this.supplierId, potentialId: this.routeId, potentialFlag: this.potentialFlag } }));
-      this.goPage('driverManage', { id: this.supplierId, potentialId: this.routeId, potentialFlag: this.potentialFlag });
-    },
-    async getSupplierById(id) {
-      let res = await supplierSelectById({ id });
-      this.supplierId = res?.data?.supplierId || '';
-      this.initialized = true;
-    },
     showTip(msg) {
       Dialog.alert({
         title: '未通过原因',
@@ -306,7 +277,6 @@ export default {
           inputStatusList: this.inputStatusList,
           authStates: this.authStates,
           liabilityInsuranceAuditList: this.liabilityInsuranceAuditList,
-          supplierId: this.supplierId || undefined,
         })
           this.total=result.total
           if(this.pageNum == 1){// 第一页直接赋值
@@ -615,23 +585,5 @@ export default {
     justify-content: flex-start;
     margin-left: 10px;
   }
-  .btn_wrap {
-    width: 100%;
-    padding: 15px 0;
-    position: fixed;
-    bottom: 10px;
-    z-index: 10000;
-    .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/workOrderDetail.vue

@@ -93,10 +93,9 @@
            <span v-if="orderDetailInfo.driverName && orderDetailInfo.proprietary?.code==1" class="driverPoiBtn" @click="noMultipleClicks(createDriverInfo)">生成司机信息</span>
           </span>
         </div>
-        <div class="item" v-if="queryType == 9 || queryType ==11  || queryType ==12 || queryType ==5">
+        <div class="item" v-if="queryType == 9 || queryType ==11  || queryType ==12">
           <span class="leftTitle fontColor">工单照片:</span><span class="rightContent">
            <span  class="driverPoiBtn" @click="checkPhoto">查看照片</span>
-           <span  class="driverPoiBtn" v-if="orderDetailInfo.beforeDispatchImages && orderDetailInfo.beforeDispatchImages.length > 0" @click="environmentPhoto">环境照片</span>
           </span>
         </div>
       </div>
@@ -185,15 +184,19 @@ export default {
       })
       if(result.data){
         // console.log('--result--',result.data)
-        let params=`姓名：${this.orderDetailInfo.driverName}\n身份证：${result.data.identityCardNumber}\n车牌：${this.orderDetailInfo.vehiclePlateNumber}\n手机：${this.orderDetailInfo.driverPhone}`
+        let params={
-        // console.log('params',params)
+          '姓名：':this.orderDetailInfo.driverName,
-        let data = {"action":"copyToClipboard","params":params}
+          '身份证：':result.data.identityCardNumber,
+          '车牌：':this.orderDetailInfo.vehiclePlateNumber,
+          '手机:':this.orderDetailInfo.driverPhone,
+        }
+        let data = {"action":"copyToClipboard","params":JSON.stringify(params)}
         var u = navigator.userAgent;
         var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
         if(isiOS){
           window.webkit.messageHandlers.nativeObject.postMessage(data);
         }else {
-          window.android.copyToClipboard(params);
+          window.android.copyToClipboard(JSON.stringify(params));
         }
       }else {
         this.$toast('未获取到司机信息')
@@ -236,12 +239,6 @@ export default {
         window.android.sendMessage("orderPhoto,"+this.userOrderId+","+this.orderCode+","+this.taskOrderId+","+isAllowImage);
       }
     },
-    environmentPhoto() {
-      this.$router.push({
-        path: '/environmentPhotos',
-        query: { userOrderId: this.userOrderId }
-      })
-    },
     initMap() {
       this.map = new AMap.Map('container',{
         zoom:14,//级别(缩放比例 3-20 )

src/views/kpi/kpiIndex.vue

@@ -263,7 +263,6 @@ import {
   getDriverName,getDriverStatisticsKpi,
   getRecentSupplierKpi,
 } from "@/api/kpi.js"
-import { getUserBO } from "@/api/order"
 // querySupplierDriverStatisticsScore
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@@ -331,10 +330,6 @@ export default {
       showScoreChart:true,
       continueMonthKpi:[],
       isBtn:false,//是否有信息变更申请按钮权限
-      source: 'App',
-      currentSupplierId: '',
-      userId: '',
-      enterTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     }
   },
   created() {
@@ -343,41 +338,13 @@ export default {
     this.isZd = urlParams?.get('isZd') || ''
     this.supplierId = urlParams?.get('supplierId') || ''
     this.isBtn= Number(urlParams?.get('isBtn'))
-    this.source = urlParams?.get('source') || 'App'
   },
   async mounted() {
     await this.checkMobile();
     await this.initDate();
     await this.selectSupplierNameHandle();
-    await this.getUserInfo();
-    document.addEventListener('visibilitychange', async (  ) => {
-      let state = document.visibilityState
-      if (state == 'hidden') {  // 用户离开了
-        if( this.source == 'App' ) {
-          this.setLogHandler({
-            supplierId: this.currentSupplierId,      // 服务商 id
-            userId: this.userId,              // userId
-            source: '服务商KPI',
-            event: this.source,               // 区分 App 还是 system
-            openTime: this.enterTime,   // log 时间，其中 阅读时长是由 enter 和 leave 的时间计算而来
-            leaveTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-          });
-        }
-      }
-      if (state == 'visible') {
-        this.enterTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      }
-    });
-
-
   },
   methods: {
-    async getUserInfo() {
-      let res = await getUserBO();
-      this.userId = res.data.id;
-      this.currentSupplierId = res.data.supplierId
-      console.log('getUserBO', res)
-    },
     applicateHandle() {
       if (window.parent) {
         const hasListener = window.parent.dispatchEvent(new Event('checkCloseDialog'));

src/views/liabilityInsurance/insuredPage.vue

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

src/views/workOrder/accounting.vue

@@ -54,11 +54,6 @@
         <span
             class="content">{{ orderInfo.carClothingToolAmount }}</span>
       </div>
-      <div class="item">
-        <span class="titleLeft">免拖：</span>
-        <span
-            class="content">{{ orderInfo.customerDistanceLimit }} {{orderInfo.hedgingMileage && orderInfo.hedgingMileage > 0 ? '(超限对冲，只结免拖)' : ''}}</span>
-      </div>
       <div class="item">
         <span class="titleLeft">换电瓶费用：</span>
         <span
@@ -77,35 +72,35 @@
       <div class="inpInfo">
         <div class="titleContent">
           <div class="flex-between" v-show="abState">
-            <div><span style="color: red;">*</span> 到事发地距离:</div>
+            <div> 到事发地距离:</div>
             <div class="halfOpcity"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
           </div>
           <div class="flex-between" v-show="bcState">
-            <div><span style="color: red;">*</span> 拖车里程:</div>
+            <div> 拖车里程:</div>
             <div class="halfOpcity"><input class="ipt"    type="number" v-model="form.supplierSettleMileageBc"/>公里</div>
           </div>
           <div class="flex-between" v-show="caState">
-            <div><span style="color: red;">*</span>返程里程:</div>
+            <div>返程里程:</div>
             <div class="halfOpcity"><input  class="ipt"   type="number" v-model="form.supplierSettleMileageCa"/>公里</div>
           </div>
           <div class="flex-between" v-show="bridgeAbState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>ab路桥费:</div>
+            <div>ab路桥费:</div>
             <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
           </div>
           <div class="flex-between" v-show="bridgeBcState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>bc路桥费:</div>
+            <div>bc路桥费:</div>
             <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountBc"/>元</div>
           </div>
           <div class="flex-between" v-show="bridgeCaState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>ca路桥费:</div>
+            <div>ca路桥费:</div>
             <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle" type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
           </div>
           <div class="flex-between" v-show="waitAmountState">
-            <div><span style="color: red;">*</span>等候费:</div>
+            <div>等候费:</div>
             <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierWaitAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="tyreAmountState">
-            <div><span v-show="!isUnsuccessfulSettle" style="color: red;">*</span>小轮个数:</div>
+            <div>小轮个数:</div>
             <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"   type="number" v-model="form.tyreNumber"/>个</div>
           </div>
           <div class="flex-between" v-show="tyreAmountState">
@@ -113,11 +108,11 @@
             <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  disabled  type="number" v-model="form.supplierTyreAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="dilemmaAmountState && basePriceDisabled">
-            <div><span style="color: red;">*</span>困境费:</div>
+            <div>困境费:</div>
             <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierDilemmaAmount"/>元</div>
           </div>
           <div class="flex-between" v-show="basementFeeState">
-            <div><span v-show="isBasementSettle && !isUnsuccessfulSettle" style="color: red;">*</span>地库费:</div>
+            <div>地库费:</div>
             <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle || isUnsuccessfulSettle" />元</div>
           </div>
           <div class="flex-between">
@@ -125,7 +120,7 @@
             <div class="halfOpcity inputContent"><input type="number" class="ipt"  v-model="form.supplierCustomerAmount"/>元</div>
           </div>
           <div class="flex-between bgDisable" :class=" { 'flex-between': true, 'bgDisable' : basePriceDisabled } ">
-            <div><span v-show="!basePriceDisabled && !isBasementSettle" style="color: red;">*</span>基本费用:</div>
+            <div>基本费用:</div>
             <div class="halfOpcity inputContent "><input class="disable" type="number" :readonly="basePriceDisabled || isBasementSettle"
                                                          v-model="form.supplierBasePrice"/><span>元</span></div>
           </div>
@@ -498,7 +493,13 @@ export default {
       console.log("ii", i)
     },
     goback() {
-      this.$router.back()
+      this.$router.push({
+        name: "workOrderReconciliation",
+        params: {
+          activeIndex: this.index,
+          queryTime: this.queryTime,
+        }
+      })
     },
     async compute() {
       if(this.orderInfo.contractSettleTypeString == '车主现收'){
@@ -656,49 +657,6 @@ export default {
       this.goback()
     },
     async save() {
-      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) < 0
-      if (this.abState && isBlank(this.form.supplierSettleMileageAb)) {
-        this.$toast('请填写到事发地距离'); return;
-      }
-      if (this.bcState && isBlank(this.form.supplierSettleMileageBc)) {
-        this.$toast('请填写拖车里程'); return;
-      }
-      if (this.caState && isBlank(this.form.supplierSettleMileageCa)) {
-        this.$toast('请填写返程里程'); return;
-      }
-      if (this.bridgeAbState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountAb)) {
-        this.$toast('请填写ab路桥费'); return;
-      }
-      if (this.bridgeBcState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountBc)) {
-        this.$toast('请填写bc路桥费'); return;
-      }
-      if (this.bridgeCaState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountCa)) {
-        this.$toast('请填写ca路桥费'); return;
-      }
-      if (this.waitAmountState && isBlank(this.form.supplierWaitAmount)) {
-        this.$toast('请填写等候费'); return;
-      }
-      if (!this.auditFormShow && this.tyreAmountState && !this.isUnsuccessfulSettle && isBlank(this.form.tyreNumber)) {
-        this.$toast('请填写小轮个数'); return;
-      }
-      if (this.dilemmaAmountState && this.basePriceDisabled && isBlank(this.form.supplierDilemmaAmount)) {
-        this.$toast('请填写困境费'); return;
-      }
-      if (this.basementFeeState && this.isBasementSettle && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBasementFee)) {
-        this.$toast('请填写地库费'); return;
-      }
-      if (!this.basePriceDisabled && !this.isBasementSettle && isBlank(this.form.supplierBasePrice)) {
-        this.$toast('请填写基本费用'); return;
-      }
-      if (
-        this.orderInfo.customerDistanceLimit &&
-        parseFloat(this.form.supplierSettleMileageBc) > parseFloat(this.orderInfo.customerDistanceLimit)
-      ) {
-        if (!this.form.supplierCustomerAmount || parseFloat(this.form.supplierCustomerAmount) == 0) {
-          this.$toast('拖车里程超出免拖范围，请填写收取客户金额');
-          return;
-        }
-      }
       if (this.form.supplierOtherAmount > 0) {
         if (this.form.supplierOtherAmountRemark == '') {
           this.$toast('请填写其他费用说明');
@@ -736,7 +694,6 @@ export default {
       await this.compute();
       const formData = new FormData();
       let obj = this.form;
-      console.log('obj',obj)
       Object.keys(obj).forEach((key) => {
         formData.append(key, obj[key]);
       });
@@ -768,45 +725,6 @@ export default {
         this.$toast('已进入后续流程，不允许操作');
         return;
       }
-      const isBlank = (v) => v === '' || v === null || v === undefined || parseFloat(v) < 0
-      if (this.abState && isBlank(this.form.supplierSettleMileageAb)) {
-        this.$toast('请填写到事发地距离'); return;
-      }
-      if (this.bcState && isBlank(this.form.supplierSettleMileageBc)) {
-        this.$toast('请填写拖车里程'); return;
-      }
-      if (this.caState && isBlank(this.form.supplierSettleMileageCa)) {
-        this.$toast('请填写返程里程'); return;
-      }
-      if (this.bridgeAbState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountAb)) {
-        this.$toast('请填写ab路桥费'); return;
-      }
-      if (this.bridgeBcState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountBc)) {
-        this.$toast('请填写bc路桥费'); return;
-      }
-      if (this.bridgeCaState && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBridgeAmountCa)) {
-        this.$toast('请填写ca路桥费'); return;
-      }
-      if (this.waitAmountState && isBlank(this.form.supplierWaitAmount)) {
-        this.$toast('请填写等候费'); return;
-      }
-      if (this.dilemmaAmountState && this.basePriceDisabled && isBlank(this.form.supplierDilemmaAmount)) {
-        this.$toast('请填写困境费'); return;
-      }
-      if (this.basementFeeState && this.isBasementSettle && !this.isUnsuccessfulSettle && isBlank(this.form.supplierBasementFee)) {
-        this.$toast('请填写地库费'); return;
-      }
-      if (!this.basePriceDisabled && !this.isBasementSettle && isBlank(this.form.supplierBasePrice)) {
-        this.$toast('请填写基本费用'); return;
-      }
-      if (
-        this.orderInfo.customerDistanceLimit &&
-        parseFloat(this.form.supplierSettleMileageBc) > parseFloat(this.orderInfo.customerDistanceLimit)
-      ) {
-        if (!this.form.supplierCustomerAmount || parseFloat(this.form.supplierCustomerAmount) == 0) {
-          this.$toast('拖车里程超出免拖范围，请填写收取客户金额'); return;
-        }
-      }
       this.loading1 = true;
       this.form.supplierExtraPrice = this.form.extraPrice || 0
       this.form.supplierBasePrice = this.form.basePrice || 0
@@ -1024,7 +942,7 @@ img {
 }
 
 .baseInfo {
-  width: 100%;
+  @include wh(100%, 344px);
 
 }