From f6ba33b0a2fae7b95ed35471ec4b7dcd400e0a01 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Wed, 23 Aug 2023 16:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=98=B2=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mine.js                     |   7 ++
 src/components/commonBtn.vue        |   4 +-
 src/components/twoBtnCommon.vue     |   6 +-
 src/utils/http.js                   |  34 +++++----
 src/views/index/invoicingDetail.vue |   6 +-
 src/views/index/invoicingNotify.vue |   4 +-
 src/views/index/reporting.vue       |   4 +-
 src/views/index/toDoList.vue        |   8 +-
 src/views/index/vehicleAdd.vue      | 110 +++++++++++-----------------
 src/views/index/vehicleManage.vue   |  12 +--
 src/views/index/workOrderDetail.vue |   7 +-
 11 files changed, 95 insertions(+), 107 deletions(-)

diff --git a/src/api/mine.js b/src/api/mine.js
index 55f410fc..b9c5ee05 100644
--- a/src/api/mine.js
+++ b/src/api/mine.js
@@ -42,6 +42,13 @@ export function vehicleTypeList(){
         url:'/supplierAppV2/dispatchApp/user/vehicleTypeList',
         method:'POST'
     })
+}
+ // 服务商服务能力
+export function supplierServiceTree(){
+    return request({
+        url:'/supplierAppV2/dispatchApp/user/supplierServiceTree',
+        method:'POST'
+    })
 }
  //司机列表
 export function driverList(data){
diff --git a/src/components/commonBtn.vue b/src/components/commonBtn.vue
index c3f1c2bc..72cbedea 100644
--- a/src/components/commonBtn.vue
+++ b/src/components/commonBtn.vue
@@ -1,12 +1,14 @@
 <template>
-  <div class="button" @click="clickHandler">
+  <div class="button" @click="noMultipleClicks(clickHandler)">
     {{ title }}
   </div>
 </template>
 
 <script>
+import {myMixins} from "@/utils/myMixins"
   export default {
     name: "commonBtn",
+    mixins:[myMixins],
     props: {
       title: {
         type: String,
diff --git a/src/components/twoBtnCommon.vue b/src/components/twoBtnCommon.vue
index 856578d7..2e8d3324 100644
--- a/src/components/twoBtnCommon.vue
+++ b/src/components/twoBtnCommon.vue
@@ -1,13 +1,15 @@
 <template>
   <div class="btn">
-    <button class="cancel" @click="cancelClick">{{ title1 }}</button>
-    <button class="submit" @click="submitClick">{{ title2}}</button>
+    <button class="cancel" @click="noMultipleClicks(cancelClick)">{{ title1 }}</button>
+    <button class="submit" @click="noMultipleClicks(submitClick)">{{ title2}}</button>
   </div>
 </template>
 
 <script>
+import {myMixins} from "@/utils/myMixins"
 export default {
   name: "twoBtnCommon",
+  mixins:[myMixins],
   props:{
     title1:{
       type:String,
diff --git a/src/utils/http.js b/src/utils/http.js
index fcc92d63..796daab0 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import qs from 'qs'
-
+import { Toast } from 'vant'
 // console.log('process.env.VUE_APP_BASE_API', process.env.VUE_APP_BASE_API)
 
 const service = axios.create({
@@ -17,10 +17,10 @@ service.interceptors.request.use(
     config => {
       config.data = config.contentType ? config.data : qs.stringify(config.data)
       config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded'
-        const token = localStorage.getItem('token');
+        // const token = localStorage.getItem('token');
       // const urlParams = new URLSearchParams(window.location.search);
       // const token = urlParams.get('token') ;
-      // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5MjY4MDk1MywidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyNzY3MzUzLCJpYXQiOjE2OTI2ODA5NTN9.GClSyBkWX_LedBuO2h6xoBHyL3xsgFeGp_zirimAuTk'
+      let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzemwiLCJhdWQiOlsic3VwcGxpZXItYXBwIl0sIm5iZiI6MTY5Mjc3MzMxMSwidXNlcl9pbmZvIjp7InVzZXJJZCI6NTQ1ODUsInBob25lIjoiMTc2MzAwMzU2NTgiLCJuYW1lIjoi5bCP5a6LIiwic3VwcGxpZXJOYW1lIjoi5LiK5rW35a6J55WFQSIsInN1cHBsaWVySWQiOjExMjgsInN1cHBsaWVyVHlwZSI6MSwidXNlcm5hbWUiOiJzemwiLCJ1c2VyVHlwZSI6IkFQUCIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNjkyODU5NzExLCJpYXQiOjE2OTI3NzMzMTF9.bFTJlX73vYl06ncE6Ge5_qtbEwRNFZwXhzNjMXzikkE'
       config.headers['Authorization'] = `${token}`;
       return config
     },
@@ -33,21 +33,27 @@ service.interceptors.request.use(
 service.interceptors.response.use(
     response => {
       const res = response.data
-      // console.log('rere', res)
-      return res //请求响应数据
-      // if (res.code && (res.code != '00'  && res.code != '105' )) {
-      //   Toast(res.msg || 'Error')
-      //   return Promise.reject(new Error(res.msg || 'Error'))
-      // } else {
-      //   if( res.code === 0 ) {
-      //     return res.result
-      //   } else {
-      //     return res.data
-      //   }
+      // return res //请求响应数据
+      // if(res.code === 401){
+      //     Toast('token不合法或过期')
+      // }else if(){
+      //
       // }
+      if ( res.code === 401 || res.code === 400  || res.code == 500) {
+          Toast(res.msg || 'Error')
+          return Promise.reject(new Error(res.msg || 'Error'))
+      } else {
+          return res
+        // if( res.code === 200 ) {
+        //   return res.data
+        // } else {
+        //   return res.data
+        // }
+      }
     },
     error => {
       console.log('err' + error)
+      Toast(error.message)
       return Promise.reject(error)
     }
 )
diff --git a/src/views/index/invoicingDetail.vue b/src/views/index/invoicingDetail.vue
index 19bcfab6..b74c1f73 100644
--- a/src/views/index/invoicingDetail.vue
+++ b/src/views/index/invoicingDetail.vue
@@ -43,7 +43,7 @@ export default {
     }
   },
   async mounted() {
-    console.log(this.$route.query?.id)
+    // console.log(this.$route.query?.id)
     this.form.batchCode=this.$route.query?.id;
     this.form.startTime=this.$route.query?.startTime;
     this.form.overTime=this.$route.query?.overTime;
@@ -56,9 +56,9 @@ export default {
           pageSize:this.pageSize,
          ...this.form,
         })
-        if(res.code=== 200){
+        // if(res.code=== 200){
           this.detailList=res.data
-        }
+        // }
         // console.log("resssss",res)
       }
   }
diff --git a/src/views/index/invoicingNotify.vue b/src/views/index/invoicingNotify.vue
index cb0d76fa..3737b49f 100644
--- a/src/views/index/invoicingNotify.vue
+++ b/src/views/index/invoicingNotify.vue
@@ -73,7 +73,7 @@ export default {
           pageNum:this.pageNum,
           pageSize:this.pageSize
       })
-      if(res.code === 0){
+      // if(res.code === 0){
         this.notifyList=res.data;
         console.log(this.notifyList)
         if(this.notifyList.length === 0){
@@ -82,7 +82,7 @@ export default {
           this.show=false
         }
       }
-    },
+    // },
   }
 }
 </script>
diff --git a/src/views/index/reporting.vue b/src/views/index/reporting.vue
index f2d08a50..7a9f003f 100644
--- a/src/views/index/reporting.vue
+++ b/src/views/index/reporting.vue
@@ -90,12 +90,12 @@ export default {
           reportingItem:this.radio ? this.radio : "",
           reportingDesc:this.decscripTxt ? this.decscripTxt : ""
         })
-        if(result.code === 200){
+        // if(result.code === 200){
           this.$toast(result.msg)
           setTimeout(()=>{
             window.android.sendMessage("goBack");
           },2000)
-        }
+        // }
       }else{
         this.$toast("报备事项和报备描述必填一项")
       }
diff --git a/src/views/index/toDoList.vue b/src/views/index/toDoList.vue
index 3c3a1728..e701fc70 100644
--- a/src/views/index/toDoList.vue
+++ b/src/views/index/toDoList.vue
@@ -37,15 +37,15 @@ export default {
   methods:{
     async getList(){
       let result=await getToDoList();
-      if(result.code === 200){
+      // if(result.code === 200){
           this.todolist=result.data;
-          if(this.todolist.length === 0){
+          if(this.todolist?.length === 0){
             this.show=true
           }else {
             this.show=false
           }
-        console.log("this.todolist",this.todolist.length)
-      }
+        // console.log("this.todolist",this.todolist?.length)
+      // }
     },
      async noPass(item){
       let result=await  toDoAudit({
diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue
index 953076a1..addc91e0 100644
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@@ -57,68 +57,28 @@
     </div>
   </div>
   <div class="serviceType">
-    <div class="trailerService">
+    <div class="trailerService" v-for="(item,index) in supplierServiceList" :key="index">
       <div class="serviceline">
-        <span  class="service">拖车服务:</span>
+        <span  class="service">{{ item.name }}:</span>
         <span class="line"></span>
       </div>
       <van-radio-group v-model="trailerService" @change="change" class="radioWrap">
-        <van-radio name="故障——平板拖车" class="item">
-          故障——平板拖车
-          <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>
-    </div>
-    <div class="smallRepairService">
-      <div  class="serviceline">
-        <span class="service">小修服务:</span>
-        <span class="line"></span>
-      </div>
-      <van-radio-group v-model="smallRepairService" @change="change2" class="radioWrap">
-        <van-radio name="换胎" class="item">
-          换胎
-          <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 name="送油" class="item">
-          送油
-          <img
-              slot="icon"
-              slot-scope="props"
-              :src="props.checked ? activeIcon : inactiveIcon"
-          >
-        </van-radio>
-        <van-radio name="送水" class="item">
-          送水
+        <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>
     </div>
   </div>
@@ -129,7 +89,7 @@
 
 <script>
 import {myMixins} from "@/utils/myMixins"
-import {vehicleTypeList,saveVehicle,getInfoById} from "@/api/mine"
+import {vehicleTypeList,saveVehicle,getInfoById,supplierServiceTree} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup from "@/components/cellGroup.vue";
 export default {
@@ -146,7 +106,8 @@ export default {
       typeList:[],//车辆类型列表
       selectedOption:'1',//车辆类型
       id:'',//车辆Id
-      serviceIds:''//车辆服务种类
+      serviceIds:'',//车辆服务种类,
+      supplierServiceList:[]
     }
   },
   async mounted() {
@@ -159,7 +120,10 @@ export default {
      this.selectedOption=selectElement.value;
     });
     await this.getTypeList();
-    await this.vehicleInfo()
+    if( this.id){
+      await this.vehicleInfo()
+    }
+    await this.getSupplierServiceTree();
   },
   methods:{
     async getTypeList() {
@@ -168,21 +132,26 @@ export default {
           this.typeList=result.data
         }
     },
+    async getSupplierServiceTree(){
+      let res = await supplierServiceTree();
+      this.supplierServiceList=res.data
+    },
     async vehicleInfo(){
       let res= await  getInfoById({
         vehicleId:this.id
       })
-      if(res.code === 200){
+      // 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
+      console.log(" this.trailerService", this.trailerService)
     },
     change2(e) {
       this.smallRepairService=e
@@ -194,17 +163,18 @@ export default {
       this.$router.back()
     },
     async submitBtn(){
-      let res=await saveVehicle({
-        vehicleId:this.id ? this.id : '',
-        plateNumber:this.carNum ? this.carNum :'',
-        vehicleType:this.selectedOption ? this.selectedOption : '',
-        hasPolymerization:Number(this.isJoin ? this.isJoin : '') ,
-        serviceIds:this.serviceIds ? this.serviceIds : []
-      })
-      if(res.code === 200){
+      if(!(this.carNum && this.selectedOption && this.isJoin)){
+        this.$toast('必填字段未填写')
+      }else{
+        await saveVehicle({
+          vehicleId:this.id ? this.id : '',
+          plateNumber:this.carNum ? this.carNum :'',
+          vehicleType:this.selectedOption ? this.selectedOption : '',
+          hasPolymerization:Number(this.isJoin ? this.isJoin : '') ,
+          serviceIds:this.serviceIds ? this.serviceIds : []
+        })
         if(this.id){
           this.$toast('修改成功')
-
         }else{
           this.$toast('添加成功')
         }
@@ -229,6 +199,7 @@ export default {
 }
 .wrap{
 @include wh(100%,100%);
+  overflow-y: auto;
 }
 .addContentWrap{
   margin-left: 16px;
@@ -301,10 +272,11 @@ export default {
     }
   }
   .btn{
-    margin-left: 8px;
+    //margin-left: 8px;
     width: 90%;
-    position: fixed;
-    bottom: 30px;
+    margin: 40px 0 30px 8px;
+    //position: fixed;
+    //bottom: 30px;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/index/vehicleManage.vue b/src/views/index/vehicleManage.vue
index b48b0f5f..f801817d 100644
--- a/src/views/index/vehicleManage.vue
+++ b/src/views/index/vehicleManage.vue
@@ -64,7 +64,7 @@ export default {
           pageNum:this.pageNum,
           pageSize:this.pageSize
         })
-        if(result.code === 200){
+        // if(result.code === 200){
           this.total=result.total
           if(this.pageNum == 1){// 第一页直接赋值
             this.vehicleList=result.data;
@@ -73,20 +73,20 @@ export default {
             let arr = result.data;
             this.vehicleList = preList.concat(arr)
           }
-        }
+        // }
       },
     deleteItem(id){//删除车辆
         this.show=true
         this.id=id
     },
    async handleConfirm(){//调删除车辆接口
-      let result= await deleteVehicle({
+      await deleteVehicle({
         vehicleId:this.id
       })
-     if(result.code === 200){
+     // if(result.code === 200){
        this.$toast('删除成功');
-        await this.getVehicleList();
-     }
+       await this.getVehicleList();
+     // }
     },
     updateVehicle(item){//修改
       this.$router.push({
diff --git a/src/views/index/workOrderDetail.vue b/src/views/index/workOrderDetail.vue
index f531cafe..20b54bac 100644
--- a/src/views/index/workOrderDetail.vue
+++ b/src/views/index/workOrderDetail.vue
@@ -90,7 +90,6 @@ export default {
     this.userOrderId = urlParams.get('userOrderId');
     this.orderCode=urlParams.get('orderCode');
     this.taskOrderId=urlParams.get('taskOrderId') ? urlParams.get('taskOrderId') : '';
-    // console.log(this.queryType)
     await this.getDetail();
   },
   methods:{
@@ -101,9 +100,9 @@ export default {
         orderCode:this.orderCode,
         taskOrderId:this.taskOrderId ? this.taskOrderId : ''
       })
-      if(result.code === 200){
-        this.orderDetailInfo=result.data;
-      }
+      // if(result.code === 200){
+        this.orderDetailInfo=result;
+      // }
     }
   }
 }