From 85a8bdc5c38fcba4bb8f059f48ae151bf4e32d7e Mon Sep 17 00:00:00 2001
From: Sliverber <2622874537@qq.com>
Date: Mon, 27 May 2024 09:02:28 +0800
Subject: [PATCH] 11

---
 src/views/system/area/index.vue |  3 ++-
 src/views/system/fee/index.vue  | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index dcff681..e65455e 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -376,7 +376,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="电量低于多少值自动生成换电订单" label-width="150">
+            <el-form-item label="电量低于多少值自动生成换电订单" label-width="150" prop="autoReplacementOrder">
               <el-input-number style="width: 50%" v-model="form.autoReplacementOrder" placeholder="电量低于多少值自动生成换电订单"></el-input-number>
             </el-form-item>
           </el-col>
@@ -493,6 +493,7 @@ export default {
         areaName: [{ required: true, message: "运营区域不能为空", trigger: "blur" }],
         contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
         phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }],
+        autoReplacementOrder: [{ required: true, message: "最低电量不能为空", trigger: "blur" }],
       },
     };
   },
diff --git a/src/views/system/fee/index.vue b/src/views/system/fee/index.vue
index 95baf6f..b594bcb 100644
--- a/src/views/system/fee/index.vue
+++ b/src/views/system/fee/index.vue
@@ -42,7 +42,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="ruleId" />
       <el-table-column label="套餐名称" align="center" prop="name" />
-      <el-table-column label="说明" align="center" prop="explain" />
+      <el-table-column label="说明" align="center" prop="instructions" />
       <el-table-column label="时间(小时)" align="center" prop="time" />
       <el-table-column label="费用(元)" align="center" prop="fee" />
       <el-table-column label="状态" align="center" prop="status">
@@ -76,8 +76,9 @@
         <el-form-item label="套餐名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入套餐名称" />
         </el-form-item>
-        <el-form-item label="说明" prop="explain" :show-overflow-tooltip="true">
-          <el-input v-model="form.explain" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="说明" prop="instructions" :show-overflow-tooltip="true">
+          <editor v-model="form.instructions" :min-height="192"/>
+          <!-- <el-input v-model="form.explain" type="textarea" placeholder="请输入内容" /> -->
         </el-form-item>
         <el-form-item label="状态" prop="status" v-if="title != '添加收费方式'">
           <el-select v-model="form.status" placeholder="请选择状态">
@@ -322,7 +323,7 @@ export default {
       },
       form: {
         name: '',
-        explain: '',
+        instructions: '',
         status: "正常",
         autoRefundDeposit: '',
         orderExceedMinutes: '',
@@ -350,7 +351,7 @@ export default {
         name: [
           { required: true, message: '请输入套餐名称', trigger: 'blur' },
         ],
-        explain: [
+        instructions: [
           { required: true, message: '请输入说明', trigger: 'blur' },
         ],
         status: [
@@ -433,7 +434,7 @@ export default {
     reset() {
       this.form = {
         name: '',
-        explain: '',
+        instructions: '',
         status: "正常",
         autoRefundDeposit: '',
         orderExceedMinutes: '',