水电表基本搭建完成

This commit is contained in:
Zy
2026-04-27 08:08:30 +08:00
parent ab736fa15f
commit 826b22e206
26 changed files with 2208 additions and 393 deletions

BIN
dist.7z

Binary file not shown.

View File

@@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { BillVO, BillForm, BillQuery } from './type';
/**
* 查询账单管理列表
* @param query
* @returns {*}
*/
export const listBill = (query?: BillQuery): AxiosPromise<BillVO[]> => {
return request({
url: '/bill/list',
method: 'get',
params: query
});
};
/**
* 查询账单管理详细
* @param id
*/
export const getBill = (id: string | number): AxiosPromise<BillVO> => {
return request({
url: '/bill/' + id,
method: 'get'
});
};
/**
* 新增账单管理
* @param data
*/
export const addBill = (data: BillForm) => {
return request({
url: '/bill',
method: 'post',
data: data
});
};
/**
* 修改账单管理
* @param data
*/
export const updateBill = (data: BillForm) => {
return request({
url: '/bill',
method: 'put',
data: data
});
};
/**
* 删除账单管理
* @param id
*/
export const delBill = (id: string | number | Array<string | number>) => {
return request({
url: '/bill/' + id,
method: 'delete'
});
};

View File

@@ -0,0 +1,150 @@
export interface BillVO {
/**
* 账单管理表id
*/
id: string;
/**
* 账单编号
*/
billCode: string;
/**
* 收费项目id
*/
chargeItemId: string;
/**
* 收费范围 0全体业主 1部分业主
*/
chargeScope: string;
/**
* 收费周期 0年 1月 2日
*/
chargePeriod: string;
/**
* 开始日期
*/
startDate: string;
/**
* 结束日期
*/
endDate: string;
/**
* 小区id
*/
villageId: number;
/**
* 备注
*/
remark: string;
/**
* 创建时间
*/
cerateTime: string;
}
export interface BillForm extends BaseEntity {
/**
* 账单管理表id
*/
id?: string | number;
/**
* 账单编号
*/
billCode?: string;
/**
* 收费项目id
*/
chargeItemId?: string | number;
/**
* 收费范围 0全体业主 1部分业主
*/
chargeScope?: string;
/**
* 收费周期 0年 1月 2日
*/
chargePeriod?: string;
/**
* 开始日期
*/
startDate?: string;
/**
* 结束日期
*/
endDate?: string;
/**
* 小区id
*/
villageId?: string | number;
/**
* 备注
*/
remark?: string;
/**
* 创建时间
*/
cerateTime?: string;
}
export interface BillQuery extends PageQuery {
/**
* 账单编号
*/
billCode?: string;
/**
* 收费项目id
*/
chargeItemId?: string | number;
/**
* 收费范围 0全体业主 1部分业主
*/
chargeScope?: string;
/**
* 收费周期 0年 1月 2日
*/
chargePeriod?: string;
/**
* 开始日期
*/
startDate?: string;
/**
* 结束日期
*/
endDate?: string;
/**
* 小区id
*/
villageId?: string | number;
/**
* 创建时间
*/
cerateTime?: string;
/**
* 日期范围参数
*/
params?: any;
}

View File

@@ -61,3 +61,14 @@ export const delChargeItem = (id: string | number | Array<string | number>) => {
method: 'delete'
});
};
/**
* 启停 收费项目
* @param id
*/
export const changChargeItem = (data: { id: string; status: string }) => {
return request({
url: '/chargeItem/',
method: 'PUT'
});
};

View File

@@ -2,7 +2,7 @@ export interface ChargeItemVO {
/**
* 收费项目管理表id
*/
id: string | number;
id: string;
/**
* 项目名称

View File

@@ -61,3 +61,27 @@ export const delElectricityDevice = (id: string | number | Array<string | number
method: 'delete'
});
};
/**
* 生成条形码
* @param id
*/
export const ElectricityDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
return request({
url: '/electricityDevice/generateBarCodee',
method: 'POST',
data: data
});
};
/**
* 获取设备指定时间段的用电量
* @param id
*/
export const getElectricityDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
return request({
url: '/electricityDevice/getEle',
method: 'POST',
data
});
};

View File

@@ -19,6 +19,8 @@ export interface ElectricityDeviceVO {
*/
deleted: number;
houseName: string;
/**
*
*/

View File

@@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { PayRecordVO, PayRecordForm, PayRecordQuery } from './type';
/**
* 查询 抄表周期管理列表
* @param query
* @returns {*}
*/
export const listPayRecord = (query?: PayRecordQuery): AxiosPromise<PayRecordVO[]> => {
return request({
url: '/payRecord/list',
method: 'get',
params: query
});
};
/**
* 查询 抄表周期管理详细
* @param id
*/
export const getPayRecord = (id: string | number): AxiosPromise<PayRecordVO> => {
return request({
url: '/payRecord/' + id,
method: 'get'
});
};
/**
* 新增 抄表周期管理
* @param data
*/
export const addPayRecord = (data: PayRecordForm) => {
return request({
url: '/payRecord',
method: 'post',
data: data
});
};
/**
* 修改 抄表周期管理
* @param data
*/
export const updatePayRecord = (data: PayRecordForm) => {
return request({
url: '/payRecord',
method: 'put',
data: data
});
};
/**
* 删除 抄表周期管理
* @param id
*/
export const delPayRecord = (id: string | number | Array<string | number>) => {
return request({
url: '/payRecord/' + id,
method: 'delete'
});
};

View File

@@ -0,0 +1,110 @@
export interface PayRecordVO {
/**
* 抄表周期管理表id
*/
id: string | number;
/**
* 设备类型 0电表 1水表
*/
deviceType: string;
/**
* 房屋id
*/
houseId: string | number;
/**
* 收费项目 0电费 1水费
*/
payType: string;
/**
* 抄表月份
*/
recordMonth: string;
/**
* 开始日期
*/
startTime: string;
/**
* 结束日期
*/
endTime: string;
}
export interface PayRecordForm extends BaseEntity {
/**
* 抄表周期管理表id
*/
id?: string | number;
/**
* 设备类型 0电表 1水表
*/
deviceType?: string;
/**
* 房屋id
*/
houseId?: string | number;
/**
* 收费项目 0电费 1水费
*/
payType?: string;
/**
* 抄表月份
*/
recordMonth?: string;
/**
* 开始日期
*/
startTime?: string;
/**
* 结束日期
*/
endTime?: string;
}
export interface PayRecordQuery extends PageQuery {
/**
* 设备类型 0电表 1水表
*/
deviceType?: string;
/**
* 房屋id
*/
houseId?: string | number;
/**
* 收费项目 0电费 1水费
*/
payType?: string;
/**
* 抄表月份
*/
recordMonth?: string;
/**
* 开始日期
*/
startTime?: string;
/**
* 结束日期
*/
endTime?: string;
/**
* 日期范围参数
*/
params?: any;
}

View File

@@ -93,48 +93,14 @@ export interface TopupRecordForm extends BaseEntity {
}
export interface TopupRecordQuery extends PageQuery {
/**
* 用户ID
*/
userId?: string | number;
/**
* 充值金额
*/
rechargeAmount?: number;
/**
* 充值时间
*/
rechargeTime?: string;
/**
* 设备ID
*/
deviceCode?: string;
/**
* 订单表
*/
orderId?: string | number;
/**
* 1.电表 2.水表
*/
type?: string;
/**
* 订单状态(0.未支付 1.已支付 2.支付中3.支付失败 4.退款)
*/
status?: number;
/**
* 0.待接收 1.已接收
*/
getOver?: number;
/**
* 日期范围参数
*/
params?: any;
id?: string;
}

View File

@@ -61,3 +61,27 @@ export const delWaterDevice = (id: string | number | Array<string | number>) =>
method: 'delete'
});
};
/**
* 获取设备指定时间段的用水量
* @param id
*/
export const getWaterDeviceTimeRangeUsedWater = (data: { deviceCode: string; 'startTime': string; 'endTime': string }) => {
return request({
url: '/waterDevice/getEle',
method: 'POST',
data
});
};
/**
* 生成条形码
* @param id
*/
export const WaterDeviceMakerQrcode = (data: { deviceCode: string; id: string }[]) => {
return request({
url: '/waterDevice/generateBarCode',
method: 'POST',
data: data
});
};

View File

@@ -2,7 +2,7 @@ export interface WaterDeviceVO {
/**
* id
*/
id: string | number;
id: string;
/**
* 水表设备编码
@@ -27,14 +27,14 @@ export interface WaterDeviceVO {
/**
*
*/
openid: string | number;
openid: string;
}
export interface WaterDeviceForm extends BaseEntity {
/**
* id
*/
id?: string | number;
id?: string;
/**
* 水表设备编码
@@ -86,7 +86,7 @@ export interface WaterDeviceQuery extends PageQuery {
/**
*
*/
openid?: string | number;
openid?: string;
/**
* 日期范围参数

View File

@@ -56,7 +56,6 @@
<div class="dialog-footer flex flex-items-center flex-justify-between">
<pagination
style="margin-top: 0"
layout="total, prev, pager, next, jumper"
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"

View File

@@ -15,6 +15,27 @@ export const formatDate = (cellValue: string) => {
return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
};
/**
* 表格时间格式化(修复时区问题,固定 00:00:00
*/
export const formatDate2 = (cellValue: string) => {
if (!cellValue) return '';
const date = new Date(cellValue);
// 无效日期直接返回空
if (isNaN(date.getTime())) return '';
// 统一使用本地时间,强制 0 点
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
// 补零工具
const pad = (num: number) => num.toString().padStart(2, '0');
return `${year}-${pad(month)}-${pad(day)} 00:00:00`;
};
/**
* @param {number} time
* @param {string} option

View File

@@ -38,7 +38,9 @@ const service = axios.create({
// 不需要小区 ID 的接口白名单(支持 * 通配符)
const whiteVillageId = [
'/village',
'/village/*'
'/village/*',
'/waterDevice/generateBarCode', // 水表 条码
'/electricityDevice/generateBarCodee' // 电表 条码
// 以后直接在这里加新地址,支持 /xxx/*、/xxx/xxx 写法
];
@@ -151,6 +153,8 @@ service.interceptors.request.use(
if (config.data instanceof FormData) {
delete config.headers['Content-Type'];
}
console.log(config, config.data);
return config;
},
(error: any) => {

View File

@@ -5,19 +5,15 @@
<div class="title">基本信息</div>
<div class="addBuildingFormBody">
<el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
<el-form-item label="项目名称" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入项目名称" />
<el-form-item label="项目名称" prop="itemName">
<el-input v-model.trim="form.itemName" placeholder="请输入项目名称" />
</el-form-item>
<el-form-item label="计费方式" prop="billingMethod">
<!-- <el-select v-model="form.billingMethod">
<el-option v-for="(item, index) in com_charge_item_method" :key="index" :value="item.value" :label="item.label"></el-option>
</el-select> -->
<el-radio-group v-model="form.billingMethod">
<el-radio value="0">固定单价</el-radio>
<el-form-item label="计费方式" prop="billingType">
<el-radio-group v-model="form.billingType">
<el-radio v-for="(item, index) in com_charge_item_method" :key="index" :value="item.value" :label="item.label"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="计算公式" prop="materialName">
<el-form-item label="计算公式" prop="formula">
<el-select v-model="form.formula">
<el-option v-for="(item, index) in com_charge_item_formula" :key="index" :value="item.value" :label="item.label"></el-option>
</el-select>
@@ -27,11 +23,11 @@
<el-option v-for="(item, index) in com_charge_item_unit" :key="index" :value="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item label="费用单价" prop="price">
<el-input v-model.trim="form.price" placeholder="请输入费用单价" />
<el-form-item label="费用单价" prop="fixedPrice">
<el-input v-model.trim="form.fixedPrice" placeholder="请输入费用单价" />
</el-form-item>
<el-form-item label="计算精度" prop="precision">
<el-select v-model="form.precision">
<el-form-item label="计算精度" prop="accuracy">
<el-select v-model="form.accuracy">
<el-option v-for="(item, index) in com_charge_item_precision" :key="index" :value="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
@@ -40,7 +36,12 @@
<el-option v-for="(item, index) in com_charge_item_carry_method" :key="index" :value="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item label="启用/停用" prop="status">
<el-radio-group v-model="form.status">
<el-radio value="0" label="启用"></el-radio>
<el-radio value="1" label="停用"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入" />
</el-form-item>
@@ -65,6 +66,7 @@ const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_uni
const { com_charge_item_precision } = toRefs<any>(proxy?.useDict('com_charge_item_precision'));
const { com_charge_item_carry_method } = toRefs<any>(proxy?.useDict('com_charge_item_carry_method'));
const { com_charge_item_formula } = toRefs<any>(proxy?.useDict('com_charge_item_formula'));
const { com_charge_item_method } = toRefs<any>(proxy?.useDict('com_charge_item_method'));
const router = useRouter();
const route = useRoute();
@@ -72,22 +74,23 @@ const route = useRoute();
const formRef = ref();
const form = ref({
'id': null,
'name': '',
'billingMethod': '0',
'price': null,
'itemName': '',
'billingType': '0',
'fixedPrice': null,
'unit': '',
'precision': '',
'accuracy': '',
'carryMethod': '',
'remark': '',
'status': '0',
'formula': ''
});
const rules = ref({
name: [{ required: true, message: '请输入 项目名称', trigger: 'blur' }],
billingMethod: [{ required: true, message: '请输入 计费方式', trigger: 'blur' }],
price: [{ required: true, message: '请输入 费用单价', trigger: 'blur' }],
itemName: [{ required: true, message: '请输入 项目名称', trigger: 'blur' }],
billingType: [{ required: true, message: '请输入 计费方式', trigger: 'blur' }],
fixedPrice: [{ required: true, message: '请输入 费用单价', trigger: 'blur' }],
formula: [{ required: true, message: '请选择 计费公式', trigger: 'blur' }],
unit: [{ required: true, message: '请选择 计费单位', trigger: 'blur' }],
precision: [{ required: true, message: '选择 计算精度', trigger: 'blur' }],
accuracy: [{ required: true, message: '选择 计算精度', trigger: 'blur' }],
carryMethod: [{ required: true, message: '请选择 进位方式', trigger: 'blur' }]
});
const userid = ref(null);

View File

@@ -39,27 +39,31 @@
<el-table v-loading="loading" border :data="chargeItemList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="center" prop="name" />
<el-table-column label="计费方式" align="center" prop="billingMethod">
<el-table-column label="项目名称" align="center" prop="itemName" />
<el-table-column label="计费方式" align="center" prop="billingType">
<template #default="scope">
<dict-tag :options="com_charge_item_method" :value="scope.row.billingMethod"></dict-tag>
<dict-tag :options="com_charge_item_method" :value="scope.row.billingType"></dict-tag>
</template>
</el-table-column>
<el-table-column label="单价" align="center" prop="price">
<el-table-column label="计算公式" align="center" prop="formula">
<template #default="scope">
<dict-tag :options="com_charge_item_formula" :value="scope.row.formula"></dict-tag>
</template>
</el-table-column>
<el-table-column label="单价" align="center" prop="fixedPrice">
<template #default="scope">
{{ scope.row.price }}
<dict-tag :options="com_charge_item_unit" :value="scope.row.unit"></dict-tag>
<dict-tag :options="com_charge_item_unit" :value="scope.row.fixedPrice"></dict-tag>
</template>
</el-table-column>
<el-table-column label=" 计算方式" align="center" prop="price" />
<el-table-column label="计量单位" align="center" prop="unit">
<template #default="scope">
<dict-tag :options="com_charge_item_unit" :value="scope.row.unit"></dict-tag>
</template>
</el-table-column>
<el-table-column label="计算精度" align="center" prop="precision">
<el-table-column label="计算精度" align="center" prop="accuracy">
<template #default="scope">
<dict-tag :options="com_charge_item_precision" :value="scope.row.precision"></dict-tag>
<dict-tag :options="com_charge_item_precision" :value="scope.row.accuracy"></dict-tag>
</template>
</el-table-column>
<el-table-column label="进位方式" align="center" prop="carryMethod">
@@ -69,7 +73,14 @@
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<el-switch inactive-text="停用" active-text="启用" inactive-value="0" active-value="1" v-model="scope.row.status"></el-switch>
<el-switch
@change="(val: string) => handleSwitch(val, scope.row)"
inactive-text="停用"
active-text="启用"
inactive-value="1"
active-value="0"
v-model="scope.row.status"
></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
@@ -86,7 +97,7 @@
</template>
<script setup name="ChargeItem" lang="ts">
import { listChargeItem, getChargeItem, delChargeItem, addChargeItem, updateChargeItem } from '@/api/system/SdbChargeItem';
import { listChargeItem, getChargeItem, delChargeItem, addChargeItem, updateChargeItem, changChargeItem } from '@/api/system/SdbChargeItem';
import { ChargeItemVO, ChargeItemQuery, ChargeItemForm } from '@/api/system/SdbChargeItem/type';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -94,6 +105,7 @@ const { com_charge_item_method } = toRefs<any>(proxy?.useDict('com_charge_item_m
const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_unit'));
const { com_charge_item_precision } = toRefs<any>(proxy?.useDict('com_charge_item_precision'));
const { com_charge_item_carry_method } = toRefs<any>(proxy?.useDict('com_charge_item_carry_method'));
const { com_charge_item_formula } = toRefs<any>(proxy?.useDict('com_charge_item_formula'));
const chargeItemList = ref<ChargeItemVO[]>([]);
const buttonLoading = ref(false);
@@ -204,27 +216,20 @@ const handleUpdate = async (row?: ChargeItemVO) => {
});
};
/** 提交按钮 */
const submitForm = () => {
chargeItemFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateChargeItem(form.value).finally(() => (buttonLoading.value = false));
} else {
await addChargeItem(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
const handleSwitch = (val: string, row: ChargeItemVO) => {
console.log(val, typeof val, row);
// 1停用 0 启用
updateChargeItem({
id: row.id,
status: val
}).then(() => {
ElMessage.success('修改成功');
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: ChargeItemVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除收费项目管理编号为"' + _ids + '"的数据项').finally(() => (loading.value = false));
await proxy?.$modal.confirm('是否确认删除收费项目?').finally(() => (loading.value = false));
await delChargeItem(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();

View File

@@ -0,0 +1,261 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="仪表名称" prop="houseId">
<el-input v-model="queryParams.houseId" placeholder="请输入房屋id" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['payRecord:payRecord:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['payRecord:payRecord:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['payRecord:payRecord:remove']"
>删除</el-button
>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" border :data="payRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备类型" align="center" prop="deviceType">
<template #default="scope">
<dict-tag :options="com_waterelectricity_topup_type" :value="scope.row.deviceType"></dict-tag>
</template>
</el-table-column>
<el-table-column label="房屋id" align="center" prop="houseId" />
<el-table-column label="收费项目" align="center" prop="payType">
<template #default="scope">
<dict-tag :options="com_payrecord_pay_type" :value="scope.row.payType"></dict-tag>
</template>
</el-table-column>
<el-table-column label="抄表月份" align="center" prop="recordMonth" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.recordMonth, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="开始日期" align="center" prop="startTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束日期" align="center" prop="endTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['payRecord:payRecord:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['payRecord:payRecord:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改 抄表周期管理对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="payRecordFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="房屋id" prop="houseId">
<el-input v-model="form.houseId" placeholder="请输入房屋id" />
</el-form-item>
<el-form-item label="抄表月份" prop="recordMonth">
<el-date-picker clearable v-model="form.recordMonth" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择抄表月份">
</el-date-picker>
</el-form-item>
<el-form-item label="开始日期" prop="startTime">
<el-date-picker clearable v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始日期">
</el-date-picker>
</el-form-item>
<el-form-item label="结束日期" prop="endTime">
<el-date-picker clearable v-model="form.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="PayRecord" lang="ts">
import { listPayRecord, getPayRecord, delPayRecord, addPayRecord, updatePayRecord } from '@/api/system/SdbPayRecord';
import { PayRecordVO, PayRecordQuery, PayRecordForm } from '@/api/system/SdbPayRecord/type';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_waterelectricity_topup_type } = toRefs<any>(proxy?.useDict('com_waterelectricity_topup_type'));
const { com_payrecord_pay_type } = toRefs<any>(proxy?.useDict('com_payrecord_pay_type'));
const payRecordList = ref<PayRecordVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const payRecordFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: PayRecordForm = {
id: undefined,
deviceType: undefined,
houseId: undefined,
payType: undefined,
recordMonth: undefined,
startTime: undefined,
endTime: undefined
};
const data = reactive<PageData<PayRecordForm, PayRecordQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
deviceType: undefined,
houseId: undefined,
payType: undefined,
recordMonth: undefined,
startTime: undefined,
endTime: undefined,
params: {}
},
rules: {
id: [{ required: true, message: '抄表周期管理表id不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询 抄表周期管理列表 */
const getList = async () => {
loading.value = true;
const res = await listPayRecord(queryParams.value);
payRecordList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
payRecordFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: PayRecordVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = '添加 抄表周期管理';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: PayRecordVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getPayRecord(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改 抄表周期管理';
};
/** 提交按钮 */
const submitForm = () => {
payRecordFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updatePayRecord(form.value).finally(() => (buttonLoading.value = false));
} else {
await addPayRecord(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: PayRecordVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除 抄表周期管理编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delPayRecord(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'payRecord/payRecord/export',
{
...queryParams.value
},
`payRecord_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>

View File

@@ -8,26 +8,56 @@
<el-form-item label="账单名称" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入账单名称" />
</el-form-item>
<el-form-item label="收费项目" prop="materialName">
<el-select v-model="form.formula">
<el-option v-for="(item, index) in com_charge_item_formula" :key="index" :value="item.value" :label="item.label"></el-option>
<el-form-item label="收费项目" prop="chargeItemId">
<el-select v-model="form.chargeItemId">
<el-option v-for="(item, index) in chargeitemlist" :key="index" :value="item.id" :label="item.itemName"></el-option>
</el-select>
</el-form-item>
<el-form-item label="收费范围" prop="billingMethod">
<el-radio-group v-model="form.billingMethod">
<el-radio value="0">固定单价</el-radio>
<el-form-item label="收费范围" prop="chargeScope">
<el-radio-group v-model="form.chargeScope">
<el-radio v-for="(item, index) in com_questionnaire_scope" :key="index" :value="item.value" :label="item.label"></el-radio>
</el-radio-group>
<div @click="() => handleClearCheckout" v-if="form.chargeScope === '1'" class="ml-10px cursor-pointer color-red">清空</div>
</el-form-item>
<el-form-item label="费用周期" prop="unit">
<el-select v-model="form.unit">
<el-option v-for="(item, index) in com_charge_item_unit" :key="index" :value="item.value" :label="item.label"></el-option>
<el-form-item v-if="form.chargeScope === '1'">
<div class="residentBox">
<ul class="checkoutSideUsesbox">
<li v-for="(item, index) in checkoutUses" :key="index">
<span>{{ item.name }}</span>
<el-icon @click="delteUse(item.id)">
<Delete></Delete>
</el-icon>
</li>
<Holder returnvalue="*" ref="HolderRef" :isMultiple="true" :userid="checkoutUses" @change="handleSelect">
<template #default>
<li @click="OpenUseTablesfun" class="add justify-center">
<el-icon>
<DocumentAdd></DocumentAdd>
</el-icon>
<span>添加业主</span>
</li>
</template>
</Holder>
</ul>
</div>
</el-form-item>
<el-form-item label="费用周期" prop="chargePeriod">
<el-select v-model="form.chargePeriod">
<el-option v-for="(item, index) in com_bill_charge_period" :key="index" :value="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item label="起止日期" prop="price">
<el-input v-model.trim="form.price" placeholder="请输入费用单价" />
<el-date-picker
v-model="StartEndDate"
@update:model-value="handleDate"
:value-format="datepicker[form.chargePeriod].format"
:format="datepicker[form.chargePeriod].format"
:type="datepicker[form.chargePeriod].type"
range-separator=""
start-placeholder="开始"
end-placeholder="结束"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入" />
</el-form-item>
@@ -44,49 +74,100 @@
<script setup lang="ts">
import { ref } from 'vue';
import Holder from '@/components/Holder/index.vue';
import PageHeader from '@/components/Pageheader/index.vue';
import { getChargeItem, updateChargeItem, addChargeItem } from '@/api/system/SdbChargeItem';
import { listChargeItem } from '@/api/system/SdbChargeItem';
import { getBill, updateBill, addBill } from '@/api/system/SdbBill';
import type { DatePickerType } from 'element-plus';
import { formatDate, formatDate2 } from '@/utils';
import { Delete } from '@element-plus/icons-vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_unit'));
const { com_charge_item_precision } = toRefs<any>(proxy?.useDict('com_charge_item_precision'));
const { com_charge_item_carry_method } = toRefs<any>(proxy?.useDict('com_charge_item_carry_method'));
const { com_charge_item_formula } = toRefs<any>(proxy?.useDict('com_charge_item_formula'));
const { com_questionnaire_scope } = toRefs<any>(proxy?.useDict('com_questionnaire_scope'));
const { com_bill_charge_period } = toRefs<any>(proxy?.useDict('com_bill_charge_period'));
type PickerConfig = {
type: DatePickerType;
format: string;
};
const datepicker: Record<string, PickerConfig> = {
'0': { type: 'yearrange', format: 'YYYY' },
'1': { type: 'monthrange', format: 'YYYY-MM' },
'2': { type: 'daterange', format: 'YYYY-MM-DD' }
};
const router = useRouter();
const route = useRoute();
const formRef = ref();
const form = ref({
'id': null,
'name': '',
'billingMethod': '0',
'price': null,
'unit': '',
'precision': '',
'carryMethod': '',
'remark': '',
'formula': ''
'chargeItemId': '', // 收费项目
'chargeScope': '0', // 业主范围
'chargePeriod': '2', // 费用周期
residents: '', // 部分业主
'startDate': '', // 开始
'endDate': '', // 结束
'remark': ''
});
// TODO 添加账单
// TODO 账单详情
const rules = ref({
name: [{ required: true, message: '请输入 项目名称', trigger: 'blur' }],
billingMethod: [{ required: true, message: '请输入 计费方式', trigger: 'blur' }],
price: [{ required: true, message: '请输入 费用单价', trigger: 'blur' }],
formula: [{ required: true, message: '请选择 计费公式', trigger: 'blur' }],
unit: [{ required: true, message: '请选择 计费单位', trigger: 'blur' }],
precision: [{ required: true, message: '选择 计算精度', trigger: 'blur' }],
carryMethod: [{ required: true, message: '请选择 进位方式', trigger: 'blur' }]
chargeItemId: [{ required: true, message: '请选择 收费项目', trigger: 'blur' }],
chargePeriod: [{ required: true, message: '请选择 费用周期', trigger: 'blur' }],
startDate: [{ required: true, message: '请选择 起止日期', trigger: 'blur' }],
endDate: [{ required: true, message: '请选择 起止日期', trigger: 'blur' }]
});
const userid = ref(null);
if (route.query.id) {
userid.value = route.query.id;
getChargeItem(userid.value).then((res) => {
form.value = {
...form.value,
...res.data
};
});
// 开始结束日期
const StartEndDate = ref([]);
function handleDate(val: string[]) {
form.value.startDate = formatDate2(val[0]);
form.value.endDate = formatDate2(val[1]);
console.log(formatDate2(val[0]), formatDate2(val[1]));
}
const chargeitemlist = ref([]);
function init() {
listChargeItem().then((res) => {
chargeitemlist.value = res.rows;
});
if (route.query.id) {
userid.value = route.query.id;
getBill(userid.value).then((res) => {
form.value = {
...form.value,
...res.data
};
});
}
}
init();
// !== 业主 =============================================================================
// 打开
const HolderRef = ref<InstanceType<typeof Holder>>();
function OpenUseTablesfun() {
HolderRef.value.open();
}
// 多选
const checkoutUses = ref([]);
function handleSelect(val) {
checkoutUses.value = val;
form.value.residents = checkoutUses.value.join(',');
}
// 删除
function delteUse(id: string | number) {
checkoutUses.value = checkoutUses.value.filter((item) => item.id !== id);
}
function handleClearCheckout() {
checkoutUses.value = [];
form.value.residents = '';
}
// !== 业主 =============================================================================
// !== 提交 =============================================================================
// 提交
// TODO 收费项目提交
@@ -95,12 +176,12 @@ const submitForm = () => {
formRef.value?.validate(async (valid: boolean) => {
if (valid) {
if (userid.value) {
updateChargeItem(form.value).then((res) => {
updateBill(form.value).then((res) => {
ElMessage.success('编辑成功');
cancelForm();
});
} else {
addChargeItem(form.value).then((res) => {
addBill(form.value).then((res) => {
ElMessage.success('添加成功');
cancelForm();
});
@@ -140,6 +221,58 @@ const cancelForm = () => {
.formBody {
width: 650px;
margin: 0 auto;
.residentBox {
max-height: 400px;
overflow-y: auto;
padding: 10px 5px;
}
.checkoutSideUsesbox {
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 5px;
li {
display: flex;
align-items: center;
justify-content: space-between;
min-width: 120px;
height: 35px;
padding: 0 10px;
line-height: 35px;
margin-bottom: 10px;
background-color: #f3f9ff;
border: 1px solid #8fc0f1;
@media (max-width: 2000px) {
font-size: 12px;
}
@media (max-width: 1650px) {
font-size: 10px;
}
@media (max-width: 1650px) {
font-size: 8px;
}
.el-icon {
cursor: pointer;
&:hover {
color: red;
}
}
&.add {
cursor: pointer;
justify-content: center;
color: #409eff;
border: 1px dashed #409eff;
background-color: transparent;
&:hover {
background-color: #40a0ff10;
}
span {
margin-left: 10px;
}
}
}
}
&:deep(.el-form-item__content, .el-select, .el-input) {
width: 350px !important;
margin-right: 10px;

View File

@@ -1,12 +1,266 @@
<template>
<div class="p-2 h-full flex flex-col">
<Pageheader></Pageheader>
<div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中敬请期待...</div>
<pageheader></pageheader>
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="收费项目" prop="chargeItemId">
<el-select v-model="queryParams.chargeItemId" placeholder="请选择收费项目">
<el-option v-for="(item, index) in chargeItems" :key="index" :value="item.id" :label="item.itemName"></el-option>
</el-select>
</el-form-item>
<el-form-item label="精确查询" prop="type">
<el-select style="width: 150px; margin-right: 10px" v-model="queryParams.type">
<el-option v-for="(item, index) in com_bill_search_filter" :key="index" :value="item.value" :label="item.label"></el-option>
</el-select>
<el-input v-model="queryParams.billCode" placeholder="请输入" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card class="flex-1" shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleMain" v-hasPermi="['system:bill:add']">新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:bill:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:bill:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:bill:remove']"
>删除</el-button
>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" border :data="billList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="账单编号" align="center" prop="billCode" />
<el-table-column label="账单名称" align="center" prop="billCode" />
<el-table-column label="收费范围" align="center" prop="chargeScope">
<template #default="scope">
<dict-tag :options="com_questionnaire_scope" :value="scope.row.chargeScope"></dict-tag>
</template>
</el-table-column>
<el-table-column label="收费项目" align="center" prop="chargeItemId" />
<el-table-column label="收费周期" align="center" prop="chargePeriod">
<template #default="scope">
<dict-tag :options="com_bill_charge_period" :value="scope.row.chargePeriod"></dict-tag>
</template>
</el-table-column>
<el-table-column label="开始日期" align="center" prop="startDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束日期" align="center" prop="endDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单价" align="center" prop="endDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="数量" align="center" prop="chargePeriod" />
<el-table-column label="费用合计" align="center" prop="chargePeriod" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:bill:edit']">修改</el-button>
<el-button link type="primary" icon="Edit" @click="handleMain(scope.row)" v-hasPermi="['system:bill:edit']">详情</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:bill:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
</div>
</template>
<script setup lang="ts">
import { ref } from 'vue';
<script setup name="Bill" lang="ts">
import { listBill, getBill, delBill, addBill, updateBill } from '@/api/system/SdbBill/index';
import { BillVO, BillQuery, BillForm } from '@/api/system/SdbBill/type';
import { listChargeItem } from '@/api/system/SdbChargeItem';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_bill_search_filter } = toRefs<any>(proxy?.useDict('com_bill_search_filter'));
const { com_questionnaire_scope } = toRefs<any>(proxy?.useDict('com_questionnaire_scope'));
const { com_bill_charge_period } = toRefs<any>(proxy?.useDict('com_bill_charge_period'));
const billList = ref<BillVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const billFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: BillForm = {
id: undefined,
billCode: undefined,
chargeItemId: undefined,
chargeScope: undefined,
chargePeriod: undefined,
startDate: undefined,
endDate: undefined,
villageId: undefined,
remark: undefined,
cerateTime: undefined
};
const data = reactive<PageData<BillForm, BillQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
billCode: '',
type: '',
value: ''
}
});
const { queryParams, form } = toRefs(data);
const chargeItems = ref([]);
function init() {
listChargeItem().then((res) => {
chargeItems.value = res.rows;
});
}
init();
/** 查询账单管理列表 */
const getList = async () => {
loading.value = true;
const res = await listBill(queryParams.value);
billList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
billFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: BillVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
const router = useRouter();
/** 新增按钮操作 */
const handleAdd = () => {
router.push({
path: '/sdb/addSdbbill'
});
};
/** 修改按钮操作 */
const handleUpdate = async (row?: BillVO) => {
reset();
const _id = row?.id || ids.value[0];
const res = await getBill(_id);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改账单管理';
};
/** 提交按钮 */
const submitForm = () => {
billFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateBill(form.value).finally(() => (buttonLoading.value = false));
} else {
await addBill(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
function handleMain(row) {
router.push({
path: '/sdb/sdbbillMain',
query: {
id: row.id
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: BillVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除账单管理编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delBill(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'system/bill/export',
{
...queryParams.value
},
`bill_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
});
</script>
<style scoped lang="scss"></style>
<style lang="scss" scoped>
.el-table {
height: calc(100% - 80px);
}
</style>

View File

@@ -0,0 +1,9 @@
<template>
<div class=" "></div>
</template>
<script setup lang="ts">
import { ref } from 'vue';
</script>
<style scoped lang="scss"></style>

View File

@@ -1,12 +1,174 @@
<template>
<div class="p-2 h-full flex flex-col">
<Pageheader title="收银台管理"></Pageheader>
<div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中敬请期待...</div>
<div class="">
<p class="actionsmain">
功能说明可根据住户姓名住户手机号房屋号车位号车牌号快速搜索对应的未缴费用修改未缴费用的优惠及滞纳金金额完成对未缴费用的收取
</p>
<div class="contanier flex-center">
<div class="h-full flex-1 flex flex-items-start">
<div class="typebox">
<el-select v-model="searchform.type">
<el-option v-for="(item, index) in com_cashier_type" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<div class="searchBox">
<el-input>
<template #suffix>
<el-icon>
<Search></Search>
</el-icon>
</template>
</el-input>
<div class="listbox" v-show="Boolean(list.length > 0)">
<div class="list_item">
<div class="title">
<DictTag :options="com_cashier_type" :value="searchform.type"></DictTag>
</div>
<div class="list_value" v-for="(item, index) in list" :key="index">北境碧桂园小区A栋1单元101-张姗-13899999999</div>
<div class="list_value">北境碧桂园小区A栋1单元101-张姗-13899999999</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div>
<div class="tabsbox">
<div @click="handleChecout(index)" v-for="(item, index) in tabs" :key="index" class="tabs_item" :class="{ active: checkouttabs === index }">
{{ item.name }}
</div>
</div>
<div>
<component :is="tabs[checkouttabs].component" :key="checkouttabs"></component>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { Search } from '@element-plus/icons-vue';
import { ref } from 'vue';
import cashier from './cashier.vue';
import history from './history.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_cashier_type } = toRefs<any>(proxy?.useDict('com_cashier_type'));
const searchform = ref({
type: '0'
});
const list = ref([]);
// ! ===================================================================================
const checkouttabs = ref(0);
const tabs = [
{
name: "'收银台'",
component: cashier
},
{
name: '历史缴费',
component: history
}
];
function handleChecout(index: number) {
checkouttabs.value = index;
}
// ! ===================================================================================
</script>
<style scoped lang="scss"></style>
<style scoped lang="scss">
.tabsbox {
height: 60px;
background-color: #fff;
border-radius: 5px;
display: flex;
align-items: center;
padding: 0 20px;
.tabs_item {
height: 40px;
line-height: 40px;
padding: 0 10px;
margin-right: 40px;
font-size: 0.8rem;
cursor: pointer;
&:hover {
color: #40a0ff98;
border-bottom-color: #40a0ff98;
}
&.active {
color: #409eff;
border-bottom-color: #409eff;
border-bottom: 1px solid;
}
}
}
.actionsmain {
font-size: 0.7rem;
color: #000;
padding-left: 30px;
}
.contanier {
width: 900px;
min-height: 200px;
margin: 100px auto;
.typebox {
width: 140px;
height: 40px;
:deep(.el-select__wrapper) {
width: 140px;
height: 50px;
line-height: 20px;
border-radius: 5px 0px 0px 5px;
background-color: rgba(255, 255, 255, 1);
color: rgba(16, 16, 16, 1);
font-size: 14px;
outline: none;
}
}
.searchBox {
flex: 1;
background-color: #fff;
&:deep(.el-input__wrapper) {
width: 100%;
height: 50px;
border-radius: 0px 5px 5px 0px;
outline: none;
}
.listbox {
border: 1px solid #ccc;
width: 100%;
padding: 15px;
min-height: 200px;
font-size: 16px;
.title {
color: rgba(48, 49, 51, 1);
font-size: 1rem;
font-weight: 450;
height: 40px;
line-height: 40px;
border-bottom: 1px solid rgba(204, 204, 204, 1);
}
.list_item {
padding-bottom: 30px;
}
.list_value {
height: 40px;
line-height: 40px;
border-bottom: 1px solid rgba(204, 204, 204, 1);
cursor: pointer;
&:hover {
background-color: #cccccc33;
}
}
}
}
}
</style>

View File

@@ -4,9 +4,24 @@
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="设备编码" prop="deviceCode">
<el-input v-model="queryParams.deviceCode" placeholder="请输入设备编码" clearable @keyup.enter="handleQuery" />
<el-form ref="queryFormRef" label-width="100px" :model="queryParams" :inline="true">
<el-form-item label="设备状态" prop="status">
<el-select v-model="queryParams.status">
<el-option v-for="(item, index) in com_waterdevice_on_status" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="分合状态" prop="status">
<el-select v-model="queryParams.status">
<el-option
v-for="(item, index) in com_electricity_readrecord_status"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="房间号" prop="houseName">
<el-input v-model="queryParams.houseName" placeholder="请输入房间号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,46 +35,55 @@
<el-card class="flex-1" shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleMarkqrcode" v-hasPermi="['waterRecord:waterRecord:add']"
>批量生成条形码</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Upload">批量更新固件</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" border :data="electricityDeviceList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" border :data="ElectricityDeviceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="设备编码" align="center" prop="deviceCode" />
<el-table-column label="户号" align="center" prop="address">
<template #default="{ $index }">
{{ huhao + $index }}
<el-table-column label="电表设备编码" align="center" prop="deviceCode" />
<el-table-column label="设备状态" width="100" align="center" prop="status">
<template #default="scope">
<dict-tag :options="com_waterdevice_on_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column label="设备状态" align="center">
<el-table-column label="分合状态" width="100" align="center">
<template #default="scope">
<DictTag :options="com_waterdevice_on_status" :value="scope.row.status"></DictTag>
</template>
</el-table-column>
<el-table-column label="分合状态" align="center">
<template #default="scope">
<div class="readRecord" v-if="scope.row.electricityRecord">
<DictTag :options="com_electricity_readrecord_status" :value="scope.row.electricityRecord.status"></DictTag>
<div class="readRecord" v-if="scope.row.waterRecord">
<DictTag :options="com_electricity_readrecord_status" :value="scope.row.waterRecord.status"></DictTag>
</div>
<span v-else>-----</span>
</template>
</el-table-column>
<el-table-column label="余额" align="center" width="80">
<template #default="scope">
<el-table-column label="户号" align="center" prop="houseName" />
<el-table-column label="余额" width="100" align="center" prop="elePrice">
<template #defaul="scope">
<span v-if="scope.row.electricityRecord">{{ scope.row.electricityRecord.balance }}</span>
<span v-else>--</span>
<span v-else>-----</span>
</template>
</el-table-column>
<el-table-column label="图片" width="85" align="center" prop="deleted">
<el-table-column label="条形码" width="140" align="center" prop="deleted">
<template #default="scope">
<el-image
v-if="scope.row.url && scope.row.url.includes('http')"
:src="scope.row.url"
:preview-src-list="[scope.row.url]"
style="width: 40px; height: 40px; border-radius: 4px; margin-right: 5px"
style="width: 90px; height: 30px; border-radius: 4px; margin-right: 5px"
fit="cover"
preview-teleported
/>
>
<template #toolbar>
<el-icon @click="download(scope.row.url)"><Download /></el-icon>
</template>
</el-image>
<span v-else>暂未生成</span>
</template>
</el-table-column>
@@ -68,122 +92,371 @@
<span>{{ scope.row.waterRecord ? scope.row.waterRecord.readTime : '--' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" @click="handleProject(scope.row)">生成二维码</el-button>
<el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:electricityDevice:edit']">修改</el-button>
<el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:electricityDevice:remove']">删除</el-button>
<el-button link type="primary" @click="handleRecode(scope.row)">充值记录</el-button>
<el-button link type="primary" @click="handleQrCode(scope.row)">生成条码</el-button>
<el-button link type="primary" @click="handleOpenDialog('usedWater', scope.row)">用电量</el-button>
<el-button link type="primary" @click="handleOpenDialog('Upload', scope.row)">更新固件</el-button>
<el-button link type="primary" @click="handleOpenDialog('UpdateHouse', scope.row)" v-hasPermi="['system:waterDevice:edit']"
>修改</el-button
>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改电设备对话框 -->
<!-- 添加或修改电 设备对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="electricityDeviceFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="设备编" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
<el-form v-if="dialogType === 'usedWater'" ref="UsedWaterformRef" :model="UsedWaterform" label-width="100px">
<el-form-item label="设备编号:" prop="deviceCode"> {{ UsedWaterform.deviceCode }} </el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
format="YYYY-MM-DD HH:MM:ss"
value-format="YYYY-MM-DD HH:MM:ss"
v-model="UsedWaterform.startTime"
type="datetime"
placeholder="开始时间"
/>
</el-form-item>
<el-form-item label="安装地址" prop="address">
<el-input v-model="form.address" placeholder="请输入安装地址" />
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
format="YYYY-MM-DD HH:MM:ss"
value-format="YYYY-MM-DD HH:MM:ss"
v-model="UsedWaterform.endTime"
type="datetime"
placeholder="结束时间"
/>
</el-form-item>
<el-form-item label="0.未删除1.删除" prop="deleted">
<el-input v-model="form.deleted" placeholder="请输入0.未删除1.删除" />
</el-form-item>
<el-form-item label="" prop="url">
<el-input v-model="form.url" placeholder="请输入" />
</el-form-item>
<el-form-item label="" prop="openid">
<el-input v-model="form.openid" placeholder="请输入" />
<el-form-item>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">搜索</el-button>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
<el-form v-else-if="dialogType === 'Upload'" ref="UploadFileformRef" :model="UploadFileform" :rules="UploadFileformRules" label-width="100px">
<el-form-item label="上传更新文件" prop="file">
<el-upload
ref="uploadRef"
accept=".bin"
:action="uploadUrl"
name="file"
:headers="headerToken()"
:show-file-list="true"
class="upload-demo"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
>
<div class="uploadFileBox flex flex-items-center">
<el-icon>
<upload></upload>
</el-icon>
<div style="margin-left: 10px">上传文件</div>
</div>
<template #tip>
<div class="el-upload__tip">文件格式必须是 bin 格式</div>
</template>
</el-upload>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="unSubmit">取消</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">更新到设备</el-button>
</el-form-item>
</el-form>
<el-form v-else-if="dialogType === 'UpdateHouse'" ref="EditHouseformRef" :model="EditHouseform" :rules="EditHouseformRules" label-width="100px">
<el-form-item label="更新户号" prop="houseId">
<el-cascader v-model="userHousepath" :options="treedata" @change="handleChange" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="unSubmit">取消</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">更新到设备</el-button>
</el-form-item>
</el-form>
<div v-show="!usedWaterInfo" class="usedWaterbox">
<div class="useditem">查询用电量开始时间</div>
<div class="useditem value">{{ UsedWaterInfo.startTime }}</div>
<div class="useditem">查询用电量结束时间</div>
<div class="useditem value">{{ UsedWaterInfo.endTime }}</div>
<div class="useditem">用电量</div>
<div class="useditem value">{{ UsedWaterInfo.count }}</div>
</div>
</el-dialog>
</div>
</template>
<script setup name="ElectricityDevice" lang="ts">
<script setup name="WaterDevice" lang="ts">
import {
ElectricityDeviceMakerQrcode,
getElectricityDeviceTimeRangeUsedWater,
listElectricityDevice,
getElectricityDevice,
delElectricityDevice,
addElectricityDevice,
updateElectricityDevice
} from '@/api/system/SdbElectricityDevice/index';
import { ElectricityDeviceVO, ElectricityDeviceQuery, ElectricityDeviceForm } from '@/api/system/SdbElectricityDevice/type';
import { splitImages } from '@/utils';
const huhao = 9649998338;
import { ElectricityDeviceVO } from '@/api/system/SdbElectricityDevice/type';
import { useHouseStore } from '@/store/modules/house';
import { useUserStore } from '@/store/modules/user';
import { Upload } from '@element-plus/icons-vue';
import { CascaderValue, tourEmits, UploadProps, UploadRawFile } from 'element-plus';
const huhao = 3096371295;
const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/electricityDevice/upload';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_waterdevice_on_status } = toRefs<any>(proxy?.useDict('com_waterdevice_on_status'));
const { com_electricity_readrecord_status } = toRefs<any>(proxy?.useDict('com_electricity_readrecord_status'));
const electricityDeviceList = ref<ElectricityDeviceVO[]>([]);
const ElectricityDeviceList = ref<ElectricityDeviceVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const ids = ref<{ id: string; deviceCode: string }[]>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const electricityDeviceFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: ElectricityDeviceForm = {
id: undefined,
deviceCode: undefined,
address: undefined,
deleted: undefined,
url: undefined,
openid: undefined
};
const data = reactive<PageData<ElectricityDeviceForm, ElectricityDeviceQuery>>({
form: { ...initFormData },
const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
deviceCode: undefined,
address: undefined,
deleted: undefined,
url: undefined,
openid: undefined,
params: {}
houseName: undefined,
status: undefined
}
});
const { queryParams, form, rules } = toRefs(data);
const { queryParams } = toRefs(data);
/** 查询电设备列表 */
/** 查询电 设备列表 */
const getList = async () => {
loading.value = true;
const res = await listElectricityDevice(queryParams.value);
electricityDeviceList.value = res.rows;
ElectricityDeviceList.value = res.rows;
total.value = res.total;
loading.value = false;
};
// ! 用电量 =============================================================================
const usedWaterInfo = ref(true);
const UsedWaterformRef = ref(null);
const UsedWaterform = ref({
deviceCode: '',
startTime: '',
endTime: ''
});
const UsedWaterInfo = ref({
count: '',
startTime: '',
endTime: ''
});
// ! =======================================================================================
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
// ? 上传固件 ==============================================================================================
const UploadFileformRef = ref(null);
const UploadFileform = ref({
id: '',
deviceCode: '',
file: ''
});
const UploadFileformRules = {
file: [{ required: true, message: '更新文件不能为空', trigger: 'blur' }]
};
// 携带token
function headerToken() {
const useStore = useUserStore();
return {
Authorization: 'Bearer ' + useStore.token
};
}
const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile: UploadRawFile) => {
// 1. 校验后缀
console.log(rawFile);
if (!rawFile.name.endsWith('.bin')) {
ElMessage.warning('请上传 .bin 后缀的文件');
return false;
}
// 2. 校验文件类型bin 文件类型)
if (rawFile.type !== 'application/octet-stream' && rawFile.type !== '') {
ElMessage.warning('文件类型不正确,请上传标准 bin 文件');
return false;
}
// 3. 校验文件大小(不能空)
if (rawFile.size === 0) {
ElMessage.warning('上传 bin 文件不能为空');
return false;
}
return true;
};
const handleAvatarSuccess: UploadProps['onSuccess'] = (response: any) => {
UploadFileform.value.file = response.data.url;
};
// ? 上传固件 ==============================================================================================
// * 编辑房屋 ==============================================================================================
// 编辑房屋
const EditHouseformRef = ref(null);
const EditHouseformRules = {
file: [{ required: true, message: '更新文件不能为空', trigger: 'blur' }]
};
const EditHouseform = ref({
id: '',
deviceCode: '',
houseId: ''
});
// * 编辑房屋 ==============================================================================================
/** 批量生成 条形码 */
function handleMarkqrcode() {
if (ids.value.length > 0) {
ElectricityDeviceMakerQrcode(ids.value).then((res) => {
ElMessage.success('批量生成成功');
getList();
});
} else {
ElMessage.warning('请选择设备');
}
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: ElectricityDeviceVO[]) => {
ids.value = selection.map((item) => {
return {
id: item.id,
deviceCode: item.deviceCode
};
});
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 生成二维码 */
const handleQrCode = (row: ElectricityDeviceVO) => {
// 1.电表 2.电表
ElectricityDeviceMakerQrcode([
{
id: row.id,
deviceCode: row.deviceCode
}
]).then(() => {
ElMessage.success('生成成功');
getList();
});
};
// * house
const treedata = ref([]);
const houseStore = useHouseStore();
const userHousepath = ref<CascaderValue>([]);
function handleChange(val: CascaderValue) {
userHousepath.value = val;
EditHouseform.value.houseId = val[2];
}
// * house
const dialogType = ref<'usedWater' | 'Upload' | 'UpdateHouse'>('usedWater');
/** 用电量 更新固件 */
const handleOpenDialog = (type: 'usedWater' | 'Upload' | 'UpdateHouse', row: ElectricityDeviceVO) => {
reset();
dialog.visible = true;
dialogType.value = type;
dialog.title = type === 'usedWater' ? '用电量' : type === 'UpdateHouse' ? '编辑户号' : '更新固件';
if (type === 'usedWater') {
UsedWaterform.value.deviceCode = row.deviceCode;
UsedWaterform.value.startTime = new Date().toLocaleString();
UsedWaterform.value.endTime = new Date().toLocaleString();
usedWaterInfo.value = true;
} else if (type === 'Upload') {
UploadFileform.value.file = '';
UploadFileform.value.deviceCode = row.deviceCode;
UploadFileform.value.id = row.id;
} else if (type === 'UpdateHouse') {
EditHouseform.value.id = row.id;
EditHouseform.value.deviceCode = row.deviceCode;
EditHouseform.value.houseId = '';
getTree();
}
};
function getTree() {
treedata.value = [];
houseStore.getCurrentVilageTreeHouse().then((res) => {
treedata.value = res;
userHousepath.value = [];
});
}
/** 电表 启停*/
const handleChangeWater = (val: string, row: ElectricityDeviceVO) => {};
/** 编辑房屋 按钮操作 */
const handleUpdate = async (row?: ElectricityDeviceVO) => {
reset();
dialog.visible = true;
dialog.title = '编辑房屋';
};
/** 提交按钮 */
const submitForm = () => {
if (dialogType.value === 'usedWater') {
UsedWaterformRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
await getElectricityDeviceTimeRangeUsedWater(UsedWaterform.value)
.then((res) => {
UsedWaterInfo.value.endTime = res.data.endTime;
UsedWaterInfo.value.startTime = res.data.startTime;
UsedWaterInfo.value.count = res.data.count;
})
.finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
usedWaterInfo.value = false;
}
});
} else if (dialogType.value === 'UpdateHouse') {
EditHouseformRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
await updateElectricityDevice(EditHouseform.value).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
getList();
unSubmit();
}
});
}
};
const unSubmit = () => {
reset();
dialog.visible = false;
dialog.title = '';
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
electricityDeviceFormRef.value?.resetFields();
usedWaterInfo.value = true;
UsedWaterform.value = {
deviceCode: '',
startTime: '',
endTime: ''
};
UsedWaterInfo.value = {
count: '',
startTime: '',
endTime: ''
};
EditHouseform.value = {
houseid: ''
};
// 上传 清空
UploadFileformRef.value?.resetFields();
// 使用电量 清空
EditHouseformRef.value?.resetFields();
// 使用电量 清空
UsedWaterformRef.value?.resetFields();
};
/** 搜索按钮操作 */
@@ -198,69 +471,68 @@ const resetQuery = () => {
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: ElectricityDeviceVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
const router = useRouter();
/** 新增按钮操作 */
const handleAdd = () => {
/** 充值记录 */
const handleRecode = (row: ElectricityDeviceVO) => {
// 1.电表 2.电表
router.push({
path: '/sdb/addSdbElectricityDevice'
});
};
/** 修改按钮操作 */
const handleUpdate = async (row?: ElectricityDeviceVO) => {
router.push({
path: '/sdb/addSdbElectricityDevice',
query: { id: row?.id }
});
};
/** 提交按钮 */
const submitForm = () => {
electricityDeviceFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateElectricityDevice(form.value).finally(() => (buttonLoading.value = false));
} else {
await addElectricityDevice(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
path: '/equipment/TopupRecord2',
query: {
type: '2',
houseName: row.houseName,
id: row.id
}
});
};
const handleProject = (row) => {
row.url = 'https://www.bugtc.com/static/dsb/20260107/272d59d5-bff1-49b3-b899-046169c07257.png';
};
/** 删除按钮操作 */
const handleDelete = async (row?: ElectricityDeviceVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除电设备编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
await delElectricityDevice(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.$modal.msgError('暂不支持导出功能');
};
onMounted(() => {
getList();
});
const download = (url: string) => {
console.log(url);
if (!url) return;
if (!url.includes('http')) return;
// 创建一个隐藏的 a 标签,直接跳转下载
const link = document.createElement('a');
link.href = url;
link.download = ''; // 自动获取文件名
link.target = '_blank';
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
};
</script>
<style lang="scss" scoped>
.el-table {
height: calc(100% - 80px);
}
.usedWaterbox {
width: 100%;
border: 1px solid #eef0ff;
.useditem {
height: 42px;
line-height: 42px;
background-color: rgba(26, 117, 255, 0.1);
color: rgba(16, 16, 16, 1);
font-size: 14px;
padding: 0 10px;
&.value {
background-color: #fff;
}
}
}
.uploadFileBox {
width: 276px;
height: 35px;
line-height: 20px;
border-radius: 4px 4px 4px 4px;
background-color: rgba(255, 255, 255, 1);
color: rgba(16, 16, 16, 1);
border: 1px solid #ccc;
padding-left: 20px;
font-size: 14px;
}
</style>

View File

@@ -16,8 +16,8 @@
<el-table v-loading="loading" border :data="topupRecordList">
<el-table-column label="订单号" align="center" prop="orderId" />
<el-table-column label="充值金额" align="center" prop="rechargeAmount" />
<el-table-column label="用户ID" align="center" prop="rechargeAmount" />
<el-table-column label="充值时间" align="center" prop="rechargeTime" width="180">
<el-table-column label="用户ID" align="center" prop="userId" />
<el-table-column label="充值时间" align="center" prop="rechargeTime">
<template #default="scope">
<span>{{ parseTime(scope.row.rechargeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
@@ -51,8 +51,9 @@ const data = reactive<PageData<TopupRecordForm, TopupRecordQuery>>({
queryParams: {
pageNum: 1,
pageSize: 10,
type: undefined,
deviceCode: undefined
type: '',
deviceCode: '',
id: ''
}
});
@@ -64,14 +65,16 @@ const getList = async () => {
loading.value = true;
const res = await listTopupRecord(queryParams.value);
topupRecordList.value = res.rows;
housename.value = res.rows.pop().housname ?? '';
total.value = res.total;
loading.value = false;
};
onMounted(() => {
if (route.query.id) {
routeid.value = route.query.id;
routeid.value = route.query.deviceCode;
housename.value = (route.query.houseName as string) ?? '';
queryParams.value.type = route.query.type as string;
queryParams.value.deviceCode = route.query.deviceCode as string;
}
getList();
});

View File

@@ -5,18 +5,18 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" label-width="100px" :model="queryParams" :inline="true">
<el-form-item label="设备状态" prop="deviceCode">
<el-select v-model="queryParams.deleted">
<el-form-item label="设备状态" prop="eleStatus">
<el-select v-model="queryParams.eleStatus">
<el-option v-for="(item, index) in com_waterdevice_on_status" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="分合状态" prop="waterRecord">
<el-select v-model="queryParams.waterRecord">
<el-form-item label="分合状态" prop="status">
<el-select v-model="queryParams.status">
<el-option v-for="(item, index) in com_water_readrecord_status" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="房间号" prop="deviceCode">
<el-input v-model="queryParams.deviceCode" placeholder="请输入水表设备编码" clearable @keyup.enter="handleQuery" />
<el-form-item label="房间号" prop="houseName">
<el-input v-model="queryParams.houseName" placeholder="请输入房间号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -30,48 +30,63 @@
<el-card class="flex-1" shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleMarkqrcode" v-hasPermi="['waterRecord:waterRecord:add']"
>批量生成条形码</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-button type="success" plain icon="Upload">批量更新固件</el-button> -->
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" border :data="waterDeviceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="水表设备编码" align="center" prop="deviceCode" />
<el-table-column label="设备状态" width="100" align="center" prop="deleted">
<el-table-column label="水表设备编码" width="250" align="center" prop="deviceCode" />
<el-table-column label="设备状态" width="100" align="center" prop="eleStatus">
<template #default="scope">
<dict-tag :options="com_waterdevice_on_status" :value="scope.row.deleted"></dict-tag>
<dict-tag v-if="scope.row.waterRecord" :options="com_waterdevice_on_status" :value="scope.row.waterRecord.eleStatus"></dict-tag>
<span v-else>-------</span>
</template>
</el-table-column>
<el-table-column label="分合状态" width="100" align="center">
<template #default="scope">
<div class="readRecord" v-if="scope.row.waterRecord">
<el-tag type="success" v-if="scope.row.waterRecord.status == 1">供水</el-tag>
<el-tag type="info" v-else>断水</el-tag>
</div>
<span v-else>--</span>
<dict-tag v-if="scope.row.status" :options="com_water_readrecord_status" :value="scope.row.status"></dict-tag>
<span v-else>-------</span>
</template>
</el-table-column>
<el-table-column label="房间号" align="center" prop="deviceCode" />
<el-table-column label="余额" width="100" align="center" prop="deviceCode" />
<el-table-column label="条形码" width="140" align="center" prop="deleted">
<el-table-column label="号" align="center" prop="houseName" />
<el-table-column label="余额" width="120" align="center" prop="deviceCode">
<template #default="scope">
<span v-if="scope.row.waterRecord">{{ scope.row.waterRecord.balance }}</span>
<span v-else>------</span>
</template>
</el-table-column>
<el-table-column label="条形码" width="250" align="center">
<template #default="scope">
<el-image
v-if="scope.row.url && scope.row.url.includes('http')"
:src="scope.row.url"
:preview-src-list="[scope.row.url]"
style="width: 90px; height: 30px; border-radius: 4px; margin-right: 5px"
style="width: 100%; height: 100%; border-radius: 4px"
fit="cover"
preview-teleported
/>
>
<template #toolbar>
<el-icon @click="download(scope.row.url)"><Download /></el-icon>
</template>
</el-image>
<span v-else>暂未生成</span>
</template>
</el-table-column>
<el-table-column label="抄表时间" align="center">
<el-table-column label="抄表时间" width="200" align="center">
<template #default="scope">
<span>{{ scope.row.waterRecord ? scope.row.waterRecord.readTime : '--' }}</span>
</template>
</el-table-column>
<el-table-column width="150" label="启停" align="center" prop="deleted">
<!-- <el-table-column width="150" label="启停" align="center" prop="deleted">
<template #default="scope">
<el-switch
@change="(val: string) => handleChangeWater(val, scope.row)"
@@ -82,14 +97,35 @@
inactive-value="1"
></el-switch>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" @click="handleRecode(scope.row)">充值记录</el-button>
<el-button link type="primary" @click="handleQrCode(scope.row)">生成条码</el-button>
<el-button link type="primary" @click="handleOpenDialog('usedWater', scope.row)">用水量</el-button>
<el-button link type="primary" @click="handleOpenDialog('Upload', scope.row)">更新固件</el-button>
<el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:waterDevice:edit']">修改</el-button>
<el-row>
<el-col :span="24" class="flex flex-items-center">
<el-button link type="primary" @click="handleRecode(scope.row)">充值记录</el-button>
<el-button link type="primary" @click="handleQrCode(scope.row)">生成条码</el-button>
<el-dropdown style="vertical-align: text-top">
<el-button link type="primary">
<div>
更多<el-icon><arrow-down /></el-icon>
</div>
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item>
<div @click="handleOpenDialog('usedWater', scope.row)">用水量</div>
</el-dropdown-item>
<el-dropdown-item>
<div @click="handleOpenDialog('Upload', scope.row)">更新固件</div>
</el-dropdown-item>
<el-dropdown-item>
<div @click="handleOpenDialog('UpdateHouse', scope.row)" v-hasPermi="['system:waterDevice:edit']">修改</div>
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</el-col>
</el-row>
</template>
</el-table-column>
</el-table>
@@ -98,29 +134,96 @@
</el-card>
<!-- 添加或修改水 设备对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="waterDeviceFormRef" :model="form" label-width="100px">
<el-form-item label="水表设备编码" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入水表设备编码" />
<!-- water -->
<el-form v-if="dialogType === 'usedWater'" ref="UsedWaterformRef" :model="UsedWaterform" label-width="100px">
<el-form-item label="设备编号:" prop="deviceCode"> {{ UsedWaterform.deviceCode }} </el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
format="YYYY-MM-DD HH:MM:ss"
value-format="YYYY-MM-DD HH:MM:ss"
v-model="UsedWaterform.startTime"
type="datetime"
placeholder="开始时间"
/>
</el-form-item>
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" placeholder="请输入地址" />
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
format="YYYY-MM-DD HH:MM:ss"
value-format="YYYY-MM-DD HH:MM:ss"
v-model="UsedWaterform.endTime"
type="datetime"
placeholder="结束时间"
/>
</el-form-item>
<el-form-item>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">搜索</el-button>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
<!-- upload file -->
<el-form v-else-if="dialogType === 'Upload'" ref="UploadFileformRef" :model="UploadFileform" :rules="UploadFileformRules" label-width="100px">
<el-form-item label="上传更新文件" prop="file">
<el-upload
ref="uploadRef"
accept=".bin"
:action="uploadUrl"
name="file"
:headers="headerToken()"
:show-file-list="true"
class="upload-demo"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
>
<div class="uploadFileBox flex flex-items-center">
<el-icon>
<upload></upload>
</el-icon>
<div style="margin-left: 10px">上传文件</div>
</div>
<template #tip>
<div class="el-upload__tip">文件格式必须是 bin 格式</div>
</template>
</el-upload>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="unSubmit">取消</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">更新到设备</el-button>
</el-form-item>
</el-form>
<!-- house -->
<el-form v-else-if="dialogType === 'UpdateHouse'" ref="EditHouseformRef" :model="EditHouseform" :rules="EditHouseformRules" label-width="100px">
<el-form-item label="更新户号" prop="houseId">
<el-cascader v-model="userHousepath" :options="treedata" @change="handleChange" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="unSubmit">取消</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">更新到设备</el-button>
</el-form-item>
</el-form>
<div v-show="!usedWaterInfo" class="usedWaterbox">
<div class="useditem">查询用水量开始时间</div>
<div class="useditem value">{{ UsedWaterInfo.startTime }}</div>
<div class="useditem">查询用水量结束时间</div>
<div class="useditem value">{{ UsedWaterInfo.endTime }}</div>
<div class="useditem">用水量</div>
<div class="useditem value">{{ UsedWaterInfo.count }}</div>
</div>
</el-dialog>
</div>
</template>
<script setup name="WaterDevice" lang="ts">
import { listWaterDevice, getWaterDevice, delWaterDevice, addWaterDevice, updateWaterDevice } from '@/api/system/SdbWaterDevice/index';
import 'element-plus/theme-chalk/display.css';
import { listWaterDevice, getWaterDeviceTimeRangeUsedWater, WaterDeviceMakerQrcode, updateWaterDevice } from '@/api/system/SdbWaterDevice/index';
import { WaterDeviceVO, WaterDeviceQuery, WaterDeviceForm } from '@/api/system/SdbWaterDevice/type';
import { useHouseStore } from '@/store/modules/house';
import { useUserStore } from '@/store/modules/user';
import { getHousePathById } from '@/utils/house';
import { Upload } from '@element-plus/icons-vue';
import { CascaderValue, tourEmits, UploadProps, UploadRawFile } from 'element-plus';
const huhao = 3096371295;
const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/waterDevice/upload';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_waterdevice_on_status } = toRefs<any>(proxy?.useDict('com_waterdevice_on_status'));
@@ -130,13 +233,12 @@ const waterDeviceList = ref<WaterDeviceVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const ids = ref<{ id: string; deviceCode: string }[]>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const waterDeviceFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@@ -147,11 +249,9 @@ const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
deviceCode: undefined,
address: undefined,
deleted: undefined,
url: undefined,
openid: undefined
eleStatus: '',
houseName: '',
status: ''
}
});
@@ -165,36 +265,209 @@ const getList = async () => {
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
// ! 用水量 =============================================================================
const usedWaterInfo = ref(true);
const UsedWaterformRef = ref(null);
const UsedWaterform = ref({
water: 0,
startDate: '',
endDate: ''
deviceCode: '',
startTime: '',
endTime: ''
});
const UsedWaterInfo = ref({
count: '',
startTime: '',
endTime: ''
});
// ! =======================================================================================
// ? 上传固件 ==============================================================================================
const UploadFileformRef = ref(null);
const EditHouseformRef = ref(null);
const EditHouseform = ref({
houseid: ''
const uploadRef = ref();
const UploadFileform = ref({
id: '',
deviceCode: '',
file: ''
});
const UploadFileformRules = {
file: [{ required: true, message: '更新文件不能为空', trigger: 'blur' }]
};
function headerToken() {
const useStore = useUserStore();
return {
Authorization: 'Bearer ' + useStore.token
};
}
const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile: UploadRawFile) => {
// 1. 校验后缀
console.log(rawFile);
if (!rawFile.name.endsWith('.bin')) {
ElMessage.warning('请上传 .bin 后缀的文件');
return false;
}
// 2. 校验文件类型bin 文件类型)
if (rawFile.type !== 'application/octet-stream' && rawFile.type !== '') {
ElMessage.warning('文件类型不正确,请上传标准 bin 文件');
return false;
}
// 3. 校验文件大小(不能空)
if (rawFile.size === 0) {
ElMessage.warning('上传 bin 文件不能为空');
return false;
}
return true;
};
const handleAvatarSuccess: UploadProps['onSuccess'] = (response: any) => {
UploadFileform.value.file = response.data.url;
};
// ? 上传固件 ==============================================================================================
// * 编辑房屋 ==============================================================================================
// 编辑房屋
const EditHouseformRef = ref(null);
const EditHouseformRules = {
file: [{ required: true, message: '更新文件不能为空', trigger: 'blur' }]
};
const EditHouseform = ref({
id: '',
deviceCode: '',
houseId: ''
});
// * 编辑房屋 ==============================================================================================
/** 批量生成 条形码 */
function handleMarkqrcode() {
if (ids.value.length > 0) {
WaterDeviceMakerQrcode(ids.value).then((res) => {
ElMessage.success('批量生成成功');
getList();
});
} else {
ElMessage.warning('请选择设备');
}
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: WaterDeviceVO[]) => {
ids.value = selection.map((item) => {
return {
id: item.id,
deviceCode: item.deviceCode
};
});
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 生成二维码 */
const handleQrCode = (row: WaterDeviceVO) => {
// 1.电表 2.水表
WaterDeviceMakerQrcode([
{
id: row.id,
deviceCode: row.deviceCode
}
]).then(() => {
ElMessage.success('生成成功');
getList();
});
};
// * house
const treedata = ref([]);
const houseStore = useHouseStore();
const userHousepath = ref<CascaderValue>([]);
function handleChange(val: CascaderValue) {
userHousepath.value = val;
EditHouseform.value.houseId = val[2];
}
// * house
const dialogType = ref<'usedWater' | 'Upload' | 'UpdateHouse'>('usedWater');
/** 用水量 更新固件 编辑房屋*/
const handleOpenDialog = (type: 'usedWater' | 'Upload' | 'UpdateHouse', row: WaterDeviceVO) => {
reset();
if (type === 'usedWater') {
UsedWaterform.value.deviceCode = row.deviceCode;
UsedWaterform.value.startTime = new Date().toLocaleString();
UsedWaterform.value.endTime = new Date().toLocaleString();
usedWaterInfo.value = true;
} else if (type === 'Upload') {
UploadFileform.value.file = '';
UploadFileform.value.deviceCode = row.deviceCode;
UploadFileform.value.id = row.id;
} else if (type === 'UpdateHouse') {
EditHouseform.value.id = row.id;
EditHouseform.value.deviceCode = row.deviceCode;
EditHouseform.value.houseId = '';
getTree();
}
dialog.visible = true;
dialogType.value = type;
dialog.title = type === 'usedWater' ? '用水量' : type === 'UpdateHouse' ? '编辑户号' : '更新固件';
};
function getTree() {
treedata.value = [];
houseStore.getCurrentVilageTreeHouse().then((res) => {
treedata.value = res;
userHousepath.value = [];
});
}
/** 水表 启停*/
const handleChangeWater = (val: string, row: WaterDeviceVO) => {};
/** 提交按钮 */
const submitForm = () => {
if (dialogType.value === 'usedWater') {
UsedWaterformRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
await getWaterDeviceTimeRangeUsedWater(UsedWaterform.value)
.then((res) => {
UsedWaterInfo.value.endTime = res.data.endTime;
UsedWaterInfo.value.startTime = res.data.startTime;
UsedWaterInfo.value.count = res.data.count;
})
.finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
usedWaterInfo.value = false;
}
});
} else if (dialogType.value === 'UpdateHouse') {
EditHouseformRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
await updateWaterDevice(EditHouseform.value).finally(() => (buttonLoading.value = false));
proxy?.$modal.msgSuccess('操作成功');
getList();
unSubmit();
}
});
}
};
const unSubmit = () => {
reset();
dialog.visible = false;
dialog.title = '';
};
/** 表单重置 */
const reset = () => {
usedWaterInfo.value = true;
UsedWaterform.value = {
water: 0,
startDate: '',
endDate: ''
deviceCode: '',
startTime: '',
endTime: ''
};
UsedWaterInfo.value = {
count: '',
startTime: '',
endTime: ''
};
EditHouseform.value = {
houseid: ''
id: '',
deviceCode: '',
houseId: ''
};
// 上传 清空
UploadFileformRef.value?.resetFields();
@@ -216,75 +489,78 @@ const resetQuery = () => {
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: WaterDeviceVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
const router = useRouter();
/** 充值记录 */
const handleRecode = (row: WaterDeviceVO) => {
// 1.电表 2.水表
router.push({
path: '/Sdb/TopupRecord',
path: '/equipment/TopupRecord',
query: {
type: '2',
id: row.id
id: row.id,
houseName: row.houseName,
deviceCode: row.deviceCode
}
});
};
/** 生成二维码 */
const handleQrCode = (row: WaterDeviceVO) => {
// 1.电表 2.水表
console.log('qrcode');
};
/** 用水量 更新固件 */
const handleOpenDialog = (type: 'usedWater' | 'Upload', row: WaterDeviceVO) => {
reset();
dialog.visible = true;
dialog.title = type === 'usedWater' ? '用水量' : '更新固件';
};
/** 水表 启停*/
const handleChangeWater = (val: string, row: WaterDeviceVO) => {
console.log(val, row, typeof val);
};
/** 编辑房屋 按钮操作 */
const handleUpdate = async (row?: WaterDeviceVO) => {
reset();
dialog.visible = true;
dialog.title = '编辑房屋';
};
/** 提交按钮 */
const submitForm = () => {
waterDeviceFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.id) {
await updateWaterDevice(form.value).finally(() => (buttonLoading.value = false));
} else {
await addWaterDevice(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
onMounted(() => {
getList();
});
const download = (url: string) => {
console.log(url);
if (!url) return;
if (!url.includes('http')) return;
// 创建一个隐藏的 a 标签,直接跳转下载
const link = document.createElement('a');
link.href = url;
link.download = ''; // 自动获取文件名
link.target = '_blank';
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
};
</script>
<style lang="scss" scoped>
.example-showcase .el-dropdown + .el-dropdown {
margin-left: 15px;
}
.example-showcase .el-dropdown-link {
cursor: pointer;
color: var(--el-color-primary);
display: flex;
align-items: center;
}
.el-table {
height: calc(100% - 80px);
}
.usedWaterbox {
width: 100%;
border: 1px solid #eef0ff;
.useditem {
height: 42px;
line-height: 42px;
background-color: rgba(26, 117, 255, 0.1);
color: rgba(16, 16, 16, 1);
font-size: 14px;
padding: 0 10px;
&.value {
background-color: #fff;
}
}
}
.uploadFileBox {
width: 276px;
height: 35px;
line-height: 20px;
border-radius: 4px 4px 4px 4px;
background-color: rgba(255, 255, 255, 1);
color: rgba(16, 16, 16, 1);
border: 1px solid #ccc;
padding-left: 20px;
font-size: 14px;
}
</style>