From e53e33dd46fdf138c851b10f12cdc00131a8d644 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期二, 25 二月 2025 17:12:44 +0800 Subject: [PATCH] fix: bug --- packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue index bc8a618..20b5478 100644 --- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue +++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue @@ -6,13 +6,22 @@ label-position="top" class="order-bill-recharge electric" > - <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="province" required> + <FormItem label="鎵�鍦ㄥ尯鍩�" class="bole-form-item" prop="province" required> <ChooseInputWithPicker v-model="form.province" - placeholder="璇烽�夋嫨鍩庡競" + placeholder="璇烽�夋嫨鍖哄煙" :value-enum="electricParValueList" - enum-label-key="areaName" - enum-value-key="areaName" + enum-label-key="cityName" + enum-value-key="cityName" + /> + </FormItem> + <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="city" required v-if="form.province"> + <ChooseInputWithPicker + v-model="form.city" + placeholder="璇烽�夋嫨鍩庡競" + :value-enum="electricCityList" + enum-label-key="cityName" + enum-value-key="cityName" /> </FormItem> <!-- <FormItem label="鐢电綉绫诲瀷" class="bole-form-item" prop="electricType" required> @@ -159,6 +168,7 @@ electricType: '', electricAccountType: '', province: '', + city: '', sixID: '', }); @@ -166,14 +176,18 @@ const { electricParValueList } = useGetElectricParValue(); const parValueList = computed( - () => electricParValueList.value.find((x) => x.areaName === form.province)?.parValue ?? [] + () => electricParValueList.value.find((x) => x.cityName === form.province)?.parValue ?? [] +); + +const electricCityList = computed( + () => electricParValueList.value.find((x) => x.cityName === form.province)?.childCityList ?? [] ); watch( () => form.province, (provinceName) => { const electricParValue = electricParValueList.value.find( - (item) => item.areaName === provinceName + (item) => item.cityName === provinceName ); form.electricType = electricParValue.electricType; } @@ -187,7 +201,8 @@ const { blLifeRecharge } = useLifeRechargeContext(); const rules = reactive<FormRules>({ - province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }], + province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ尯鍩�' }], + city: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }], electricAccountType: [{ required: true, message: '璇烽�夋嫨鐢佃垂绫诲瀷' }], electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�', regex: /^\d{13}$/ }], sixID: [ @@ -237,7 +252,7 @@ electricAccountType: form.electricAccountType, electricAccount: form.electricAccount, province: form.province, - city: '', + city: form.city, sixID: form.sixID, }, }; -- Gitblit v1.9.1