From 84b4e6e9a36ed98b41424d4d83c20fe4022364c0 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Wed, 13 Nov 2024 16:37:01 +0800
Subject: [PATCH] 1

---
 components/orderCard.vue                |  3 ---
 pages-order/addOrder/addOrder.vue       | 20 ++++++++++++-------
 pages-order/orderDetail/orderDetail.vue | 26 ++++++++++++-------------
 pages/myCar/carDetail.vue               |  6 ++++--
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/components/orderCard.vue b/components/orderCard.vue
index 8517283..0b50317 100644
--- a/components/orderCard.vue
+++ b/components/orderCard.vue
@@ -63,9 +63,6 @@
 <!--        <view @click="doOrder(order.id)" v-if="order.ticketsStatus == '05' && order.ticketsWorkStatus=='04' && roleCanSg" class="btn qc">-->
 <!--          开始施工-->
 <!--        </view>-->
-        <view v-if="order.ticketsStatus == '06' && roleCanQc" class="btn qc">
-          告知取车
-        </view>
         <view v-if="userInfo.roleCodes.includes('weixiu') || userInfo.roleCodes.includes('service_advisor') || userInfo.roleCodes.includes('general_inspection')" @click="doVoid(order)" class="btn pg">
           <!--          在什么都不能操作的情况下，可以查看详情-->
           作废
diff --git a/pages-order/addOrder/addOrder.vue b/pages-order/addOrder/addOrder.vue
index f69c833..98a5207 100644
--- a/pages-order/addOrder/addOrder.vue
+++ b/pages-order/addOrder/addOrder.vue
@@ -560,7 +560,7 @@ export default {
       this.ticketType = event.detail.value;
     },
 
-    getCarList() {
+    getCarList(carId) {
       const params = {
         userId: this.userInfo.userId,
         pageNo: 1,
@@ -606,17 +606,23 @@ export default {
               break
             }
           }
+        }else if(carId){
+          for (let i = 0; i < this.carList.length; i++) {
+            if (carId == this.carList[i].id) {
+              this.activeCarIndex = i
+              break
+            }
+          }
         }
       })
     },
     editCarInfo(index) {
       bus.$off('updateCarInfo')
-      bus.$on('updateCarInfo', (carInfo) => {
-        if (index) {
-          this.carList[index] = carInfo
-        } else {
-          this.carList.push(carInfo)
-        }
+      bus.$on('updateCarInfo', (carId) => {
+        this.$nextTick(()=>{
+          //重新查车辆信息
+          this.getCarList(carId)
+        })
       })
       if (this.userInfo == null) {
         //弹窗提示请选择客户
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index c8f0c57..a36fbb8 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -479,17 +479,17 @@ export default {
             })
             return
           }
-          if((item.itemPrice && item.itemPrice>0) && (item.itemCount && item.itemCount>0) && (item.itemDiscount && item.itemDiscount>0 && item.itemDiscount<=1)){
-            //数据符合要求重新计算
-            item.itemMoney = item.itemPrice*item.itemCount*item.itemDiscount
-          }else{
-            canSubmit=false
-            uni.showToast({
-              title: '维修项目'+item.itemName+'价格有误！',
-              icon: 'none'
-            })
-            return
+          //不校验项目金额、折扣、数量必填，但是为null的设置为0
+          if(!item.itemPrice){
+            item.itemPrice = 0
           }
+          if(!item.itemCount){
+            item.itemCount = 0
+          }
+          if(!item.itemDiscount){
+            item.itemDiscount = 1
+          }
+          item.itemMoney = item.itemPrice*item.itemCount*item.itemDiscount
         })
       }
       //APP暂时不修改配件的信息--
@@ -598,7 +598,7 @@ export default {
           }).then((res) => {
           })
         }else if("callCus"==this.nowChooseOperate){
-          //服务顾问通知客户取车
+          //服务顾问通知客户取车，
           let dataObj = {
             id: this.ticketInfo.id,
             name:this.callServiceInfo.name,
@@ -642,8 +642,7 @@ export default {
       if(this.loginUser.roleCodes.includes("service_advisor")){
         //服务顾问
         this.canOpenCus = true
-        if(this.ticketInfo.nowRepairId==this.loginUser.id){
-          //当前用户就是处理人，可以进行出厂检验  和通知客户取车
+          //服务顾问可以进行出厂检验  和通知客户取车
           if("05"==this.ticketInfo.ticketsStatus) {
             this.content.push({
               text: '出厂检验', active: false, code: "out"
@@ -655,7 +654,6 @@ export default {
               text: '通知取车', active: false,code:"callCus"
             })
           }
-        }
         //设置服务顾问默认的姓名联系方式
         this.callServiceInfo.name = this.loginUser.nickname
         this.callServiceInfo.tel = this.loginUser.mobile
diff --git a/pages/myCar/carDetail.vue b/pages/myCar/carDetail.vue
index 9cae93c..2405dab 100644
--- a/pages/myCar/carDetail.vue
+++ b/pages/myCar/carDetail.vue
@@ -130,6 +130,7 @@
 import VNavigationBar from '@/components/VNavigationBar.vue';
 import request from "@/utils/request";
 import config from '@/config'
+import {bus} from "@/utils/eventBus";
 import upload from "@/utils/upload";
 import {getDictByCode} from "@/utils/utils";
 
@@ -177,6 +178,7 @@ export default {
       //可选车辆性质范围
       natureList: [],
       natureIndex: 0,
+      index:null,
     };
   },
   onLoad(options) {
@@ -194,6 +196,7 @@ export default {
           url: config.baseImageUrl + this.car.carLicenseImg
         })
       }
+      this.index = options.index
     } else {
       // 没有数据 需要赋值一下初始化
       this.bo1 = false;
@@ -303,8 +306,6 @@ export default {
     },
     // 新增
     async submit() {
-
-      // bus.$emit('updateCarInfo', this.car)
       this.car.brandAndModel = [this.brandId, this.car.carModel]
       //将日期转为时间戳
       if (this.car.nextInspectionDate) {
@@ -329,6 +330,7 @@ export default {
           method: 'PUT',
           data: this.car,
         }).then(res => {
+          bus.$emit('updateCarInfo',this.car.id)
           uni.navigateBack();
         })
       } else {