zhaoyang/estate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物业之前，新工作台

Browse Source
This commit is contained in:
Zy
2026-04-16 21:03:35 +08:00
parent cf9a1f1585
commit 4184f1c55d
91 changed files with 1781 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/system/resident/ResidentMain.vue
View File

@@ -190,7 +190,6 @@ if (route.query.id) {
getresidentReviewlistAPI(userid.value).then((res) => {
if (res.rows[0]) {
reviewInfo.value = res.rows[0];
console.log(reviewInfo.value);
handleActivestaus(reviewInfo.value);
}
});
@@ -258,7 +257,6 @@ function updatePass(val: '0' | '1' | '2') {
function update() {
UpdateResidentReviewAPI(reviewInfo.value).then((res) => {
console.log(res);
backRoute();
});
}

90
src/views/system/resident/addResident.vue
View File

@@ -23,8 +23,7 @@
<el-col :span="11">
<el-form-item label="住户性别" prop="gender">
<el-radio-group v-model="form.gender">
<el-radio :value="1">男</el-radio>
<el-radio :value="0">女</el-radio>
<el-radio v-for="dist in sys_user_sex" :label="dist.label" :value="dist.value" :key="dist.value"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -40,7 +39,7 @@
<el-col :span="11">
<el-form-item label="与业主的关系" prop="type">
<el-select v-model.number="form.type" class="m-2" placeholder="请选择">
<el-option v-for="item in ownerRelationshiplist" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in com_resident_relationship" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -106,7 +105,7 @@
<script setup lang="ts">
import { ref } from 'vue';
import PageHeader from '@/components/Pageheader/index.vue';
import { getHousePathById, ownerRelationshiplist } from '@/utils/house';
import { getHousePathById } from '@/utils/house';
import { ResidentForm } from '@/api/system/resident/type';
import { CascaderValue, UploadFiles, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
import { genFileId } from 'element-plus';
@@ -118,15 +117,19 @@ const houseStore = useHouseStore();
const { treedata } = storeToRefs(houseStore);
const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/resident/uploadImage';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
const router = useRouter();
const route = useRoute();
const formRef = ref();
const form = ref<ResidentForm>({
houseId: null,
name: '',
gender: 1,
gender: '0',
idCard: '',
type: 0, // 与业主关系 0业主
type: '0', // 与业主关系 0业主
phone: null, //手机号
cardImageFront: '',
cardImageBack: '',
@@ -137,25 +140,25 @@ const rules = ref({
houseId: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
gender: [{ required: true, message: '请选择性别', trigger: 'blur' }],
cardImageFront: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
cardImageBack: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
idCard: [
{ required: true, message: '请输入身份证号', trigger: 'blur' },
{
validator: (_, value) => validator(value, 'idCard'),
message: '请输入正确的18位身份证号码',
trigger: 'blur'
}
],
type: [{ required: true, message: '请选择与业主关系', trigger: 'blur' }],
phone: [
{ required: true, message: '请输入手机号', trigger: 'blur' },
{
validator: (_, value) => validator(value, 'phone'),
message: '请输入正确的手机号码',
trigger: 'blur'
}
]
// cardImageFront: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
// cardImageBack: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
// idCard: [
// { required: true, message: '请输入身份证号', trigger: 'blur' },
// {
// validator: (_, value) => validator(value, 'idCard'),
// message: '请输入正确的18位身份证号码',
// trigger: 'blur'
// }
// ],
type: [{ required: true, message: '请选择与业主关系', trigger: 'blur' }]
// phone: [
// { required: true, message: '请输入手机号', trigger: 'blur' },
// {
// validator: (_, value) => validator(value, 'phone'),
// message: '请输入正确的手机号码',
// trigger: 'blur'
// }
// ]
});
// !== 楼栋房屋 =============================================================================
@@ -169,7 +172,6 @@ function gettreedata() {
...res.data
};
const arr = getHousePathById(treedata.value, form.value.houseId);
console.log(arr);
userHousepath.value = arr;
});
}
@@ -177,8 +179,7 @@ function gettreedata() {
gettreedata();
function handleChange(val: CascaderValue) {
userHousepath.value = val;
form.value.villageId = val[0];
form.value.buildingId = val[1];
form.value.buildingId = val[0];
form.value.houseId = val[2];
}
@@ -226,36 +227,27 @@ const handleError2: UploadProps['onError'] = (error: Error, uploadFile: UploadFi
const submitForm = () => {
formRef.value?.validate(async (valid: boolean) => {
if (valid) {
if (!form.value.cardImageFront.trim()) {
return ElMessage.error('请上传身份证正面照片');
}
if (!form.value.cardImageBack.trim()) {
return ElMessage.error('请上传身份证背面照片');
}
// if (!form.value.cardImageFront.trim()) {
// return ElMessage.error('请上传身份证正面照片');
// }
// if (!form.value.cardImageBack.trim()) {
// return ElMessage.error('请上传身份证背面照片');
// }
const obj = {
...form.value,
villageId: Number(localStorage.getItem('villageid'))
};
if (userid.value) {
console.log('edit');
updateResident(form.value).then(() => {
updateResident(obj).then(() => {
ElMessage.success('修改成功');
cancelForm();
});
} else {
console.log('add');
addResident(form.value).then(() => {
addResident(obj).then(() => {
ElMessage.success('添加成功');
// addResidentReviewProcess({
// 'residentId': 0,
// 'submitTime': new Date().toLocaleString(),
// 'submitStatus': 0,
// 'propertyTime': null,
// 'propertyStatus': null,
// 'propertyReviewFeedback': null,
// 'certificationTime': null,
// 'certificationStatus': null
// });
cancelForm();
});
}
console.log(form.value);
}
});
};

35
src/views/system/resident/index.vue
View File

@@ -7,15 +7,15 @@
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="住户类型" prop="type">
<el-select v-model="queryParams.type" placeholder="请输入住户类型" style="width: 240px">
<el-option v-for="item in typelist" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in com_resident_relationship" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="住户状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请输入住户状态" style="width: 240px">
<el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in com_review" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="提交日期" prop="date">
<!-- <el-form-item label="提交日期" prop="date">
<el-date-picker
v-model="queryParams.date"
type="date"
@@ -23,7 +23,7 @@
:disabled-date="disabledDate"
:shortcuts="shortcuts"
/>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -36,7 +36,7 @@
<el-card style="flex: 1" shadow="never">
<div class="residentBody h-full">
<div class="treebox h-full">
<div class="treeTitlebox">北境碧桂园小区</div>
<div class="treeTitlebox">{{ currentVilageInfo.villageName ?? '12' }}</div>
<div class="treeboxbody">
<!-- 树状+ -->
<el-tree :highlight-current="true" style="max-width: 600px" :data="treedata" :props="defaultProps" @node-click="handleNodeClick" />
@@ -114,7 +114,8 @@ import { getHousePathById } from '@/utils/house';
import { useHouseStore } from '@/store/modules/house';
const houseStore = useHouseStore();
const { treedata } = storeToRefs(houseStore);
const { currentVilageInfo } = storeToRefs(houseStore);
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
const { com_review } = toRefs<any>(proxy?.useDict('com_review'));
@@ -129,16 +130,6 @@ const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
// 住户类型
const typelist = [
{ label: '业主', value: 0 },
{ label: '租户', value: 1 }
];
// 住户状态
const statuslist = [
{ label: '审核中', value: 0 },
{ label: '已认证', value: 1 }
];
const initFormData: ResidentForm = {
id: undefined,
@@ -162,12 +153,12 @@ const data = reactive<PageData<ResidentForm, ResidentQuery>>({
queryParams: {
pageNum: 1,
pageSize: 10,
villageId: Number(localStorage.getItem('villageid')),
date: '',
type: null,
status: null,
houseId: null,
villageId: null,
buildingId: null,
unitNo: null
}
@@ -256,16 +247,22 @@ const defaultProps = {
label: 'label'
};
// ! 树形------------------------------------------------------------------------
const treedata = ref([]);
function gettree() {
houseStore.getCurrentVilageTreeHouse().then((res) => {
treedata.value = res;
});
}
gettree();
/** 查询住户管理列表 */
const getList = async () => {
loading.value = true;
const res = await listResident(queryParams.value);
residentList.value = res.rows;
console.log(residentList.value);
residentList.value.forEach((item) => {
const arr = getHousePathById(treedata.value, item.houseId, 'label');
console.log(arr);
item.houseAddress = arr.join(' ');
});
total.value = res.total;