From 6e87e8add705cb11d8792c1ce7ed6fb077a0e497 Mon Sep 17 00:00:00 2001 From: ky_yusj <2655568377@qq.com> Date: Wed, 2 Jun 2021 14:29:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0=20add=20=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AF=BB=E5=8F=96=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Application/Entity/BsHouseInfo.cs | 2 +- Api/Ewide.Application/Ewide.Application.xml | 245 ++++++++++++++- .../HouseCode/Dto/HouseCodeOutput.cs | 22 +- .../HouseSafety/HouseCode/HouseCodeService.cs | 1 - .../HouseCode/IHouseCodeService.cs | 3 +- .../HouseInfo/Dto/HouseInfoInput.cs | 2 +- .../HouseInfo/Dto/HouseInfoOutput.cs | 280 +++++++++++++++++- .../HouseSafety/HouseInfo/HouseInfoService.cs | 60 +++- .../HouseInfo/IHouseInfoService.cs | 2 +- .../house/info/form/base/attachments.vue | 12 +- .../house/info/form/base/building.vue | 85 +++--- .../house/info/form/base/identification.vue | 12 +- .../house/info/form/base/investigation.vue | 4 +- .../business/house/info/form/base/unit.vue | 18 +- .../pages/business/house/info/form/index.vue | 9 +- .../business/house/info/form/patrol/base.vue | 196 ++++++++++++ .../business/house/info/form/patrol/index.vue | 124 ++++++++ 17 files changed, 985 insertions(+), 92 deletions(-) create mode 100644 Web/src/pages/business/house/info/form/patrol/base.vue create mode 100644 Web/src/pages/business/house/info/form/patrol/index.vue diff --git a/Api/Ewide.Application/Entity/BsHouseInfo.cs b/Api/Ewide.Application/Entity/BsHouseInfo.cs index 952062a..c17580a 100644 --- a/Api/Ewide.Application/Entity/BsHouseInfo.cs +++ b/Api/Ewide.Application/Entity/BsHouseInfo.cs @@ -358,7 +358,7 @@ namespace Ewide.Application /// [Comment("竣工验收备案")] [MaxLength(2000)] - public string CompletionRecord { get; set; } + public string CompletedRecord { get; set; } /// /// 监理资料 diff --git a/Api/Ewide.Application/Ewide.Application.xml b/Api/Ewide.Application/Ewide.Application.xml index a02a63f..00303a1 100644 --- a/Api/Ewide.Application/Ewide.Application.xml +++ b/Api/Ewide.Application/Ewide.Application.xml @@ -269,7 +269,7 @@ 规划许可 - + 竣工验收备案 @@ -539,7 +539,22 @@ 是否选中 - + + + 市住建部门 + + + + + 区住建部门 + + + + + 街道管理员 + + + 片区监管员 @@ -561,6 +576,11 @@ + + + 房屋详细信息 + + 分页查询用户 @@ -749,6 +769,227 @@ + + + 总建筑面积 + + + + + 总户数（户） + + + + + 房屋单元数 + + + + + 各单元每层户数（户） + + + + + 总层数 + + + + + 地上层数 + + + + + 地上商业层数开始 + + + + + 地上商业层数结束 + + + + + 地上车棚层开始 + + + + + 地上住宅层开始 + + + + + 地上住宅层结束 + + + + + 地下层数 + + + + + 产权性质 + + + + + 总共套数 + + + + + + 自管公房套数 + + + + + 私房套数 + + + + + 商品房套数 + + + + + 房改房套数 + + + + + 拆迁安置房套数 + + + + + 其它套数 + + + + + 房屋场地 + + + + + 相邻施工 + + + + + 化学侵蚀 + + + + + 结构拆改 + + + + + 加层改造 + + + + + 修缮加固 + + + + + 历史灾害 + + + + + 使用功能变更 + + + + + 其他调查内容 + + + + + 房屋等级 1,2,3,4,C,d + + + + + 房屋使用状态 + + + + + 图纸资料存档处 + + + + + 其他图纸存档 + + + + + 立项文件 + + + + + 规划许可 + + + + + 竣工验收备案 + + + + + 监理资料 + + + + + 鉴定报告 + + + + + 其它资料 + + + + + 外立面照片 + + + + + 调查登记机构 + + + + + 纸质资料调查人 + + + + + 纸质资料审核人 + + + + + 主管部门 + + 沉降倾斜 diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs index 8e47132..c268551 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs @@ -5,19 +5,23 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Ewide.Application.Service.HouseCode.Dto +namespace Ewide.Application { - public class HouseCodeOutput : PageInputBase + public class HouseCodeOutput { - public string HouseCode { get; set; } + public string Id { get; set; } public string Address { get; set; } public string ProjectId { get; set; } - public string ZoonId { get; set; } + public string ZoneId { get; set; } public int Type { get; set; } - public int ProjectFullName { get; set; } - public int ProjectName { get; set; } - public int AreaName { get; set; } - public int RoadName { get; set; } - public int CommName { get; set; } + public string AreaName { get; set; } + public string RoadName { get; set; } + public string CommName { get; set; } + public string ZoneName { get; set; } + public string ProjectNote { get; set; } + public string ProjectFullName { get; set; } + public string HouseCode { get; set; } + public string Lng { get; set; } + public string Lat { get; set; } } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs index 2523e7c..fb526c0 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs @@ -1,5 +1,4 @@ using Ewide.Application.Entity; -using Ewide.Application.Service.HouseCode.Dto; using Ewide.Core; using Furion.DatabaseAccessor; using Furion.DatabaseAccessor.Extensions; diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs index c735523..c1e1e4f 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseCode/IHouseCodeService.cs @@ -1,5 +1,4 @@ -using Ewide.Application.Service.HouseCode.Dto; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs index 28de2ae..10ea34b 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Ewide.Application { - class HouseInfoInput + public class HouseInfoInput { } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs index 5a1f700..7ed5809 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs @@ -6,7 +6,285 @@ using System.Threading.Tasks; namespace Ewide.Application { - public class HouseInfoOutput + public class HouseInfoOutput + { + #region 建筑物基本信息building + public string BuildingName { get; set; } + + public int? LandAttribute { get; set; } + + public int? StructureType { get; set; } + + public int? SeismicGrade { get; set; } + + public int? BaseInfo { get; set; } + + public string InsulationMaterial { get; set; } + + public string WallMaterial { get; set; } + + public string FireproofGrade { get; set; } + public int? CurtainWall { get; set; } + public int? FaceBrick { get; set; } + public int? WhiteWash { get; set; } + public int? Coating { get; set; } + public string Elevator { get; set; } + public DateTime? CompletedDate { get; set; } + public int? UsefulYear { get; set; } + /// + /// 总建筑面积 + /// + public float? TotalArea { get; set; } + /// + /// 总户数（户） + /// + public int? HouseHolds { get; set; } + + /// + /// 房屋单元数 + /// + public int? Units { get; set; } + + /// + /// 各单元每层户数（户） + /// + public int? UnitFloorHolds { get; set; } + + /// + /// 总层数 + /// + public int? TotalFloor { get; set; } + + /// + /// 地上层数 + /// + public int? LandFloorCount { get; set; } + + /// + /// 地上商业层数开始 + /// + public int? LandBsFloorStart { get; set; } + + /// + /// 地上商业层数结束 + /// + public int? LandBsFloorEnd { get; set; } + + /// + /// 地上车棚层开始 + /// + public int? LandBikeFloorStart { get; set; } + + /// + /// 地上住宅层开始 + /// + public int? LandResidenceFloorStart { get; set; } + + /// + /// 地上住宅层结束 + /// + public int? LandResidenceFloorEnd { get; set; } + + /// + /// 地下层数 + /// + public int? UnderFloorCount { get; set; } + #endregion + #region 权属情况ownership + /// + /// 产权性质 + /// + public string PropertyRights { get; set; } + + /// + /// 总共套数 + /// + public int? HouseCount { get; set; } + + /// 直管公房套数 + /// + public int? StraightHouseCount { get; set; } + + /// + /// 自管公房套数 + /// + public int? SelfHouseCount { get; set; } + + /// + /// 私房套数 + /// + public int? PrivateHouseCount { get; set; } + + /// + /// 商品房套数 + /// + public int? BusinessCount { get; set; } + + /// + /// 房改房套数 + /// + public int? ChangeHouseCount { get; set; } + + /// + /// 拆迁安置房套数 + /// + public int? ResettlementHouseCount { get; set; } + + /// + /// 其它套数 + /// + public int? OtherCount { get; set; } + + #endregion + #region 管理情况manager + #endregion + #region 调查情况investigation + /// + /// 房屋场地 + /// + public string HouseSite { get; set; } + + /// + /// 相邻施工 + /// + public string AdjacentConstruction { get; set; } + + /// + /// 化学侵蚀 + /// + public string ChemicalErosion { get; set; } + + /// + /// 结构拆改 + /// + public int? StructuralDismantling { get; set; } + + /// + /// 加层改造 + /// + public int? AddingLayer { get; set; } + + /// + /// 修缮加固 + /// + public string RepairAndReinforce { get; set; } + + /// + /// 历史灾害 + /// + public string HistoricalCalamity { get; set; } + + /// + /// 使用功能变更 + /// + public string FunctionalChange { get; set; } + + /// + /// 其他调查内容 + /// + public string OtherContents { get; set; } + #endregion + #region 鉴定治理identification + + /// + /// 房屋等级 1,2,3,4,C,d + /// + public int? HouseLevel { get; set; } + + /// + /// 房屋使用状态 + /// + public int? UsedStatus { get; set; } + #endregion + + #region 图纸资料存档处drawing + + /// + /// 图纸资料存档处 + /// + public string DrawingMaterial { get; set; } + + /// + /// 其他图纸存档 + /// + public string DrawingMaterialText { get; set; } + #endregion + + #region 相关附件资料attachments + /// + /// 立项文件 + /// + public string AnEntryDocument { get; set; } + + /// + /// 规划许可 + /// + public string PlanningPermission { get; set; } + + /// + /// 竣工验收备案 + /// + public string CompletedRecord { get; set; } + + /// + /// 监理资料 + /// + public string MonitorDocument { get; set; } + + /// + /// 鉴定报告 + /// + public string IdentificationReport { get; set; } + + /// + /// 其它资料 + /// + public string OtherDocument { get; set; } + #endregion + + #region 建筑概貌aspect + /// + /// 外立面照片 + /// + public string FacadePhoto { get; set; } + #endregion + + #region 调查单位unit + /// + /// 调查登记机构 + /// + public string InvestigateAgency { get; set; } + + /// + /// 纸质资料调查人 + /// + public string InvestigateUser { get; set; } + + /// + /// 纸质资料审核人 + /// + public string OfflineAuditor { get; set; } + + /// + /// 主管部门 + /// + public string CompetentDepartment { get; set; } + #endregion + } + + public class HouseInfoOutputForDetailPage { + #region header + public HouseCodeOutput houseCode { get; set; } + #endregion + + public HouseInfoOutput houseInfoOutput { get; set; } + public PatrolInfo PatrolInfo { get; set; } + } + + public class PatrolInfo + { + public DateTime? PatrolDate { get; set; } + public string PatrolUser { get; set; } } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs index b81e2b8..657abdf 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs @@ -1,8 +1,12 @@ using Dapper; +using Ewide.Core; using Furion.DatabaseAccessor; using Furion.DependencyInjection; using Furion.DynamicApiController; +using Furion.FriendlyException; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -12,21 +16,67 @@ using System.Threading.Tasks; namespace Ewide.Application.Service.HouseSafety.HouseInfo { + /// + /// 房屋详细信息 + /// + [ApiDescriptionSettings(Name = "HouseInfo", Order = 200)] public class HouseInfoService : IHouseInfoService, IDynamicApiController, ITransient { + + private readonly IRepository _houseCodeRep; private readonly IRepository _houseInfoRep; + private readonly IUserManager _userManager; private readonly IDapperRepository _dapperRepository; - public HouseInfoService(IRepository HouseInfoRep, IDapperRepository dapperRepository) + + public HouseInfoService(IRepository HouseCodeRep,IRepository HouseInfoRep, IUserManager userManager, IDapperRepository dapperRepository) { + _houseCodeRep = HouseCodeRep; _houseInfoRep = HouseInfoRep; + _userManager = userManager; _dapperRepository = dapperRepository; } - //[HttpGet("/houseInfo/getByTaskId")] - //public async Task GetByTaskId([Required] string taskId) - //{ + [HttpGet("/houseInfo/getByTaskId")] + [AllowAnonymous] + public async Task GetByTaskId([Required] string taskId) + { + var houseTaskRep = Db.GetRepository(); + var houseTask = await houseTaskRep.DetachedEntities.FirstOrDefaultAsync(t=>t.Id == taskId); + if(houseTask == null) throw Oops.Oh("任务不存在"); - //} + var houseCodeOutputAsync = await _dapperRepository.QueryAsync( + @"SELECT HC.Id,HC.Address,HC.ProjectId,HC.ZoneId,HC.Type,AA.Name AreaName,RA.Name RoadName,CA.Name CommName,Proj.Note ProjectNote,CONCAT(Proj.Name,'(',Proj.Note,')') ProjectFullName,HC.HouseCode,HC.Lng,HC.Lat FROM bs_house_code HC +LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId +LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode +LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9) +LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) +WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } + ); + var houseCodeOutput= houseCodeOutputAsync.SingleOrDefault(); + if (houseCodeOutput == null) throw Oops.Oh("任务已失效：房屋编码不存在"); + + var currentUser = await _userManager.CheckUserAsync(); + + var houseInfo = await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(h => h.HouseCodeId == houseTask.HouseCodeId); + var houseInfoOutputForDetailPage = new HouseInfoOutputForDetailPage + { + houseCode = houseCodeOutput + }; + houseInfoOutputForDetailPage.PatrolInfo = new PatrolInfo(); + houseInfoOutputForDetailPage.PatrolInfo.PatrolDate = houseTask.PatrolDate.GetValueOrDefault(DateTime.Now); + houseInfoOutputForDetailPage.PatrolInfo.PatrolUser = String.IsNullOrEmpty(houseTask.PatrolUser) ? currentUser.Name : houseTask.PatrolUser; + if (houseInfo == null) + { + houseInfoOutputForDetailPage.houseInfoOutput = new HouseInfoOutput(); + return houseInfoOutputForDetailPage; + } + + var houseInfoOutputAsync = await _dapperRepository.QueryAsync("SELECT * FROM bs_house_info HI WHERE Id = @HouseCodeId", new { houseTask.HouseCodeId }); + var houseInfoOutput = houseInfoOutputAsync.SingleOrDefault(); + houseInfoOutputForDetailPage.houseInfoOutput = houseInfoOutput; + + return houseInfoOutputForDetailPage; + } } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs index a5b31d3..14dda5f 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/IHouseInfoService.cs @@ -8,6 +8,6 @@ namespace Ewide.Application.Service { public interface IHouseInfoService { - //async Task GetByTaskId(string taskId); + Task GetByTaskId(string taskId); } } diff --git a/Web/src/pages/business/house/info/form/base/attachments.vue b/Web/src/pages/business/house/info/form/base/attachments.vue index bc19132..7729fc0 100644 --- a/Web/src/pages/business/house/info/form/base/attachments.vue +++ b/Web/src/pages/business/house/info/form/base/attachments.vue @@ -46,12 +46,12 @@ - + 上传竣工验收备案 @@ -60,12 +60,12 @@ - + 上传监理文件 diff --git a/Web/src/pages/business/house/info/form/base/building.vue b/Web/src/pages/business/house/info/form/base/building.vue index f023edf..2f4f4ec 100644 --- a/Web/src/pages/business/house/info/form/base/building.vue +++ b/Web/src/pages/business/house/info/form/base/building.vue @@ -15,28 +15,23 @@ - - - - - - + - - + + {{ item.value }} @@ -198,14 +193,14 @@ - + @@ -215,14 +210,14 @@ - + @@ -268,7 +263,7 @@ - + @@ -317,7 +312,7 @@ - + @@ -337,7 +332,7 @@ :colon="false" class="ant-row-flex" label="地下" - prop="undergroundLevelCount" + prop="underFloorCount" > @@ -346,7 +341,7 @@ :step="1" class="w-100-p" placeholder="请输入地下层" - v-model="form.undergroundLevelCount" + v-model="form.underFloorCount" /> @@ -354,7 +349,7 @@ - + @@ -379,12 +374,12 @@ 地上第 - + @@ -392,12 +387,12 @@ 层，至 - + @@ -412,12 +407,12 @@ 地上 - + @@ -432,12 +427,12 @@ 地上第 - + @@ -445,12 +440,12 @@ 层，至 - + @@ -473,10 +468,10 @@ const defaultForm = { axisX: '', axisY: '', - curtainWall: '1', - faceBrick: true, - whiteWash: true, - coating: true, + curtainWall: '0', + faceBrick: false, + whiteWash: false, + coating: false, }; export default { @@ -495,7 +490,7 @@ export default { projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }], buildingName: [{ required: true, message: '请输入幢名称', trigger: 'blur' }], address: [{ required: true, message: '请输入坐落地址', trigger: 'blur' }], - natureLand: [{ required: true, message: '请选择土地性质', trigger: 'blur' }], + landAttribute: [{ required: true, message: '请选择土地性质', trigger: 'blur' }], axisX: [{ required: true, message: '请在地图上选择坐标', trigger: 'blur' }], axisY: [{ required: true, message: '请在地图上选择坐标', trigger: 'blur' }], structureType: [{ required: true, message: '请选择结构类型', trigger: 'blur' }], @@ -504,18 +499,18 @@ export default { curtainWall: [{ required: true, message: '请选择建筑幕墙', trigger: 'blur' }], elevator: [{ required: true, message: '请选择电梯', trigger: 'blur' }], completedDate: [{ required: true, message: '请选择竣工日期', trigger: 'blur' }], - useYear: [{ required: true, message: '请输入设计使用年限', trigger: 'blur' }], - areaCount: [{ required: true, message: '请输入总建筑面积', trigger: 'blur' }], + usefulYear: [{ required: true, message: '请输入设计使用年限', trigger: 'blur' }], + totalArea: [{ required: true, message: '请输入总建筑面积', trigger: 'blur' }], households: [{ required: true, message: '请输入总户数', trigger: 'blur' }], units: [{ required: true, message: '请输入房屋单元数', trigger: 'blur' }], - unitHouseholds: [{ required: true, message: '请输入每层每单元户数', trigger: 'blur' }], + unitFloorHolds: [{ required: true, message: '请输入每层每单元户数', trigger: 'blur' }], buildingUnit: [{ required: true, message: '请输入建设单位', trigger: 'blur' }], buildingUnitUser: [{ required: true, message: '请输入建设单位联系人', trigger: 'blur' }], buildingUnitTel: [{ required: true, message: '请输入建设单位联系电话', trigger: 'blur' }], desingerUnit: [{ required: true, message: '请输入设计单位', trigger: 'blur' }], constructionUnit: [{ required: true, message: '请输入施工单位', trigger: 'blur' }], - landLevelCount: [{ required: true, message: '请输入地上层', trigger: 'blur' }], - undergroundLevelCount: [{ required: true, message: '请输入地下层', trigger: 'blur' }], + landFloorCount: [{ required: true, message: '请输入地上层', trigger: 'blur' }], + underFloorCount: [{ required: true, message: '请输入地下层', trigger: 'blur' }], }, /** 加载异步数据状态 */ @@ -524,7 +519,7 @@ export default { /** 其他成员属性 */ /* ... */ codes: { - natureLand: [], + landAttribute: [], houseStructureType: [], houseSseismicGrade: [], houseBaseInfo: [], @@ -651,7 +646,7 @@ export default { return this.$api .sysDictTypeDropDowns({ code: [ - 'dic_nature_land', + 'dic_land_attribute', 'dic_house_structure_type', 'dic_house_aseismic_grade', 'dic_house_base_info', @@ -665,7 +660,7 @@ export default { .then( ({ data: { - dic_nature_land, + dic_land_attribute, dic_house_structure_type, dic_house_aseismic_grade, dic_house_base_info, @@ -677,7 +672,7 @@ export default { }, }) => { this.codes = { - natureLand: dic_nature_land, + landAttribute: dic_land_attribute, houseStructureType: dic_house_structure_type, houseSseismicGrade: dic_house_aseismic_grade, houseBaseInfo: dic_house_base_info, diff --git a/Web/src/pages/business/house/info/form/base/identification.vue b/Web/src/pages/business/house/info/form/base/identification.vue index 565c8d6..7458f28 100644 --- a/Web/src/pages/business/house/info/form/base/identification.vue +++ b/Web/src/pages/business/house/info/form/base/identification.vue @@ -39,21 +39,21 @@ - - + + {{ item.value }} - - + + {{ item.value }} diff --git a/Web/src/pages/business/house/info/form/base/investigation.vue b/Web/src/pages/business/house/info/form/base/investigation.vue index 16a3299..8a4dacc 100644 --- a/Web/src/pages/business/house/info/form/base/investigation.vue +++ b/Web/src/pages/business/house/info/form/base/investigation.vue @@ -112,8 +112,8 @@ - - + + diff --git a/Web/src/pages/business/house/info/form/base/unit.vue b/Web/src/pages/business/house/info/form/base/unit.vue index 0e58e3f..8036838 100644 --- a/Web/src/pages/business/house/info/form/base/unit.vue +++ b/Web/src/pages/business/house/info/form/base/unit.vue @@ -18,18 +18,18 @@ - - + + - - + + - - + + @@ -60,9 +60,9 @@ export default { /** 验证格式 */ rules: { /* ... */ - aegistrationAgency: [{ required: true, message: '请输入调查登记机构' }], - aegistrationUser: [{ required: true, message: '请输入调查人员' }], - checkUser: [{ required: true, message: '请输入审核人员' }], + investigateAgency: [{ required: true, message: '请输入调查登记机构' }], + investigateUser: [{ required: true, message: '请输入调查人员' }], + offlineAuditor: [{ required: true, message: '请输入审核人员' }], competentDepartment: [{ required: true, message: '请输入主管部门' }], }, diff --git a/Web/src/pages/business/house/info/form/index.vue b/Web/src/pages/business/house/info/form/index.vue index bca21f0..296a6ba 100644 --- a/Web/src/pages/business/house/info/form/index.vue +++ b/Web/src/pages/business/house/info/form/index.vue @@ -106,6 +106,13 @@ export default { active: false, show: false, }, + { + title: '巡查登记', + name: 'patrol', + component: () => import('./patrol'), + active: false, + show: true, + }, ], loading: false, @@ -121,7 +128,7 @@ export default { created() { this.loading = true; setTimeout(() => { - this.$set(this.param, 'data', {}); + this.$set(this.param, 'record', {}); this.loading = false; }, 3000); }, diff --git a/Web/src/pages/business/house/info/form/patrol/base.vue b/Web/src/pages/business/house/info/form/patrol/base.vue new file mode 100644 index 0000000..c3b35b5 --- /dev/null +++ b/Web/src/pages/business/house/info/form/patrol/base.vue @@ -0,0 +1,196 @@ + + diff --git a/Web/src/pages/business/house/info/form/patrol/index.vue b/Web/src/pages/business/house/info/form/patrol/index.vue new file mode 100644 index 0000000..78b0e9d --- /dev/null +++ b/Web/src/pages/business/house/info/form/patrol/index.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file