From f0aee860729f2e43ad1ebb8a2a3502620d87c276 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:34 +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  | 28 +++++++++++++++++++---------
 src/views/system/order/indexjs.js |  4 ++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 8b88f42..909be3d 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -129,6 +129,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="nurseStationName">
           <div class="text">{{query.nurseStationName}}</div>
         </el-form-item>
@@ -138,20 +141,18 @@
         <!-- <el-form-item label="护理员名称" prop="nursePersonName">
           <div class="text">{{query.nursePersonName}}</div>
         </el-form-item>-->
-        <el-form-item label="评价星级" prop="compositeScore">
-          <div class="text">{{query.compositeScore}}</div>
-        </el-form-item>
         <el-form-item label="服务时间" prop="time">
           <div class="text">{{query.time}}</div>
         </el-form-item>
         <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
           <div class="text">{{query.itemServeDurationUnit}}</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
+          label="评价星级"
+          prop="compositeScore"
+          v-if="query.orderStatus =='COMPLETE'||query.orderStatus =='EVALUATED'"
+        >
+          <div class="text">{{query.compositeScore}}</div>
         </el-form-item>
         <el-form-item label="是否失能" prop="disablingCondition">
           <div class="text">{{query.disablingCondition}}</div>
@@ -160,7 +161,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="服务到岗照片"
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js
index c71d835..278f303 100644
--- a/src/views/system/order/indexjs.js
+++ b/src/views/system/order/indexjs.js
@@ -225,8 +225,8 @@ export default {
             appointmentOrderDetails(id).then((res) => {
                 res.data.time = res.data.serviceDate + "-" + res.data.serviceStartTime;
                 this.query = res.data;
-                res.data.disablingCondition == 'DISABLED' ? res.data.disablingCondition = '失能' : ''
-                res.data.disablingCondition == 'NOT_DISABLED' ? res.data.disablingCondition = '未失能' : ''
+                res.data.disablingCondition == 'DISABLED' ? res.data.disablingCondition = '是' : ''
+                res.data.disablingCondition == 'NOT_DISABLED' ? res.data.disablingCondition = '否' : ''
                 if (row.orderStatus == 'EVALUATED') {
                     if (res.data) {
                         if (res.data.evaluateSatisfaction == 'COMMONLY') {