Merge pull request 'fix：更新bug' (#8) from develop into main

Reviewed-on: #8

.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: { '^': '' },
     },

src/common/components/layout/ChangePassword.tsx

@@ -34,9 +34,15 @@ export default function ChangePassword({
       }}
     >
       <ProFormText.Password name="old_password" label="原密码" required />
-      <ProFormText.Password name="new_password" label="新密码" required />
+      <ProFormText.Password
+        name="new_password"
+        label="新密码"
+        tooltip="必须超6位数，包含数字、大小字母、#-_@&*特殊字符"
+        required
+      />
       <ProFormText.Password
         name="re_new_password"
+        tooltip="必须超6位数，包含数字、大小字母、#-_@&*特殊字符"
         label="重复新密码"
         required
       />

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'

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'