Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-repair-app

pages-order/orderDetail/orderDetail.vue

@@ -16,6 +16,11 @@
               </view>
             </template>
           </view>
+          <view class="noReviewPart" @click="showReviewList()">
+            <u-icon color="#E8A321" name="error-circle-fill" size="14"></u-icon>
+            <text class="messageText">当前项目有待审批的配件申请单！</text>
+            <u-icon color="#E8A321" name="arrow-right" size="14"></u-icon>
+          </view>
           <view class="carTitle">车辆信息</view>
           <view class="carDetail">
             <view class="carHeader">
@@ -114,11 +119,7 @@
           <view class="projList">
             <template>
               <view v-for="item in ticketInfo.items" :key="item.id" class="projEditItem">
-                <view class="noReviewPart" @click="showReviewList(item.id)">
+
-                  <u-icon color="#E8A321" name="error-circle-fill" size="14"></u-icon>
-                  <text class="messageText">当前项目有待审批的配件申请单！</text>
-                  <u-icon color="#E8A321" name="arrow-right" size="14"></u-icon>
-                </view>
                 <view class="projEditLine1">
                   <text>{{ item.itemName }}</text>
                   <text class="projAmount">￥{{ item.itemMoney }}</text>
@@ -172,6 +173,28 @@
             </template>
           </view>
         </view>
+        <view v-if="ticketInfo.wares && ticketInfo.wares.length > 0" class="card cardInfo projCard">
+          <view class="projTitle">维修配件</view>
+          <view class="projList">
+            <template>
+              <view v-for="item in ticketInfo.wares" :key="item.id" class="projEditItem">
+
+                <view class="projEditLine1">
+                  <text>{{ item.itemName }}</text>
+                  <text class="projAmount">￥{{ item.itemMoney }}</text>
+                </view>
+                <view class="projBaseInfo">
+                  <view>规格：{{item.project.spec}}</view>
+                  <view>售价：{{ item.itemPrice }}</view>
+                  <view>数量：{{ item.itemCount }}</view>
+                  <view>单位：{{ item.itemUnit}}</view>
+                  <view>折扣：{{ item.itemDiscount }}</view>
+                  <view>金额：{{ item.itemMoney }}</view>
+                </view>
+              </view>
+            </template>
+          </view>
+        </view>
         <view v-if="isDetail == '1'" class="card cardInfo projCard">
           <view class="projTitle">维修记录</view>
           <view class="projList">
@@ -630,25 +653,6 @@ export default {
             }
           }
 
-          .noReviewPart {
-            padding: 20rpx 36rpx 20rpx 10rpx;
-            display: flex;
-            align-items: center;
-            column-gap: 10rpx;
-
-            background: #FFF6E7;
-            border-radius: 4rpx 4rpx 4rpx 4rpx;
-
-            font-weight: 500;
-            font-size: 28rpx;
-            color: #E8A321;
-
-            .messageText {
-              flex: 1;
-              width: 0;
-            }
-          }
-
           .projSend {
             display: flex;
             align-items: center;
@@ -660,6 +664,25 @@ export default {
         }
       }
 
+      .noReviewPart {
+        padding: 10rpx 36rpx 10rpx 10rpx;
+        display: flex;
+        align-items: center;
+        column-gap: 10rpx;
+        margin-top: 10rpx;
+        background: #FFF6E7;
+        border-radius: 4rpx 4rpx 4rpx 4rpx;
+
+        font-weight: 500;
+        font-size: 28rpx;
+        color: #E8A321;
+
+        .messageText {
+          flex: 1;
+          width: 0;
+        }
+      }
+
       .projEditItem {
         padding: 0 20rpx;
         background: #F2F2F7;