From 53baf1b2fa7e17f7b41e0999bc452f80efe6d216 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 25 二月 2025 16:53:12 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront --- packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue index cb77357..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 @@ -132,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'; @@ -187,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