司机app使用该请求不挂token

src/utils/http.js

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

src/views/documentView/diverTrainDocment.vue

@@ -90,6 +90,7 @@ export default {
       totalList:[],
       numInfo:'',
       keyword:'',
+      serviceTypeName:'',
       show:false,
       showEmpty:false,
       isLoading:false,
@@ -102,6 +103,7 @@ export default {
     this.driverId = urlParams.get('driverId');
     this.time=timeFormat(Date.now())
     this.keyword=urlParams.get('keyword') || ''
+    this.serviceTypeName=urlParams.get('serviceTypeName') || ''
     this.getTrainingList();
     document.addEventListener('visibilitychange', async (  ) => {
       let state = document.visibilityState
@@ -129,6 +131,7 @@ export default {
         type:1,
         id:this.driverId,
         text:this.keyword || '',
+        serviceTypeName:this.serviceTypeName || ''
       })
       this.totalList=[]
       this.pageList=[]

src/views/documentView/docmentList.vue

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

src/views/documentView/trainDocment.vue

@@ -68,6 +68,7 @@ export default {
       pageList:[],
       totalList:[],
       keyword:'',
+      serviceTypeName:'',
       show:false,
       showEmpty:false,
       isLoading:false,
@@ -77,6 +78,8 @@ export default {
   mounted() {
     const urlParams = new URLSearchParams(window.location.search);
     this.supplierId = urlParams.get('supplierId');
+    this.keyword=urlParams.get('keyword') || ''
+    this.serviceTypeName=urlParams.get('serviceTypeName') || ''
     this.getTrainingList();
     document.addEventListener('visibilitychange', async (  ) => {
       let state = document.visibilityState
@@ -104,6 +107,7 @@ export default {
         type:2,
         id: this.supplierId,
         text:this.keyword || '',
+        serviceTypeName:this.serviceTypeName || ''
       })
       this.totalList=[]
       this.pageList=[]

src/views/index/vehicleAdd.vue

@@ -572,6 +572,14 @@ export default {
           }
         })
         this.$forceUpdate();
+      } else if( this.vehicleLicenseInfo?.vehicleType?.includes('载货') || this.vehicleLicenseInfo?.vehicleType?.includes('中型') || this.vehicleLicenseInfo?.vehicleType?.includes('重型')) {
+        this.vehicleTypes.map(item => {
+          if( item.value == 1 || item.value == 9 ) {
+            item.disabled = true;
+          } else {
+            item.disabled = false;
+          }
+        })
       } else {
         this.vehicleTypes.map(item => {
           item.disabled = false;
@@ -667,8 +675,21 @@ export default {
         this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
         this.vehicleLicenseInfo.issueAuthority = frontInfo?.seal;
         this.setDefault();
+        this.checkDisabledItems();
       }
     },
+    checkDisabledItems() {
+      let _arr = [];
+      this.selectedOption.map(item => {
+        let _tempArr = this.vehicleTypes.filter(_item => _item.disabled && _item.value == item);
+        _arr = [..._arr, ..._tempArr]
+      })
+      if (_arr.length > 0) {
+        this.$toast(`车辆类别数据不合法：${_arr.map(item => item.name).join('、')}`)
+        return false
+      }
+      return  true
+    },
     async vehicleBackOcrHandler() {     // 行驶证副页 ocr 识别
       this.vehicleLicenseInfo.recordNumber = '';
       this.vehicleLicenseInfo.passengerCapacity = '';
@@ -821,6 +842,10 @@ export default {
         this.$toast('车辆类别不能为空')
         return
       }
+      let res = this.checkDisabledItems();
+      if(!res) {
+        return false
+      }
       if( !this.virtualVehicle ) {
         this.$toast('车辆属性不能为空')
         return