车辆管理，司机管理bug修复

src/api/mine.js

@@ -165,7 +165,7 @@ export function notifyInvoiceDetail(data){
 // /supplier/supplierTrainingMaterials/pageList 获取培训材料列表
 export function pageList(data){
     return request({
-        url:'/supplier/supplierTrainingMaterials/pageList',
+        url:'/supplierAppV2/dispatchApp/user/supplierTrainingMaterialsPageList',
         method:'POST',
         contentType:'application/json',
         data

src/components/cellGroup.vue

@@ -5,6 +5,7 @@
         :label="label"
         :placeholder="placeholder"
         required
+        :disabled="disabled"
         @input="$emit('input', $event)"
         @blur="$emit('blurIn')"
         input-align="right"
@@ -24,11 +25,15 @@ export default {
       type:String,
       default: ''
     },
-    value: [String, Number]
+    value: [String, Number],
+    disabled:{
+      type:Boolean,
+      default:false
+    }
   },
   data(){
     return{
-        name:''
+        name:'',
     }
   },
   mounted() {

src/components/twoBtnCommon.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="btn">
-    <button :class="title1 == '取消' ? 'cancel' : 'submit'"  @click="noMultipleClicks(cancelClick)">{{ title1 }}</button>
+    <button :class=" { 'loading1': loading1, 'cancel' : title1 == '取消', 'submit' : title1 != '取消' } "  @click="noMultipleClicks( title1 == '提交' ? submitClick1 :cancelClick )">{{ title1 }}</button>
-    <button class="submit" @click="noMultipleClicks(submitClick)">{{ title2}}</button>
+    <button class="submit" @click="noMultipleClicks(submitClick)" :class="{'loading': loading}">{{ title2}}</button>
   </div>
 </template>
 
@@ -12,7 +12,9 @@ export default {
   mixins:[myMixins],
   data(){
     return{
-      noClick:true
+      noClick:true,
+      loading: false,
+      loading1: false
     }
   },
   props:{
@@ -30,7 +32,32 @@ export default {
       this.$emit('cancelClick')
     },
     submitClick(){
+      // 设置 loading 状态
+      this.loading = true;
+
+      // 模拟异步请求
+      setTimeout(() => {
+        // 处理请求结果
+        // ...
         this.$emit('submitClick')
+        // 重置 loading 状态
+        this.loading = false;
+      }, 2000);
+
+    },
+    submitClick1(){
+      // 设置 loading1状态
+      this.loading1 = true;
+
+      // 模拟异步请求
+      setTimeout(() => {
+        // 处理请求结果
+        // ...
+        this.$emit('submitClick1')
+        // 重置 loading1 状态
+        this.loading1 = false;
+      }, 2000);
+
     }
   }
 }
@@ -39,6 +66,32 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
+.loading,.loading1 {
+  position: relative;
+}
+
+.loading::after,.loading1::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 20px;
+  height: 20px;
+  border: 2px solid #000;
+  border-top-color: transparent;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+  100% {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
 .btn{
   @include flexColBet;
   button{

src/views/index/driverAdd.vue

@@ -11,7 +11,7 @@
         @click-left="h5GoBack"
     />
   </div>
-  <cell-group label="司机姓名" placeholder="请输入司机姓名"  v-model="driverName"/>
+  <cell-group label="司机姓名" placeholder="请输入司机姓名"  v-model="driverName"   :disabled="supplierType ==1 ? true:false"/>
   <cell-group label="手机号码"  v-model="driverPhone"   placeholder="请输入手机号" />
   <p v-if="phoneNumberError" class="error-message">{{ phoneNumberErrorMessage }}</p>
   <cell-group label="身份证号" v-model="identityCardNumber"   placeholder="请输入身份证号"   />
@@ -64,7 +64,7 @@
 
 <script>
 import {myMixins} from  "@/utils/myMixins"
-import {timeFormat} from "@/utils/common"
+// import {timeFormat} from "@/utils/common"
 import {saveDriver} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup  from "@/components/cellGroup.vue"
@@ -82,7 +82,9 @@ export default {
       activeIcon: require('@/assets/check.png'),
       inactiveIcon: require('@/assets/uncheck.png'),
       phoneNumberError: false,
-      phoneNumberErrorMessage: ''
+      phoneNumberErrorMessage: '',
+      supplierType:'',
+      createTime:''
     }
   },
   mounted() {
@@ -92,6 +94,8 @@ export default {
     this.drivingModel = this.$route.params?.drivingModel;
     this.identityCardNumber = this.$route.params?.identityCardNumber;
     this.states = this.$route.params?.states;
+    this.supplierType=this.$route.params?.supplierType;
+    this.createTime=this.$route.params?.createTime;
     console.log(this.driverName,this.driverPhone,this.drivingModel,this.identityCardNumber,this.states)
       const selectElement = document.getElementById('mySelect');
       selectElement.addEventListener('change', function() {
@@ -115,7 +119,7 @@ export default {
           identityCardNumber:this.identityCardNumber,
           drivingModel:this.drivingModel,
           states:Number(this.states),
-          createTime:timeFormat(new Date())
+          createTime:this.createTime || ''
         })
         if(this.id){
           this.$toast('修改成功')

src/views/index/driverManage.vue

@@ -84,6 +84,7 @@ export default {
       }, 1000);
     },
     addDriver(){
+      this.$toast('supplierType的值为：'+this.supplierType)
       if(this.supplierType == 1){
         this.$toast("无权添加")
       }else{
@@ -135,7 +136,9 @@ export default {
           phone:item.driverPhone,
           drivingModel:item.drivingModel,
           identityCardNumber:item.identityCardNumber,
-          states:item.states.code
+          states:item.states.code,
+          createTime:item.createTime,
+          supplierType:this.supplierType
         }
       });
     },

src/views/index/vehicleManage.vue

@@ -95,6 +95,7 @@ export default {
       })
      // if(result.code === 200){
        this.$toast('删除成功');
+      this.pageNum=1
        // this.vehicleList=[]
        await this.getVehicleList();
      // }

src/views/workOrder/accounting.vue

@@ -217,7 +217,7 @@
       </tr>
     </table>
   </div>
-  <two-common-btn v-show="auditFormShow" class="btn" title1="提交" title2="确定审核" @cancelClick="save" @submitClick="save" />
+  <two-common-btn v-show="auditFormShow" class="btn" title1="提交" title2="确定审核" @submitClick1="save" @submitClick="save" />
 <!--  <div class="twoBtn" v-show="auditFormShow">-->
 <!--    <button class="cancel" @click="noMultipleClicks(save)">提交</button>-->
 <!--    <button class="submit" @click="noMultipleClicks(save)">确定审核</button>-->