Revert "CRM_26-04-22#story#8495,潜在供应商H5页面提交信息，信息审核，提交补充信息与退回理由的优化与修复(停启用修改)"

This reverts commit 57f83916

src/api/mine.js

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

src/router/index.js

@@ -27,6 +27,14 @@ const routes = [
             title: '审核中',
         }
     },
+    {
+        path: '/addWechat',
+        name: 'addWechat',
+        component: () => import('@/views/index/addWechat'),
+        meta:{
+            title: '添加微信',
+        }
+    },
     {
         path: '/supplierInfo',
         name: 'supplierInfo',

src/views/index/addWechat.vue

@@ -0,0 +1,176 @@
+<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: '',
+        formPayload: null,
+        qrCodeUrl: '',
+        qrCode: '',
+        configId: '',
+        wechatId: '',
+        clickFlag: true,
+      }
+    },
+    async mounted() {
+      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 } };
+                localStorage.setItem('lastRoute', JSON.stringify(target));
+                this.goPage('supplierInfo', { id: res?.code });
+              });
+            } else {
+              Toast('该服务商已存在');
+            }
+          } else {
+            localStorage.removeItem('supplierAddForm');
+            const supplierId = res?.data;
+            const target = { name: 'supplierAddResult', query: { id: supplierId } };
+            localStorage.setItem('lastRoute', JSON.stringify(target));
+            Dialog.confirm({
+              title: '提示',
+              message: '添加车辆和驾驶员会加快审核进度，是否去添加？',
+              confirmButtonText: '去添加',
+              cancelButtonText: '取消',
+            }).then(() => {
+              localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId } }));
+              this.goPage('vehicleManage', { id: supplierId });
+            }).catch(() => {
+              localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: supplierId } }));
+              this.goPage('supplierAddResult', { id: supplierId });
+            });
+          }
+        } 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

@@ -163,6 +163,7 @@ export default {
       // baseURL:'',
       // licenseOcrInfo:'',
       id:'',
+      supplierId: '',
       driverName:"",
       driverPhone:"",
       identityCardNumber:"",
@@ -204,6 +205,7 @@ 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;
@@ -426,6 +428,7 @@ export default {
       }
        await saveDriver({
          driverId:this.id ? this.id : '',
+         supplierId: this.supplierId || undefined,
          driverName:this.driverName ,
          driverPhone:this.driverPhone,
          identityCardNumber:this.identityCardNumber,

src/views/index/driverManage.vue

@@ -3,14 +3,14 @@
     <div class="navBar">
       <van-nav-bar
           title="司机管理"
-          left-arrow
+          :left-arrow="!supplierId"
           left-arrow-color="#FFFFFF"
           :border="false"
           :fixed="true"
           :safe-area-inset-top="true"
           @click-left="goBack"
       >
-        <template slot="right" v-if="permissonList.includes('driverAddBtn')">
+        <template slot="right" v-if="permissonList.includes('driverAddBtn') || supplierId">
           <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="updateDriver(item)">
+          <div class="itemWrap" v-for="(item,index) in driverList" :key="index" @click.stop="!isMiniProgram(item) && updateDriver(item)">
             <div class="name-status">
               <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}
                 <span style="margin-left: 10px" :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
               </div>
               <div class="twoBtn">
-<!--               只有启用状态下才展示停用按钮-->
+<!--               只有启用状态下才展示停用按钮，小程序来源司机不显示-->
-                <button v-if="permissonList.includes('driverModifyBtn') && item.states?.code==1" class="del" @click.stop="handleStatus(item)">停用</button>
+                <button v-if="!isMiniProgram(item) && 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="permissonList.includes('driverModifyBtn')" name="arrow" />
+            <van-icon class="arrow_position" v-if="!isMiniProgram(item) && 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,6 +113,9 @@
       </van-pull-refresh>
 
     </div>
+    <div class="btn_wrap" v-if="supplierId">
+      <div class="btn" @click="nextToResult">下一步</div>
+    </div>
   </div>
 </template>
 
@@ -131,6 +134,9 @@ export default {
       total:'',
       driverList:[],
       states:'',
+      supplierId: '',
+      routeId: '',
+      initialized: false,
       supplierType:'',
       count: 0,
       isLoading: false,
@@ -176,10 +182,23 @@ 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.supplierId = rawId ? Number(rawId) : '';
+    const potentialId = this.$route.query.potentialId || urlParams.get('potentialId');
+    this.routeId = potentialId;
+    if(!rawId) {
       this.getPermissions();
+    }
     // this.getDriverList()
   },
   methods:{
+    nextToResult() {
+      localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.routeId } }));
+      this.goPage('supplierAddResult', { id: this.routeId });
+    },
+    isMiniProgram(item) {
+      return item.registerFrom === '小程序' || (item.jobNumber && item.jobNumber.includes('小程序'))
+    },
     getClass(id) {
       const ids = String(id)
       const steps = {
@@ -236,6 +255,7 @@ export default {
       }else{
         this.$router.push({
           name: 'driverAdd',
+          params: this.supplierId ? { supplierId: this.supplierId } : {}
         })
       }
     },
@@ -247,6 +267,7 @@ export default {
           idCardStatusList: this.idCardStatusList,
           driverLicenseStatusList: this.driverLicenseStatusList,
           authStatusList: this.authStatusList,
+          supplierId: this.supplierId || undefined,
         });
         if(res.code == 200){
           this.total=res.total
@@ -517,4 +538,22 @@ 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

@@ -298,7 +298,23 @@
           return
         }
         if( this.$refs.tree.getCheckedKeys().length > 0 ) {
-          await this.saveHandler()
+          let _node = this.$refs.areaCascader.getCheckedNodes();
+          let checkArr = [];
+          _node.map(item => { checkArr.push(item.data.id) });
+          const payload = {
+            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', {});
         }
       },
       async QrCodeResult() {    //获取添加企微结果

src/views/index/supplierAddResult.vue

@@ -5,12 +5,6 @@
       <img class="wait_icon" src="@/assets/supplier/successIcon.png" alt="">
       <div class="info-tip">信息录入完成，请等待审核结果。</div>
     </div>
-    <div class="wei_code_wrap" v-if="name && id">
-      <div class="wei_title">请先添加企业微信，保证申请流程正常进行。</div>
-      <div class="wei_code_bg">
-        <img v-if="qrCodeUrl" :src="qrCodeUrl" alt="企业微信二维码" />
-      </div>
-    </div>
     <div class="btn_wrap">
       <div class="btn" @click="searchInfo">信息查看</div>
     </div>
@@ -18,10 +12,7 @@
 </template>
 
 <script>
-  import QRCode from 'qrcode'
-  import {getOrCodeInfo, getContactQrCodeResult, updateWechatId, getSupplierInfo} from "@/api/mine"
   import {myMixins} from "@/utils/myMixins"
-  import {Toast} from "vant";
   export default {
     name: "supplierAddResult",
     mixins:[myMixins],
@@ -38,66 +29,17 @@
     async mounted() {
       const urlParams = new URLSearchParams(window.location.search);
       this.id = this.$route.query.id || urlParams.get('id');
-      await this.getInfoHandler();
+      if (this.id) {
-      if (this.name && this.id) {
+        localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.id } }));
-        await this.QrCodeHandler();
       }
     },
     methods: {
-      async getInfoHandler() {
-        let res = await getSupplierInfo({
-          id: this.id
-        });
-        console.log('66666', res)
-        let _data = res?.data
-        this.wechatId = _data?.wechatId;
-        this.name = _data?.name;
-      },
-      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 QrCodeResult() {
-        let res = await getContactQrCodeResult({ configId: this.configId });
-        this.wechatId = res?.data?.wechatId;
-      },
-      async updateWechat() {
-        await updateWechatId({
-          wechatId: this.wechatId,
-          id: this.id
-        })
-      },
       async searchInfo() {
-        if (!this.wechatId ) {
+        localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierInfo', query: { id: this.id } }));
-          await this.QrCodeResult();
-        }
-        if (!this.wechatId) {
-          Toast('请先添加企微再查看信息');
-          return;
-        }
-        if(this.wechatId) {
-          await this.updateWechat()
         this.goPage('supplierInfo', { id: this.id })
       }
     }
   }
-  }
 </script>
 
 <style scoped lang="scss">

src/views/index/supplierInfo.vue

@@ -124,7 +124,9 @@
         </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>
@@ -162,6 +164,11 @@
       await this.getInfoHandler();
     },
     methods: {
+      goAddVehicle() {
+        const supplierId = this.id
+        localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId } }));
+        this.goPage('vehicleManage', { id: supplierId });
+      },
       goModifyPage() {
         this.goPage('supplierAdd', { id : this.id })
       },

src/views/index/vehicleAdd.vue

@@ -686,6 +686,9 @@ 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){
@@ -948,7 +951,7 @@ export default {
         }
     },
     async getSupplierServiceTree(){
-      let res = await supplierServiceTree();
+      let res = await supplierServiceTree({ supplierId: this.supplierId });
       this.supplierServiceList=res.data
       this.oldSupplierServiceList=this.supplierServiceList
     },
@@ -1212,12 +1215,17 @@ export default {
       this.insuranceChange=false
     },
     back() {
+      if( this.supplierId ) {
+        this.$router.back();
+      } else {
         this.$router.push({
           name:'vehicleManage',
           params:{
             id: this.id
           }
         })
+      }
+
     },
     async submitBtn(){
       if( !this.vehicleLicenseFront ) {
@@ -1303,6 +1311,7 @@ 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,

src/views/index/vehicleManage.vue

@@ -3,15 +3,15 @@
   <div class="navBar">
     <van-nav-bar
         title="车辆管理"
-        left-arrow
+        :left-arrow="!supplierId"
         left-arrow-color="#FFFFFF"
         :border="false"
         :fixed="true"
         :safe-area-inset-top="true"
         @click-left="goBack"
     >
-      <template slot="right" v-if="permissonList.includes('vehicleAddBtn')">
+      <template slot="right" v-if="permissonList.includes('vehicleAddBtn') || supplierId">
-        <div class="rightWrap" @click="goPage('vehicleAdd')">
+        <div class="rightWrap" @click="goPage('vehicleAdd', supplierId ? { supplierId } : {})">
               <img src="@/assets/addImg.png" />
               <span class="addTxt">添加</span>
         </div>
@@ -71,6 +71,7 @@
   <div class="wrap_cls">
     <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
       <van-list
+        v-if="initialized"
         v-model="loading"
         :finished="finished"
         finished-text="没有更多了"
@@ -114,6 +115,9 @@
   </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>
@@ -121,7 +125,7 @@
 <script>
   import {Dialog} from "vant";
 import { myMixins} from "@/utils/myMixins";
-  import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle} from "@/api/mine"
+  import {supplierVehicleList, deleteVehicle, userOperationPermissions, enableVehicle, supplierSelectById} from "@/api/mine"
 export default {
   name: "vehicleManage",
   mixins:[myMixins],
@@ -130,6 +134,9 @@ export default {
       vehicleList:[],
       show:false,
       id:'',
+      supplierId: '',
+      routeId: '',
+      initialized: false,
       pageNum:1,
       pageSize:10,
       total:'',
@@ -189,10 +196,30 @@ export default {
         }],
     }
   },
-  mounted() {
+  async mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    const rawId = this.$route.query.id || urlParams.get('id');
+    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 } }));
+      this.goPage('driverManage', { id: this.supplierId, potentialId: this.routeId });
+    },
+    async getSupplierById(id) {
+      let res = await supplierSelectById({ id });
+      this.supplierId = res?.data?.supplierId || '';
+      this.initialized = true;
+    },
     showTip(msg) {
       Dialog.alert({
         title: '未通过原因',
@@ -277,6 +304,7 @@ export default {
           inputStatusList: this.inputStatusList,
           authStates: this.authStates,
           liabilityInsuranceAuditList: this.liabilityInsuranceAuditList,
+          supplierId: this.supplierId || undefined,
         })
           this.total=result.total
           if(this.pageNum == 1){// 第一页直接赋值
@@ -585,5 +613,23 @@ 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>