From 67b0e84de3b5462870143fb98c1eed41ea59b5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Sat, 7 Jun 2025 18:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E8=A1=8C=E5=89=8D=E7=BB=95=E8=BD=A6?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bst/area/edit/edit.vue  | 17 +++++++----------
 src/views/bst/order/view/view.vue |  4 ++--
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/bst/area/edit/edit.vue b/src/views/bst/area/edit/edit.vue
index 77aaf57..c60252f 100644
--- a/src/views/bst/area/edit/edit.vue
+++ b/src/views/bst/area/edit/edit.vue
@@ -10,12 +10,12 @@
           <el-tabs >
             <el-tab-pane label="基本信息">
               <el-row :gutter="gutter">
-                <form-col :span="span" label="运营商" prop="userId" v-if="checkPermi(['system:user:list'])">
-                  <user-input v-model="form.userId" :text.sync="form.userName"/>
-                </form-col>
-                <form-col :span="span" label="名称" prop="name">
+                <form-col :span="span" label="运营区名称" label-width="7em" prop="name">
                   <el-input v-model="form.name" placeholder="请输入运营区名称" />
                 </form-col>
+                <form-col :span="span" label="所属运营商" label-width="7em" prop="userId" v-if="checkPermi(['system:user:list'])">
+                  <user-input v-model="form.userId" :text.sync="form.userName"/>
+                </form-col>
                 <form-col :span="span" label="运营时间" prop="areaTimeStart">
                   <el-time-picker
                     is-range
@@ -81,12 +81,6 @@
                 <form-col :span="span" label="禁行区内断电" prop="noRidingOutage" label-width="8em" tip="开启后，当车辆进入禁行区内将断电，直到车辆离开禁行区重新上电">
                   <el-switch v-model="form.noRidingOutage" active-text="断电" inactive-text="不断电"/>
                 </form-col>
-                <form-col :span="span" label="短信通知" prop="msgSwitch" tip="开启短信通知，费用0.1元/条，从运营商余额中扣除（场景：还车审核）">
-                  <el-switch v-model="form.msgSwitch" active-text="开启" inactive-text="关闭"/>
-                </form-col>
-                <!-- <form-col :span="span"  label="超时断电" prop="timeoutLock" tip="风险操作！！！开启后，当订单的押金不足时，将会对车辆进行断电">
-                  <el-switch v-model="form.timeoutLock" active-text="开启" inactive-text="关闭" @change="onChangeTimeoutLock"/>
-                </form-col> -->
               </el-row>
             </el-tab-pane>
             <el-tab-pane label="还车设置">
@@ -117,6 +111,9 @@
                     <el-switch v-model="form.areaOutReturn" active-text="允许" inactive-text="不允许"/>
                   </form-col>
                 </template>
+                <form-col :span="span" label="短信通知" prop="msgSwitch" tip="开启还车审核短信通知，费用0.1元/条，从运营商余额中扣除；当用户还车需要审核时，将会向运营商手机发送一条通知。">
+                  <el-switch v-model="form.msgSwitch" active-text="开启" inactive-text="关闭"/>
+                </form-col>
               </el-row>
             </el-tab-pane>
           </el-tabs>
diff --git a/src/views/bst/order/view/view.vue b/src/views/bst/order/view/view.vue
index 2c31a6e..6e464ca 100644
--- a/src/views/bst/order/view/view.vue
+++ b/src/views/bst/order/view/view.vue
@@ -470,7 +470,7 @@ export default {
         }
 
         if (fee.manageFee || fee.dispatchFee) {
-        this.$confirm(`订单${row.no}存在${fee.dispatchFee ? '调度费' + fee.dispatchFee + '元' : ''}${fee.manageFee ? '管理费' + fee.manageFee + '元' : ''}，是否收取？`, '提示', {
+          this.$confirm(`订单${row.no}存在${fee.dispatchFee ? '调度费' + fee.dispatchFee + '元' : ''}${fee.manageFee ? '管理费' + fee.manageFee + '元' : ''}，是否收取？`, '提示', {
             confirmButtonText: '收取',
             cancelButtonText: '不收取',
             type: 'warning'
@@ -496,7 +496,7 @@ export default {
       this.loading = true;
       endOrder(id, needDispatchFee).then(res => {
         this.$message.success("结束成功");
-        this.getList();
+        this.getDetail();
       }).catch((err) => {
         this.loading = false;
       })