From 2b5e3a73961b0c3a11d6c1b368a6aefd57819ad6 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Tue, 22 Aug 2023 18:05:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8A=A5=E5=A4=87=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=8A=A0=E9=98=B2=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BA=A4=E6=8A=A5=E5=A4=87=E5=81=9A=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order.js                     |  9 ++++++
 src/utils/myMixins.js                | 20 ++++++++++++
 src/views/index/driverAdd.vue        |  6 +---
 src/views/index/driverManage.vue     | 20 ++++++++++--
 src/views/index/invoicingNotify.vue  |  6 ++--
 src/views/index/reporting.vue        | 46 ++++++++++++++++++----------
 src/views/index/supplySettlement.vue | 32 ++++++++++++-------
 src/views/index/vehicleAdd.vue       |  5 +--
 src/views/index/vehicleManage.vue    |  6 ++--
 9 files changed, 104 insertions(+), 46 deletions(-)

diff --git a/src/api/order.js b/src/api/order.js
index b9e02493..a434cce5 100644
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -34,6 +34,15 @@ export  function orderReporting(data){
     data
   })
 }
+// 获取订单结算单信息
+export function getOrderSettlement(data){
+  return request({
+    url:'/supplierAppV2/dispatchApp/order/getOrderSettlement',
+    method:'POST',
+    contentType:'application/json',
+    data
+  })
+}
 // 修改结算信息
 export function updateOrderSettlement(data){
   return request({
diff --git a/src/utils/myMixins.js b/src/utils/myMixins.js
index b477a466..e7e56f37 100644
--- a/src/utils/myMixins.js
+++ b/src/utils/myMixins.js
@@ -37,5 +37,25 @@ export const myMixins = {
     h5GoBack(){
       this.$router.back();
     },
+    noMultipleClicks(methods, info) {
+      // methods是需要点击后需要执行的函数， info是点击需要传的参数
+      let that = this;
+      if (that.noClick) {
+        // 第一次点击
+        that.noClick = false;
+        if (info && info !== '') {
+          //info是执行函数需要传的参数
+          methods(info)
+        } else {
+          methods();
+        }
+        setTimeout(() => {
+          console.log("shengxiaoxi")
+          that.noClick = true;
+        }, 3000)
+      } else {
+        // 这里是重复点击的判断
+      }
+    }
   }
 }
diff --git a/src/views/index/driverAdd.vue b/src/views/index/driverAdd.vue
index e8709eaa..e961496f 100644
--- a/src/views/index/driverAdd.vue
+++ b/src/views/index/driverAdd.vue
@@ -127,11 +127,7 @@ export default {
       }
     },
     cancelBtn(){//取消
-      this.driverName='';
-      this.driverPhone='',
-      this.identityCardNumber='',
-      this.drivingModel=''
-      this.states=''
+     this.$router.back()
     },
     validatePhoneNumber() {
       const phoneNumberRegex = /^1[0-9]{10}$/;
diff --git a/src/views/index/driverManage.vue b/src/views/index/driverManage.vue
index a7d87c13..a2c1d7cf 100644
--- a/src/views/index/driverManage.vue
+++ b/src/views/index/driverManage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="wrap">
+  <div class="wrap"  @scroll="handleScroll">
     <div class="navBar">
       <van-nav-bar
           title="司机管理"
@@ -76,7 +76,13 @@ export default {
         });
         if(res.code == 200){
           this.total=res.total
-          this.driverList=res.data
+          if(this.pageNum == 1){
+            this.driverList=res.data
+          }else{
+            let preList = this.driverList;
+            let arr = res.data;
+            this.driverList = preList.concat(arr)
+          }
         }
      },
     async handleStatus(item){
@@ -109,6 +115,16 @@ export default {
         }
       });
     },
+    async handleScroll(){
+      let num =  Math.ceil( this.total / 10)
+      if(num <= this.pageNum){
+        // console.log("不在加载数据")
+      }else{
+        console.log("111111111111")
+        this.pageNum++;
+        await this.getDriverList()
+      }
+    },
 
   }
 }
diff --git a/src/views/index/invoicingNotify.vue b/src/views/index/invoicingNotify.vue
index 66951830..cb0d76fa 100644
--- a/src/views/index/invoicingNotify.vue
+++ b/src/views/index/invoicingNotify.vue
@@ -29,11 +29,11 @@
   </div>
   <div class="item">
     <span class="title">结算总金额:</span>
-    <span class="content">{{ item.totalMoney }}</span>
+    <span class="content">{{ item.totalMoney + '元' }}</span>
   </div>
   <div class="item">
     <span class="title">扣款金额:</span>
-    <span class="content">{{ item.cutMoney }}</span>
+    <span class="content">{{ item.cutMoney + '元'}}</span>
   </div>
   <div class="item">
     <span class="title">扣款原因:</span>
@@ -41,7 +41,7 @@
   </div>
   <div class="item">
     <span class="title">最终开票金额:</span>
-    <span class="content">{{ item.invoiceMoney }}</span>
+    <span class="content">{{ item.invoiceMoney+ '元' }}</span>
   </div>
 </div>
   <div v-show="show" class="bgShow">
diff --git a/src/views/index/reporting.vue b/src/views/index/reporting.vue
index e93653d1..f2d08a50 100644
--- a/src/views/index/reporting.vue
+++ b/src/views/index/reporting.vue
@@ -37,15 +37,17 @@
       </van-radio>
     </van-radio-group>
     <textarea class="multiple" id="text-input" rows="4" cols="50" placeholder="报备描述" v-model="decscripTxt"></textarea><br>
-    <common-btn @submitClick="submit" />
+    <common-btn @submitClick="noMultipleClicks(submit)" />
   </div>
 </template>
 
 <script>
 import {orderReporting} from "@/api/order"
+import {myMixins} from  "@/utils/myMixins"
 import CommonBtn from "@/components/commonBtn.vue"
 export default {
   name: "reportingView",
+  mixins:[myMixins],
   data(){
     return{
       decscripTxt:'',
@@ -54,38 +56,48 @@ export default {
       inactiveIcon: require('@/assets/uncheck.png'),
       queryType:'',
       userOrderId:'',
-      orderCode:''
+      orderCode:'',
+      noClick:true,
     }
   },
   mounted() {
-    console.log(this.radio)
     const urlParams = new URLSearchParams(window.location.search);
     this.queryType = urlParams.get('queryType');
     this.userOrderId = urlParams.get('userOrderId');
     this.orderCode = urlParams.get('orderCode')
   },
+  computed:{
+    isRadio(){
+      return this.radio ? true : false
+    },
+    isTxt(){
+      return this.decscripTxt ? true : false
+    },
+  },
   methods:{
     submit(){
-      console.log("提交1111111111")
       this.goReporting();
     },
     change(e){
       this.radio=e
-      console.log("可以拿到选中的是哪个值",this.radio)
     },
     async goReporting(){
-      let result = await orderReporting({
-        queryType:this.queryType,
-        userOrderId:this.userOrderId,
-        orderCode:this.orderCode,
-        reportingItem:this.radio ? this.radio : "",
-        reportingDesc:this.decscripTxt ? this.decscripTxt : ""
-      })
-      if(result.code === 200){
-        this.$toast(result.msg)
-        setTimeout(()=>{
-          window.android.sendMessage("goBack");
-        },2000)
+      if(this.isRadio || this.isTxt){
+        let result = await orderReporting({
+          queryType:this.queryType,
+          userOrderId:this.userOrderId,
+          orderCode:this.orderCode,
+          reportingItem:this.radio ? this.radio : "",
+          reportingDesc:this.decscripTxt ? this.decscripTxt : ""
+        })
+        if(result.code === 200){
+          this.$toast(result.msg)
+          setTimeout(()=>{
+            window.android.sendMessage("goBack");
+          },2000)
+        }
+      }else{
+        this.$toast("报备事项和报备描述必填一项")
       }
     }
   },
diff --git a/src/views/index/supplySettlement.vue b/src/views/index/supplySettlement.vue
index c6777c82..9ce0dace 100644
--- a/src/views/index/supplySettlement.vue
+++ b/src/views/index/supplySettlement.vue
@@ -51,12 +51,14 @@
       </div>
     </div>
     <common-btn class="btn" @submitClick="submit" />
+
   </div>
 </template>
 
 <script>
 import CommonBtn  from "@/components/commonBtn.vue"
-import  {updateOrderSettlement} from  "@/api/order"
+import {leftCopy} from  "@/utils/common"
+import {getOrderSettlement, updateOrderSettlement} from "@/api/order"
 export default {
   name: "supplySettlement",
   data(){
@@ -78,23 +80,32 @@ export default {
       }
     }
   },
-  mounted() {
-    const urlParams = new URLSearchParams(window.location.search);
-    this.taskOrderId = urlParams.get('taskOrderId');
-    this.userOrderId = urlParams.get('userOrderId');
-    this.orderCode = urlParams.get('orderCode')
+    async mounted() {
+      const urlParams = new URLSearchParams(window.location.search);
+      this.taskOrderId = urlParams.get('taskOrderId');
+      this.userOrderId = urlParams.get('userOrderId');
+      this.orderCode = urlParams.get('orderCode')
+      await this.getDetail()
+
   },
   methods:{
     submit() {
-      console.log("提交")
       this.updatSettlement()
     },
+    async getDetail(){
+      let res = await getOrderSettlement({
+        userOrderId: this.userOrderId,
+        orderCode:  this.orderCode,
+        taskOrderId: this.taskOrderId
+      })
+      leftCopy(this.form,{...res.data})
+    },
     async updatSettlement(){
       let result =await updateOrderSettlement({
         ...this.form,
-        userOrderId:this.userOrderId,
-        orderCode:this.orderCode,
-        taskOrderId:this.taskOrderId
+        userOrderId: this.userOrderId,
+        orderCode:  this.orderCode,
+        taskOrderId: this.taskOrderId
       })
       if(result.code !== 200){
         this.$toast(result.msg)
@@ -104,7 +115,6 @@ export default {
           window.android.sendMessage("goBack");
         },2000)
       }
-      console.log("result",result)
     }
   },
   components:{
diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue
index f0c64e5f..eb82c383 100644
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@@ -200,10 +200,7 @@ export default {
       this.isJoin=e
     },
     cancelBtn(){//取消车辆
-      this.isJoin='';
-      this.trailerService='';
-      this.smallRepairService='';
-      this.carNum=''
+      this.$router.back()
     },
     async submitBtn(){
       console.log("提交车辆");
diff --git a/src/views/index/vehicleManage.vue b/src/views/index/vehicleManage.vue
index d8456e84..84587215 100644
--- a/src/views/index/vehicleManage.vue
+++ b/src/views/index/vehicleManage.vue
@@ -67,7 +67,6 @@ export default {
         })
         if(result.code === 200){
           this.total=result.total
-          //
           if(this.pageNum == 1){// 第一页直接赋值
             this.vehicleList=result.data;
           }else{// 第二页数据拼接
@@ -93,14 +92,13 @@ export default {
      }
     },
     async handleScroll(){
-      // console.log("滑动")
       let num =  Math.ceil( this.total / 10)
       if(num <= this.pageNum){
-        console.log("不在加载数据")
+        // console.log("不在加载数据")
       }else{
         this.pageNum++;
         await this.getVehicleList()
-        console.log("111111111111")
+        // console.log("111111111111")
       }
     },