tangning 2 лет назад
Родитель
Сommit
67078b9e57
3 измененных файлов с 19 добавлено и 17 удалено
  1. 11 11
      src/store/modules/home.ts
  2. 5 4
      src/views/detail/index.vue
  3. 3 2
      src/views/detail/repair.vue

+ 11 - 11
src/store/modules/home.ts

@@ -17,17 +17,17 @@ export const useHomeStore = defineStore({
             statusList: {
                 '-1': '全部',
                 0: '待接单',
-                1: '待检测',
-                2: '待报价',
-                3: '待确认',
-                4: '已取消',
-                5: '待备料',
-                6: '维修中',
-                7: '待回收',
-                8: '待测试',
-                9: '待支付',
-                10: '待发货',
-                11: '已完结',//'已发货',
+                10: '待检测',
+                20: '待报价',
+                30: '待确认',
+                40: '已取消',
+                50: '待备料',
+                60: '维修中',
+                70: '待回收',
+                80: '待支付',
+                90: '待回收',
+                100: '待发货',
+                110: '已完结',//'已发货',
                 12: '已完结',//'已评价',
                 13: '已完结',//'待评价',
                 21: '待跟进',

+ 5 - 4
src/views/detail/index.vue

@@ -70,7 +70,7 @@
         <div class="cost_list">
           <div class="item" v-for="item in detailData.priceList" :key="item.name">
             <span>{{ item.name }}</span>
-            <span>¥{{ item.price }} x{{ item.count }}</span>
+            <span>¥{{ item.discount ==0 ?item.price:item.priceDiscount }} x{{ item.count }}</span>
           </div>
         </div>
         <div class="cell" style="border: none">
@@ -170,11 +170,12 @@ onActivated(()=>{
 
 })
 function priceCount(list){
-  let price = 0
+  let priceCount = 0
   list.map(ele => {
-    price = (ele.price * ele.count) + price
+    let price = ele.discount == 0 ? ele.price : ele.priceDiscount
+    priceCount = (price * ele.count) + priceCount
   })
-  return price.toFixed(2)
+  return priceCount.toFixed(2)
 }
 const getDetaile = async () => {
   const { data } = await repairDetails(id);

+ 3 - 2
src/views/detail/repair.vue

@@ -20,7 +20,7 @@
       <div class="cost_list">
         <div class="item" v-for="item in detail.priceList" :key="item.name">
           <span>{{ item.name }}</span>
-          <span>¥{{ item.price }} x{{ item.count }}</span>
+          <span>¥{{ item.discount ==0 ?item.price:item.priceDiscount }} x{{ item.count }}</span>
         </div>
       </div>
       <div class="cell" style="border: none">
@@ -57,7 +57,8 @@ onMounted(async () => {
   detail.value.repairerVo = <any>detaile.repairerVo;
   detail.value.repairRegisterVo = <any>detaile.repairRegisterVo;
   detail.value.priceList = <any>detaile.priceList.map((ele) => {
-    amount = amount + ele.price * ele.count;
+    let price = ele.discount == 0 ? ele.price : ele.priceDiscount
+    amount = amount +  price * ele.count;
     return ele;
   });
   detail.value.amount = amount;