From 3742c2f3a13592eed0608dc0f2b99ac5eced2244 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Thu, 24 Aug 2023 13:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=EF=BC=8C=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=EF=BC=8C?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86->=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E7=A7=8D=E7=B1=BB=E9=A2=84=E6=9C=9F=EF=BC=9A=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index/driverManage.vue  | 73 ++++++++++++++++++-------------
 src/views/index/vehicleAdd.vue    | 29 ++++--------
 src/views/index/vehicleManage.vue | 38 ++++++++++------
 3 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/src/views/index/driverManage.vue b/src/views/index/driverManage.vue
index 422bdfdf..79147872 100644
--- a/src/views/index/driverManage.vue
+++ b/src/views/index/driverManage.vue
@@ -18,33 +18,35 @@
         </template>
       </van-nav-bar>
     </div>
-    <div class="itemWrap" v-for="(item,index) in driverList" :key="index">
-      <div class="name-status">
-        <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}</div>
-        <div class="twoBtn">
-          <button class="del" @click="handleStatus(item)">{{ item.states?.label == '启用'  ? '停用' : '启用' }}</button>
-          <button class="revise" @click="updateDriver(item)">修改</button>
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+      <div class="itemWrap" v-for="(item,index) in driverList" :key="index">
+        <div class="name-status">
+          <div class="namephone">{{ item.driverName }} / {{ item.driverPhone }}</div>
+          <div class="twoBtn">
+            <button class="del" @click="handleStatus(item)">{{ item.states?.label == '启用'  ? '停用' : '启用' }}</button>
+            <button class="revise" @click="updateDriver(item)">修改</button>
+          </div>
+        </div>
+        <div class="" style="display: flex">
+          <div class="sex" style="margin-right: 40px">
+            <span class="halfOpci">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
+            <span class="allOpci">{{item.sex?.label}}</span>
+          </div>
+          <div class="carType">
+            <span class="halfOpci">准驾车型:</span>
+            <span class="allOpci">{{item.drivingModel}}</span>
+          </div>
+        </div>
+        <div>
+          <span class="halfOpci">身份证号:</span>
+          <span class="allOpci">{{ item.identityCardNumber }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态:</span>
+          <span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
         </div>
       </div>
-      <div class="" style="display: flex">
-        <div class="sex" style="margin-right: 40px">
-          <span class="halfOpci">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</span>
-          <span class="allOpci">{{item.sex?.label}}</span>
-        </div>
-        <div class="carType">
-          <span class="halfOpci">准驾车型:</span>
-          <span class="allOpci">{{item.drivingModel}}</span>
-        </div>
-      </div>
-      <div>
-        <span class="halfOpci">身份证号:</span>
-        <span class="allOpci">{{ item.identityCardNumber }}</span>
-      </div>
-      <div>
-        <span class="halfOpci">状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态:</span>
-        <span :class="item.states?.code == 1 ? 'statusYes' : 'statusNo'">{{ item.states?.label }}</span>
-      </div>
-    </div>
+    </van-pull-refresh>
 
   </div>
 </template>
@@ -64,6 +66,8 @@ export default {
       driverList:[],
       states:'',
       supplierType:'',
+      count: 0,
+      isLoading: false,
     }
   },
   mounted() {
@@ -72,8 +76,14 @@ export default {
     this.getDriverList()
   },
   methods:{
+    onRefresh() {
+      this.getDriverList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
     addDriver(){
-      this.$toast(this.supplierType)
       if(this.supplierType == 1){
         this.$toast("无权添加")
       }else{
@@ -82,7 +92,7 @@ export default {
         })
       }
     },
-     async getDriverList(){
+    async getDriverList(){
         let res = await  driverList({
           pageNum:this.pageNum,
           pageSize:this.pageSize
@@ -108,11 +118,12 @@ export default {
          driverId:item.driverId,
          states:this.states
        })
+
       await this.getDriverList();
-      setTimeout(()=>{
-        this.$toast('操作成功')
-      },2000)
-      console.log("item",res)
+        // setTimeout(()=>{
+        //   this.$toast('操作成功')
+        // },2000)
+        console.log("item",res)
     },
     updateDriver(item){
       // 在当前组件中进行路由跳转并传递参数对象
diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue
index 525796b2..eb9b9bc6 100644
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@@ -62,24 +62,9 @@
         <span  class="service">{{ item.name }}:</span>
         <span class="line"></span>
       </div>
-      <van-radio-group v-model="trailerService" @change="change" class="radioWrap">
-        <van-radio :name="item2.name" class="item" v-for="(item2,index2) in item.children" :key="index2">
-          {{item2.name }}
-          <img
-              slot="icon"
-              slot-scope="props"
-              :src="props.checked ? activeIcon : inactiveIcon"
-          >
-        </van-radio>
-<!--        <van-radio name=" 事故——平板拖车" class="item">-->
-<!--          事故——平板拖车-->
-<!--          <img-->
-<!--              slot="icon"-->
-<!--              slot-scope="props"-->
-<!--              :src="props.checked ? activeIcon : inactiveIcon"-->
-<!--          >-->
-<!--        </van-radio>-->
-      </van-radio-group>
+      <van-checkbox-group v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap" @change="change">
+        <van-checkbox class="item" :name="item2.id">{{item2.name }}</van-checkbox>
+      </van-checkbox-group>
     </div>
   </div>
   <two-common-btn class="btn" @cancelClick="cancelBtn" @submitClick="submitBtn" />
@@ -102,11 +87,13 @@ export default {
       isJoin:'',//是否参与
       activeIcon: require('@/assets/check.png'),
       inactiveIcon: require('@/assets/uncheck.png'),
+      // result: [],
+      checked: true,
       carNum:"",//车牌号
       typeList:[],//车辆类型列表
       selectedOption:'1',//车辆类型
       id:'',//车辆Id
-      serviceIds:'',//车辆服务种类,
+      serviceIds:[],//车辆服务种类,
       supplierServiceList:[]
     }
   },
@@ -145,8 +132,8 @@ export default {
         this.serviceIds=result.serviceIds
     },
     change(e) {
-      this.trailerService=e
-      console.log(" this.trailerService", this.trailerService)
+      // this.trailerService=e
+      console.log(" this.trailerService",e, this.result)
     },
     change2(e) {
       this.smallRepairService=e
diff --git a/src/views/index/vehicleManage.vue b/src/views/index/vehicleManage.vue
index 1d3ac4aa..12b83d98 100644
--- a/src/views/index/vehicleManage.vue
+++ b/src/views/index/vehicleManage.vue
@@ -18,21 +18,23 @@
       </template>
     </van-nav-bar>
   </div>
-  <div class="carItem" v-for="(item,index) in vehicleList" :key="index">
-    <div class="carCode">
-      <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}</div>
-      <div class="twoBtn">
-        <button class="del" @click="deleteItem(item.vehicleId)">删除</button>
-        <button class="revise" @click="updateVehicle(item)">修改</button>
+  <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+    <div class="carItem" v-for="(item,index) in vehicleList" :key="index">
+      <div class="carCode">
+        <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}</div>
+        <div class="twoBtn">
+          <button class="del" @click="deleteItem(item.vehicleId)">删除</button>
+          <button class="revise" @click="updateVehicle(item)">修改</button>
+        </div>
+      </div>
+      <div class="carType">{{ item.serviceName }}</div>
+      <div class="juhe">
+        <span class="zdJuhe">是否参与中道聚合:        </span>
+        <span :class="item.hasPolymerization.code == 0  ? 'isYes' :'isNo'">{{item.hasPolymerization.label}}</span>
       </div>
     </div>
-    <div class="carType">{{ item.serviceName }}</div>
-    <div class="juhe">
-      <span class="zdJuhe">是否参与中道聚合:        </span>
-      <span :class="item.hasPolymerization.code == 0  ? 'isYes' :'isNo'">{{item.hasPolymerization.label}}</span>
-    </div>
-  </div>
-  <van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
+  </van-pull-refresh>
+<van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
   <div v-if="loading">加载中...</div>
 </div>
 
@@ -53,12 +55,20 @@ export default {
       pageSize:10,
       total:'',
       loading:false,
+      isLoading: false,
     }
   },
   mounted() {
     this.getVehicleList();
   },
   methods:{
+    onRefresh() {
+      this.getVehicleList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
     async getVehicleList(){
         let result = await supplierVehicleList({
           pageNum:this.pageNum,
@@ -85,7 +95,7 @@ export default {
       })
      // if(result.code === 200){
        this.$toast('删除成功');
-       this.vehicleList=[]
+       // this.vehicleList=[]
        await this.getVehicleList();
      // }
     },