From 91adda297b014fa43cf09b2e924f32cb6228d0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 11 Apr 2023 17:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/order/index.vue | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index b5fd7e2..bf2e35b 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -132,6 +132,9 @@
         <el-form-item label="订单数量" prop="orderCount">
           <div class="text">{{query.orderCount}}</div>
         </el-form-item>
+        <el-form-item label="佣金金额" prop="orderCount">
+          <div class="text">{{query.orderCommissionAmount}}</div>
+        </el-form-item>
         <el-form-item label="护理项目名称" prop="nurseItemName">
           <div class="text">{{query.nurseItemName}}</div>
         </el-form-item>
@@ -150,12 +153,6 @@
         <el-form-item label="护理站名称" prop="nurseStationName">
           <div class="text">{{query.nurseStationName}}</div>
         </el-form-item>
-        <el-form-item label="服务地址" prop="serviceAddress">
-          <div
-            class="text"
-            style="height:100px;line-height:26px;overflow: scroll"
-          >{{query.serviceAddress}}</div>
-        </el-form-item>
         <el-form-item label="是否失能" prop="disablingCondition">
           <div class="text">{{query.disablingCondition}}</div>
         </el-form-item>
@@ -163,7 +160,16 @@
           <div class="text">{{query.disablingReason}}</div>
         </el-form-item>
         <el-form-item label="健康状况" prop="diseaseName">
-          <div class="text">{{query.diseaseName}}</div>
+          <div
+            class="text"
+            style="height:100px;line-height:26px;overflow: scroll"
+          >{{query.diseaseName}}</div>
+        </el-form-item>
+        <el-form-item label="服务地址" prop="serviceAddress">
+          <div
+            class="text"
+            style="height:100px;line-height:26px;overflow: scroll"
+          >{{query.serviceAddress}}</div>
         </el-form-item>
         <el-form-item
           label="服务到岗照片"
@@ -604,10 +610,10 @@ export default {
         res.data.time = res.data.serviceDate + "-" + res.data.serviceStartTime;
         this.query = res.data;
         res.data.disablingCondition == "DISABLED"
-          ? (res.data.disablingCondition = "失能")
+          ? (res.data.disablingCondition = "是")
           : "";
         res.data.disablingCondition == "NOT_DISABLED"
-          ? (res.data.disablingCondition = "未失能")
+          ? (res.data.disablingCondition = "否")
           : "";
         if (row.orderStatus == "EVALUATED") {
           if (res.data) {