by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修改地址查询层级

Browse Source
This commit is contained in:
fyy
2025-07-30 14:57:42 +08:00
parent 64a01a3d6f
commit e0d55b6ab4
7 changed files with 440 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
apps/web-antd/src/views/property/costManagement/costMeterWater/costMeterWater-modal.vue
View File

@@ -3,15 +3,19 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { useVbenForm } from '#/adapter/form';
import { costMeterWaterAdd, costMeterWaterInfo, costMeterWaterUpdate } from '#/api/property/costMeterWater';
import {
costMeterWaterAdd,
costMeterWaterInfo,
costMeterWaterUpdate,
} from '#/api/property/costMeterWater';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import { cloneDeep,handleNode,getPopupContainer } from '@vben/utils';
import { cloneDeep, handleNode, getPopupContainer } from '@vben/utils';
import { communityTree } from '#/api/property/community';
import { costItemSettingList} from '#/api/property/costManagement/costItemSetting';
import { costItemSettingList } from '#/api/property/costManagement/costItemSetting';
import { meterReadingTypeList } from '#/api/property/costManagement/meterReadingType';
import { getDictOptions } from '#/utils/dict';
import {ultimoWater} from '#/api/property/costMeterWater'
import {personList} from '#/api/property/resident/person'
import { ultimoWater } from '#/api/property/costMeterWater';
import { personList } from '#/api/property/resident/person';
const emit = defineEmits<{ reload: [] }>();
const costItemsOptions = ref<any>([]);
const meterTypeOptions = ref<any>([]);
@@ -20,21 +24,21 @@ const isUpdate = ref(false);
const title = computed(() => {
return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
});
const schema =[
{
label: '主键ID',
fieldName: 'id',
component: 'Input',
dependencies: {
const schema = [
{
label: '主键ID',
fieldName: 'id',
component: 'Input',
dependencies: {
show: () => false,
triggerFields: [''],
},
},
{
},
{
label: '房间号',
fieldName: 'roomId',
component: 'TreeSelect',
rules: 'required'
rules: 'required',
},
{
label: '业主',
@@ -43,13 +47,13 @@ const schema =[
rules: 'required',
componentProps: {
api: async () => {
const res = await personList({pageSize:1000000000,pageNum:1});
const res = await personList({ pageSize: 1000000000, pageNum: 1 });
return res.rows.map((item: any) => ({
label: item.userName,
value: item.id,
}));
},
}
},
},
{
label: '费用类型',
@@ -58,21 +62,29 @@ const schema =[
rules: 'required',
componentProps: {
options: getDictOptions('wy_cbfylx'),
onChange: async (value:any) => {
onChange: async (value: any) => {
// 请求并更新下拉
if (!value) {
costItemsOptions.value = [];
meterTypeOptions.value = [];
isMeterType.value = false
isMeterType.value = false;
} else {
isMeterType.value = true
const costItemsRes = await costItemSettingList({ pageSize: 1000000000, pageNum: 1, costType: value });
costItemsOptions.value = (costItemsRes?.rows || []).map(item => ({
isMeterType.value = true;
const costItemsRes = await costItemSettingList({
pageSize: 1000000000,
pageNum: 1,
costType: value,
});
costItemsOptions.value = (costItemsRes?.rows || []).map((item) => ({
label: item.chargeItem,
value: item.id,
}));
const meterTypeRes = await meterReadingTypeList({ pageSize: 1000000000, pageNum: 1, costType: value == '5' ? 0 : 1 });
meterTypeOptions.value = (meterTypeRes?.rows || []).map(item => ({
const meterTypeRes = await meterReadingTypeList({
pageSize: 1000000000,
pageNum: 1,
costType: value == '5' ? 0 : 1,
});
meterTypeOptions.value = (meterTypeRes?.rows || []).map((item) => ({
label: item.name,
value: item.id,
}));
@@ -100,8 +112,8 @@ const schema =[
meterTypeId: '',
});
console.log(await formApi.getValues());
}
}
},
},
},
{
label: '收费项目',
@@ -111,7 +123,7 @@ const schema =[
componentProps: {
options: costItemsOptions.value,
disabled: !isMeterType.value,
}
},
},
{
label: '抄表类型',
@@ -121,7 +133,7 @@ const schema =[
componentProps: {
options: meterTypeOptions.value,
disabled: !isMeterType.value,
}
},
},
{
label: '上期止度',
@@ -144,7 +156,7 @@ const schema =[
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
disabled:true
disabled: true,
},
{
label: '本期读表时间',
@@ -161,7 +173,7 @@ const schema =[
label: '说明',
fieldName: 'remark',
component: 'Input',
}
},
];
const [BasicForm, formApi] = useVbenForm({
commonConfig: {
@@ -172,7 +184,7 @@ const [BasicForm, formApi] = useVbenForm({
// 通用配置项 会影响到所有表单项
componentProps: {
class: 'w-full',
}
},
},
schema: schema,
showDefaultActions: false,
@@ -197,44 +209,51 @@ const [BasicModal, modalApi] = useVbenModal({
if (!isOpen) {
return null;
}
isMeterType.value = true
setupCommunitySelect()
isMeterType.value = true;
setupCommunitySelect();
modalApi.modalLoading(true);
const { id } = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
if (isUpdate.value && id) {
const record = await costMeterWaterInfo(id);
console.log(1,record);
console.log(1, record);
const costItemsRes = await costItemSettingList({ pageSize: 1000000000, pageNum: 1, costType: record.costType });
costItemsOptions.value = (costItemsRes?.rows || []).map(item => ({
const costItemsRes = await costItemSettingList({
pageSize: 1000000000,
pageNum: 1,
costType: record.costType,
});
costItemsOptions.value = (costItemsRes?.rows || []).map((item) => ({
label: item.chargeItem,
value: item.id,
}));
const meterTypeRes = await meterReadingTypeList({ pageSize: 1000000000, pageNum: 1, costType: record.costType == '5' ? 0 : 1 });
meterTypeOptions.value = (meterTypeRes?.rows || []).map(item => ({
const meterTypeRes = await meterReadingTypeList({
pageSize: 1000000000,
pageNum: 1,
costType: record.costType == '5' ? 0 : 1,
});
meterTypeOptions.value = (meterTypeRes?.rows || []).map((item) => ({
label: item.name,
value: item.id,
}));
formApi.updateSchema([
{
fieldName: 'itemId',
componentProps: {
options: costItemsOptions.value,
disabled: !isMeterType.value,
},
{
fieldName: 'itemId',
componentProps: {
options: costItemsOptions.value,
disabled: !isMeterType.value,
},
{
fieldName: 'meterTypeId',
componentProps: {
options: meterTypeOptions.value,
disabled: !isMeterType.value,
},
},
{
fieldName: 'meterTypeId',
componentProps: {
options: meterTypeOptions.value,
disabled: !isMeterType.value,
},
]);
},
]);
await formApi.setValues(record);
console.log(2,await formApi.getValues());
console.log(2, await formApi.getValues());
}
await markInitialized();
@@ -253,29 +272,31 @@ async function handleConfirm() {
const data = cloneDeep(await formApi.getValues());
console.log(data);
await (isUpdate.value ? costMeterWaterUpdate(data) : costMeterWaterAdd(data));
await (isUpdate.value
? costMeterWaterUpdate(data)
: costMeterWaterAdd(data));
resetInitialized();
//必须要手动清空，不然ref会保留值
costItemsOptions.value = [];
meterTypeOptions.value = [];
isMeterType.value = false
// 更新表单下拉
formApi.updateSchema([
{
fieldName: 'itemId',
componentProps: {
options: costItemsOptions.value,
disabled: !isMeterType.value,
},
},
{
fieldName: 'meterTypeId',
componentProps: {
options: meterTypeOptions.value,
disabled: !isMeterType.value,
},
},
]);
isMeterType.value = false;
// 更新表单下拉
formApi.updateSchema([
{
fieldName: 'itemId',
componentProps: {
options: costItemsOptions.value,
disabled: !isMeterType.value,
},
},
{
fieldName: 'meterTypeId',
componentProps: {
options: meterTypeOptions.value,
disabled: !isMeterType.value,
},
},
]);
emit('reload');
modalApi.close();
} catch (error) {
@@ -287,37 +308,37 @@ async function handleConfirm() {
async function handleClosed() {
await formApi.resetForm();
await formApi.setValues({})
await formApi.setValues({});
costItemsOptions.value = [];
meterTypeOptions.value = [];
isMeterType.value = false
// 更新表单下拉
formApi.updateSchema([
{
fieldName: 'itemId',
componentProps: {
options: costItemsOptions.value,
disabled: !isMeterType.value,
},
},
{
fieldName: 'meterTypeId',
componentProps: {
options: meterTypeOptions.value,
disabled: !isMeterType.value,
},
},
]);
isMeterType.value = false;
// 更新表单下拉
formApi.updateSchema([
{
fieldName: 'itemId',
componentProps: {
options: costItemsOptions.value,
disabled: !isMeterType.value,
},
},
{
fieldName: 'meterTypeId',
componentProps: {
options: meterTypeOptions.value,
disabled: !isMeterType.value,
},
},
]);
resetInitialized();
}
// 获取服务地址
async function setupCommunitySelect() {
const areaList = await communityTree(5);
const areaList = await communityTree(4);
// 选中后显示在输入框的值 即父节点 / 子节点
// addFullName(areaList, 'areaName', ' / ');
const splitStr = '/';
handleNode(areaList, 'label', splitStr, function (node: any) {
if (node.level != 5) {
if (node.level != 4) {
node.disabled = true;
}
});
@@ -342,17 +363,17 @@ async function setupCommunitySelect() {
// 选中后显示在输入框的值
treeNodeLabelProp: 'fullName',
onChange: async (value: any) => {
if(!value){
await formApi.setValues({preDegrees:''})
await formApi.setValues({preReadingTime:''})
}else{
const data = await ultimoWater(value)
if(data){
await formApi.setValues({preDegrees:data.curDegrees})
await formApi.setValues({preReadingTime:data.curReadingTime})
if (!value) {
await formApi.setValues({ preDegrees: '' });
await formApi.setValues({ preReadingTime: '' });
} else {
const data = await ultimoWater(value);
if (data) {
await formApi.setValues({ preDegrees: data.curDegrees });
await formApi.setValues({ preReadingTime: data.curReadingTime });
}
}
}
},
},
}),
fieldName: 'roomId',
},

164
apps/web-antd/src/views/property/costManagement/houseCharge/houseCharge-add.vue
View File

@@ -1,25 +1,25 @@
<script setup lang="ts">
import {computed, ref} from 'vue';
import { computed, ref } from 'vue';
import {useVbenModal} from '@vben/common-ui';
import {$t} from '@vben/locales';
import {cloneDeep, handleNode} from '@vben/utils';
import { useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { cloneDeep, handleNode } from '@vben/utils';
import {useVbenForm} from '#/adapter/form';
import { useVbenForm } from '#/adapter/form';
import {
houseChargeAdd,
houseChargeInfo,
houseChargeUpdate
houseChargeUpdate,
} from '#/api/property/costManagement/houseCharge';
import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
import {modalSchema} from './data';
import {communityTree} from "#/api/property/community";
import {costItemSettingList} from "#/api/property/costManagement/costItemSetting";
import type {CostItemSettingVO} from "#/api/property/costManagement/costItemSetting/model";
import {getDictOptions} from "#/utils/dict";
import {personList} from "#/api/property/resident/person";
import {renderDictValue} from "#/utils/render";
import { modalSchema } from './data';
import { communityTree } from '#/api/property/community';
import { costItemSettingList } from '#/api/property/costManagement/costItemSetting';
import type { CostItemSettingVO } from '#/api/property/costManagement/costItemSetting/model';
import { getDictOptions } from '#/utils/dict';
import { personList } from '#/api/property/resident/person';
import { renderDictValue } from '#/utils/render';
const emit = defineEmits<{ reload: [] }>();
@@ -38,14 +38,14 @@ const [BasicForm, formApi] = useVbenForm({
// 通用配置项 会影响到所有表单项
componentProps: {
class: 'w-full',
}
},
},
schema: modalSchema(),
showDefaultActions: false,
wrapperClass: 'grid-cols-2',
});
const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff(
const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
{
initializedGetter: defaultFormValueGetter(formApi),
currentGetter: defaultFormValueGetter(formApi),
@@ -64,16 +64,16 @@ const [BasicModal, modalApi] = useVbenModal({
return null;
}
modalApi.modalLoading(true);
await initRoomOptions()
await queryCostItemOptions()
await initCostTypeOptions()
await queryPersonData()
const {id} = modalApi.getData() as { id?: number | string };
await initRoomOptions();
await queryCostItemOptions();
await initCostTypeOptions();
await queryPersonData();
const { id } = modalApi.getData() as { id?: number | string };
isUpdate.value = !!id;
if (isUpdate.value && id) {
const record = await houseChargeInfo(id);
record.chargeTime = [record.startTime, record.endTime]
record.chargeTime = [record.startTime, record.endTime];
await formApi.setValues(record);
}
await markInitialized();
@@ -85,15 +85,15 @@ const [BasicModal, modalApi] = useVbenModal({
async function handleConfirm() {
try {
modalApi.lock(true);
const {valid} = await formApi.validate();
const { valid } = await formApi.validate();
if (!valid) {
return;
}
// getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
const data = cloneDeep(await formApi.getValues());
if (data.chargeTime && data.chargeTime.length) {
data.startTime = data.chargeTime[0]
data.endTime = data.chargeTime[1]
data.startTime = data.chargeTime[0];
data.endTime = data.chargeTime[1];
}
await (isUpdate.value ? houseChargeUpdate(data) : houseChargeAdd(data));
resetInitialized();
@@ -115,10 +115,10 @@ async function handleClosed() {
* 房间数据
*/
async function initRoomOptions() {
const roomList = await communityTree(5);
const roomList = await communityTree(4);
const splitStr = '/';
handleNode(roomList, 'label', splitStr, function (node: any) {
if (node.level != 5) {
if (node.level != 4) {
node.disabled = true;
}
});
@@ -136,7 +136,7 @@ async function initRoomOptions() {
showSearch: true,
treeData: roomList,
treeDefaultExpandAll: true,
treeLine: {showLeafIcon: false},
treeLine: { showLeafIcon: false },
// 筛选的字段
treeNodeFilterProp: 'label',
// 选中后显示在输入框的值
@@ -150,77 +150,93 @@ async function initRoomOptions() {
/**
* 查询费用项设置
*/
async function queryCostItemOptions(costType:string) {
async function queryCostItemOptions(costType: string) {
let params = {
pageSize: 1000,
pageNum: 1,
costType
}
const res = await costItemSettingList(params)
costItemOptions.value = res.rows
formApi.updateSchema([{
componentProps: {
options: costItemOptions.value,
fieldNames: {label: 'chargeItem', value: 'id'},
showSearch: true,
optionFilterProp: 'chargeItem',
onChange: async (value: string) => {
if (value) {
const costItem = costItemOptions.value.find(item => item.id == value)
if(costItem){
await formApi.setFieldValue('remark', `单价：${costItem.unitPrice} 附加费：${costItem.surcharge}`);
costType,
};
const res = await costItemSettingList(params);
costItemOptions.value = res.rows;
formApi.updateSchema([
{
componentProps: {
options: costItemOptions.value,
fieldNames: { label: 'chargeItem', value: 'id' },
showSearch: true,
optionFilterProp: 'chargeItem',
onChange: async (value: string) => {
if (value) {
const costItem = costItemOptions.value.find(
(item) => item.id == value,
);
if (costItem) {
await formApi.setFieldValue(
'remark',
`单价：${costItem.unitPrice} 附加费：${costItem.surcharge}`,
);
}
}
}
}
},
},
fieldName: 'costItemsId',
},
fieldName: 'costItemsId'
}])
]);
}
/**
* 初始化费用类型
*/
async function initCostTypeOptions(){
formApi.updateSchema([{
componentProps: {
options: getDictOptions('pro_expense_type'),
onChange: async (value: string) => {
if (value) {
await queryCostItemOptions(value)
await formApi.setFieldValue('costItemsId', null)
}
}
async function initCostTypeOptions() {
formApi.updateSchema([
{
componentProps: {
options: getDictOptions('pro_expense_type'),
onChange: async (value: string) => {
if (value) {
await queryCostItemOptions(value);
await formApi.setFieldValue('costItemsId', null);
}
},
},
fieldName: 'costType',
},
fieldName: 'costType'
}])
]);
}
async function queryPersonData() {
let params = {
pageSize: 1000,
pageNum: 1,
}
};
const res = await personList(params);
const options = res.rows.map((user) => ({
label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex')
+ '-' + user.phone + '-' + user.unitName,
label:
user.userName +
'-' +
renderDictValue(user.gender, 'sys_user_sex') +
'-' +
user.phone +
'-' +
user.unitName,
value: user.id,
}));
formApi.updateSchema([{
componentProps: () => ({
options: options,
showSearch: true,
optionFilterProp: 'label',
optionLabelProp: 'label',
}),
fieldName: 'personId',
}])
formApi.updateSchema([
{
componentProps: () => ({
options: options,
showSearch: true,
optionFilterProp: 'label',
optionLabelProp: 'label',
}),
fieldName: 'personId',
},
]);
}
</script>
<template>
<BasicModal :title="title">
<BasicForm/>
<BasicForm />
</BasicModal>
</template>