From 4d7b6c15a978776de3f420a5486c44438fced8ed Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Wed, 22 Jan 2025 19:03:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B8=88=E5=82=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=91=20=E4=BC=98=E5=8C=96#=20=E7=A7=BB=E9=99=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/master_worker/edit.vue  |  4 ++--
 src/views/master_worker/index.vue |  4 ++--
 src/views/order/lists/detail.vue  | 12 ++++++++++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/views/master_worker/edit.vue b/src/views/master_worker/edit.vue
index 5acd96c..1a5558f 100644
--- a/src/views/master_worker/edit.vue
+++ b/src/views/master_worker/edit.vue
@@ -67,7 +67,7 @@
             <el-form-item label="详细地址:">
                 <el-input class="ls-input" type="textarea" v-model="formData.address" placeholder="选填，请输入详细地址" :rows="6"></el-input>
             </el-form-item>
-            <el-form-item label="接单状态:" prop="isReceiveOrder">
+            <!-- <el-form-item label="接单状态:" prop="isReceiveOrder">
                 <el-switch
                     v-model="formData.isReceiveOrder"
                     :active-text="!formData.isReceiveOrder ? '启用' : '停用'"
@@ -75,7 +75,7 @@
                     :inactive-value="1"
                     disabled
                 />
-            </el-form-item>
+            </el-form-item> -->
             <!-- <el-form-item label="运营师傅:">
                 <el-switch
                     v-model="formData.isOperational"
diff --git a/src/views/master_worker/index.vue b/src/views/master_worker/index.vue
index 540ec6c..f8c3377 100644
--- a/src/views/master_worker/index.vue
+++ b/src/views/master_worker/index.vue
@@ -117,7 +117,7 @@
                         </el-popover>
                     </template>
                 </el-table-column> -->
-                <el-table-column label="接单状态" min-width="80">
+                <!-- <el-table-column label="接单状态" min-width="80">
                     <template #default="scope">
                         <el-switch
                             v-model="scope.row.isReceiveOrder"
@@ -127,7 +127,7 @@
                             disabled
                         />
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <!-- <el-table-column label="运营师傅" min-width="80">
                     <template #default="scope">
                         <el-switch
diff --git a/src/views/order/lists/detail.vue b/src/views/order/lists/detail.vue
index 5cdc63c..e169407 100644
--- a/src/views/order/lists/detail.vue
+++ b/src/views/order/lists/detail.vue
@@ -14,7 +14,7 @@
                 </div>
             </template>
             <!-- 订单信息 -->
-            <el-form :inline="true" :model="formData" label-width="auto">
+            <el-form :inline="true" :model="formData" label-width="auto" class="order-form">
                 <el-form-item label="订单状态: ">
                     <div class="content text-warning">{{ formData.orderStatusName || '-' }}</div>
                 </el-form-item>
@@ -56,6 +56,11 @@
                 <el-form-item label="商家备注: ">
                     <div class="w-[300px] break-words">{{ formData.orderRemarks! || '-' }}</div>
                 </el-form-item>
+                <el-form-item label="退款原因: " v-if="formData.orderStatus == 4">
+                    <div class="content">
+                        {{ formData?.orderRefundDetailVo?.refundReason || '-' }}
+                    </div>
+                </el-form-item>
             </el-form>
             <!-- Button Group Start -->
             <div class="button-group">
@@ -451,7 +456,6 @@ watch(
     () => formData.value.staffId,
     newVal => {
         if (newVal) {
-            console.log('watch', newVal)
             const { provinceId, cityId, districtId } = formData.value
             areaValue.value = [provinceId, cityId, districtId]
             handleSelect(areaValue.value)
@@ -558,4 +562,8 @@ onMounted(async () => {
 .button-group {
     border-top: 1px solid #f2f2f2;
 }
+.order-form {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+}
 </style>