no message

src/packageWorkorder/pages/orderDetail.vue

@@ -382,7 +382,7 @@
                   :key="idx"
                 >
                   <view class="name">{{ it.goodsName }}</view>
-                  <view class="price">¥{{ it.normAmount.toFixed(2) }}</view>
+                  <view class="price">¥{{ it.totalAmount.toFixed(2) }}</view>
                 </view>
                 <view class="total">
                   <view class="text">合计：</view>
@@ -392,7 +392,7 @@
                         0,
                         0,
                         0,
-                        ...item.rpMaterialOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.normAmount)
+                        ...item.rpMaterialOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.totalAmount)
                       ]
                         .reduce((a, b) => (a * 100 + b * 100) / 100, 0)
                         .toFixed(2)
@@ -410,7 +410,7 @@
                         0,
                         0,
                         0,
-                        ...item.rpMaterialOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.normAmount),
+                        ...item.rpMaterialOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.totalAmount),
                         ...item.rpMaterialOrderItems
                           .filter(o => o.chargeType == 'ACC' || o.chargeType == 'MCC')
                           .map(val => val.totalAmount)
@@ -484,13 +484,18 @@
                   :key="idx"
                 >
                   <view class="name">{{ it.goodsName }}</view>
-                  <view class="price">¥{{ it.normAmount.toFixed(2) }}</view>
+                  <view class="price">¥{{ it.totalAmount.toFixed(2) }}</view>
                 </view>
                 <view class="total">
                   <view class="text">合计：</view>
                   <view class="price"
                     >¥{{
-                      [0, 0, 0, ...item.workerOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.normAmount)]
+                      [
+                        0,
+                        0,
+                        0,
+                        ...item.workerOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.totalAmount)
+                      ]
                         .reduce((a, b) => (a * 100 + b * 100) / 100, 0)
                         .toFixed(2)
                     }}</view
@@ -507,7 +512,7 @@
                         0,
                         0,
                         0,
-                        ...item.workerOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.normAmount),
+                        ...item.workerOrderItems.filter(o => o.chargeType == 'SERV').map(val => val.totalAmount),
                         ...item.workerOrderItems
                           .filter(o => o.chargeType == 'ACC' || o.chargeType == 'MCC')
                           .map(val => val.totalAmount)
@@ -1098,12 +1103,12 @@ export default {
                 {
                   chargeType: 'SERV',
                   goodsName: '服务费用',
-                  normAmount: item.servicePrice || 0
+                  totalAmount: item.servicePrice || 0
                 },
                 {
                   chargeType: 'SERV',
                   goodsName: '其他费用',
-                  normAmount: item.otherPrice || 0
+                  totalAmount: item.otherPrice || 0
                 }
               ]
               if (this.detail.rpProjectRepairId) {