CRM_26-06-30#story#8858,关于“我的车辆”中行驶证主页照片识别出的“车牌号”和“车架号”的校验需求

This reverts commit 57f83916

.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
 node_modules
 /dist
-
+/.kaifa
+/.summaries
 
 # local env files
 .env.local

src/router/index.js

@@ -337,7 +337,7 @@ const routes = [
         name: 'goToApp',
         component:()=>import('@/views/goToApp/goToApp.vue'),
         meta: {
-            title:'电瓶详情'
+            title:'中道小板运输'
         }
     },
     ...kpiRouter,

src/views/goToApp/goToApp.vue

@@ -7,6 +7,12 @@
         <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>
 
@@ -14,7 +20,22 @@
 import { getNewVersion } from "@/api/order"
 export default {
   name: "goToApp",
+  data() {
+    return {
+      showGuide: false
+    }
+  },
+  mounted() {
+    this.showGuide = this.isWeixin()
+  },
   methods: {
+    isWeixin() {
+      const ua = navigator.userAgent.toLowerCase()
+      return ua.indexOf('micromessenger') !== -1
+    },
+    closeGuide() {
+      this.showGuide = false
+    },
     goAppHandler() {
       window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
     },
@@ -70,4 +91,32 @@ export default {
     }
   }
 }
-</style>
+.guide-mask {
+  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

@@ -26,6 +26,7 @@
     data() {
       return {
         name: '',
+        potentialFlag: '',
         formPayload: null,
         qrCodeUrl: '',
         qrCode: '',
@@ -35,6 +36,8 @@
       }
     },
     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);
@@ -83,9 +86,9 @@
             if (res?.code != 0) {
               Dialog.alert({ title: '提示', message: '该服务商已存在，查看信息' }).then(() => {
                 localStorage.removeItem('supplierAddForm');
-                const target = { name: 'supplierInfo', query: { id: res?.code } };
+                const target = { name: 'supplierInfo', query: { id: res?.code, potentialFlag: this.potentialFlag } };
                 localStorage.setItem('lastRoute', JSON.stringify(target));
-                this.goPage('supplierInfo', { id: res?.code });
+                this.goPage('supplierInfo', { id: res?.code, potentialFlag: this.potentialFlag });
               });
             } else {
               Toast('该服务商已存在');
@@ -93,7 +96,8 @@
           } else {
             localStorage.removeItem('supplierAddForm');
             const supplierId = res?.data;
-            const target = { name: 'supplierAddResult', query: { id: supplierId } };
+            const potentialFlag = this.potentialFlag;
+            const target = { name: 'supplierAddResult', query: { id: supplierId, potentialFlag } };
             localStorage.setItem('lastRoute', JSON.stringify(target));
             Dialog.confirm({
               title: '提示',
@@ -101,11 +105,11 @@
               confirmButtonText: '去添加',
               cancelButtonText: '取消',
             }).then(() => {
-              localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId } }));
+              localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId, potentialFlag } }));
-              this.goPage('vehicleManage', { id: supplierId });
+              this.goPage('vehicleManage', { id: supplierId, potentialFlag });
             }).catch(() => {
-              localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: supplierId } }));
+              localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: supplierId, potentialFlag } }));
-              this.goPage('supplierAddResult', { id: supplierId });
+              this.goPage('supplierAddResult', { id: supplierId, potentialFlag });
             });
           }
         } catch (e) {

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-radio': statesDisabled }" class="joinWrap">
+      <van-radio-group v-model="states" @change="isUse" :disabled="statesDisabled" :class="{ 'disabled-tree': statesDisabled }" class="joinWrap">
         <van-radio :name="1" style="margin-right: 26px" class="item">
           启用
           <img
@@ -185,7 +185,7 @@ export default {
       iconList: [],
       driverInfo: {},
       drivingLicenceName: '',
-      fromSupplierAdd: false, // 是否从 supplierAdd 进入
+      potentialFlag: '',
       idCardAuthority:'',
       idCardValidStartTime:'',
       idCardValidEndTime:'',
@@ -223,11 +223,9 @@ export default {
     this.identityCardFront = this.$route.params?.identityCardFront;
     this.driverInfo.lssueDate = this.$route.params?.lssueDate;
     this.drivingLicenceName =  this.$route.params?.drivingLicenceName;
-    // 获取 fromSupplierAdd 标识
+    this.potentialFlag = this.$route.params?.potentialFlag || '';
-    const fromSupplierAdd = this.$route.params?.fromSupplierAdd;
+    console.log('this.potentialFlagthis.potentialFlag', this.potentialFlag)
-    this.fromSupplierAdd = fromSupplierAdd === 'true';
+    if(!this.id && this.potentialFlag === '1') {
-    // 如果从 supplierAdd 进入且不是修改模式，默认设置为停用状态
-    if(!this.id && this.fromSupplierAdd) {
       this.states = 0;
     }
     if( this.identityCardFront ) {
@@ -250,7 +248,7 @@ export default {
       const selectedValue = selectElement.value;
       this.drivingModel=selectedValue
     });
-
+    console.log('statesDisabled', this.statesDisabled)
   },
   methods:{
     isUse(e){
@@ -465,9 +463,8 @@ export default {
       },
   },
   computed: {
-    // 司机状态是否禁用（从 supplierAdd 进入且非修改模式时禁用）
     statesDisabled() {
-      return !this.id && this.fromSupplierAdd;
+      return !this.id && this.potentialFlag === '1';
     }
   },
   components:{
@@ -544,8 +541,4 @@ export default {
   position: fixed;
   bottom: 30px;
 }
-.disabled-radio {
-  pointer-events: none;
-  opacity: 0.6;
-}
 </style>

src/views/index/driverManage.vue

@@ -137,7 +137,7 @@ export default {
       supplierId: '',
       routeId: '',
       initialized: false,
-      fromSupplierAdd: '', // 是否从 supplierAdd 进入
+      potentialFlag: '',
       supplierType:'',
       count: 0,
       isLoading: false,
@@ -187,8 +187,7 @@ export default {
     this.supplierId = rawId ? Number(rawId) : '';
     const potentialId = this.$route.query.potentialId || urlParams.get('potentialId');
     this.routeId = potentialId;
-    // 获取 fromSupplierAdd 标识
+    this.potentialFlag = this.$route.query.potentialFlag || urlParams.get('potentialFlag') || '';
-    this.fromSupplierAdd = this.$route.query.fromSupplierAdd || urlParams.get('fromSupplierAdd') || '';
     if(!rawId) {
       this.getPermissions();
     }
@@ -196,8 +195,8 @@ export default {
   },
   methods:{
     nextToResult() {
-      localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.routeId } }));
+      localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.routeId, potentialFlag: this.potentialFlag } }));
-      this.goPage('supplierAddResult', { id: this.routeId });
+      this.goPage('supplierAddResult', { id: this.routeId, potentialFlag: this.potentialFlag });
     },
     isMiniProgram(item) {
       return item.registerFrom === '小程序' || (item.jobNumber && item.jobNumber.includes('小程序'))
@@ -258,7 +257,7 @@ export default {
       }else{
         this.$router.push({
           name: 'driverAdd',
-          params: this.supplierId ? { supplierId: this.supplierId, fromSupplierAdd: this.fromSupplierAdd } : {}
+          params: { supplierId: this.supplierId || undefined, potentialFlag: this.potentialFlag || undefined }
         })
       }
     },

src/views/index/supplierAdd.vue

@@ -314,7 +314,7 @@
             serviceAreaCode: checkArr.join(','),
           };
           localStorage.setItem('supplierAddForm', JSON.stringify(payload));
-          this.goPage('addWechat', {});
+          this.goPage('addWechat', { potentialFlag: 1 });
         }
       },
       async QrCodeResult() {    //获取添加企微结果
@@ -323,10 +323,6 @@
         });
         this.wechatId = res?.data?.wechatId
       },
-      isFromSupplierAdd() {
-        // 判断是否从 supplierAdd 进入
-        return this.$route.name === 'supplierAdd' || this.$route.query.fromSupplierAdd === 'true';
-      },
       async saveHandler() {
         if( this.clickFlag ) {
           try {

src/views/index/supplierAddResult.vue

@@ -19,6 +19,7 @@
     data() {
       return {
         id: '',
+        potentialFlag: '',
         name: '',
         qrCodeUrl: '',
         qrCode: '',
@@ -29,14 +30,15 @@
     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 } }));
+        localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierAddResult', query: { id: this.id, potentialFlag: this.potentialFlag } }));
       }
     },
     methods: {
       async searchInfo() {
-        localStorage.setItem('lastRoute', JSON.stringify({ name: 'supplierInfo', query: { id: this.id } }));
+        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 })
       }
     }
   }

src/views/index/supplierInfo.vue

@@ -154,6 +154,7 @@
         supplierInfo: {},
         type: 'show',
         origin: '',
+        potentialFlag: '',
       }
     },
     async mounted() {
@@ -161,13 +162,14 @@
       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, fromSupplierAdd: 'true' } }));
+        localStorage.setItem('lastRoute', JSON.stringify({ name: 'vehicleManage', query: { id: supplierId, potentialFlag: this.potentialFlag } }));
-        this.goPage('vehicleManage', { id: supplierId, fromSupplierAdd: 'true' });
+        this.goPage('vehicleManage', { id: supplierId, potentialFlag: this.potentialFlag });
       },
       goModifyPage() {
         this.goPage('supplierAdd', { id : this.id })

src/views/index/vehicleAdd.vue

@@ -470,8 +470,8 @@ export default {
       maxDate: new Date(2099, 11, 31), // 设置最大可选日期（2099年12月31日）
       checkList: [],
       virtualVehicle: '',
-      vehicleStatus: '',
+      potentialFlag: new URLSearchParams(window.location.search).get('potentialFlag') || '',
-      fromSupplierAdd: false, // 是否从 supplierAdd 进入
+      vehicleStatus: new URLSearchParams(window.location.search).get('potentialFlag') === '1' ? 2 : '',
       showDatePicker: false,
       dateVal: '',
       trailerService: '',//拖车服务
@@ -650,9 +650,8 @@ export default {
         return false
       }
     },
-    // 车辆状态是否禁用（从 supplierAdd 进入且非修改模式时禁用）
     vehicleStatusDisabled() {
-      return !this.id && this.fromSupplierAdd;
+      return !this.id && this.potentialFlag === '1';
     }
   },
   watch:{
@@ -694,9 +693,6 @@ export default {
     const urlParams = new URLSearchParams(window.location.search);
     const rawId = this.$route.query.supplierId || urlParams.get('supplierId');
     this.supplierId = rawId ? Number(rawId) : '';
-    // 获取 fromSupplierAdd 标识
-    const fromSupplierAdd = this.$route.query.fromSupplierAdd || urlParams.get('fromSupplierAdd');
-    this.fromSupplierAdd = fromSupplierAdd === 'true';
     await this.getSupplierServiceTree();
     await this.getTypeList();
     if( this.id){
@@ -713,10 +709,6 @@ export default {
         liabilityInsuranceEndTime:'',
         insurancePicturePhoto:''
       }
-      // 如果从 supplierAdd 进入，默认设置为停用状态
-      if(this.fromSupplierAdd) {
-        this.vehicleStatus = 2;
-      }
     }
   },
   methods:{
@@ -883,7 +875,7 @@ export default {
         this.vehicleLicenseInfo.address = frontInfo?.address;
         this.vehicleLicenseInfo.useNature = frontInfo?.useCharacter;
         this.vehicleLicenseInfo.model = frontInfo?.model;
-        this.vehicleLicenseInfo.vinCode = frontInfo?.vin;
+        this.vehicleLicenseInfo.vinCode = String(frontInfo?.vin || '').toUpperCase().replace(/O/g, '0');
         this.vehicleLicenseInfo.engineNumber = frontInfo?.engineNo;
         this.vehicleLicenseInfo.registrationDate = frontInfo?.registerDate;
         this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
@@ -1227,7 +1219,8 @@ export default {
       this.insuranceChange=false
     },
     back() {
-      if( this.supplierId ) {
+      this.$router.back();
+      /*if( this.supplierId ) {
         this.$router.back();
       } else {
         this.$router.push({
@@ -1236,10 +1229,55 @@ export default {
             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

src/views/index/vehicleManage.vue

@@ -11,7 +11,7 @@
         @click-left="goBack"
     >
       <template slot="right" v-if="permissonList.includes('vehicleAddBtn') || supplierId">
-        <div class="rightWrap" @click="goPage('vehicleAdd', supplierId ? { supplierId, fromSupplierAdd } : {})">
+        <div class="rightWrap" @click="goPage('vehicleAdd', supplierId ? { supplierId, potentialFlag } : {})">
               <img src="@/assets/addImg.png" />
               <span class="addTxt">添加</span>
         </div>
@@ -149,7 +149,7 @@ export default {
       searchVal: '',
       authStates: [],
       liabilityInsuranceAuditList: [],
-      fromSupplierAdd: '', // 是否从 supplierAdd 进入
+      potentialFlag: '',
       inputStatusListOptions: [{
         name: '行驶证未录入',
         value: 0
@@ -200,14 +200,13 @@ export default {
   async mounted() {
     const urlParams = new URLSearchParams(window.location.search);
     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;
     }
-    // 获取 fromSupplierAdd 标识
-    this.fromSupplierAdd = this.$route.query.fromSupplierAdd || urlParams.get('fromSupplierAdd') || '';
     let _token = localStorage.getItem('token')
     if( _token ) {
       this.getPermissions();
@@ -215,8 +214,8 @@ export default {
   },
   methods:{
     nextToDriver() {
-      localStorage.setItem('lastRoute', JSON.stringify({ name: 'driverManage', query: { id: this.supplierId, potentialId: this.routeId, fromSupplierAdd: this.fromSupplierAdd } }));
+      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, fromSupplierAdd: this.fromSupplierAdd });
+      this.goPage('driverManage', { id: this.supplierId, potentialId: this.routeId, potentialFlag: this.potentialFlag });
     },
     async getSupplierById(id) {
       let res = await supplierSelectById({ id });

src/views/workOrder/accounting.vue

@@ -498,13 +498,7 @@ export default {
       console.log("ii", i)
     },
     goback() {
-      this.$router.push({
+      this.$router.back()
-        name: "workOrderReconciliation",
-        params: {
-          activeIndex: this.index,
-          queryTime: this.queryTime,
-        }
-      })
     },
     async compute() {
       if(this.orderInfo.contractSettleTypeString == '车主现收'){