From e7b532e0514eae9c426465da6e6f922e6e9a0696 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 25 二月 2025 15:13:03 +0800
Subject: [PATCH] fix: bug

---
 packages/components/src/views/electricBillRecharge/electricBillRecharge.vue |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index 55fc42a..bc8a618 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -30,11 +30,11 @@
       />
     </FormItem>
     <FormItem label="鐢电綉鎴峰彿" class="bole-form-item" prop="electricAccount" required>
-      <NutInput
+      <NumberInput
         v-model.trim="form.electricAccount"
         class="bole-input-text"
         placeholder="璇疯緭鍏�13浣嶆暟瀛楃紪鍙�"
-        type="text"
+        max-length="13"
       />
     </FormItem>
     <FormItem
@@ -49,6 +49,7 @@
         class="bole-input-text"
         placeholder="璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�"
         type="text"
+        max-length="6"
       />
     </FormItem>
     <FormItem
@@ -96,7 +97,10 @@
         璇ヤ骇鍝佷负鎱㈠厖妯″紡锛�0-72灏忔椂鍐呭埌璐︼紝浠嬫剰璇峰嬁浠樻锛佸厖鍊煎墠璇蜂粩缁嗛槄璇诲厖鍊奸』鐭ワ紒
       </template>
       <template #info>
-        <ConfirmDialogInfoItem label="鐢电綉绫诲瀷" content="鍥藉鐢电綉" />
+        <ConfirmDialogInfoItem
+          label="鐢电綉绫诲瀷"
+          :content="blLifeRecharge.constants.ElectricTypeText[form.electricType]"
+        />
         <ConfirmDialogInfoItem label="鐢佃垂绫诲瀷" content="浣忓畢" />
         <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
         <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
@@ -129,6 +133,7 @@
 import ConfirmDialog from '../../components/Dialog/ConfirmDialog.vue';
 import ConfirmDialogInfoItem from '../../components/Dialog/ConfirmDialogInfoItem.vue';
 import ChooseInputWithPicker from '../../components/Input/ChooseInputWithPicker.vue';
+import NumberInput from '../../components/Input/NumberInput.vue';
 import { useGetRate, useGetElectricParValue } from '../../hooks';
 import { FormValidator } from '../../utils';
 
@@ -184,8 +189,14 @@
 const rules = reactive<FormRules>({
   province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }],
   electricAccountType: [{ required: true, message: '璇烽�夋嫨鐢佃垂绫诲瀷' }],
-  electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�' }],
-  sixID: [{ required: true, message: '璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�' }],
+  electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�', regex: /^\d{13}$/ }],
+  sixID: [
+    {
+      required: true,
+      message: '璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�',
+      validator: FormValidator.validatorIDNumberSix,
+    },
+  ],
   parValue: [
     { required: true, message: '璇烽�夋嫨鍏呭�奸噾棰�', validator: FormValidator.validatorNumberNotNull },
   ],

--
Gitblit v1.9.1