From 7b20d3e7eff4a6da6f3034fd5ca5a6ca76843707 Mon Sep 17 00:00:00 2001 From: Zy <1448159279@qq.com> Date: Thu, 20 Aug 2026 17:03:40 +0800 Subject: [PATCH] 8/19 report --- .env.development | 4 +- src/api/system/Payment/index.ts | 2 +- src/components/Holder/house.vue | 43 ++++++++++++------- src/views/system/Activity/index.vue | 2 +- src/views/system/Repair/addRepair.vue | 2 +- src/views/system/Repair/addRepairlist.vue | 2 +- src/views/system/Sdb/SdbBill/add.vue | 7 ++- src/views/system/Sdb/SdbBill/index.vue | 2 +- src/views/system/house/AddHouse.vue | 2 +- .../system/houseRental/addhouseResident.vue | 2 +- src/views/system/houseRental/houseMain.vue | 1 - src/views/system/houseRental/index.vue | 2 +- src/views/system/notice/index.vue | 2 +- src/views/system/report/arrears.vue | 2 +- src/views/system/report/arrearsTrend.vue | 2 +- src/views/system/report/dailyFeeReport.vue | 8 +++- src/views/system/report/detailed.vue | 2 +- src/views/system/report/monthFeeReport.vue | 6 +-- src/views/system/resident/ResidentMain.vue | 2 +- src/views/system/resident/addResident.vue | 2 +- .../system/statistics/Personnel/index.vue | 2 +- src/views/system/user/addUser.vue | 2 +- 22 files changed, 61 insertions(+), 40 deletions(-) diff --git a/.env.development b/.env.development index cd182d8..2bd86fc 100644 --- a/.env.development +++ b/.env.development @@ -9,9 +9,9 @@ VITE_APP_ENV='development' # 开发环境 VITE_APP_BASE_API='/dev-api' # # 开发环境 接口代理地址 -#VITE_APP_PROXY_API='http://192.168.1.222:8080' +VITE_APP_PROXY_API='http://192.168.1.222:8080' # 开发环境 接口代理地址 -VITE_APP_PROXY_API='http://192.168.1.6:8080' +#VITE_APP_PROXY_API='http://192.168.1.6:8080' # 图片基础地址 VITE_IMG_URL='http://192.168.1.222:8080' diff --git a/src/api/system/Payment/index.ts b/src/api/system/Payment/index.ts index 5f7f045..85ef163 100644 --- a/src/api/system/Payment/index.ts +++ b/src/api/system/Payment/index.ts @@ -58,7 +58,7 @@ export interface sourceType { 'garbageFee': string; 'garbageFeePercent': string; } -// 收入来源 --₧╬.╬ +// 收入来源 export const income_scourcApi = (datetime?: string): AxiosPromise => { return request({ url: '/api/analysis/income/source', diff --git a/src/components/Holder/house.vue b/src/components/Holder/house.vue index 79deb1a..46f3b64 100644 --- a/src/components/Holder/house.vue +++ b/src/components/Holder/house.vue @@ -23,7 +23,7 @@
单元
- +
@@ -119,8 +119,6 @@ const props = defineProps({ const { titleName, returnvalue } = toRefs(props); -const showids = ref([]); - // ✅ 手动设置默认值（替代 withDefaults） const emit = defineEmits<{ change: [value: string | number | (string | number)[] | BillHouse | BillHouse[]]; // 支持返回数组 @@ -201,7 +199,7 @@ function getList() { /** 楼栋列表 */ const buildingList = ref([]); /** 房屋列表 */ -const unitlist = ref([]); +const unitList = ref([]); /** 获取楼栋 列表 */ function handleChangeHouse() { @@ -209,6 +207,11 @@ function handleChangeHouse() { buildingList.value = res.data; }); } +function handleChangeHouseUseType() { + listHouseUseType_add_house().then((res) => { + houseUseTypeList.value = res.data; + }); +} function handleClear() { queryParams.value.residentName = ''; @@ -220,11 +223,11 @@ function handleHouseUseChange() { /** 单元列表 */ function handleChangeBuilding(val: string) { queryParams.value.unitNoId = null; - unitlist.value = []; + unitList.value = []; if (queryParams.value.buildingId) { getHouselistAPI(val).then((res) => { - unitlist.value = res.data.units; + unitList.value = res.data.units; getList(); }); } @@ -299,7 +302,7 @@ function conBack() { } // ============================================== -// ✅ 核心修改：根据 returnvalue 返回对应的值 +// ✅ 核心修改：根据 returnValue 返回对应的值 // ============================================== function confirm() { dialog.value.dialogVisible = false; @@ -331,23 +334,33 @@ function confirm() { } defineExpose({ - open: (showidArray: string[] = []) => { + /** + * @description 打开弹窗 + * @param { string[] } showIdArray 显示的房屋ID数组 + * @param { object } params 额外查询参数对象 + * */ + open: (showIdArray: string[] = [], params: object = {}) => { multipleSelection.value = []; - showids.value = showidArray; - if (showidArray && showidArray.length > 0) { - multipleSelection.value = showidArray.map( + if (Object.keys(params).length > 0) { + queryParams.value = Object.assign({}, queryParams.value, params); + } + // 显示的房屋ID数组 + if (showIdArray && showIdArray.length > 0) { + multipleSelection.value = showIdArray.map( (id) => ({ houseId: id }) as BillHouse ); } + // 刷新列表 getList(); - dialog.value.dialogVisible = true; - listHouseUseType_add_house().then((res) => { - houseUseTypeList.value = res.data; - }); + // 刷新房屋用途类型列表 + handleChangeHouseUseType(); + // 刷新房屋用途类型列表 handleChangeHouse(); + // 显示弹窗 + dialog.value.dialogVisible = true; } }); diff --git a/src/views/system/Activity/index.vue b/src/views/system/Activity/index.vue index 9361205..d4eddc7 100644 --- a/src/views/system/Activity/index.vue +++ b/src/views/system/Activity/index.vue @@ -226,7 +226,7 @@ const handleUpdate = (row?: ActivityVO) => { }); }; -/** 提交按钮 ╬╬╬╬╬╬2╬22╬2╬«2╬2▐2╬╬╬╬╬ */ +/** 提交按钮 */ const submitForm = () => { activityFormRef.value?.validate(async (valid: boolean) => { if (valid) { diff --git a/src/views/system/Repair/addRepair.vue b/src/views/system/Repair/addRepair.vue index d708163..eb778e2 100644 --- a/src/views/system/Repair/addRepair.vue +++ b/src/views/system/Repair/addRepair.vue @@ -70,7 +70,7 @@ - + diff --git a/src/views/system/Repair/addRepairlist.vue b/src/views/system/Repair/addRepairlist.vue index 267dc7f..a7ea253 100644 --- a/src/views/system/Repair/addRepairlist.vue +++ b/src/views/system/Repair/addRepairlist.vue @@ -95,7 +95,7 @@ function handleChange(val: string) { form.value.projectType = find.projectType; } } -// != ==========================================8╬ +// != ========================================== async function init() { form.value = { diff --git a/src/views/system/Sdb/SdbBill/add.vue b/src/views/system/Sdb/SdbBill/add.vue index 75652fc..c404270 100644 --- a/src/views/system/Sdb/SdbBill/add.vue +++ b/src/views/system/Sdb/SdbBill/add.vue @@ -241,7 +241,7 @@ const HandleTypeId = { /** 显示房屋 */ 'House': { /** 水费 */ - 'Water': '2049026484272791553', + 'Water': '2064181187503652865', /** 电费 */ 'Electricity': '2049026503017136129' }, @@ -260,6 +260,7 @@ function handleChange(val: string, callback: boolean = false) { if (find) { form.value.chargeTypeId = find.typeId; typeName.value = find.typeId; + if (callback) { handleClearCheckout(); } @@ -302,7 +303,9 @@ const userRef = ref>(); const ParkingUserRef = ref>(); function OpenUseTablesFun(val: string) { if (val === 'house') { - HolderRef.value.open(checkoutHouses.value); + HolderRef.value.open(checkoutHouses.value, { + chargeTypeId: form.value.chargeTypeId + }); } else if (val === 'user') { if (typeName.value === HandleTypeId.Resident.Parking) { ParkingUserRef.value.open(checkoutParking.value); diff --git a/src/views/system/Sdb/SdbBill/index.vue b/src/views/system/Sdb/SdbBill/index.vue index 674ce2c..33a4c97 100644 --- a/src/views/system/Sdb/SdbBill/index.vue +++ b/src/views/system/Sdb/SdbBill/index.vue @@ -143,7 +143,7 @@ const total = ref(0); const queryFormRef = ref(); -const ShowHouseList = ['2049026484272791553', '2049026503017136129']; +const ShowHouseList = ['2064181187503652865', '2049026503017136129']; const initFormData: BillForm = { id: undefined, diff --git a/src/views/system/house/AddHouse.vue b/src/views/system/house/AddHouse.vue index b4027d2..2a2f20a 100644 --- a/src/views/system/house/AddHouse.vue +++ b/src/views/system/house/AddHouse.vue @@ -94,7 +94,7 @@ const houseStore = useHouseStore(); const formRef = ref(); const form = ref({ buildingId: '', - houseUseTypeId: '', // 房屋用途╬ + houseUseTypeId: '', // 房屋用途 unitNoId: '', floorNo: '', houseNo: '', // 房 间 号 diff --git a/src/views/system/houseRental/addhouseResident.vue b/src/views/system/houseRental/addhouseResident.vue index 4d01376..a01f472 100644 --- a/src/views/system/houseRental/addhouseResident.vue +++ b/src/views/system/houseRental/addhouseResident.vue @@ -320,7 +320,7 @@ const rules = ref({ const userid = ref(null); const treeData = ref(null); const houseFacilities = ref([]); -// !== 楼栋房屋 =============================================================================╬ +// !== 楼栋房屋 ============================================================================= async function getTreeData() { const resList = await listHouseFacilities(); houseFacilities.value = resList.rows diff --git a/src/views/system/houseRental/houseMain.vue b/src/views/system/houseRental/houseMain.vue index 93b7961..50d958d 100644 --- a/src/views/system/houseRental/houseMain.vue +++ b/src/views/system/houseRental/houseMain.vue @@ -150,7 +150,6 @@ async function init() { HouseInfo.value.houseImageUrls = HouseInfo.value.houseImageUrl.split(',').filter((item) => item); }); } -//.╬ init(); function handlefacilities(id: string) { diff --git a/src/views/system/houseRental/index.vue b/src/views/system/houseRental/index.vue index f8a0ec8..c4efbba 100644 --- a/src/views/system/houseRental/index.vue +++ b/src/views/system/houseRental/index.vue @@ -294,7 +294,7 @@ const getList = async () => { }); }; -/** 取消按钮╬ */ +/** 取消按钮 */ const cancel = () => { reset(); dialog.visible = false; diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue index 034e8b6..f3a40ca 100644 --- a/src/views/system/notice/index.vue +++ b/src/views/system/notice/index.vue @@ -78,7 +78,7 @@ - + diff --git a/src/views/system/report/arrears.vue b/src/views/system/report/arrears.vue index bfa93ec..e2d25a5 100644 --- a/src/views/system/report/arrears.vue +++ b/src/views/system/report/arrears.vue @@ -117,7 +117,7 @@ const data = reactive({ const { queryParams } = toRefs(data); -// 查询 房屋类型╬╬╬╬╬2╬> +// 查询 房屋类型 const houseUseList = ref([]); function handleQueryHouseUse() { listHouseUseType().then((res) => { diff --git a/src/views/system/report/arrearsTrend.vue b/src/views/system/report/arrearsTrend.vue index e2344e2..cabcef1 100644 --- a/src/views/system/report/arrearsTrend.vue +++ b/src/views/system/report/arrearsTrend.vue @@ -132,7 +132,7 @@ function getChartTypeList() { }); } -/** 查询电抄记录列表 ╬╬╬2╬«2╬╬╬╬22╬╬╬╬╬*/ +/** 查询电抄记录列表 */ const getList = async () => { loading.value = true; const search = { ...queryParams.value }; diff --git a/src/views/system/report/dailyFeeReport.vue b/src/views/system/report/dailyFeeReport.vue index 0da4bd2..687c959 100644 --- a/src/views/system/report/dailyFeeReport.vue +++ b/src/views/system/report/dailyFeeReport.vue @@ -57,14 +57,17 @@ @@ -227,6 +230,8 @@ const handleExport = () => { label: '现金类', children: [ { label: '现金', prop: 'cashAmount' }, + { label: '支付宝', prop: 'alipayAmount' }, + { label: '宜当付', prop: 'yiDangFuAmount' }, { label: '银联', prop: 'unionPayAmount' }, { label: '转账', prop: 'transferAmount' }, { label: '微信商户', prop: 'wechatAmount' } @@ -236,6 +241,7 @@ const handleExport = () => { label: '顶账类', children: [ { label: '押金抵顶', prop: 'depositAmount' }, + { label: '房产抵顶', prop: 'propertyOffsetAmount' }, { label: '减免优惠', prop: 'discountAmount' } ] } diff --git a/src/views/system/report/detailed.vue b/src/views/system/report/detailed.vue index ba5b42d..c7403ca 100644 --- a/src/views/system/report/detailed.vue +++ b/src/views/system/report/detailed.vue @@ -157,7 +157,7 @@ function getMonthList() { ...arr ]; } -// 动态列名列表▐╬ .3╬ +// 动态列名列表 const dynamicColumns = ref([]); // 在获取数据后更新动态列 diff --git a/src/views/system/report/monthFeeReport.vue b/src/views/system/report/monthFeeReport.vue index 434dc9a..1d4c879 100644 --- a/src/views/system/report/monthFeeReport.vue +++ b/src/views/system/report/monthFeeReport.vue @@ -384,7 +384,7 @@ const data = reactive({ ] } }); -// 动态生成表单验证规则╘╬ +// 动态生成表单验证规则╘╬╬╬ const { queryParams, rules } = toRefs(data); // 查询房屋类型列表 @@ -406,14 +406,14 @@ const getList = async () => { }); getMonthFeeReportList(search) .then((res) => { - ArrearsDetailList.value = [...res.rows]; + ArrearsDetailList.value = res.rows ?? []; }) .finally(() => { loading.value = false; }); }; -/** 搜索按钮操作 */ +/** 搜索按钮操作8 */ const handleQuery = () => { queryParams.value.pageNum = 1; getList(); diff --git a/src/views/system/resident/ResidentMain.vue b/src/views/system/resident/ResidentMain.vue index 238e913..caa5600 100644 --- a/src/views/system/resident/ResidentMain.vue +++ b/src/views/system/resident/ResidentMain.vue @@ -36,7 +36,7 @@ -->
身份证正面：
diff --git a/src/views/system/resident/addResident.vue b/src/views/system/resident/addResident.vue index db25771..a6d0fc7 100644 --- a/src/views/system/resident/addResident.vue +++ b/src/views/system/resident/addResident.vue @@ -158,7 +158,7 @@ const form = ref({ idCardType: '0', // 证件类型 cardImageBack: '', age: 0, //年龄 - remark: '' //备注╬╬▓╬▐╬╬ + remark: '' //备注 }); const userHousePath = ref([]); const rules = ref({ diff --git a/src/views/system/statistics/Personnel/index.vue b/src/views/system/statistics/Personnel/index.vue index 6ad9627..51447a8 100644 --- a/src/views/system/statistics/Personnel/index.vue +++ b/src/views/system/statistics/Personnel/index.vue @@ -372,7 +372,7 @@ const dayX = ref([]); const inData = ref([]); const outData = ref([]); -/** 近十天人员流入流出 - 平滑折线图╥╬ */ +/** 近十天人员流入流出 - 平滑折线图*/ const flowLineOption = ref({ title: { text: '近七日人员流动趋势', diff --git a/src/views/system/user/addUser.vue b/src/views/system/user/addUser.vue index d74ca33..71b374c 100644 --- a/src/views/system/user/addUser.vue +++ b/src/views/system/user/addUser.vue @@ -124,7 +124,7 @@ const rules = ref({ } ] }); -// 选择小区╬222╬╬╬╬╬╬n╬ +// 选择小区 const checkvillage = ref([]); // 角色列表 const roleOptions = ref([]);