Skip to content

P
property-management
Commit 33a9f557 authored by 刘帅's avatar 刘帅
Browse files
Options

1.BUG修复、页面优化

parent 4b77dd51
Hide whitespace changes
Inline Side-by-side
Showing with 348 additions and 91 deletions
propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/WxCarportController.java
View file @ 33a9f557
......@@ -5,9 +5,12 @@ import com.propertyManagement.business.domain.bo.WxCarportBo;
import com.propertyManagement.business.domain.bo.WxProprietorLedgerBo;
import com.propertyManagement.business.domain.vo.WxCarportVo;
import com.propertyManagement.business.domain.vo.WxProprietorLedgerVo;
import com.propertyManagement.business.domain.vo.WxProtocolVo;
import com.propertyManagement.business.listener.WxCarportImportListener;
import com.propertyManagement.business.listener.WxProprietorLedgerImportListener;
import com.propertyManagement.business.service.IWxCarportService;
import com.propertyManagement.business.service.IWxProprietorLedgerService;
import com.propertyManagement.business.service.IWxProtocolService;
import com.propertyManagement.common.annotation.Log;
import com.propertyManagement.common.annotation.RepeatSubmit;
import com.propertyManagement.common.core.controller.BaseController;
......@@ -45,6 +48,7 @@ import java.util.List;
public class WxCarportController extends BaseController {
private final IWxCarportService iWxCarportService;
private final IWxProprietorLedgerService proprietorLedgerService;
/**
* 查询业主车位列表
......@@ -55,6 +59,18 @@ public class WxCarportController extends BaseController {
return iWxCarportService.queryPageList(bo, pageQuery);
}
/**
* 查询业主车位列表
*/
@GetMapping("/listAll")
public R<List<WxCarportVo>> listAll(WxCarportBo bo) {
if (bo.getProprietorId() != null) {
WxProprietorLedgerVo proprietorLedgerVo = proprietorLedgerService.queryById(bo.getProprietorId());
bo.setCommunityId(proprietorLedgerVo.getCommunityId());
}
return R.ok(iWxCarportService.queryList(bo));
}
/**
* 导出业主车位列表
*/
......
propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxCarportController.java 0 → 100644
View file @ 33a9f557
package com.propertyManagement.web.controller.business.api;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.propertyManagement.business.domain.bo.WxCarportBo;
import com.propertyManagement.business.domain.bo.WxProprietorLedgerBo;
import com.propertyManagement.business.domain.vo.WxCarportVo;
import com.propertyManagement.business.listener.WxCarportImportListener;
import com.propertyManagement.business.service.IWxCarportService;
import com.propertyManagement.business.support.util.AuthUtil;
import com.propertyManagement.common.annotation.Log;
import com.propertyManagement.common.annotation.RepeatSubmit;
import com.propertyManagement.common.core.controller.BaseController;
import com.propertyManagement.common.core.domain.PageQuery;
import com.propertyManagement.common.core.domain.R;
import com.propertyManagement.common.core.page.TableDataInfo;
import com.propertyManagement.common.core.validate.AddGroup;
import com.propertyManagement.common.core.validate.EditGroup;
import com.propertyManagement.common.enums.BusinessType;
import com.propertyManagement.common.excel.ExcelResult;
import com.propertyManagement.common.utils.poi.ExcelUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* 业主车位
*
* @author liushuai
* @date 2025-05-26
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/api/carport")
public class ApiWxCarportController extends BaseController {
private final IWxCarportService iWxCarportService;
/**
* 查询业主车位列表
*/
@GetMapping("/listByType")
public R<List<WxCarportVo>> list(@Validated @NotNull(message = "车位类型不能为空") Integer type) {
WxCarportBo wxCarportBo = new WxCarportBo();
wxCarportBo.setType(type);
wxCarportBo.setProprietorId(AuthUtil.getWxUser().getProprietorId());
return R.ok(iWxCarportService.queryList(wxCarportBo));
}
}
propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxPayRecordController.java
View file @ 33a9f557
......@@ -45,7 +45,7 @@ public class ApiWxPayRecordController extends BaseController {
WxPayRecordBo recordBo = new WxPayRecordBo();
recordBo.setProprietorId(AuthUtil.getWxUser().getProprietorId());
recordBo.setOrderType(type);
// recordBo.setPayState(PayState.NO.getCode());
recordBo.setPayState(PayState.YES.getCode());
return R.ok(iWxPayRecordService.queryList(recordBo));
}
......
propertyManagement-admin/src/main/java/com/propertyManagement/web/controller/business/api/ApiWxSlideshowController.java
View file @ 33a9f557
......@@ -44,9 +44,10 @@ public class ApiWxSlideshowController extends BaseController {
* 查询轮播图列表
*/
@GetMapping("/list")
public R<List<WxSlideshowVo>> listAll() {
public R<List<WxSlideshowVo>> listAll(@Validated @NotNull(message = "类型不能为空") Integer type) {
WxSlideshowBo wxSlideshowBo = new WxSlideshowBo();
wxSlideshowBo.setIsEnable(IsEnableType.YES.getCode());
wxSlideshowBo.setType(type);
return R.ok(iWxSlideshowService.queryList(wxSlideshowBo));
}
}
propertyManagement-business/src/main/java/com/propertyManagement/business/domain/WxSlideshow.java
View file @ 33a9f557
......@@ -36,6 +36,10 @@ public class WxSlideshow extends BaseEntity {
* 跳转地址
*/
private String skipUrl;
/**
* 类型（1首页轮播图 2个人中心轮播图）
*/
private Integer type;
/**
* 是否启用（0否 1是）
*/
......
propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxClockBo.java
View file @ 33a9f557
......@@ -69,11 +69,13 @@ public class WxClockBo extends BaseEntity {
/**
* 打卡时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date clockStartTime;
/**
* 打卡时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date clockEndTime;
/**
......
propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxGuestBo.java
View file @ 33a9f557
......@@ -43,9 +43,21 @@ public class WxGuestBo extends BaseEntity {
/**
* 到访时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date guestTime;
/**
* 到访时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date guestStartTime;
/**
* 到访时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date guestEndTime;
/**
* 访客手机
*/
......
propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxLiveBillBo.java
View file @ 33a9f557
......@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.propertyManagement.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
......@@ -98,7 +99,7 @@ public class WxLiveBillBo extends BaseEntity {
/**
* 缴费月份
*/
@JsonFormat(pattern = "YYYY-MM")
@JsonFormat(pattern = "yyyy-MM")
private Date month;
/**
......
propertyManagement-business/src/main/java/com/propertyManagement/business/domain/bo/WxSlideshowBo.java
View file @ 33a9f557
......@@ -39,6 +39,11 @@ public class WxSlideshowBo extends BaseEntity {
*/
private String skipUrl;
/**
* 类型（1首页轮播图 2个人中心轮播图）
*/
private Integer type;
/**
* 是否启用（0否 1是）
*/
......
propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxLiveBillVo.java
View file @ 33a9f557
......@@ -2,6 +2,9 @@ package com.propertyManagement.business.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
......@@ -108,6 +111,8 @@ public class WxLiveBillVo implements Serializable {
* 缴费月份
*/
@ExcelProperty(value = "缴费月份")
@DateTimeFormat("YYYY-MM")
@ColumnWidth(18)
private Date month;
/**
......@@ -143,5 +148,10 @@ public class WxLiveBillVo implements Serializable {
@ExcelDictFormat(readConverterExp = "1=.小程序,2=.PC端")
private Integer createType;
/**
* 创建时间
*/
private Date createTime;
}
propertyManagement-business/src/main/java/com/propertyManagement/business/domain/vo/WxSlideshowVo.java
View file @ 33a9f557
......@@ -40,6 +40,11 @@ public class WxSlideshowVo implements Serializable {
@ExcelProperty(value = "跳转地址")
private String skipUrl;
/**
* 类型（1首页轮播图 2个人中心轮播图）
*/
private Integer type;
/**
* 是否启用（0否 1是）
*/
......
propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxCarportServiceImpl.java
View file @ 33a9f557
......@@ -69,6 +69,7 @@ public class WxCarportServiceImpl implements IWxCarportService {
private LambdaQueryWrapper<WxCarport> buildQueryWrapper(WxCarportBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WxCarport> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getCommunityId() != null, WxCarport::getCommunityId, bo.getCommunityId());
lqw.eq(bo.getProprietorId() != null, WxCarport::getProprietorId, bo.getProprietorId());
lqw.like(StringUtils.isNotBlank(bo.getProprietorName()), WxCarport::getProprietorName, bo.getProprietorName());
lqw.eq(StringUtils.isNotBlank(bo.getProprietorPhone()), WxCarport::getProprietorPhone, bo.getProprietorPhone());
......
propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxClockServiceImpl.java
View file @ 33a9f557
......@@ -93,6 +93,7 @@ public class WxClockServiceImpl implements IWxClockService {
lqw.like(bo.getCommunityName() != null, WxClock::getCommunityName, bo.getCommunityName());
lqw.eq(bo.getClockTime() != null, WxClock::getClockTime, bo.getClockTime());
lqw.eq(bo.getClockUserRole() != null, WxClock::getClockUserRole, bo.getClockUserRole());
lqw.between(bo.getClockStartTime() != null, WxClock::getClockTime, bo.getClockStartTime(), bo.getClockEndTime());
return lqw;
}
......
propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxFamilyMemberServiceImpl.java
View file @ 33a9f557
......@@ -70,6 +70,8 @@ public class WxFamilyMemberServiceImpl implements IWxFamilyMemberService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WxFamilyMember> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, WxFamilyMember::getUserId, bo.getUserId());
lqw.eq(bo.getProprietorId() != null, WxFamilyMember::getProprietorId, bo.getProprietorId());
lqw.like(StringUtils.isNotBlank(bo.getProprietorName()), WxFamilyMember::getProprietorName, bo.getProprietorName());
lqw.eq(bo.getCommunityId() != null, WxFamilyMember::getCommunityId, bo.getCommunityId());
lqw.like(bo.getCommunityName() != null, WxFamilyMember::getCommunityName, bo.getCommunityName());
lqw.eq(StringUtils.isNotBlank(bo.getAvatar()), WxFamilyMember::getAvatar, bo.getAvatar());
......
propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxGuestServiceImpl.java
View file @ 33a9f557
......@@ -75,6 +75,7 @@ public class WxGuestServiceImpl implements IWxGuestService {
lqw.eq(StringUtils.isNotBlank(bo.getPlateNumber()), WxGuest::getPlateNumber, bo.getPlateNumber());
lqw.eq(bo.getCommunityId() != null, WxGuest::getCommunityId, bo.getCommunityId());
lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), WxGuest::getCommunityName, bo.getCommunityName());
lqw.between(bo.getGuestStartTime() != null, WxGuest::getGuestTime, bo.getGuestStartTime(), bo.getGuestEndTime());
lqw.orderByDesc(WxGuest::getCreateTime);
return lqw;
}
......
propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxLiveBillServiceImpl.java
View file @ 33a9f557
package com.propertyManagement.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.propertyManagement.business.domain.WxCarport;
import com.propertyManagement.business.domain.vo.LoginWxUser;
import com.propertyManagement.business.mapper.WxCarportMapper;
import com.propertyManagement.business.support.util.AuthUtil;
import com.propertyManagement.common.enums.LiveBillCreateType;
import com.propertyManagement.common.enums.LiveBillType;
......@@ -34,6 +36,7 @@ import java.util.Collection;
public class WxLiveBillServiceImpl implements IWxLiveBillService {
private final WxLiveBillMapper baseMapper;
private final WxCarportMapper carportMapper;
/**
* 查询生活缴费账单
......@@ -109,6 +112,11 @@ public class WxLiveBillServiceImpl implements IWxLiveBillService {
public Boolean insertByBo(WxLiveBillBo bo) {
WxLiveBill add = BeanUtil.toBean(bo, WxLiveBill.class);
add.setCreateType(LiveBillCreateType.TWO.getCode());
if (bo.getCarportId() != null) {
WxCarport wxCarport = carportMapper.selectById(bo.getCarportId());
add.setCarportNumber(wxCarport.getCarportNumber());
add.setPlateNumber(wxCarport.getPlateNumber());
}
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setBillId(add.getBillId());
......@@ -122,7 +130,11 @@ public class WxLiveBillServiceImpl implements IWxLiveBillService {
@Override
public Boolean updateByBo(WxLiveBillBo bo) {
WxLiveBill update = BeanUtil.toBean(bo, WxLiveBill.class);
validEntityBeforeSave(update);
if (bo.getCarportId() != null) {
WxCarport wxCarport = carportMapper.selectById(bo.getCarportId());
update.setCarportNumber(wxCarport.getCarportNumber());
update.setPlateNumber(wxCarport.getPlateNumber());
}
return baseMapper.updateById(update) > 0;
}
......
propertyManagement-business/src/main/java/com/propertyManagement/business/service/impl/WxRepairsServiceImpl.java
View file @ 33a9f557
......@@ -114,10 +114,20 @@ public class WxRepairsServiceImpl implements IWxRepairsService {
.eq(WxRepairs::getState, RepairsState.ONE.getCode());
map.put(RepairsState.ONE.getCode(), baseMapper.selectCount(lambdaQueryWrapper));
lambdaQueryWrapper.clear();
lambdaQueryWrapper
.eq(WxRepairs::getAccountId, wxUser.getAccountId())
.eq(WxRepairs::getState, RepairsState.TWO.getCode());
map.put(RepairsState.TWO.getCode(), baseMapper.selectCount(lambdaQueryWrapper));
lambdaQueryWrapper.clear();
lambdaQueryWrapper
.eq(WxRepairs::getAccountId, wxUser.getAccountId())
.eq(WxRepairs::getState, RepairsState.THREE.getCode());
map.put(RepairsState.THREE.getCode(), baseMapper.selectCount(lambdaQueryWrapper));
lambdaQueryWrapper.clear();
lambdaQueryWrapper
.eq(WxRepairs::getAccountId, wxUser.getAccountId())
.eq(WxRepairs::getState, RepairsState.FOUR.getCode());
map.put(RepairsState.FOUR.getCode(), baseMapper.selectCount(lambdaQueryWrapper));
return map;
}
......
propertyManagement-ui/src/api/business/carport.js
View file @ 33a9f557
......@@ -9,6 +9,15 @@ export function listCarport(query) {
})
}
// 查询业主车位列表
export function listCarportAll(query) {
return request({
url: '/business/carport/listAll',
method: 'get',
params: query
})
}
// 查询业主车位详细
export function getCarport(carportId) {
return request({
......
propertyManagement-ui/src/views/business/account/index.vue
View file @ 33a9f557
......@@ -192,12 +192,8 @@
<el-col :span="12">
<el-form-item label="性别" prop="sex">
<el-select v-model="form.sex" style="width: 100%" placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
/>
<el-option :key="0" label="男" :value="0" />
<el-option :key="1" label="女" :value="1" />
</el-select>
</el-form-item>
</el-col>
......
propertyManagement-ui/src/views/business/carport/index.vue
View file @ 33a9f557
......@@ -151,7 +151,7 @@
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="车位类型" align="center" prop="type">
<el-table-column label="车位类型" align="center" prop="type" width="150">
<template slot-scope="scope">
<dict-tag :options="dict.type.wx_carport_type" :value="scope.row.type"/>
</template>
......
propertyManagement-ui/src/views/business/comment/index.vue
View file @ 33a9f557
......@@ -26,14 +26,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="负责人" prop="disposeUserName">
<el-input
v-model="queryParams.disposeUserName"
placeholder="请输入负责人名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="负责人" prop="disposeUserName">-->
<!-- <el-input-->
<!-- v-model="queryParams.disposeUserName"-->
<!-- placeholder="请输入负责人名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -139,7 +139,6 @@
icon="el-icon-edit"
@click="handleComplete(scope.row)"
v-if="scope.row.state === 1"
v-hasPermi="['business:comment:remove']"
>处理完成</el-button>
</template>
</el-table-column>
......
propertyManagement-ui/src/views/business/guest/index.vue
View file @ 33a9f557
......@@ -15,12 +15,21 @@
/>
</el-form-item>
<el-form-item label="到访时间" prop="guestTime">
<el-date-picker clearable
v-model="queryParams.guestTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择到访时间">
</el-date-picker>
<el-date-picker
v-model="guestTime"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
/>
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.guestTime"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择到访时间">-->
<!-- </el-date-picker>-->
</el-form-item>
<el-form-item label="访客电话" prop="guestPhone">
<el-input
......@@ -202,6 +211,7 @@ export default {
// 访客表格数据
guestList: [],
communityList: [],
guestTime: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -252,6 +262,13 @@ export default {
/** 查询访客列表 */
getList() {
this.loading = true;
if (null != this.guestTime && this.guestTime.length > 0) {
this.queryParams.guestStartTime = this.guestTime[0];
this.queryParams.guestEndTime = this.guestTime[1];
}else {
this.queryParams.guestStartTime = undefined;
this.queryParams.guestEndTime = undefined;
}
listGuest(this.queryParams).then(response => {
this.guestList = response.rows;
this.total = response.total;
......@@ -295,6 +312,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
this.guestTime = []
this.resetForm("queryForm");
this.handleQuery();
},
......
propertyManagement-ui/src/views/business/liveBill/index.vue
View file @ 33a9f557
......@@ -115,12 +115,12 @@
<!-- <el-table-column label="账单主键" align="center" prop="billId" v-if="false"/>-->
<!-- <el-table-column label="用户名称" align="center" prop="userName" />-->
<el-table-column label="小区" align="center" prop="communityName" />
<el-table-column label="姓名" align="center" prop="proprietorName" />
<el-table-column label="电话" align="center" prop="proprietorPhone" />
<el-table-column label="户号" align="center" prop="room" />
<el-table-column label="姓名" align="center" prop="proprietorName" width="70"/>
<el-table-column label="电话" align="center" prop="proprietorPhone" width="110"/>
<el-table-column label="户号" align="center" prop="room" width="150"/>
<el-table-column label="面积㎡" align="center" prop="sqm" />
<el-table-column label="车位号" align="center" prop="carportNumber" />
<el-table-column label="登记车牌" align="center" prop="plateNumber" />
<el-table-column label="登记车牌" align="center" prop="plateNumber" width="95"/>
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="项目描述" align="center" prop="projectInfo" />
<el-table-column label="缴费月份" align="center" prop="month">
......@@ -140,7 +140,12 @@
<dict-tag :options="dict.type.wx_live_bill_state" :value="scope.row.state"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="创建时间" align="center" prop="createTime" width="140">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
......@@ -190,7 +195,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="费用类型" prop="type">
<el-select v-model="form.type" style="width: 100%" placeholder="请选择类型">
<el-select v-model="form.type" @change="typeChange" style="width: 100%" placeholder="请选择类型">
<el-option
v-for="dict in dict.type.wx_live_bill_type"
:key="dict.value"
......@@ -201,6 +206,25 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="金额" prop="money">
<el-input-number v-model="form.money" :min="0" style="width: 100%" placeholder="请输入金额" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车位" prop="carportId">
<el-select v-model="form.carportId" :disabled="isCarport" style="width: 100%" placeholder="请选择车位">
<el-option
v-for="dict in carportList"
:key="dict.carportId"
:label="`${dict.carportNumber} | ${dict.plateNumber}`"
:value="dict.carportId"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="小区" prop="communityName">
......@@ -237,13 +261,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="金额" prop="money">
<el-input-number v-model="form.money" :min="0" style="width: 100%" placeholder="请输入金额" />
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="登记车牌" prop="plateNumber">-->
......@@ -271,6 +289,7 @@ import {
} from "@/api/business/liveBill";
import {listCommunityAll} from "@/api/business/community";
import {listProprietorLedgerAll} from "@/api/business/proprietorLedger";
import {listCarport, listCarportAll} from "@/api/business/carport";
export default {
name: "LiveBill",
......@@ -289,12 +308,15 @@ export default {
multiple: true,
// 显示搜索条件
showSearch: true,
// 车位是否可选
isCarport: true,
// 总条数
total: 0,
// 生活缴费账单表格数据
liveBillList: [],
communityList: [],
proprietorLedgerList: [],
carportList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -367,6 +389,12 @@ export default {
this.loading = false;
});
},
/** 根据业主台账获取车位信息列表 */
getCarportListByLedgerId(type) {
listCarportAll({proprietorId: this.form.proprietorId, type}).then(response => {
this.carportList = response.data;
});
},
/** 业主改变 */
proprietorIdChange(id) {
let proprietorLedger = this.proprietorLedgerList.find(item => item.proprietorId === id)
......@@ -379,6 +407,12 @@ export default {
this.form.sqm = proprietorLedger.sqm
this.form.price = proprietorLedger.sqmPrice
this.form.money = proprietorLedger.monthMoney
this.form.carportId = null
if (this.form.type && this.form.type === 4) {
this.getCarportListByLedgerId(1)
}else if (this.form.type === 5) {
this.getCarportListByLedgerId(2)
}
}
},
// 取消按钮
......@@ -404,6 +438,7 @@ export default {
money: undefined,
type: undefined,
state: undefined,
carportId: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
......@@ -447,6 +482,7 @@ export default {
this.getProprietorLedgerList()
const billId = row.billId || this.ids
getLiveBill(billId).then(response => {
this.typeChange(response.data.type)
this.loading = false;
this.form = response.data;
this.open = true;
......@@ -508,6 +544,30 @@ export default {
this.loading = false;
});
},
/** 状态变更操作 */
typeChange(type) {
this.form.carportId = null
if (type === 4) {
if (!this.form.proprietorId) {
this.form.type = null
this.$modal.msgError('请先选择小区业主')
return;
}
this.getCarportListByLedgerId(1)
this.isCarport = false
}else if (type === 5) {
if (!this.form.proprietorId) {
this.form.type = null
this.$modal.msgError('请先选择小区业主')
return
}
this.getCarportListByLedgerId(2)
this.isCarport = false
}else {
this.isCarport = true
this.form.carportId = null
}
},
/** 导出按钮操作 */
handleExport() {
this.download('business/liveBill/export', {
......
propertyManagement-ui/src/views/business/payRecord/index.vue
View file @ 33a9f557
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="小区名称" prop="communityName">
<el-form-item label="小区名称" prop="communityId">
<el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
<el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
</el-select>
......@@ -120,7 +120,7 @@
<!-- <el-table-column label="登记车牌" align="center" prop="plateNumber" />-->
<el-table-column label="订单类型" align="center" prop="orderType">
<template slot-scope="scope">
<dict-tag :options="dict.type.wx_live_bill_type" :value="scope.row.orderType"/>
<dict-tag :options="dict.type.wx_pay_record_type" :value="scope.row.orderType"/>
</template>
</el-table-column>
<!-- <el-table-column label="支付渠道" align="center" prop="payChannelCode" />-->
......
propertyManagement-ui/src/views/business/proprietorLedger/index.vue
View file @ 33a9f557
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="小区名称" prop="communityName">
<el-form-item label="小区名称" prop="communityId">
<el-select v-model="queryParams.communityId" placeholder="请选择小区" clearable>
<el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName" />
</el-select>
......@@ -124,7 +124,7 @@
<el-table-column label="房间户型" align="center" prop="houseType" />
<el-table-column label="房间号" align="center" prop="room" />
<el-table-column label="房间面积" align="center" prop="sqm" />
<el-table-column label="面积单价" align="center" prop="sqmPrice" />
<el-table-column label="物业费面积单价" align="center" prop="sqmPrice" />
<el-table-column label="物业月费" align="center" prop="monthMoney" />
<el-table-column label="物业年费" align="center" prop="yearMoney" />
<el-table-column label="出生日期" align="center" prop="birthDate" width="180">
......@@ -204,7 +204,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="面积单价" prop="sqmPrice">
<el-form-item label="物业费面积单价" prop="sqmPrice">
<el-input-number v-model="form.sqmPrice" :min="0" precision="2" style="width: 100%;" placeholder="请输入面积单价" />
</el-form-item>
</el-col>
......
propertyManagement-ui/src/views/business/repairs/index.vue
View file @ 33a9f557
......@@ -50,9 +50,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="维修人员" prop="maintainUserName">
<el-form-item label="维修人员" prop="accountName">
<el-input
v-model="queryParams.maintainUserName"
v-model="queryParams.accountName"
placeholder="请输入维修人员"
clearable
@keyup.enter.native="handleQuery"
......@@ -316,8 +316,8 @@ export default {
closeTime: undefined,
state: undefined,
type: undefined,
maintainUserId: undefined,
maintainUserName: undefined,
accountId: undefined,
accountName: undefined,
},
// 表单参数
form: {},
......
propertyManagement-ui/src/views/business/rule/index.vue
View file @ 33a9f557
......@@ -122,36 +122,48 @@
/>
<!-- 添加或修改规则说明对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="小区" prop="communityId">
<el-select v-model="form.communityId" filterable style="width: 100%" placeholder="请选择小区">
<el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName"/>
</el-select>
</el-form-item>
<el-form-item label="规则内容">
<editor v-model="form.ruleContent" :min-height="192"/>
</el-form-item>
<el-form-item label="规则类型" prop="ruleType">
<el-select v-model="form.ruleType" style="width: 100%;" placeholder="请选择规则类型">
<el-option
v-for="dict in dict.type.wx_rule_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-select v-model="form.isEnable" style="width: 100%;" placeholder="请选择是否启用">
<el-option
v-for="dict in dict.type.sys_is_enable"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-row>
<el-col :span="8">
<el-form-item label="小区" prop="communityId">
<el-select v-model="form.communityId" filterable style="width: 100%" placeholder="请选择小区">
<el-option v-for="item in communityList" :key="item.communityId" :value="item.communityId" :label="item.communityName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规则类型" prop="ruleType">
<el-select v-model="form.ruleType" style="width: 100%;" placeholder="请选择规则类型">
<el-option
v-for="dict in dict.type.wx_rule_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="isEnable">
<el-select v-model="form.isEnable" style="width: 100%;" placeholder="请选择是否启用">
<el-option
v-for="dict in dict.type.sys_is_enable"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="规则内容">
<editor v-model="form.ruleContent" :min-height="300"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
......
propertyManagement-ui/src/views/business/slideshow/index.vue
View file @ 33a9f557
......@@ -80,6 +80,11 @@
</template>
</el-table-column>
<!-- <el-table-column label="跳转地址" align="center" prop="skipUrl" />-->
<el-table-column label="类型" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :options="dict.type.wx_slideshow_type" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="isEnable">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_is_enable" :value="scope.row.isEnable"/>
......@@ -124,6 +129,16 @@
<!-- <el-form-item label="跳转地址" prop="skipUrl">-->
<!-- <el-input v-model="form.skipUrl" placeholder="请输入跳转地址" />-->
<!-- </el-form-item>-->
<el-form-item label="类型" prop="type">
<el-select v-model="form.type" style="width: 100%" placeholder="请选择类型">
<el-option
v-for="dict in dict.type.wx_slideshow_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="isEnable">
<el-select v-model="form.isEnable" style="width: 100%" placeholder="请选择是否启用">
<el-option
......@@ -131,7 +146,7 @@
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
/>
</el-select>
</el-form-item>
</el-form>
......@@ -148,7 +163,7 @@ import { listSlideshow, getSlideshow, delSlideshow, addSlideshow, updateSlidesho
export default {
name: "Slideshow",
dicts: ['sys_is_enable'],
dicts: ['sys_is_enable', 'wx_slideshow_type'],
data() {
return {
// 按钮loading
......@@ -188,6 +203,9 @@ export default {
url: [
{ required: true, message: "图片地址不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "类型不能为空", trigger: "change" }
],
isEnable: [
{ required: true, message: "是否启用不能为空", trigger: "change" }
],
......@@ -219,6 +237,7 @@ export default {
url: undefined,
skipUrl: undefined,
isEnable: 1,
type: 1,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
......
propertyManagement-ui/src/views/business/user/index.vue
View file @ 33a9f557
......@@ -94,18 +94,18 @@
<!-- <el-table-column label="所在省份" align="center" prop="province" />-->
<el-table-column label="手机号码" align="center" prop="mobile" />
<!-- <el-table-column label="用户语言" align="center" prop="language" />-->
<el-table-column label="地理位置纬度" align="center" prop="latitude" />
<el-table-column label="地理位置经度" align="center" prop="longitude" />
<!-- <el-table-column label="地理位置纬度" align="center" prop="latitude" />-->
<!-- <el-table-column label="地理位置经度" align="center" prop="longitude" />-->
<!-- <el-table-column label="地理位置精度" align="center" prop="locPrecision" />-->
<!-- <el-table-column label="账号" align="center" prop="username" />-->
<!-- <el-table-column label="密码" align="center" prop="possword" />-->
<el-table-column label="用户类型" align="center" prop="userType">
<el-table-column label="用户类型" align="center" prop="userPermission">
<template slot-scope="scope">
<dict-tag :options="dict.type.wx_user_type" :value="scope.row.userType"/>
<dict-tag :options="dict.type.wx_user_type" :value="scope.row.userPermission"/>
</template>
</el-table-column>
<!-- <el-table-column label="是否删除" align="center" prop="isDelete" />-->
<el-table-column label="用户备注" align="center" prop="remark" show-overflow-tooltip />
<!-- <el-table-column label="用户备注" align="center" prop="remark" show-overflow-tooltip />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
......
propertyManagement-ui/src/views/system/user/index.vue
View file @ 33a9f557
......@@ -246,12 +246,14 @@
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option :key="0" label="男" :value="0"/>
<el-option :key="1" label="女" :value="1"/>
<!-- <el-option-->
<!-- v-for="dict in dict.type.sys_user_sex"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
</el-select>
</el-form-item>
</el-col>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment