From ae31f33850d92896f636386173621c63b26d65b0 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 19 Mar 2025 17:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=EF=BC=9A?=
 =?UTF-8?q?=201=E3=80=81=E5=8E=BB=E9=99=A4=E6=94=B6=E8=B4=B9=E9=A2=91?=
 =?UTF-8?q?=E6=AC=A1=E5=AD=97=E6=AE=B5=202=E3=80=81=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF=E9=AA=8C=E8=AF=81=EF=BC=9A=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E6=98=AF5=E7=9A=84=E5=80=8D=E6=95=B0=205~55?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigServiceDirective.data.ts            | 10 +++---
 .../components/ConfigServiceDirectiveForm.vue | 34 +++++++++++++++----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
index 8a389d2..45d7b38 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
@@ -64,11 +64,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'izPreferential_dictText',
     width: 100,
   },
-  {
-    title: '收费频次',
-    align: 'center',
-    dataIndex: 'chargingFrequency_dictText',
-  },
+  // {
+  //   title: '收费频次',
+  //   align: 'center',
+  //   dataIndex: 'chargingFrequency_dictText',
+  // },
   {
     title: '周期类型',
     align: 'center',
diff --git a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
index 8d8cbdf..1c2d60f 100644
--- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -34,13 +34,13 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="收费价格" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
+              <a-form-item label="收费价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
                 name="tollPrice">
                 <a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="提成价格" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice"
+              <a-form-item label="提成价格(元)" v-bind="validateInfos.comPrice" id="ConfigServiceDirectiveForm-comPrice"
                 name="comPrice">
                 <a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%" />
               </a-form-item>
@@ -76,7 +76,8 @@
             <a-col :span="12">
               <a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration"
                 id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
-                <a-input v-model:value="formData.serviceDuration" placeholder="请输入服务时长（分钟）" allow-clear></a-input>
+                <a-input-number v-model:value="formData.serviceDuration" :min="5" :max="55" :step="5"
+                  placeholder="请输入服务时长（分钟）" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -93,8 +94,8 @@
               </a-form-item>
             </a-col> -->
             <a-col :span="24">
-              <a-form-item label="指令标签" id="ConfigServiceDirectiveForm-typeId"
-                :labelCol="labelCol2" :wrapperCol="wrapperCol2" name="typeId">
+              <a-form-item label="指令标签" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2"
+                :wrapperCol="wrapperCol2" name="typeId">
                 <JCheckbox v-model:value="formData.tags"
                   :dictCode="`config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
               </a-form-item>
@@ -210,7 +211,7 @@ const formData = reactive<Record<string, any>>({
   cycleType: '',
   sort: 99,
   serviceContent: '',
-  serviceDuration: '',
+  serviceDuration: '5',
   izEnabled: '0',
   createBy: '',
   createTime: '',
@@ -238,7 +239,26 @@ const validatorRules = reactive({
   // chargingFrequency: [{ required: true, message: '请选择收费频次!' },],
   cycleType: [{ required: true, message: '请选择周期类型!' },],
   // sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
-  serviceDuration: [{ required: true, message: '请输入服务时长（分钟）!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
+  serviceDuration: [
+    { required: true, message: '请输入服务时长（分钟）!' },
+    { pattern: /^\d+$/, message: '请输入正整数!' },
+    {
+      validator: (_, value) => {
+        if (value % 5 !== 0) {
+          return Promise.reject('请输入5的倍数!');
+        }
+        return Promise.resolve();
+      },
+    },
+    {
+      validator: (_, value) => {
+        if (value < 5 || value > 55) {
+          return Promise.reject('请输入5到55之间的值!');
+        }
+        return Promise.resolve();
+      },
+    },
+  ],
   izEnabled: [{ required: true, message: '请选择是否启用!' },],
 });
 const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });