diff --git a/.umirc.ts b/.umirc.ts
index a10f7e4..9a83ff9 100644
--- a/.umirc.ts
+++ b/.umirc.ts
@@ -17,9 +17,9 @@ export default defineConfig({
},
proxy: {
'/api/': {
- target: 'http://10.39.13.78:8001/',
+ // target: 'http://10.39.13.78:8001/',
// target: 'https://test-company.linyikj.com.cn/',
- // target: 'https://company.linyikj.com.cn/',
+ target: 'https://company.linyikj.com.cn/',
changeOrigin: true,
pathRewrite: { '^': '' },
},
diff --git a/src/common/components/layout/ChangePassword.tsx b/src/common/components/layout/ChangePassword.tsx
index 67de4b7..38bad78 100644
--- a/src/common/components/layout/ChangePassword.tsx
+++ b/src/common/components/layout/ChangePassword.tsx
@@ -34,9 +34,15 @@ export default function ChangePassword({
}}
>
-
+
diff --git a/src/pages/meter/common_meter/modals/Create.tsx b/src/pages/meter/common_meter/modals/Create.tsx
index 8131ad5..7d85bd9 100644
--- a/src/pages/meter/common_meter/modals/Create.tsx
+++ b/src/pages/meter/common_meter/modals/Create.tsx
@@ -159,7 +159,7 @@ export default function Create(props: MyBetaModalFormProps) {
{
valueType: 'dependency',
name: ['asset_projects_id', 'usage_type', 'meter_type'],
- columns: ({ asset_projects_id, usage_type, meter_type }) => {
+ columns: ({ asset_projects_id, usage_type }) => {
return [
Selects?.ChargeStandard({
title: '选择收费标准',
@@ -168,11 +168,11 @@ export default function Create(props: MyBetaModalFormProps) {
params: {
asset_projects_id: asset_projects_id || props?.item?.id || 0,
charge_type: [
- meter_type === 'HouseMeter'
+ props?.item?.meter_type === 'HouseMeter'
? usage_type === 'WaterMeter'
? 'WaterFee'
: 'ElectricityFee'
- : meter_type === 'CommonMeter'
+ : props?.item?.meter_type === 'CommonMeter'
? usage_type === 'WaterMeter'
? 'SharedWaterFee'
: 'SharedElectricityFee'
diff --git a/src/pages/meter/house_meter/modals/Create.tsx b/src/pages/meter/house_meter/modals/Create.tsx
index ea4a7e2..94806f4 100644
--- a/src/pages/meter/house_meter/modals/Create.tsx
+++ b/src/pages/meter/house_meter/modals/Create.tsx
@@ -160,7 +160,7 @@ export default function Create(props: MyBetaModalFormProps) {
{
valueType: 'dependency',
name: ['asset_projects_id', 'usage_type', 'meter_type'],
- columns: ({ asset_projects_id, usage_type, meter_type }) => {
+ columns: ({ asset_projects_id, usage_type }) => {
return [
Selects?.ChargeStandard({
title: '选择收费标准',
@@ -169,11 +169,11 @@ export default function Create(props: MyBetaModalFormProps) {
params: {
asset_projects_id: asset_projects_id || props?.item?.id || 0,
charge_type: [
- meter_type === 'HouseMeter'
+ props?.item?.meter_type === 'HouseMeter'
? usage_type === 'WaterMeter'
? 'WaterFee'
: 'ElectricityFee'
- : meter_type === 'CommonMeter'
+ : props?.item?.meter_type === 'CommonMeter'
? usage_type === 'WaterMeter'
? 'SharedWaterFee'
: 'SharedElectricityFee'