qdintc/fishery-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:功能优化，设备报警信息、微信缓存用户，操作记录信息，代码提交。

Browse Source
This commit is contained in:
tianyongbao
2025-10-24 20:41:11 +08:00
parent 3b13ee1708
commit 3b39f9f3f3
30 changed files with 2264 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/views/fishery/payDevice/index.vue
View File

@@ -97,7 +97,7 @@
<!-- 添加或修改设备充值记录对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="payDeviceFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType" placeholder="请选择设备类型">
<el-option
@@ -108,12 +108,12 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="设备编号" prop="serialNum">
<el-input
:value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''"
placeholder="请选择设备"
readonly
<el-input
:value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''"
placeholder="请选择设备"
readonly
@click="openDeviceSelect"
style="cursor: pointer;"
:disabled="!form.deviceType"
@@ -124,10 +124,10 @@
</el-input>
</el-form-item>
<el-form-item label="用户" prop="userId">
<el-input
:value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''"
placeholder="请选择用户"
readonly
<el-input
:value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''"
placeholder="请选择用户"
readonly
@click="openUserSelect"
style="cursor: pointer;"
>
@@ -174,7 +174,7 @@
</el-select>
</el-form-item> -->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
@@ -184,42 +184,42 @@
</div>
</template>
</el-dialog>
<!-- 设备选择对话框 -->
<el-dialog title="选择设备" v-model="deviceSelectVisible" width="1200px" append-to-body>
<!-- 搜索条件 -->
<el-form :model="deviceQueryParams" :inline="true" class="mb-4">
<el-form-item label="用户信息">
<el-input
v-model="deviceQueryParams.params.userKeyword"
placeholder="请输入用户名或手机号"
clearable
<el-input
v-model="deviceQueryParams.params.userKeyword"
placeholder="请输入用户名或手机号"
clearable
style="width: 200px"
@keyup.enter="handleDeviceQuery"
/>
</el-form-item>
<el-form-item label="设备编号">
<el-input
v-model="deviceQueryParams.serialNum"
placeholder="请输入设备编号"
clearable
<el-input
v-model="deviceQueryParams.serialNum"
placeholder="请输入设备编号"
clearable
style="width: 180px"
@keyup.enter="handleDeviceQuery"
/>
</el-form-item>
<el-form-item label="设备名称">
<el-input
v-model="deviceQueryParams.deviceName"
placeholder="请输入设备名称"
clearable
<el-input
v-model="deviceQueryParams.deviceName"
placeholder="请输入设备名称"
clearable
style="width: 180px"
@keyup.enter="handleDeviceQuery"
/>
</el-form-item>
<el-form-item label="设备类型">
<el-select
v-model="deviceQueryParams.deviceType"
placeholder="请选择设备类型"
<el-select
v-model="deviceQueryParams.deviceType"
placeholder="请选择设备类型"
disabled
style="width: 150px"
>
@@ -236,10 +236,10 @@
<el-button icon="Refresh" @click="resetDeviceQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 设备表格 -->
<el-table
:data="deviceList"
<el-table
:data="deviceList"
highlight-current-row
height="400px"
border
@@ -266,9 +266,9 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template #default="scope">
<el-button
type="primary"
size="small"
<el-button
type="primary"
size="small"
@click="handleDeviceSelect(scope.row)"
>
选择
@@ -276,42 +276,42 @@
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
v-show="deviceTotal > 0"
:total="deviceTotal"
v-model:page="deviceQueryParams.pageNum"
v-model:limit="deviceQueryParams.pageSize"
<pagination
v-show="deviceTotal > 0"
:total="deviceTotal"
v-model:page="deviceQueryParams.pageNum"
v-model:limit="deviceQueryParams.pageSize"
@pagination="handleDevicePaginationChange"
class="mt-4"
/>
<template #footer>
<div class="dialog-footer">
<el-button @click="cancelDeviceSelect">取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 用户选择对话框 -->
<el-dialog title="选择用户" v-model="userSelectVisible" width="900px" append-to-body>
<!-- 搜索条件 -->
<el-form :model="userQueryParams" :inline="true" class="mb-4">
<el-form-item label="用户名">
<el-input
v-model="userQueryParams.userName"
placeholder="请输入用户名"
clearable
<el-input
v-model="userQueryParams.userName"
placeholder="请输入用户名"
clearable
style="width: 180px"
@keyup.enter="handleUserQuery"
/>
</el-form-item>
<el-form-item label="手机号">
<el-input
v-model="userQueryParams.mobilePhone"
placeholder="请输入手机号"
clearable
<el-input
v-model="userQueryParams.mobilePhone"
placeholder="请输入手机号"
clearable
style="width: 180px"
@keyup.enter="handleUserQuery"
/>
@@ -321,10 +321,10 @@
<el-button icon="Refresh" @click="resetUserQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 用户表格 -->
<el-table
:data="aquUserList"
<el-table
:data="aquUserList"
highlight-current-row
height="400px"
border
@@ -336,9 +336,9 @@
<el-table-column label="区县" align="center" prop="district" />
<el-table-column label="操作" align="center" width="100">
<template #default="scope">
<el-button
type="primary"
size="small"
<el-button
type="primary"
size="small"
@click="handleUserSelect(scope.row)"
>
选择
@@ -346,24 +346,24 @@
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
v-show="userTotal > 0"
:total="userTotal"
v-model:page="userQueryParams.pageNum"
v-model:limit="userQueryParams.pageSize"
<pagination
v-show="userTotal > 0"
:total="userTotal"
v-model:page="userQueryParams.pageNum"
v-model:limit="userQueryParams.pageSize"
@pagination="handleUserPaginationChange"
class="mt-4"
/>
<template #footer>
<div class="dialog-footer">
<el-button @click="cancelUserSelect">取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 订单详情对话框 -->
<el-dialog title="订单详情" v-model="orderDetailVisible" width="800px" append-to-body>
<el-descriptions v-if="orderDetail" :column="2" border>
@@ -583,7 +583,7 @@ const handleUpdate = async (row?: PayDeviceVO) => {
const _id = row?.id || ids.value[0]
const res = await getPayDevice(_id);
Object.assign(form.value, res.data);
// 回显用户信息
if (form.value.userId) {
try {
@@ -604,7 +604,7 @@ const handleUpdate = async (row?: PayDeviceVO) => {
} else {
selectedUser.value = null;
}
// 回显设备信息
if (form.value.serialNum) {
try {
@@ -627,7 +627,7 @@ const handleUpdate = async (row?: PayDeviceVO) => {
} else {
selectedDevice.value = null;
}
dialog.visible = true;
dialog.title = "修改设备充值记录";
}
@@ -815,7 +815,7 @@ const handleViewOrder = async (row: PayDeviceVO) => {
proxy?.$modal.msgWarning('该记录没有关联订单');
return;
}
try {
const res = await getPayOrder(row.orderId);
orderDetail.value = res.data;