From bb0b66f1782f7496fa69ad0bea7c676469e5e0d2 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Wed, 23 Aug 2023 19:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=BA=8B=E9=A1=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/commonBtn.vue   | 2 +-
 src/views/index/driverAdd.vue  | 8 +++++---
 src/views/index/vehicleAdd.vue | 7 +------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/commonBtn.vue b/src/components/commonBtn.vue
index 23fefad3..4b70520c 100644
--- a/src/components/commonBtn.vue
+++ b/src/components/commonBtn.vue
@@ -31,7 +31,7 @@ import {myMixins} from "@/utils/myMixins"
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 .button {
-  position: fixed;
+  position: absolute;
   bottom: 30px;
   border-radius: 5px;
   text-align: center;
diff --git a/src/views/index/driverAdd.vue b/src/views/index/driverAdd.vue
index ccaba4ed..8b71350b 100644
--- a/src/views/index/driverAdd.vue
+++ b/src/views/index/driverAdd.vue
@@ -12,7 +12,7 @@
     />
   </div>
   <cell-group label="司机姓名" placeholder="请输入司机姓名"  v-model="driverName"/>
-  <cell-group label="手机号码"  v-model="driverPhone"  @blurIn="validatePhoneNumber" placeholder="请输入手机号" />
+  <cell-group label="手机号码"  v-model="driverPhone"   placeholder="请输入手机号" />
   <p v-if="phoneNumberError" class="error-message">{{ phoneNumberErrorMessage }}</p>
   <cell-group label="身份证号" v-model="identityCardNumber"   placeholder="请输入身份证号"   />
   <div class="itemContent">
@@ -92,6 +92,7 @@ export default {
     this.drivingModel = this.$route.params?.drivingModel;
     this.identityCardNumber = this.$route.params?.identityCardNumber;
     this.states = this.$route.params?.states;
+    console.log(this.driverName,this.driverPhone,this.drivingModel,this.identityCardNumber,this.states)
       const selectElement = document.getElementById('mySelect');
       selectElement.addEventListener('change', function() {
         const selectedValue = selectElement.value;
@@ -104,8 +105,8 @@ export default {
       this.states=e
     },
     async submitBtn(){
-      if(!(this.driverName && this.driverPhone && this.identityCardNumber && this.drivingModel && this.states)){
-          this.$toast('必填字段未填写')
+      if (this.driverName || this.driverPhone || this.identityCardNumber || this.drivingModel || this.states){
+        this.$toast('必填字段未填写')
       }else{
          await saveDriver({
           driverId:this.id ? this.id : '',
@@ -130,6 +131,7 @@ export default {
     cancelBtn(){//取消
      this.$router.back()
     },
+    // @blurIn="validatePhoneNumber"
     // validatePhoneNumber() {
     //   const phoneNumberRegex = /^1[0-9]{10}$/;
     //   if (!phoneNumberRegex.test(this.driverPhone)) {
diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue
index addc91e0..4a134628 100644
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@@ -111,9 +111,6 @@ export default {
     }
   },
   async mounted() {
-    // const urlParams = new URLSearchParams(window.location.search);
-    // const token = urlParams.get('token');
-    // this.$toast("车辆编辑打印token" + token)
     this.id=this.$route.params?.id
     const selectElement = document.getElementById('mySelect');
     selectElement.addEventListener('change', function() {
@@ -140,14 +137,12 @@ export default {
       let res= await  getInfoById({
         vehicleId:this.id
       })
-      // if(res.code === 200){
         let result=res.data;
         this.id=result.vehicleId
         this.carNum=result.plateNumber
         this.isJoin=result.hasPolymerization.code
         this.selectedOption=result.vehicleType;
         this.serviceIds=result.serviceIds
-      // }
     },
     change(e) {
       this.trailerService=e
@@ -163,7 +158,7 @@ export default {
       this.$router.back()
     },
     async submitBtn(){
-      if(!(this.carNum && this.selectedOption && this.isJoin)){
+      if(this.carNum || this.selectedOption || this.isJoin){
         this.$toast('必填字段未填写')
       }else{
         await saveVehicle({