diff --git a/src/api/system/Repair/type.ts b/src/api/system/Repair/type.ts index 6f12149..468fc2b 100644 --- a/src/api/system/Repair/type.ts +++ b/src/api/system/Repair/type.ts @@ -58,6 +58,8 @@ export interface RepairVO { * 维修人员id */ repairId: string | number; + /** 名称（小区名-楼栋名-单元号-房间号） */ + name?: string; } export interface RepairForm extends BaseEntity { diff --git a/src/api/system/cars/index.ts b/src/api/system/cars/index.ts index b123dbb..f93386d 100644 --- a/src/api/system/cars/index.ts +++ b/src/api/system/cars/index.ts @@ -61,3 +61,15 @@ export const delCar = (id: string | number | Array) => { method: 'delete' }); }; + +/** + * 删除车辆图片 + * @param id + */ +export const uploadCar = (formdata: FormData) => { + return request({ + url: '/car/uploadImage', + method: 'POST', + data: formdata + }); +}; diff --git a/src/api/system/parking/type.ts b/src/api/system/parking/type.ts index 06e4320..1e81e7e 100644 --- a/src/api/system/parking/type.ts +++ b/src/api/system/parking/type.ts @@ -22,12 +22,12 @@ export interface ParkingVO { /** * 车位状态 0 闲置 1自用 2出租 */ - parkingStatus: number; + parkingStatus: string; /** * 0产权车位 1公共停车位 */ - type: number; + type: string; /** * 住户id @@ -47,8 +47,7 @@ export interface ParkingVO { /** * 0 审核中 1 审核通过 2 审核不通过 */ - checkStatus: number; - + checkStatus: string; /** * 备注 */ @@ -79,12 +78,12 @@ export interface ParkingForm extends BaseEntity { /** * 车位状态 0 闲置 1自用 2出租 */ - parkingStatus?: number; + parkingStatus?: string; /** * 0产权车位 1公共停车位 */ - type?: number; + type?: string; /** * 住户id @@ -104,7 +103,7 @@ export interface ParkingForm extends BaseEntity { /** * 0 审核中 1 审核通过 2 审核不通过 */ - checkStatus?: number; + checkStatus?: string; /** * 备注 @@ -151,12 +150,12 @@ export interface ParkingQuery extends PageQuery { /** * 车位状态 0 闲置 1自用 2出租 */ - parkingStatus?: number; + parkingStatus?: string; /** * 0产权车位 1公共停车位 */ - type?: number; + type?: string; /** * 住户id @@ -176,7 +175,7 @@ export interface ParkingQuery extends PageQuery { /** * 0 审核中 1 审核通过 2 审核不通过 */ - checkStatus?: number; + checkStatus?: string; /** * 日期范围参数 diff --git a/src/api/system/resident/index.ts b/src/api/system/resident/index.ts index b644297..d171311 100644 --- a/src/api/system/resident/index.ts +++ b/src/api/system/resident/index.ts @@ -74,6 +74,147 @@ export const UploadidCardApi = () => { }; // ! 住户审核流程-------------------------------------------------------------------------- +export interface ResidentReviewProcessVO { + /** + * 住户审核表 + */ + id: string | number; + + /** + * 住户表id + */ + residentId: string | number; + + /** + * 提交时间 + */ + submitTime: string; + + /** + * 提交状态 0未提交 1已提交 + */ + submitStatus: string; + + /** + * 物业审核时间 + */ + propertyTime: string; + + /** + * 物业审核状态 0 待审核 1审核通过 2审核未通过 + */ + propertyStatus: string; + + /** + * 物业审核意见 + */ + propertyReviewFeedback: string; + + /** + * 认证时间 + */ + certificationTime: string; + + /** + * 认证状态 0未认证 1已认证 + */ + certificationStatus: string; +} + +export interface ResidentReviewProcessForm extends BaseEntity { + /** + * 住户审核表 + */ + id?: string | number; + + /** + * 住户表id + */ + residentId?: string | number; + + /** + * 提交时间 + */ + submitTime?: string; + + /** + * 提交状态 0未提交 1已提交 + */ + submitStatus?: string; + + /** + * 物业审核时间 + */ + propertyTime?: string; + + /** + * 物业审核状态 0 待审核 1审核通过 2审核未通过 + */ + propertyStatus?: string; + + /** + * 物业审核意见 + */ + propertyReviewFeedback?: string; + + /** + * 认证时间 + */ + certificationTime?: string; + + /** + * 认证状态 0未认证 1已认证 + */ + certificationStatus?: string; +} + +export interface ResidentReviewProcessQuery extends PageQuery { + /** + * 住户表id + */ + residentId?: string | number; + + /** + * 提交时间 + */ + submitTime?: string; + + /** + * 提交状态 0未提交 1已提交 + */ + submitStatus?: string; + + /** + * 物业审核时间 + */ + propertyTime?: string; + + /** + * 物业审核状态 0 待审核 1审核通过 2审核未通过 + */ + propertyStatus?: string; + + /** + * 物业审核意见 + */ + propertyReviewFeedback?: string; + + /** + * 认证时间 + */ + certificationTime?: string; + + /** + * 认证状态 0未认证 1已认证 + */ + certificationStatus?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + /** * 获取住户审核流程列表 */ @@ -86,9 +227,19 @@ export const getresidentReviewlistAPI = (id: string) => { /** * 获取单一住户审核流程列表 */ -export const getresidentReviewByIdAPI = (id: number) => { +export const getresidentReviewByIdAPI = (id: number): AxiosPromise => { return request({ url: `/residentReview/${id}`, method: 'GET' }); }; +/** + * 更新 住户 审核 表 + */ +export const UpdateResidentReviewAPI = (data: ResidentReviewProcessForm) => { + return request({ + url: `/residentReview`, + method: 'PUT', + data + }); +}; diff --git a/src/api/system/residentReviewProcess/index.ts b/src/api/system/residentReviewProcess/index.ts new file mode 100644 index 0000000..c36f4b3 --- /dev/null +++ b/src/api/system/residentReviewProcess/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { ResidentReviewProcessVO, ResidentReviewProcessForm, ResidentReviewProcessQuery } from '@/api/system/residentReviewProcess/type'; + +/** + * 查询住户审核流程列表 + * @param query + * @returns {*} + */ + +export const listResidentReviewProcess = (query?: ResidentReviewProcessQuery): AxiosPromise => { + return request({ + url: '/residentReviewProcess/list', + method: 'get', + params: query + }); +}; + +/** + * 查询住户审核流程详细 + * @param id + */ +export const getResidentReviewProcess = (id: string | number): AxiosPromise => { + return request({ + url: '/residentReviewProcess/' + id, + method: 'get' + }); +}; + +/** + * 新增住户审核流程 + * @param data + */ +export const addResidentReviewProcess = (data: ResidentReviewProcessForm) => { + return request({ + url: '/residentReviewProcess', + method: 'post', + data: data + }); +}; + +/** + * 修改住户审核流程 + * @param data + */ +export const updateResidentReviewProcess = (data: ResidentReviewProcessForm) => { + return request({ + url: '/residentReviewProcess', + method: 'put', + data: data + }); +}; + +/** + * 删除住户审核流程 + * @param id + */ +export const delResidentReviewProcess = (id: string | number | Array) => { + return request({ + url: '/residentReviewProcess/' + id, + method: 'delete' + }); +}; diff --git a/src/api/system/residentReviewProcess/type.ts b/src/api/system/residentReviewProcess/type.ts new file mode 100644 index 0000000..10ce8e4 --- /dev/null +++ b/src/api/system/residentReviewProcess/type.ts @@ -0,0 +1,140 @@ +export interface ResidentReviewProcessVO { + /** + * 住户审核表 + */ + id: string | number; + + /** + * 住户表id + */ + residentId: string | number; + + /** + * 提交时间 + */ + submitTime: string; + + /** + * 提交状态 0未提交 1已提交 + */ + submitStatus: number; + + /** + * 物业审核时间 + */ + propertyTime: string; + + /** + * 物业审核状态 0 待审核 1审核通过 2审核未通过 + */ + propertyStatus: number; + + /** + * 物业审核意见 + */ + propertyReviewFeedback: string; + + /** + * 认证时间 + */ + certificationTime: string; + + /** + * 认证状态 0未认证 1已认证 + */ + certificationStatus: number; +} + +export interface ResidentReviewProcessForm extends BaseEntity { + /** + * 住户审核表 + */ + id?: string | number; + + /** + * 住户表id + */ + residentId?: string | number; + + /** + * 提交时间 + */ + submitTime?: string; + + /** + * 提交状态 0未提交 1已提交 + */ + submitStatus?: number; + + /** + * 物业审核时间 + */ + propertyTime?: string; + + /** + * 物业审核状态 0 待审核 1审核通过 2审核未通过 + */ + propertyStatus?: number; + + /** + * 物业审核意见 + */ + propertyReviewFeedback?: string; + + /** + * 认证时间 + */ + certificationTime?: string; + + /** + * 认证状态 0未认证 1已认证 + */ + certificationStatus?: number; +} + +export interface ResidentReviewProcessQuery extends PageQuery { + /** + * 住户表id + */ + residentId?: string | number; + + /** + * 提交时间 + */ + submitTime?: string; + + /** + * 提交状态 0未提交 1已提交 + */ + submitStatus?: number; + + /** + * 物业审核时间 + */ + propertyTime?: string; + + /** + * 物业审核状态 0 待审核 1审核通过 2审核未通过 + */ + propertyStatus?: number; + + /** + * 物业审核意见 + */ + propertyReviewFeedback?: string; + + /** + * 认证时间 + */ + certificationTime?: string; + + /** + * 认证状态 0未认证 1已认证 + */ + certificationStatus?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index caffecc..d656f36 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -209,6 +209,16 @@ export const deptTreeSelect = (): AxiosPromise => { }); }; +/** + * 查询用户 根据不同的角色key + */ +export const getUserByRoleKey = (roleKey: string = 'repair'): AxiosPromise => { + return request({ + url: '/system/user/list/byRoleKey?roleKey=' + roleKey, + method: 'get' + }); +}; + export default { listUser, getUser, @@ -225,5 +235,7 @@ export default { getAuthRole, updateAuthRole, deptTreeSelect, - listUserByDeptId + listUserByDeptId, + + getUserByRoleKey }; diff --git a/src/components/Holder/index.vue b/src/components/Holder/index.vue index b5c7b5a..3803e81 100644 --- a/src/components/Holder/index.vue +++ b/src/components/Holder/index.vue @@ -5,7 +5,7 @@
- 姓名：{{ multipleSelection[0] && multipleSelection[0].name }} + 姓名：{{ multipleSelection[0]?.name }}
@@ -18,14 +18,16 @@
- +
查询 - 重置 + 重置
- + + + @@ -61,7 +63,7 @@ />
退出 - 确定 + 确定
@@ -69,12 +71,15 @@ diff --git a/src/views/system/Visitor/visitorMain.vue b/src/views/system/Visitor/visitorMain.vue new file mode 100644 index 0000000..d26cc8c --- /dev/null +++ b/src/views/system/Visitor/visitorMain.vue @@ -0,0 +1,156 @@ + + + + diff --git a/src/views/system/cars/addCars.vue b/src/views/system/cars/addCars.vue index 0e89564..860ebe4 100644 --- a/src/views/system/cars/addCars.vue +++ b/src/views/system/cars/addCars.vue @@ -7,48 +7,86 @@ - - + + + + - - + + + + - - + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -66,45 +104,130 @@ import { ref } from 'vue'; import Holder from '@/components/Holder/index.vue'; import PageHeader from '@/components/Pageheader/index.vue'; +import { listArea } from '@/api/system/carArea'; +import { listParking } from '@/api/system/parking'; +import { UploadFiles, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'; +import { addCar, getCar, updateCar, uploadCar } from '@/api/system/cars'; +import { useUserStore } from '@/store/modules/user'; +import { validator } from '@/utils/Reg'; + +const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/car/uploadImage'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const router = useRouter(); const route = useRoute(); - const formRef = ref(); const form = ref({ id: null, - houseId: null, - rentalName: '', // 租户姓名 - rent: null, // 租金 - houseFace: '', // 房屋朝向 - rentalType: 0, // 整租合租 - phone: null, //手机号 - houseArea: null, // 房屋面积 - floorNo: null, //楼层号 - inTime: '', //入住时间 - facilities: '', //房屋设施 - houseImageUrl: '', //房屋图片 - supInfo: '', //补充租房信息 - vx: '', //微信 - houseUse: 0, //房屋用途 - rentalStatus: 0, //租赁状态 - email: '' //邮箱 + areaId: null, // 区域id + residentId: null, // 车位id + parkingId: null, // 持有人id + carNum: '', //车牌号 + carBrand: '', //车辆品牌 + carModel: '', //车辆型号 + carColor: '', //车身颜色 + remark: '', //备注 + carImageUrl: '' //车辆图片url }); + const rules = ref({ - houseId: [{ required: true, message: '请选择房屋', trigger: 'blur' }], - rentalName: [{ required: true, message: '请输入名称', trigger: 'blur' }] + areaId: [{ required: true, message: '请选择区域', trigger: 'blur' }], + residentId: [{ required: true, message: '请选择', trigger: 'blur' }], + carNum: [ + { required: true, message: '请输入车牌号', trigger: 'blur' }, + { + validator: (_, value) => validator(value, 'PlateNumber'), + message: '请请输入车牌号', + trigger: 'blur' + } + ], + carBrand: [{ required: true, message: '请输入车辆品牌', trigger: 'blur' }] }); -const userid = ref(null); +function headerToken() { + const useStore = useUserStore(); + return { + Authorization: 'Bearer ' + useStore.token + }; +} +const userid = ref(''); +const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile: UploadRawFile) => { + const type = rawFile.type.split('/').pop(); + if (['png', 'jpg'].includes(type)) { + if (rawFile.size / 1024 / 1024 <= 10) { + return true; + } else { + ElMessage.warning('图片大小超过10M,请重新上传'); + return false; + } + } else { + ElMessage.warning('图片格式不是 png/jpg 格式, 请重新上传'); + return false; + } +}; + +const handleAvatarSuccess: UploadProps['onSuccess'] = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => { + form.value.carImageUrl = response.data.url; +}; + +// 车辆区域 +const carArealist = ref([]); +// 根据车辆区域 动态选择 车位 +const parkinglist = ref([]); +function init() { + listArea().then((res) => { + console.log(res); + carArealist.value = res.rows; + }); +} +init(); + +if (route.query.id) { + userid.value = route.query.id as string; + form.value.id = userid.value; + getCar(userid.value).then((res) => { + form.value = { + ...form.value, + ...res.data + }; + }); +} + +function changeArealist(val: string) { + console.log(val, typeof val); + listParking({ + areaId: val, + pageSize: 9999999, + pageNum: 1 + }).then((res) => { + console.log(res); + parkinglist.value = res.rows; + }); +} // !== 提交 ============================================================================= // 提交 const submitForm = () => { formRef.value?.validate(async (valid: boolean) => { if (valid) { + console.log(form.value); + if (userid.value.trim() !== '') { + console.log('edit'); + updateCar(form.value).then((res) => { + ElMessage.success('编辑成功'); + cancelForm(); + }); + } else { + console.log('add'); + addCar(form.value).then((res) => { + console.log(res); + ElMessage.success('添加成功'); + cancelForm(); + }); + } } }); }; + // 推出 const cancelForm = () => { router.push({ @@ -115,9 +238,37 @@ const cancelForm = () => { // 选择住户 function handleChange(pop) { console.log(pop); + form.value.residentId = pop; } + diff --git a/src/views/system/house/components/components/table.vue b/src/views/system/house/components/components/table.vue index 3f2862e..6a0aebc 100644 --- a/src/views/system/house/components/components/table.vue +++ b/src/views/system/house/components/components/table.vue @@ -57,6 +57,12 @@ function contextMenuFun(val: { type: string; value: string }) { break; case 'main': console.log('你选择了：', val); + router.push({ + path: '/house/HouseDetails', + query: { + id: val.value + } + }); break; case 'delete': console.log('你选择了：', val); diff --git a/src/views/system/houseRental/addhouseResident.vue b/src/views/system/houseRental/addhouseResident.vue index 7194395..9b6cea5 100644 --- a/src/views/system/houseRental/addhouseResident.vue +++ b/src/views/system/houseRental/addhouseResident.vue @@ -178,14 +178,15 @@ import { ref } from 'vue'; import PageHeader from '@/components/Pageheader/index.vue'; import { HouseRentalVO } from '@/api/system/houseRental/type'; -import { CascaderValue, UploadFiles, UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'; +import { CascaderValue, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'; -import { getCommunitylistAPI } from '@/api/system/community'; -import { getVillageTree } from '@/api/system/house'; -import { convertBuildingToTree, getHousePathById, hasFormData, splitStringUrl } from '@/utils/house'; +import { getHousePathById, hasFormData, splitStringUrl } from '@/utils/house'; import { addHouseRental, getHouseRental, updateHouseRental, uploadHouseImage } from '@/api/system/houseRental'; import { validator } from '@/utils/Reg'; +import { useHouseStore } from '@/store/modules/house'; +const houseStore = useHouseStore(); +const { treedata } = storeToRefs(houseStore); const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/houseRental/uploadImages'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { com_rental_method } = toRefs(proxy?.useDict('com_rental_method')); @@ -233,32 +234,21 @@ const rules = ref({ // ! 编辑租赁-================================================================================= const userid = ref(null); // !== 楼栋房屋 ============================================================================= -const treedata = ref([]); function gettreedata() { - getCommunitylistAPI().then((res) => { - const currentviliage = res.rows.find((item) => item.choiceStatus === 0); - if (currentviliage.villageId) { - getVillageTree(currentviliage.villageId).then((res) => { - treedata.value = convertBuildingToTree(res.data.buildings); - console.log(treedata.value); - // !== 编辑用户 ============================================================================= - if (route.query.id) { - userid.value = route.query.id; - getHouseRental(userid.value).then((res) => { - console.log(res); - form.value = { - ...form.value, - ...res.data - }; - const imgurllist = splitStringUrl(form.value.houseImageUrl); - fileList.value = imgurllist; - const arr = getHousePathById(treedata.value, form.value.houseId); - userHousepath.value = arr; - }); - } - }); - } - }); + if (route.query.id) { + userid.value = route.query.id; + getHouseRental(userid.value).then((res) => { + console.log(res); + form.value = { + ...form.value, + ...res.data + }; + const imgurllist = splitStringUrl(form.value.houseImageUrl); + fileList.value = imgurllist; + const arr = getHousePathById(treedata.value, form.value.houseId); + userHousepath.value = arr; + }); + } } gettreedata(); @@ -284,6 +274,7 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => { }; const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => { console.log(uploadFile, uploadFiles); + fileList.value = uploadFiles; }; // !== 家电 ============================================================================= @@ -321,11 +312,11 @@ const submitForm = () => { if (item.raw && item.raw instanceof File) { formdata.append('files', item.raw); } else { - str += item.url; + str += item.url + ','; } }); console.log(formdata); - if (!hasFormData(formdata)) return sendForm(); + if (!hasFormData(formdata)) return sendForm(str); uploadHouseImage(formdata) .then((res) => { if (res.data.success.length > 0) { @@ -343,7 +334,7 @@ const submitForm = () => { }); ElMessage.error('图片：' + str + ' 上传失败！'); } - sendForm(); + sendForm(str); }) .catch((err) => { if (err && err.data && err.data.error.length > 0) { @@ -356,16 +347,16 @@ const submitForm = () => { }); return; } else { - sendForm(); + sendForm(str); } } }); }; -const sendForm = () => { +const sendForm = (val: string) => { + form.value.houseImageUrl = val; // edit or add if (userid.value) { console.log('edit'); - console.log(form.value); updateHouseRental(form.value).then(() => { ElMessage.success('编辑成功'); cancelForm(); @@ -422,6 +413,7 @@ const cancelForm = () => { padding: 15px; height: 100%; width: 100%; + overflow-y: auto; } .AddBuildingBody { margin-top: 20px; diff --git a/src/views/system/houseRental/houseMain.vue b/src/views/system/houseRental/houseMain.vue new file mode 100644 index 0000000..04cac2a --- /dev/null +++ b/src/views/system/houseRental/houseMain.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/src/views/system/houseRental/index.vue b/src/views/system/houseRental/index.vue index 6944ae8..50be4d0 100644 --- a/src/views/system/houseRental/index.vue +++ b/src/views/system/houseRental/index.vue @@ -46,17 +46,18 @@ - - - - - - + + + + + + + + @@ -67,18 +68,9 @@ @@ -90,12 +82,12 @@ - + diff --git a/src/views/system/houseRental/index2.vue b/src/views/system/houseRental/index2.vue deleted file mode 100644 index 38b14db..0000000 --- a/src/views/system/houseRental/index2.vue +++ /dev/null @@ -1,362 +0,0 @@ - - - diff --git a/src/views/system/parking/addParking.vue b/src/views/system/parking/addParking.vue index c001ab2..d765f27 100644 --- a/src/views/system/parking/addParking.vue +++ b/src/views/system/parking/addParking.vue @@ -38,7 +38,7 @@ - {{ dict.label }} + {{ dict.label }} @@ -55,7 +55,7 @@ - + @@ -96,9 +96,9 @@ const form = ref({ areaId: null, // 区域id parkingArea: null, // 车位面积 parkingFloor: null, // 车位楼层 - type: 0, // 车位类型 - resident_id: null, // 住户id - parkingStatus: null, // 车位状态 + type: '0', // 车位类型 + residentId: null, // 住户id + parkingStatus: '', // 车位状态 remark: '', // 备注 parkingCode: '' // 车位编码 }); @@ -113,7 +113,6 @@ const userid = ref(null); if (route.query.id) { userid.value = route.query.id; getParking(userid.value).then((res) => { - console.log(res); form.value = { ...form.value, ...res.data @@ -143,7 +142,7 @@ function handleChange(pop) { const submitForm = () => { formRef.value?.validate(async (valid: boolean) => { if (valid) { - form.value.resident_id = holderInfo.value; + form.value.residentId = holderInfo.value; if (userid.value) { updateParking(form.value).then((res) => { ElMessage.success('编辑成功'); diff --git a/src/views/system/parking/index.vue b/src/views/system/parking/index.vue index d0157c0..77a5618 100644 --- a/src/views/system/parking/index.vue +++ b/src/views/system/parking/index.vue @@ -7,7 +7,7 @@ - + @@ -65,19 +65,19 @@ @@ -100,10 +100,6 @@ const { com_review } = toRefs(proxy?.useDict('com_review')); const { com_parking_type } = toRefs(proxy?.useDict('com_parking_type')); const { com_parking_status } = toRefs(proxy?.useDict('com_parking_status')); -const com_reviewlist = computed(() => com_review.value ?? []); -const com_parking_typelist = computed(() => com_parking_type.value ?? []); -const com_parking_statuslist = computed(() => com_parking_status.value ?? []); - const router = useRouter(); const parkingList = ref([]); const buttonLoading = ref(false); @@ -142,16 +138,13 @@ const data = reactive>({ areaId: undefined, parkingCode: undefined, parkingArea: undefined, - parkingStatus: undefined, + parkingStatus: '', type: undefined, residentId: undefined, addTime: undefined, addBy: undefined, checkStatus: undefined, params: {} - }, - rules: { - id: [{ required: true, message: 'id车位管理表不能为空', trigger: 'blur' }] } }); @@ -210,6 +203,15 @@ const handleUpdate = async (row?: ParkingVO) => { } }); }; +/** 审核按钮操作 */ +const handleMain = async (row?: ParkingVO) => { + router.push({ + path: '/carArea/parkMain', + query: { + id: row.id + } + }); +}; /** 删除按钮操作 */ const handleDelete = async (row?: ParkingVO) => { diff --git a/src/views/system/parking/parkMain.vue b/src/views/system/parking/parkMain.vue index 04d89d8..bd13d20 100644 --- a/src/views/system/parking/parkMain.vue +++ b/src/views/system/parking/parkMain.vue @@ -148,7 +148,7 @@
- +
diff --git a/src/views/system/resident/ResidentMain.vue b/src/views/system/resident/ResidentMain.vue index ce817d8..fdd12a8 100644 --- a/src/views/system/resident/ResidentMain.vue +++ b/src/views/system/resident/ResidentMain.vue @@ -91,9 +91,9 @@
- 审核通过 - 审核不通过 - 返回 + 审核通过 + 审核不通过 + 返回
@@ -114,21 +114,17 @@ @@ -147,9 +143,14 @@ diff --git a/src/views/system/resident/addResident.vue b/src/views/system/resident/addResident.vue index e87741a..1c79f73 100644 --- a/src/views/system/resident/addResident.vue +++ b/src/views/system/resident/addResident.vue @@ -106,15 +106,16 @@