From 9d901b4215323c97a00a068cd962f5c9c04dadfa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 04 九月 2025 10:15:09 +0800
Subject: [PATCH] 前端

---
 admin/src/components/business/OperaOrderDetailWindow.vue |   99 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/business/OperaOrderDetailWindow.vue b/admin/src/components/business/OperaOrderDetailWindow.vue
index 5a4af7e..8658b5a 100644
--- a/admin/src/components/business/OperaOrderDetailWindow.vue
+++ b/admin/src/components/business/OperaOrderDetailWindow.vue
@@ -59,8 +59,8 @@
             <div  class="cont"><span class="label">鍝佺锛�</span> <span class="txt">{{info.categoryName || ''}}</span></div>
           </div>
           <div class="line">
-            <div class="cont"><span class="label" v-if="info.workType==1">浜烘暟锛�</span> <span class="txt">{{info.priceNum1 || '' }}浜�</span></div>
-            <div class="cont"><span class="label"  v-if="info.workType==0">閲嶉噺锛�</span> <span class="txt">{{info.priceNum1 || '' }}鏂�</span></div>
+            <div class="cont"  v-if="info.workType==1"><span class="label">浜烘暟锛�</span> <span class="txt">{{info.priceNum1 || '' }}浜�</span></div>
+            <div class="cont"  v-if="info.workType==0"><span class="label">閲嶉噺锛�</span> <span class="txt">{{info.priceNum1 || '' }}鏂�</span></div>
             <div class="cont"><span class="label">鐢ㄥ伐鏃堕棿锛�</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div>
             <div class="cont"><span class="label">鐢ㄥ伐澶╂暟锛�</span><span class="txt">{{info.totalDays || 0 }}澶�</span></div>
           </div>
@@ -185,6 +185,22 @@
           </div>
         </div>
       </div>
+      <div class="renzheng" v-if="(info.type ===0 || info.type===1)&&(info.status===5|| info.status===4)" >
+        <div class="info" >
+          <span class="m10">璐圭敤纭</span>
+        </div>
+        <div class="detail" style=" ">
+          <div class="line">
+            <div class="cont"><span class="label">瀹為檯{{feeFrom.priceParam1.name }}锛�</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
+            <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">瀹為檯{{feeFrom.priceParam2.name }}锛�</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
+            <div class="cont"  :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">鍏朵粬璐圭敤锛�</span> <span class="txt">{{((info.confirmOtherFee||0)/100).toFixed(2) }}鍏�</span></div>
+          </div>
+          <div class="line">
+            <div class="cont"><span class="label">瀹為檯鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
+            <div class="cont"  style="flex: 2"><span class="label">澶囨敞锛�</span><span class="txt">{{info.confirmFeeRemark || '' }}</span></div>
+          </div>
+        </div>
+      </div>
       <div class="renzheng" >
         <div class="info" >
           <span class="m10">鍙戝崟鏂逛俊鎭�</span>
@@ -248,9 +264,19 @@
   data () {
     return {
       id: '',
-      wayList:[],
+      wayList: [],
       info: {},
-      loading: false
+      loading: false,
+      feeFrom: {
+        priceParam1: {
+          name: null,
+          unit: null
+        },
+        priceParam2: {
+          name: null,
+          unit: null
+        }
+      }
     }
   },
   methods: {
@@ -259,7 +285,17 @@
       this.visible = true
       this.tableData2 = []
       this.id = row.id
-      this.wayList=[]
+      this.wayList = []
+      this.feeFrom = {
+        priceParam1: {
+          name: null,
+          unit: null
+        },
+        priceParam2: {
+          name: null,
+          unit: null
+        }
+      }
       this.getData()
     },
     getData () {
@@ -267,9 +303,10 @@
         .then(res => {
           this.info = res
           this.visible = true
-          if(this.info.wayInfo){
+          if (this.info.wayInfo) {
             this.wayList = JSON.parse(this.info.wayInfo)
           }
+          this.initPriceNumParam()
           console.log(this.wayList)
         })
     },
@@ -277,7 +314,7 @@
 
     },
     showLogList () {
-      this.$refs.orderProgress.open('璁㈠崟娴佽浆鏃ュ織', this.info.orderLogList||[])
+      this.$refs.orderProgress.open('璁㈠崟娴佽浆鏃ュ織', this.info.orderLogList || [])
     },
     getScoreLevel (num) {
       if (this.info.commentLevel && this.info.commentLevel >= num) {
@@ -312,6 +349,54 @@
               })
           })
       })
+    },
+    initPriceNumParam () {
+      this.feeFrom.priceParam1.name = null
+      this.feeFrom.priceParam1.unit = null
+      this.feeFrom.priceParam2.name = null
+      this.feeFrom.priceParam2.unit = null
+      if (this.info.type === 0 && this.info.workType === 1) {
+        // 鍒嗘嫞宸�
+        this.feeFrom.priceParam1.name = '鐢ㄥ伐澶╂暟锛�'
+        this.feeFrom.priceParam1.unit = '澶�'
+        this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟锛�'
+        this.feeFrom.priceParam2.unit = '浜�'
+      } else if (this.info.type === 0 && this.info.workType === 0) {
+        // 閲囨憳宸�
+        this.feeFrom.priceParam1.name = '閲囨憳閲嶉噺锛�'
+        this.feeFrom.priceParam1.unit = '鏂�'
+        this.feeFrom.priceParam2.name = null
+        this.feeFrom.priceParam2.unit = null
+      } else if (this.info.type === 0 && this.info.workType === 2) {
+        // 鍖呰宸�
+        if (this.info.carType === 0) {
+          // 鎸夊ぉ
+          this.feeFrom.priceParam1.name = '鐢ㄥ伐澶╂暟'
+          this.feeFrom.priceParam1.unit = '澶�'
+          this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟'
+          this.feeFrom.priceParam2.unit = '浜�'
+        } else if (this.info.carType === 1) {
+          // 鎸夊皬鏃�
+          this.feeFrom.priceParam1.name = '宸ヤ綔鏃堕暱'
+          this.feeFrom.priceParam1.unit = '鏃�'
+          this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟'
+          this.feeFrom.priceParam2.unit = '浜�'
+        } else if (this.info.carType === 1) {
+          // 鎸夊皬鏃�
+          this.feeFrom.priceParam1.name = '鍖呰閲嶉噺'
+          this.feeFrom.priceParam1.unit = '鏂�'
+          this.feeFrom.priceParam2.name = null
+          this.feeFrom.priceParam2.unit = null
+        }
+      } else if (this.info.type === 1 && this.info.carType === 0) {
+        // 杩愯揣鍗� 鎸夊ぉ鏁�
+        this.feeFrom.priceParam1.name = '鐢ㄨ溅澶╂暟'
+        this.feeFrom.priceParam1.unit = '澶�'
+      } else if (this.info.type === 1 && this.info.carType === 1) {
+        // 杩愯揣鍗� 鎸夋鏁�
+        this.feeFrom.priceParam1.name = '鐢ㄨ溅娆℃暟'
+        this.feeFrom.priceParam1.unit = '娆�'
+      }
     }
   }
 }

--
Gitblit v1.9.3