From 8f1c26d574acfc85e31a332a081cb7e957e55a80 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 7 Nov 2024 14:16:06 +0800
Subject: [PATCH] 1

---
 components/orderCard.vue                  | 12 +++++++---
 pages-order/addOrder/addOrder.vue         | 28 ++++++++++++++++++++---
 pages-order/appointOrder/appointOrder.vue |  2 +-
 pages-order/orderDetail/orderDetail.vue   | 17 +++++++-------
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/components/orderCard.vue b/components/orderCard.vue
index 1266ba6..a503ff6 100644
--- a/components/orderCard.vue
+++ b/components/orderCard.vue
@@ -286,9 +286,15 @@ export default {
      * 项目派工
      */
     projectDis(isNei){
-      uni.navigateTo({
-        url: '/pages-order/choosePeople/choosePeople?id=' + this.order.id + '&isNei='+isNei
-      })
+      if('1'==isNei){
+        uni.navigateTo({
+          url: '/pages-order/choosePeople/choosePeople?id=' + this.order.id + '&isNei='+isNei
+        })
+      }else {
+        uni.navigateTo({
+          url: '/pages-order/choosePeople/choosePeople?id=' + this.order.id
+        })
+      }
     }
   }
 }
diff --git a/pages-order/addOrder/addOrder.vue b/pages-order/addOrder/addOrder.vue
index d2fc2db..1cfff3f 100644
--- a/pages-order/addOrder/addOrder.vue
+++ b/pages-order/addOrder/addOrder.vue
@@ -274,7 +274,7 @@ import VNavigationBar from '@/components/VNavigationBar.vue'
 import ProjectPicker from "@/components/projectPicker.vue";
 import {bus} from "@/utils/eventBus";
 import request from "@/utils/request";
-import {getToken, setUserInfo, getUserInfo} from '@/utils/auth.js'
+import {getToken, setUserInfo, getUserInfo,getStorageWithExpiry,setStorageWithExpiry} from '@/utils/auth.js'
 import config from "@/config";
 import {formatTimestamp, formatTimestampCustom} from "@/utils/utils";
 import upload from "@/utils/upload";
@@ -368,19 +368,38 @@ export default {
 
 
     initDict(){
-      this.repairTypes = getDictByCode('repair_type')
+      let dictArray = getStorageWithExpiry('repair_type');
+      if(null==dictArray || undefined==dictArray){
+        request({
+          url: '/admin-api/system/dict-data/type',
+          method: 'get',
+          params:{type:'repair_type'}
+        }).then((res) => {
+          console.log(res)
+          if (res.code == 200) {
+            setStorageWithExpiry('repair_type',res.data,3600)
+            this.repairTypes = dictArray
+            this.buildRepairType()
+          }
+        })
+      }else{
+        this.repairTypes = dictArray
+        this.buildRepairType()
+      }
       this.partDisposals = getDictByCode('repair_part_disposal')
       console.log(this.pageData.repairType,"this.pageData.repairType")
+    },
+    buildRepairType(){
       if(this.pageData.repairType){
         this.repairTypes.map((item,index)=>{
           if(item.value==this.pageData.repairType){
             this.repairTypeIndex = index
+            this.formData.repairType = this.repairTypes[index].value;
             return
           }
         })
       }
     },
-
     afterRead(file) {
       for (let i = 0; i < file.tempFilePaths.length; i++) {
         upload({
@@ -446,6 +465,9 @@ export default {
         fileStr:fileStr,
         ...this.formData,
       }
+      if(this.pageData && this.pageData.hasOwnProperty("bookingId")){
+        data.bookingId = this.pageData.bookingId
+      }
       uni.navigateTo({
         // url: '/pages-repair/signature/signature?data=' + JSON.stringify(data)
         url: '/pages-repair/sign/sign?data=' + JSON.stringify(data)
diff --git a/pages-order/appointOrder/appointOrder.vue b/pages-order/appointOrder/appointOrder.vue
index 7d30bea..0ea3999 100644
--- a/pages-order/appointOrder/appointOrder.vue
+++ b/pages-order/appointOrder/appointOrder.vue
@@ -94,7 +94,7 @@ export default {
     addOrder(order){
       console.log('执行')
       uni.navigateTo({
-        url: `/pages-order/addOrder/addOrder?phone=${this.phone}&carId=${order.carId}&repairType=${order.repairType}`
+        url: `/pages-order/addOrder/addOrder?phone=${this.phone}&carId=${order.carId}&repairType=${order.repairType}&bookingId=${order.id}`
       });
     },
   }
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index a211a4e..17207f2 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -237,12 +237,12 @@
                   <!--                  <text class="projAmount">${{ item.amount }}</text>-->
                 </view>
                 <view class="projBody">
-                  <view class="projDate">
-                    <image mode="aspectFit" src="/static/icons/date.png" style="width: 24rpx;height: 24rpx"></image>
-                    <text class="projDateText">{{ item.createTime }}</text>
+                  <view class="projDate" style="padding: 10rpx 0 0 0" v-if="item.projectName">
+                    <text class="projDateText">本次维修项目：{{ item.projectName }}</text>
                   </view>
-                  <view class="projDate">
-                    <text class="projDateText">{{ item.projectName }}</text>
+                  <view class="projDate" style="padding: 10rpx 0">
+                    <image mode="aspectFit"  src="/static/icons/date.png" style="width: 24rpx;height: 24rpx"></image>
+                    <text class="projDateText">{{ item.createTime }}</text>
                   </view>
                   <template >
                     <view class="projDesc">
@@ -306,7 +306,7 @@
     <view >
       <u-modal :show="show" :title="title" confirmText="电话" cancelText="短信" showCancelButton
                @cancel="message" @confirm="phone " closeOnClickOverlay @close="show = false">
-        客户：{{ ticketInfo.userName }}（{{ ticketInfo.userMobile }}）
+        客户：<view v-if="ticketInfo">{{ ticketInfo.userName}}（{{ ticketInfo.userMobile }}）</view>
       </u-modal>
     </view>
   </view>
@@ -648,6 +648,7 @@ export default {
         this.content.push({
           text: '配件申请', active: false, code: "apply"
         })
+        console.log(this.ticketInfo,"this.ticketInfo")
         if ("05" == this.ticketInfo.ticketsStatus && this.ticketInfo.nowRepairId == this.loginUser.id) {
           //订单状态处于维修中 ，且自己就是施工人
           if ("02" == this.ticketInfo.ticketsWorkStatus) {
@@ -867,9 +868,9 @@ export default {
         }
         this.$nextTick(()=>{
           this.ticketInfo = resultObj
+          //判断当前角色及工单状态显示操作按钮
+          this.checkRoleOperate()
         })
-        //判断当前角色及工单状态显示操作按钮
-        this.checkRoleOperate()
       })
     },