From a14ccf6399e516f30e68a7ccc29db450ad5fcf38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?= <188633308@qq.com> Date: Thu, 8 Jul 2021 16:58:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E8=BD=AC=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Ewide.Application/Entity/BsHouseLog.cs | 17 +++++ Api/Ewide.Application/Entity/BsHouseTask.cs | 2 +- .../HouseSafety/HouseCode/HouseCodeService.cs | 4 +- .../HouseSafety/HouseInfo/HouseInfoService.cs | 20 +++-- .../HouseLog/Dto/HouseLogOutput.cs | 9 ++- .../HouseSafety/HouseLog/HouseLogService.cs | 76 +++++++++++++++---- .../HouseSafety/HouseLog/IHouseLogService.cs | 12 +-- .../HouseSelector/HouseSelectorService.cs | 6 +- Api/Ewide.Core/applicationconfig.json | 5 +- .../requests/business/houseSafety/houseLog.js | 7 ++ .../requests/business/houseSafety/index.js | 4 +- .../src/components/business/house-log.jsx | 47 +++++++++--- .../src/pages/business/house/code/index.jsx | 22 +++++- .../pages/business/house/info/form/index.jsx | 2 +- .../pages/business/house/task/check/index.jsx | 40 +++++++++- .../src/pages/business/house/task/index.jsx | 21 ++++- 16 files changed, 230 insertions(+), 64 deletions(-) create mode 100644 web-react/src/common/api/requests/business/houseSafety/houseLog.js diff --git a/Api/Ewide.Application/Entity/BsHouseLog.cs b/Api/Ewide.Application/Entity/BsHouseLog.cs index 594af95..bdcd8bd 100644 --- a/Api/Ewide.Application/Entity/BsHouseLog.cs +++ b/Api/Ewide.Application/Entity/BsHouseLog.cs @@ -25,5 +25,22 @@ namespace Ewide.Application [Comment("状态")] public HouseLogStatus Status { get; set; } + + [Comment("备注信息")] + public string Remark { get; set; } + + [Comment("完成时间")] + public DateTime? FinishedTime { get; set; } + + [Comment("完成者Id")] + [MaxLength(36)] + public string FinishedUserId { get; set; } + + [Comment("完成者名称")] + [MaxLength(20)] + public string FinishedUserName { get; set; } + + [Comment("排序")] + public int Sort { get; set; } } } diff --git a/Api/Ewide.Application/Entity/BsHouseTask.cs b/Api/Ewide.Application/Entity/BsHouseTask.cs index e0ecb1e..fde1073 100644 --- a/Api/Ewide.Application/Entity/BsHouseTask.cs +++ b/Api/Ewide.Application/Entity/BsHouseTask.cs @@ -261,6 +261,6 @@ namespace Ewide.Application /// 是否有效 /// [Comment("是否有效")] - public bool IsEnabled { get; set; } + public bool IsEnabled { get; set; } = true; } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs index fa32082..8175ddd 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs @@ -58,8 +58,8 @@ namespace Ewide.Application.Service.HouseCode await houseCode.InsertAsync(); // 添加到流转日志 - await _houseLogService.AddThenDone(id, _userManager.User, HouseLogType.CreateCode); - await _houseLogService.Add(id, _userManager.User, HouseLogType.SelectMember); + var sort = await _houseLogService.AddThenDone(id, _userManager.User, HouseLogType.CreateCode); + sort = await _houseLogService.Add(id, _userManager.User, HouseLogType.SelectMember, sort: sort); } [HttpPost("/houseCode/edit")] diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs index ee92918..a5b2d5e 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseInfo/HouseInfoService.cs @@ -132,6 +132,7 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } } [NonAction] + [UnitOfWork] public async Task InputDataProcess(HouseInfoInputSave input,DataStatus dataStatus = DataStatus.Init) { //房屋编码地址/坐标单独更新 @@ -142,13 +143,14 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } var houseEntity = await _houseInfoRep.DetachedEntities.FirstOrDefaultAsync(h => h.HouseCodeId == input.houseCode.Id); //建档审核通过的房屋数据修改时，对应的建档任务Task不处理 - var houseTask = input.PatrolInfo.Adapt(); + var houseTask = await _houseTaskRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.PatrolInfo.Id); if (houseEntity == null || houseEntity.State != 6) { - houseTask.HouseCodeId = input.houseCode.Id; + var _houseTask = input.PatrolInfo.Adapt(); + _houseTask.HouseCodeId = input.houseCode.Id; //任务没有暂存状态，其他状态与HouseInfo的State一致 - houseTask.Status = dataStatus == DataStatus.TempSaved ? (int)DataStatus.Saved : (int)dataStatus; - await houseTask.UpdateExcludeAsync(new string[] { nameof(BsHouseTask.TaskType) }, ignoreNullValues: true); + _houseTask.Status = dataStatus == DataStatus.TempSaved ? (int)DataStatus.Saved : (int)dataStatus; + await _houseTask.UpdateExcludeAsync(new string[] { nameof(BsHouseTask.TaskType) }, ignoreNullValues: true); } //判断房屋建档状态 //dataStatus == DataStatus.Saved 若是保存操作 则判断是新增/更新 @@ -168,7 +170,9 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } await houseInfo.UpdateExcludeAsync(new[] { nameof(BsHouseInfo.HouseGrade) }, true); } - if(dataStatus == DataStatus.Submited) + int? logSort = null; + + if (dataStatus == DataStatus.Submited) { await _houseLogService.Done(input.houseCode.Id); @@ -184,7 +188,7 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } where e.OrgId == org.Id && r.Code == Enum.GetName(HouseManagerRole.ZoneManager).ToUnderScoreCase() select u).ToListAsync(); - await _houseLogService.Add(input.houseCode.Id, zoneManagerList, HouseLogType.Check); + logSort = await _houseLogService.Add(input.houseCode.Id, zoneManagerList, HouseLogType.Check); } //审核操作则新增一条审核记录 if (dataStatus == DataStatus.Back || dataStatus == DataStatus.Passed) @@ -192,11 +196,11 @@ WHERE HC.Id=@HouseCodeId", new { houseTask.HouseCodeId } var checkRecord = input.TaskCheckRecord.Adapt(); await checkRecord.InsertAsync(); await _houseLogService.Done(input.houseCode.Id); - await _houseLogService.AddThenDone(input.houseCode.Id, _userManager.User, dataStatus == DataStatus.Passed ? HouseLogType.Agree : HouseLogType.Disagree); + logSort = await _houseLogService.AddThenDone(input.houseCode.Id, _userManager.User, dataStatus == DataStatus.Passed ? HouseLogType.Agree : HouseLogType.Disagree, remark: checkRecord.Content, sort: logSort); if (dataStatus == DataStatus.Back) { var user = await _sysUserRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id.Equals(houseTask.UserID)); - await _houseLogService.Add(input.houseCode.Id, user, HouseLogType.CreateInfo); + logSort = await _houseLogService.Add(input.houseCode.Id, user, HouseLogType.CreateInfo, sort: logSort); } } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogOutput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogOutput.cs index f5aab48..fdd2831 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogOutput.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseLog/Dto/HouseLogOutput.cs @@ -8,12 +8,13 @@ namespace Ewide.Application { public class HouseLogOutput { + public string Id { get; set; } public string TargetUserNames { get; set; } public int Type { get; set; } public int Status { get; set; } - public DateTime CreatedTime { get; set; } - public DateTime? UpdatedTimeg { get; set; } - public string CreatedUserName { get; set; } - public string UpdatedUserName { get; set; } + public string Remark { get; set; } + public DateTime? FinishedTime { get; set; } + public string FinishedUserId { get; set; } + public string FinishedUserName { get; set; } } } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseLog/HouseLogService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseLog/HouseLogService.cs index a64796e..85cf06f 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseLog/HouseLogService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseLog/HouseLogService.cs @@ -22,33 +22,45 @@ namespace Ewide.Application.Service { private readonly IDapperRepository _dapperRep; + private readonly IUserManager _userManager; + private readonly IRepository _bsHouseLogRep; - public HouseLogService(IDapperRepository dapperRep, IRepository bsHouseLogRep) + public HouseLogService(IDapperRepository dapperRep, IUserManager userManager, IRepository bsHouseLogRep) { _dapperRep = dapperRep; + _userManager = userManager; _bsHouseLogRep = bsHouseLogRep; } [NonAction] [UnitOfWork] - public async Task Add(string houseCodeId, SysUser targetUser, HouseLogType type) + public async Task Add(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null) { - await Add(houseCodeId, new List { targetUser }, type); + return await Add(houseCodeId, new List { targetUser }, type, remark, sort); } [NonAction] [UnitOfWork] - public async Task Add(string houseCodeId, List targetUsers, HouseLogType type) + public async Task Add(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null) { + if (!sort.HasValue) + { + sort = await _bsHouseLogRep.DetachedEntities.Where(p => p.HouseCodeId.Equals(houseCodeId)).MaxAsync(p => p.Sort); + } + var _sort = sort.GetValueOrDefault(1) + 1; await new BsHouseLog { Id = Guid.NewGuid().ToString(), HouseCodeId = houseCodeId, TargetUserIds = String.Join(",", targetUsers.Select(p => p.Id)), Type = type, - Status = HouseLogStatus.Handle + Status = HouseLogStatus.Handle, + Remark = remark, + Sort = _sort }.InsertAsync(); + + return _sort; } [NonAction] @@ -77,57 +89,88 @@ namespace Ewide.Application.Service if (log != null) { log.Status = HouseLogStatus.Handled; + log.FinishedTime = DateTime.Now; + log.FinishedUserId = _userManager.UserId; + log.FinishedUserName = _userManager.User.Account; await log.UpdateAsync(); } } [NonAction] [UnitOfWork] - public async Task AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type) + public async Task AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null) { - await AddThenRead(houseCodeId, new List { targetUser }, type); + return await AddThenRead(houseCodeId, new List { targetUser }, type, remark, sort); } [NonAction] [UnitOfWork] - public async Task AddThenRead(string houseCodeId, List targetUsers, HouseLogType type) + public async Task AddThenRead(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null) { + if (!sort.HasValue) + { + sort = await _bsHouseLogRep.DetachedEntities.Where(p => p.HouseCodeId.Equals(houseCodeId)).MaxAsync(p => p.Sort); + } + var _sort = sort.GetValueOrDefault(1) + 1; await new BsHouseLog { Id = Guid.NewGuid().ToString(), HouseCodeId = houseCodeId, TargetUserIds = String.Join(",", targetUsers.Select(p => p.Id)), Type = type, - Status = HouseLogStatus.Handling + Status = HouseLogStatus.Handling, + Remark = remark, + Sort = _sort }.InsertAsync(); + + return _sort; } [NonAction] [UnitOfWork] - public async Task AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type) + public async Task AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null) { - await AddThenDone(houseCodeId, new List { targetUser }, type); + return await AddThenDone(houseCodeId, new List { targetUser }, type, remark, sort); } [NonAction] [UnitOfWork] - public async Task AddThenDone(string houseCodeId, List targetUsers, HouseLogType type) + public async Task AddThenDone(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null) { + if (!sort.HasValue) + { + sort = await _bsHouseLogRep.DetachedEntities.Where(p => p.HouseCodeId.Equals(houseCodeId)).MaxAsync(p => p.Sort); + } + var _sort = sort.GetValueOrDefault(1) + 1; await new BsHouseLog { Id = Guid.NewGuid().ToString(), HouseCodeId = houseCodeId, TargetUserIds = String.Join(",", targetUsers.Select(p => p.Id)), Type = type, - Status = HouseLogStatus.Handled + Status = HouseLogStatus.Handled, + Remark = remark, + FinishedTime = DateTime.Now, + FinishedUserId = _userManager.UserId, + FinishedUserName = _userManager.User.Account, + Sort = _sort }.InsertAsync(); + + return _sort; } [HttpGet("/houseLog/list")] public async Task List([FromQuery] HouseLogInput input) { - var sql = @"SELECT *, -(SELECT GROUP_CONCAT(`Name`) FROM sys_user + var sql = @"SELECT + HL.Id, + HL.Type, + HL.`Status`, + HL.Remark, + HL.FinishedTime, + HL.FinishedUserId, + IFNULL(NickName, `Name`) FinishedUserName, +(SELECT GROUP_CONCAT(IFNULL(NickName,`Name`)) FROM sys_user WHERE Id IN ( SELECT DISTINCT SUBSTRING_INDEX(SUBSTRING_INDEX(_HL.TargetUserIds,',',HT.help_topic_id + 1),',',-1) FROM bs_house_log _HL @@ -136,8 +179,9 @@ namespace Ewide.Application.Service ) ) TargetUserNames FROM bs_house_log HL +LEFT JOIN sys_user SU ON HL.FinishedUserId = SU.Id WHERE HouseCodeId = @HouseCodeId -ORDER BY HL.CreatedTime DESC, Type DESC"; +ORDER BY Sort DESC"; return await _dapperRep.QueryAsync(sql, new { houseCodeId = input.Id }); } diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseLog/IHouseLogService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseLog/IHouseLogService.cs index f85e66f..056db2b 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseLog/IHouseLogService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseLog/IHouseLogService.cs @@ -9,14 +9,14 @@ namespace Ewide.Application.Service { public interface IHouseLogService { - Task Add(string houseCodeId, SysUser targetUser, HouseLogType type); - Task Add(string houseCodeId, List targetUsers, HouseLogType type); + Task Add(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null); + Task Add(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null); Task Read(string houseCodeId); Task Done(string houseCodeId); - Task AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type); - Task AddThenRead(string houseCodeId, List targetUsers, HouseLogType type); - Task AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type); - Task AddThenDone(string houseCodeId, List targetUsers, HouseLogType type); + Task AddThenRead(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null); + Task AddThenRead(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null); + Task AddThenDone(string houseCodeId, SysUser targetUser, HouseLogType type, string remark = null, int? sort = null); + Task AddThenDone(string houseCodeId, List targetUsers, HouseLogType type, string remark = null, int? sort = null); Task List(HouseLogInput input); Task ListByInfoId(HouseLogInput input); Task ListByTaskId(HouseLogInput input); diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs index 1da270b..df04bd2 100644 --- a/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs +++ b/Api/Ewide.Application/Service/HouseSafety/HouseSelector/HouseSelectorService.cs @@ -155,7 +155,7 @@ INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM // 选定房屋 house.ForEach(async p => { - var originalTask = _bsHouseTaskRep.DetachedEntities.FirstOrDefault(t =>t.HouseCodeId == p && t.TaskType == 0); + var originalTask = _bsHouseTaskRep.DetachedEntities.FirstOrDefault(t => t.HouseCodeId == p && t.TaskType == 0 && t.IsEnabled); if (originalTask == null) { new BsHouseTask @@ -173,7 +173,7 @@ INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM } else { - await _houseLogService.AddThenDone(p, _userManager.User, HouseLogType.SelectMember); + var sort = await _houseLogService.AddThenDone(p, _userManager.User, HouseLogType.SelectMember); if (originalTask.Status != 6)//建档未完成，生成新建档任务分配给新的人员；原建档任务数据保留，有效性设置为false，取消巡查关系 { var newTask = originalTask.Adapt(); @@ -185,7 +185,7 @@ INNER JOIN (SELECT * FROM bs_house_member_relation WHERE SysUserId = @UserId) HM originalTask.IsEnabled = false; originalTask.Update(); - await _houseLogService.Add(p, selectedUser, HouseLogType.CreateInfo); + sort = await _houseLogService.Add(p, selectedUser, HouseLogType.CreateInfo, sort: sort); }//已建档完成，不再分配建档任务，仅更换巡查关系 else { diff --git a/Api/Ewide.Core/applicationconfig.json b/Api/Ewide.Core/applicationconfig.json index 3ae16a9..78a776a 100644 --- a/Api/Ewide.Core/applicationconfig.json +++ b/Api/Ewide.Core/applicationconfig.json @@ -100,7 +100,10 @@ "sysUser:updateAvatar", "sysNotice:received", "sysNotice:unread", - "sysNotice:detail" + "sysNotice:detail", + "houseLog:list", + "houseLog:listByInfoId", + "houseLog:listByTaskId" ] }, diff --git a/web-react/src/common/api/requests/business/houseSafety/houseLog.js b/web-react/src/common/api/requests/business/houseSafety/houseLog.js new file mode 100644 index 0000000..4a1702d --- /dev/null +++ b/web-react/src/common/api/requests/business/houseSafety/houseLog.js @@ -0,0 +1,7 @@ +const urls = { + houseLogList: '/houseLog/list', + houseLogListByInfoId: '/houseLog/listByInfoId', + houseLogListByTaskId: '/houseLog/listByTaskId', +} + +export default urls \ No newline at end of file diff --git a/web-react/src/common/api/requests/business/houseSafety/index.js b/web-react/src/common/api/requests/business/houseSafety/index.js index fa768a1..284c5f2 100644 --- a/web-react/src/common/api/requests/business/houseSafety/index.js +++ b/web-react/src/common/api/requests/business/houseSafety/index.js @@ -7,6 +7,7 @@ import houseTask from './houseTask' import houseInfo from './houseInfo' import houseQuery from './houseQuery' import houseCompany from './houseCompany' +import houseLog from './houseLog' const urls = { ...houseProjectInfo, @@ -17,7 +18,8 @@ const urls = { ...houseTask, ...houseInfo, ...houseQuery, - ...houseCompany + ...houseCompany, + ...houseLog } export default urls \ No newline at end of file diff --git a/web-react/src/components/business/house-log.jsx b/web-react/src/components/business/house-log.jsx index 2ccf2c9..66a2395 100644 --- a/web-react/src/components/business/house-log.jsx +++ b/web-react/src/components/business/house-log.jsx @@ -1,10 +1,12 @@ import React, { Component } from 'react' -import { Spin, Steps, Timeline } from 'antd' +import { Descriptions, Spin, Steps, Timeline } from 'antd' import { AntIcon } from 'components' import { api } from 'common/api' import getDictData from 'util/dic' import { toCamelCase } from 'util/format' +const ellipsisType = [3, 4, 6] + export default class houseLog extends Component { state = { loading: true, @@ -21,7 +23,11 @@ export default class houseLog extends Component { state.codes = await getDictData('house_log_type') if (id) { + const { data } = await api.houseLogList({ id }) + state.data = data } else if (infoId) { + const { data } = await api.houseLogListByInfoId({ id: infoId }) + state.data = data } else if (taskId) { const { data } = await api.houseLogListByTaskId({ id: taskId }) state.data = data @@ -51,18 +57,37 @@ export default class houseLog extends Component { , - , - ][item.status] + item.type === 6 ? ( + + ) : ( + [ + , + , + , + ][item.status] + ) } > -
- {this.bindCodeValue(item.type, 'house_log_type')} -
-

{item.updatedTime}

-

{item.targetUserNames}

+
+ + {['等待', '正在', ''][item.status] + + this.bindCodeValue(item.type, 'house_log_type')} + +
+

{item.finishedTime}

+ + {item.remark && ( + {item.remark} + )} + + {item.targetUserNames.split(',').join(' / ')} + + {item.finishedUserName && ( + + {item.finishedUserName} + + )} + ))} diff --git a/web-react/src/pages/business/house/code/index.jsx b/web-react/src/pages/business/house/code/index.jsx index 35a069b..e58140a 100644 --- a/web-react/src/pages/business/house/code/index.jsx +++ b/web-react/src/pages/business/house/code/index.jsx @@ -10,9 +10,10 @@ import { message as Message, Radio, Select, + Drawer, } from 'antd' import { isEqual } from 'lodash' -import { AntIcon, Auth, Container, QueryTable, QueryTableActions } from 'components' +import { AntIcon, Auth, Container, HouseLog, QueryTable, QueryTableActions } from 'components' import { api } from 'common/api' import getDictData from 'util/dic' import auth from 'components/authorized/handler' @@ -39,6 +40,8 @@ export default class index extends Component { }, type: '', + + visibleLog: false, } // 表格实例 @@ -95,7 +98,7 @@ export default class index extends Component { if (flag) { this.columns.push({ title: '操作', - width: 150, + width: 180, dataIndex: 'actions', render: (text, record) => ( @@ -111,6 +114,7 @@ export default class index extends Component { 删除 + this.onShowLog(record.id)}>日志 ), }) @@ -255,10 +259,13 @@ export default class index extends Component { } //#region 自定义方法 + onShowLog(id) { + this.setState({ visibleLog: id }) + } //#endregion render() { - const { options, codes, type } = this.state + const { options, codes, type, visibleLog } = this.state return ( @@ -348,7 +355,14 @@ export default class index extends Component { } /> - {this.props.supportInfo} + this.setState({ visibleLog: false })} + destroyOnClose + > + + ) } diff --git a/web-react/src/pages/business/house/info/form/index.jsx b/web-react/src/pages/business/house/info/form/index.jsx index 5670d97..65a255b 100644 --- a/web-react/src/pages/business/house/info/form/index.jsx +++ b/web-react/src/pages/business/house/info/form/index.jsx @@ -250,7 +250,7 @@ export default class index extends Component { 通过