From 9b67a469d41a6998cb958dcb63d6e25a162e5013 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 24 Oct 2024 16:44:45 +0800
Subject: [PATCH] 1

---
 pages-order/orderDetail/orderDetail.vue | 34 +++----------------------
 utils/utils.js                          |  6 ++---
 2 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index a4a58a7..9dbc36e 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -173,7 +173,7 @@
             <template>
               <view v-for="item in ticketInfo.records" :key="item.id" class="projItem">
                 <view class="projTop">
-                  <text class="projName">{{item.typeStr }}【{{item.dealUserName}}】</text>
+                  <text class="projName">{{item.type }}【{{item.dealUserName}}】</text>
                   <!--                  <text class="projAmount">${{ item.amount }}</text>-->
                 </view>
                 <view class="projBody">
@@ -252,16 +252,8 @@
 					url: '/pages-order/orderDetail/evaluate'
 				})
 			},
-      buildRecords(resultObj,dictArray){
+      buildRecords(resultObj){
         resultObj.records.map((item)=>{
-          console.log(dictArray,"dictArray")
-          let dictObj = dictArray.find(dict => dict.value == item.type)
-          console.log(dictObj, "dictObj")
-          if (dictObj) {
-            item.typeStr = dictObj.label
-          } else {
-            item.typeStr = "未知数据"
-          }
           item.createTime = formatTimestamp(item.createTime)
           let canReadImg =item.itemList.filter((img)=>{
             return img.isOpen=='1'
@@ -300,27 +292,7 @@
           } else {
             resultObj.birthday = '未知'
           }
-          //维修记录匹配数据字典
-          if (null != resultObj.records){
-            let dictArray = getStorageWithExpiry("repair_records_type");
-            if(null==dictArray || undefined==dictArray){
-              request({
-                url: '/app-api/system/dict-data/type',
-                method: 'get',
-                tenantIdFlag:false,
-                params:{type:"repair_records_type"}
-              }).then((res) => {
-                console.log(res)
-                if (res.code == 200) {
-                  setStorageWithExpiry("repair_records_type",res.data,3600)
-                  this.buildRecords(resultObj,res.data)
-                }
-              })
-            }else{
-              this.buildRecords(resultObj,dictArray)
-            }
-
-          }
+          this.buildRecords(resultObj)
         })
       }
 		},
diff --git a/utils/utils.js b/utils/utils.js
index cebcc6e..651f7c4 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -38,12 +38,12 @@ function getOrderStatusText(ticketsStatus,workStatus){
 	if("04"==ticketsStatus){
 		//待派工
 		str = "待派工"
-	}else if("05"==ticketsStatus){
+	}else if("05"==ticketsStatus || "07"==ticketsStatus){
 		//维修中
 		str = "维修中"
 	}else if("01"==ticketsStatus){
 		//待结算
-		str = "待结算"
+		str = "待取车结算"
 	}else if("06"==ticketsStatus){
 		//挂单/记账
 		str = "挂单/记账"
@@ -159,4 +159,4 @@ export {
 	getDictTextByCodeAndValue,
 	formatTimestamp,
 	formatDate,
-}
\ No newline at end of file
+}