ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Browse Source
This commit is contained in:
自带大佬气场
2021-07-06 15:23:42 +08:00
parent 78ac91bbdd c35d84dd80
commit eac0711850
16 changed files with 822 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Api/Ewide.Application/Entity/BsHouseInfo.cs
View File

@@ -264,67 +264,6 @@ namespace Ewide.Application
[MaxLength(36)] [MaxLength(36)]
public string WuYeUnitId { get; set; } public string WuYeUnitId { get; set; }
/// <summary>
/// 房屋场地
/// </summary>
[Comment("房屋场地")]
[MaxLength(100)]
public string HouseSite { get; set; }
/// <summary>
/// 相邻施工
/// </summary>
[Comment("相邻施工")]
[MaxLength(100)]
public string AdjacentConstruction { get; set; }
/// <summary>
/// 化学侵蚀
/// </summary>
[Comment("化学侵蚀")]
[MaxLength(100)]
public string ChemicalErosion { get; set; }
/// <summary>
/// 结构拆改
/// </summary>
[Comment("结构拆改")]
public int? StructuralDismantling { get; set; }
/// <summary>
/// 加层改造
/// </summary>
[Comment("加层改造")]
public int? AddingLayer { get; set; }
/// <summary>
/// 修缮加固
/// </summary>
[Comment("修缮加固")]
[MaxLength(100)]
public string RepairAndReinforce { get; set; }
/// <summary>
/// 历史灾害
/// </summary>
[Comment("历史灾害")]
[MaxLength(100)]
public string HistoricalCalamity { get; set; }
/// <summary>
/// 使用功能变更
/// </summary>
[Comment("使用功能变更")]
[MaxLength(100)]
public string FunctionalChange { get; set; }
/// <summary>
/// 其他调查内容
/// </summary>
[Comment("其他调查内容")]
[MaxLength(1000)]
public string OtherContents { get; set; }
/// <summary> /// <summary>
/// 图纸资料存档处 /// 图纸资料存档处
/// </summary> /// </summary>

61
Api/Ewide.Application/Entity/BsHouseTask.cs
View File

@@ -76,6 +76,67 @@ namespace Ewide.Application
[Comment("综合等级")] [Comment("综合等级")]
public int? ComprehensiveGrade { get; set; } public int? ComprehensiveGrade { get; set; }
/// <summary>
/// 房屋场地
/// </summary>
[Comment("房屋场地")]
[MaxLength(100)]
public string HouseSite { get; set; }
/// <summary>
/// 相邻施工
/// </summary>
[Comment("相邻施工")]
[MaxLength(100)]
public string AdjacentConstruction { get; set; }
/// <summary>
/// 化学侵蚀
/// </summary>
[Comment("化学侵蚀")]
[MaxLength(100)]
public string ChemicalErosion { get; set; }
/// <summary>
/// 结构拆改
/// </summary>
[Comment("结构拆改")]
public int? StructuralDismantling { get; set; }
/// <summary>
/// 加层改造
/// </summary>
[Comment("加层改造")]
public int? AddingLayer { get; set; }
/// <summary>
/// 修缮加固
/// </summary>
[Comment("修缮加固")]
[MaxLength(100)]
public string RepairAndReinforce { get; set; }
/// <summary>
/// 历史灾害
/// </summary>
[Comment("历史灾害")]
[MaxLength(100)]
public string HistoricalCalamity { get; set; }
/// <summary>
/// 使用功能变更
/// </summary>
[Comment("使用功能变更")]
[MaxLength(100)]
public string FunctionalChange { get; set; }
/// <summary>
/// 其他调查内容
/// </summary>
[Comment("其他调查内容")]
[MaxLength(1000)]
public string OtherContents { get; set; }
/// <summary> /// <summary>
/// 主要安全隐患综述 /// 主要安全隐患综述
/// </summary> /// </summary>

270
Api/Ewide.Application/Ewide.Application.xml
View File

@@ -219,51 +219,6 @@
物业单位ID 物业单位ID
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.BsHouseInfo.HouseSite">
<summary>
房屋场地
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.AdjacentConstruction">
<summary>
相邻施工
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.ChemicalErosion">
<summary>
化学侵蚀
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.StructuralDismantling">
<summary>
结构拆改
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.AddingLayer">
<summary>
加层改造
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.RepairAndReinforce">
<summary>
修缮加固
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.HistoricalCalamity">
<summary>
历史灾害
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.FunctionalChange">
<summary>
使用功能变更
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.OtherContents">
<summary>
其他调查内容
</summary>
</member>
<member name="P:Ewide.Application.BsHouseInfo.DrawingMaterial"> <member name="P:Ewide.Application.BsHouseInfo.DrawingMaterial">
<summary> <summary>
图纸资料存档处 图纸资料存档处
@@ -394,6 +349,51 @@
综合等级 综合等级
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.BsHouseTask.HouseSite">
<summary>
房屋场地
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.AdjacentConstruction">
<summary>
相邻施工
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.ChemicalErosion">
<summary>
化学侵蚀
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.StructuralDismantling">
<summary>
结构拆改
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.AddingLayer">
<summary>
加层改造
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.RepairAndReinforce">
<summary>
修缮加固
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.HistoricalCalamity">
<summary>
历史灾害
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.FunctionalChange">
<summary>
使用功能变更
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.OtherContents">
<summary>
其他调查内容
</summary>
</member>
<member name="P:Ewide.Application.BsHouseTask.MainSafety"> <member name="P:Ewide.Application.BsHouseTask.MainSafety">
<summary> <summary>
主要安全隐患综述 主要安全隐患综述
@@ -916,51 +916,6 @@
其它套数 其它套数
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.HouseInfoInput.HouseSite">
<summary>
房屋场地
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.AdjacentConstruction">
<summary>
相邻施工
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.ChemicalErosion">
<summary>
化学侵蚀
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.StructuralDismantling">
<summary>
结构拆改
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.AddingLayer">
<summary>
加层改造
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.RepairAndReinforce">
<summary>
修缮加固
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.HistoricalCalamity">
<summary>
历史灾害
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.FunctionalChange">
<summary>
使用功能变更
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.OtherContents">
<summary>
其他调查内容
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoInput.HouseGrade"> <member name="P:Ewide.Application.HouseInfoInput.HouseGrade">
<summary> <summary>
房屋等级 1,2,3,4,C,d 房屋等级 1,2,3,4,C,d
@@ -1141,51 +1096,6 @@
其它套数 其它套数
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.HouseInfoOutput.HouseSite">
<summary>
房屋场地
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.AdjacentConstruction">
<summary>
相邻施工
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.ChemicalErosion">
<summary>
化学侵蚀
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.StructuralDismantling">
<summary>
结构拆改
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.AddingLayer">
<summary>
加层改造
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.RepairAndReinforce">
<summary>
修缮加固
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.HistoricalCalamity">
<summary>
历史灾害
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.FunctionalChange">
<summary>
使用功能变更
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.OtherContents">
<summary>
其他调查内容
</summary>
</member>
<member name="P:Ewide.Application.HouseInfoOutput.HouseGrade"> <member name="P:Ewide.Application.HouseInfoOutput.HouseGrade">
<summary> <summary>
房屋等级 1,2,3,4,C,d 房屋等级 1,2,3,4,C,d
@@ -1296,6 +1206,51 @@
其他情况附件 其他情况附件
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.HouseTaskInput.HouseSite">
<summary>
房屋场地
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.AdjacentConstruction">
<summary>
相邻施工
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.ChemicalErosion">
<summary>
化学侵蚀
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.StructuralDismantling">
<summary>
结构拆改
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.AddingLayer">
<summary>
加层改造
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.RepairAndReinforce">
<summary>
修缮加固
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.HistoricalCalamity">
<summary>
历史灾害
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.FunctionalChange">
<summary>
使用功能变更
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.OtherContents">
<summary>
其他调查内容
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskInput.MainSafety"> <member name="P:Ewide.Application.HouseTaskInput.MainSafety">
<summary> <summary>
主要安全隐患综述 主要安全隐患综述
@@ -1386,6 +1341,51 @@
综合等级 综合等级
</summary> </summary>
</member> </member>
<member name="P:Ewide.Application.HouseTaskOutput.HouseSite">
<summary>
房屋场地
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.AdjacentConstruction">
<summary>
相邻施工
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.ChemicalErosion">
<summary>
化学侵蚀
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.StructuralDismantling">
<summary>
结构拆改
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.AddingLayer">
<summary>
加层改造
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.RepairAndReinforce">
<summary>
修缮加固
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.HistoricalCalamity">
<summary>
历史灾害
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.FunctionalChange">
<summary>
使用功能变更
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.OtherContents">
<summary>
其他调查内容
</summary>
</member>
<member name="P:Ewide.Application.HouseTaskOutput.MainSafety"> <member name="P:Ewide.Application.HouseTaskOutput.MainSafety">
<summary> <summary>
主要安全隐患综述 主要安全隐患综述

47
Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoInput.cs
View File

@@ -138,52 +138,7 @@ namespace Ewide.Application
#endregion #endregion
#region 管理情况manager #region 管理情况manager
#endregion #endregion
#region 调查情况investigation
/// <summary>
/// 房屋场地
/// </summary>
public string HouseSite { get; set; }
/// <summary>
/// 相邻施工
/// </summary>
public string AdjacentConstruction { get; set; }
/// <summary>
/// 化学侵蚀
/// </summary>
public string ChemicalErosion { get; set; }
/// <summary>
/// 结构拆改
/// </summary>
public int? StructuralDismantling { get; set; }
/// <summary>
/// 加层改造
/// </summary>
public int? AddingLayer { get; set; }
/// <summary>
/// 修缮加固
/// </summary>
public string RepairAndReinforce { get; set; }
/// <summary>
/// 历史灾害
/// </summary>
public string HistoricalCalamity { get; set; }
/// <summary>
/// 使用功能变更
/// </summary>
public string FunctionalChange { get; set; }
/// <summary>
/// 其他调查内容
/// </summary>
public string OtherContents { get; set; }
#endregion
#region 鉴定治理identification #region 鉴定治理identification
/// <summary> /// <summary>

47
Api/Ewide.Application/Service/HouseSafety/HouseInfo/Dto/HouseInfoOutput.cs
View File

@@ -138,52 +138,7 @@ namespace Ewide.Application
#endregion #endregion
#region 管理情况manager #region 管理情况manager
#endregion #endregion
#region 调查情况investigation
/// <summary>
/// 房屋场地
/// </summary>
public string HouseSite { get; set; }
/// <summary>
/// 相邻施工
/// </summary>
public string AdjacentConstruction { get; set; }
/// <summary>
/// 化学侵蚀
/// </summary>
public string ChemicalErosion { get; set; }
/// <summary>
/// 结构拆改
/// </summary>
public int? StructuralDismantling { get; set; }
/// <summary>
/// 加层改造
/// </summary>
public int? AddingLayer { get; set; }
/// <summary>
/// 修缮加固
/// </summary>
public string RepairAndReinforce { get; set; }
/// <summary>
/// 历史灾害
/// </summary>
public string HistoricalCalamity { get; set; }
/// <summary>
/// 使用功能变更
/// </summary>
public string FunctionalChange { get; set; }
/// <summary>
/// 其他调查内容
/// </summary>
public string OtherContents { get; set; }
#endregion
#region 鉴定治理identification #region 鉴定治理identification
/// <summary> /// <summary>

45
Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskInput.cs
View File

@@ -42,7 +42,52 @@ namespace Ewide.Application
public int DamageGrade { get; set; } public int DamageGrade { get; set; }
//[Required(ErrorMessage = "巡查综合等级不能为空")] //[Required(ErrorMessage = "巡查综合等级不能为空")]
public int ComprehensiveGrade { get; set; } public int ComprehensiveGrade { get; set; }
#region 调查情况investigation
/// <summary>
/// 房屋场地
/// </summary>
public string HouseSite { get; set; }
/// <summary>
/// 相邻施工
/// </summary>
public string AdjacentConstruction { get; set; }
/// <summary>
/// 化学侵蚀
/// </summary>
public string ChemicalErosion { get; set; }
/// <summary>
/// 结构拆改
/// </summary>
public int? StructuralDismantling { get; set; }
/// <summary>
/// 加层改造
/// </summary>
public int? AddingLayer { get; set; }
/// <summary>
/// 修缮加固
/// </summary>
public string RepairAndReinforce { get; set; }
/// <summary>
/// 历史灾害
/// </summary>
public string HistoricalCalamity { get; set; }
/// <summary>
/// 使用功能变更
/// </summary>
public string FunctionalChange { get; set; }
/// <summary>
/// 其他调查内容
/// </summary>
public string OtherContents { get; set; }
#endregion
/// <summary> /// <summary>
/// 主要安全隐患综述 /// 主要安全隐患综述
/// </summary> /// </summary>

47
Api/Ewide.Application/Service/HouseSafety/HouseTask/Dto/HouseTaskOutput.cs
View File

@@ -46,6 +46,53 @@ namespace Ewide.Application
/// </summary> /// </summary>
public int? ComprehensiveGrade { get; set; } public int? ComprehensiveGrade { get; set; }
#region 调查情况investigation
/// <summary>
/// 房屋场地
/// </summary>
public string HouseSite { get; set; }
/// <summary>
/// 相邻施工
/// </summary>
public string AdjacentConstruction { get; set; }
/// <summary>
/// 化学侵蚀
/// </summary>
public string ChemicalErosion { get; set; }
/// <summary>
/// 结构拆改
/// </summary>
public int? StructuralDismantling { get; set; }
/// <summary>
/// 加层改造
/// </summary>
public int? AddingLayer { get; set; }
/// <summary>
/// 修缮加固
/// </summary>
public string RepairAndReinforce { get; set; }
/// <summary>
/// 历史灾害
/// </summary>
public string HistoricalCalamity { get; set; }
/// <summary>
/// 使用功能变更
/// </summary>
public string FunctionalChange { get; set; }
/// <summary>
/// 其他调查内容
/// </summary>
public string OtherContents { get; set; }
#endregion
/// <summary> /// <summary>
/// 主要安全隐患综述 /// 主要安全隐患综述
/// </summary> /// </summary>

4
web-react/src/pages/business/house/code/index.jsx
View File

@@ -167,10 +167,10 @@ export default class index extends Component {
const searchInfo = getSearchInfo({ const searchInfo = getSearchInfo({
query, query,
queryType: { queryType: {
no: '=', areaCode: '=',
houseCode: 'like',
type: '=', type: '=',
address: 'like', address: 'like',
houseCode: 'like',
}, },
}) })

287
web-react/src/pages/business/house/info/form/base/building.jsx
View File

@@ -19,6 +19,18 @@ import moment from 'moment'
import { CITY } from 'util/global' import { CITY } from 'util/global'
import store from 'store' import store from 'store'
const initialValues = {
houseInfo: {
houseUsedStatus: 1,
landAttribute: 1,
curtainWall: 0,
faceBrick: 0,
coating: 0,
painting: 0,
elevator: '0',
},
}
const { getState, dispatch } = store const { getState, dispatch } = store
const layout = { const layout = {
@@ -32,6 +44,7 @@ export default class building extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
houseUsedStatus: [],
landAttribute: [], landAttribute: [],
houseStructureType: [], houseStructureType: [],
houseAseismicGrade: [], houseAseismicGrade: [],
@@ -109,6 +122,7 @@ export default class building extends Component {
} }
} }
_state.codes = await getDictData( _state.codes = await getDictData(
'house_used_status',
'land_attribute', 'land_attribute',
'house_structure_type', 'house_structure_type',
'house_aseismic_grade', 'house_aseismic_grade',
@@ -357,6 +371,7 @@ export default class building extends Component {
return ( return (
<Spin spinning={loading} indicator={<AntIcon type="loading" />}> <Spin spinning={loading} indicator={<AntIcon type="loading" />}>
<Form <Form
initialValues={initialValues}
{...layout} {...layout}
ref={this.form} ref={this.form}
onValuesChange={(changedValues, allValues) => onValuesChange={(changedValues, allValues) =>
@@ -382,23 +397,39 @@ export default class building extends Component {
<Input autoComplete="off" placeholder="请输入坐落地址" /> <Input autoComplete="off" placeholder="请输入坐落地址" />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={12}>
<Form.Item
label="房屋使用状态"
name={['houseInfo', 'houseUsedStatus']}
rules={[{ required: true, message: '请选择房屋使用状态' }]}
>
<Radio.Group buttonStyle="solid">
{codes.houseUsedStatus.map(item => (
<Radio.Button key={item.code} value={+item.code}>
{item.value}
</Radio.Button>
))}
</Radio.Group>
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label="土地性质"
name={['houseInfo', 'landAttribute']}
rules={[{ required: true, message: '请选择土地性质' }]}
>
<Radio.Group buttonStyle="solid">
{codes.landAttribute.map(item => {
return (
<Radio.Button key={item.code} value={+item.code}>
{item.value}
</Radio.Button>
)
})}
</Radio.Group>
</Form.Item>
</Col>
</Row> </Row>
<Form.Item
label="土地性质"
name={['houseInfo', 'landAttribute']}
rules={[{ required: true, message: '请选择土地性质' }]}
>
<Radio.Group buttonStyle="solid">
{codes.landAttribute.map(item => {
return (
<Radio.Button key={item.code} value={+item.code}>
{item.value}
</Radio.Button>
)
})}
</Radio.Group>
</Form.Item>
<Form.Item className="mb-none" label="地理坐标" required> <Form.Item className="mb-none" label="地理坐标" required>
<Row gutter={16}> <Row gutter={16}>
<Col span={12}> <Col span={12}>
@@ -681,118 +712,6 @@ export default class building extends Component {
</Row> </Row>
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={8}>
<Form.Item label="总户数" required>
<Row align="middle">
<Col flex="1">
<Form.Item
name={['houseInfo', 'houseHolds']}
rules={[{ required: true, message: '请输入总户数' }]}
noStyle
>
<InputNumber
min={0}
precision={0}
step={1}
className="w-100-p"
placeholder="请输入总户数"
/>
</Form.Item>
</Col>
<Col>
<span className="yo-addon">户</span>
</Col>
</Row>
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="房屋单元数" required>
<Row align="middle">
<Col flex="1">
<Form.Item
name={['houseInfo', 'units']}
rules={[
{ required: true, message: '请输入房屋单元数' },
]}
noStyle
>
<InputNumber
min={0}
precision={0}
step={1}
className="w-100-p"
placeholder="请输入房屋单元数"
/>
</Form.Item>
</Col>
<Col>
<span className="yo-addon">单元</span>
</Col>
</Row>
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="每层每单元户数" required>
<Row align="middle">
<Col flex="1">
<Form.Item
name={['houseInfo', 'unitFloorHolds']}
rules={[
{ required: true, message: '请输入每层每单元户数' },
]}
noStyle
>
<InputNumber
min={0}
precision={0}
step={1}
className="w-100-p"
placeholder="请输入每层每单元户数"
/>
</Form.Item>
</Col>
<Col>
<span className="yo-addon">户</span>
</Col>
</Row>
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="建设单位" name={['houseInfo', 'buildingUnit']}>
<Input autoComplete="off" placeholder="请输入建设单位" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="建设单位联系人"
name={['houseInfo', 'buildingUnitUser']}
>
<Input autoComplete="off" placeholder="请输入建设单位联系人" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="建设单位联系电话"
name={['houseInfo', 'buildingUnitTel']}
>
<Input autoComplete="off" placeholder="请输入建设单位联系电话" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="设计单位" name={['houseInfo', 'desingerUnit']}>
<Input autoComplete="off" placeholder="请输入设计单位" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="施工单位" name={['houseInfo', 'constructionUnit']}>
<Input autoComplete="off" placeholder="请输入施工单位" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="监理单位" name={['houseInfo', 'monitorUnit']}>
<Input autoComplete="off" placeholder="请输入监理单位" />
</Form.Item>
</Col>
<Col span={24}> <Col span={24}>
<Form.Item label="建筑层数" className="mb-none"> <Form.Item label="建筑层数" className="mb-none">
<Row> <Row>
@@ -916,6 +835,118 @@ export default class building extends Component {
</Row> </Row>
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={8}>
<Form.Item label="总户数" required>
<Row align="middle">
<Col flex="1">
<Form.Item
name={['houseInfo', 'houseHolds']}
rules={[{ required: true, message: '请输入总户数' }]}
noStyle
>
<InputNumber
min={0}
precision={0}
step={1}
className="w-100-p"
placeholder="请输入总户数"
/>
</Form.Item>
</Col>
<Col>
<span className="yo-addon">户</span>
</Col>
</Row>
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="房屋单元数" required>
<Row align="middle">
<Col flex="1">
<Form.Item
name={['houseInfo', 'units']}
rules={[
{ required: true, message: '请输入房屋单元数' },
]}
noStyle
>
<InputNumber
min={0}
precision={0}
step={1}
className="w-100-p"
placeholder="请输入房屋单元数"
/>
</Form.Item>
</Col>
<Col>
<span className="yo-addon">单元</span>
</Col>
</Row>
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="每层每单元户数" required>
<Row align="middle">
<Col flex="1">
<Form.Item
name={['houseInfo', 'unitFloorHolds']}
rules={[
{ required: true, message: '请输入每层每单元户数' },
]}
noStyle
>
<InputNumber
min={0}
precision={0}
step={1}
className="w-100-p"
placeholder="请输入每层每单元户数"
/>
</Form.Item>
</Col>
<Col>
<span className="yo-addon">户</span>
</Col>
</Row>
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="建设单位" name={['houseInfo', 'buildingUnit']}>
<Input autoComplete="off" placeholder="请输入建设单位" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="建设单位联系人"
name={['houseInfo', 'buildingUnitUser']}
>
<Input autoComplete="off" placeholder="请输入建设单位联系人" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label="建设单位联系电话"
name={['houseInfo', 'buildingUnitTel']}
>
<Input autoComplete="off" placeholder="请输入建设单位联系电话" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="设计单位" name={['houseInfo', 'desingerUnit']}>
<Input autoComplete="off" placeholder="请输入设计单位" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="施工单位" name={['houseInfo', 'constructionUnit']}>
<Input autoComplete="off" placeholder="请输入施工单位" />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item label="监理单位" name={['houseInfo', 'monitorUnit']}>
<Input autoComplete="off" placeholder="请输入监理单位" />
</Form.Item>
</Col>
</Row> </Row>
</Form> </Form>
</Spin> </Spin>

4
web-react/src/pages/business/house/info/form/base/identification.jsx
View File

@@ -135,7 +135,7 @@ export default class identification extends Component {
))} ))}
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item {/* <Form.Item
label="综合等级" label="综合等级"
name={['houseInfo', 'houseGrade']} name={['houseInfo', 'houseGrade']}
rules={[{ required: true, message: '请选择综合等级' }]} rules={[{ required: true, message: '请选择综合等级' }]}
@@ -147,7 +147,7 @@ export default class identification extends Component {
</Radio.Button> </Radio.Button>
))} ))}
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item> */}
</Form> </Form>
</Spin> </Spin>
) )

16
web-react/src/pages/business/house/info/form/base/index.jsx
View File

@@ -13,14 +13,14 @@ const parts = [
title: '权属情况', title: '权属情况',
component: () => import('./ownership'), component: () => import('./ownership'),
}, },
{ // {
title: '调查情况', // title: '调查情况',
component: () => import('./investigation'), // component: () => import('./investigation'),
}, // },
{ // {
title: '鉴定治理', // title: '鉴定治理',
component: () => import('./identification'), // component: () => import('./identification'),
}, // },
{ {
title: '图纸资料存档处', title: '图纸资料存档处',
component: () => import('./drawing'), component: () => import('./drawing'),

13
web-react/src/pages/business/house/info/form/base/investigation.jsx
View File

@@ -4,7 +4,18 @@ import { AntIcon } from 'components'
import { cloneDeep, first, isEqual, last, sortBy } from 'lodash' import { cloneDeep, first, isEqual, last, sortBy } from 'lodash'
import getDictData from 'util/dic' import getDictData from 'util/dic'
const initialValues = {} const initialValues = {
houseInfo: {
houseSite: ['1'],
adjacentConstruction: ['0'],
chemicalErosion: ['0'],
structuralDismantling: 0,
addingLayer: 0,
repairAndReinforce: ['0'],
historicalCalamity: ['0'],
functionalChange: ['0'],
},
}
const layout = { const layout = {
labelCol: { flex: '150px' }, labelCol: { flex: '150px' },

19
web-react/src/pages/business/house/info/form/base/ownership.jsx
View File

@@ -4,7 +4,18 @@ import { AntIcon } from 'components'
import { cloneDeep, isEqual } from 'lodash' import { cloneDeep, isEqual } from 'lodash'
import getDictData from 'util/dic' import getDictData from 'util/dic'
const initialValues = {} const initialValues = {
houseInfo: {
straightHouseCount: 0,
selfHouseCount: 0,
privateHouseCount: 0,
businessCount: 0,
changeHouseCount: 0,
resettlementHouseCount: 0,
otherCount: 0,
houseCount: 0,
},
}
const layout = { const layout = {
labelCol: { flex: '150px' }, labelCol: { flex: '150px' },
@@ -151,7 +162,11 @@ export default class ownership extends Component {
this.onValuesChange(changedValues, allValues) this.onValuesChange(changedValues, allValues)
} }
> >
<Form.Item label="产权性质" name={['houseInfo', 'propertyRights']}> <Form.Item
label="产权性质"
name={['houseInfo', 'propertyRights']}
rules={[{ required: true, message: '请选择产权性质' }]}
>
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.housePropertyRights.map(item => ( {codes.housePropertyRights.map(item => (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>

25
web-react/src/pages/business/house/info/form/index.jsx
View File

@@ -87,6 +87,20 @@ export default class index extends Component {
componentDidMount() { componentDidMount() {
// 获取详细数据 // 获取详细数据
this.onLoadInitData()
}
call(child, index) {
this.children[index] = child
if (this.children.filter(p => p).length === tabs.filter(p => p.show).length) {
this.setState({ saveDisabled: false })
}
}
onLoadInitData() {
this.setState({
loading: true,
})
const { taskId } = this.props.param const { taskId } = this.props.param
if (taskId) { if (taskId) {
api.houseInfoGetByTaskId({ taskId }).then(({ data }) => { api.houseInfoGetByTaskId({ taskId }).then(({ data }) => {
@@ -103,13 +117,6 @@ export default class index extends Component {
} }
} }
call(child, index) {
this.children[index] = child
if (this.children.filter(p => p).length === tabs.filter(p => p.show).length) {
this.setState({ saveDisabled: false })
}
}
async onSave() { async onSave() {
await this.onPostData(actions.save) await this.onPostData(actions.save)
} }
@@ -180,7 +187,7 @@ export default class index extends Component {
if (success) { if (success) {
Message.success(action.remark + '成功') Message.success(action.remark + '成功')
this.setState({ saving: false }) this.setState({ saving: false })
if (this.props.param.table) { if (this.props.param.table.current) {
this.props.param.table.current.onReloadData() this.props.param.table.current.onReloadData()
} }
switch (action.after) { switch (action.after) {
@@ -188,7 +195,7 @@ export default class index extends Component {
window.closeContentWindow() window.closeContentWindow()
break break
default: default:
this.componentDidMount() this.onLoadInitData()
break break
} }
} }

4
web-react/src/pages/business/house/info/form/patrol/index.jsx
View File

@@ -17,6 +17,10 @@ const parts = [
title: '等级划分', title: '等级划分',
component: () => import('./grade'), component: () => import('./grade'),
}, },
{
title: '调查情况',
component: () => import('./investigation'),
},
{ {
title: '处理情况', title: '处理情况',
component: () => import('./handling'), component: () => import('./handling'),

312
web-react/src/pages/business/house/info/form/patrol/investigation.jsx Normal file
View File

@@ -0,0 +1,312 @@
import React, { Component } from 'react'
import { Checkbox, Form, Input, Radio, Spin } from 'antd'
import { AntIcon } from 'components'
import { cloneDeep, first, isEqual, last, sortBy } from 'lodash'
import getDictData from 'util/dic'
const initialValues = {
patrolInfo: {
houseSite: ['1'],
adjacentConstruction: ['0'],
chemicalErosion: ['0'],
structuralDismantling: 0,
addingLayer: 0,
repairAndReinforce: ['0'],
historicalCalamity: ['0'],
functionalChange: ['0'],
},
}
const layout = {
labelCol: { flex: '150px' },
wrapperCol: { flex: '1' },
}
const checkboxKeys = [
'houseSite',
'adjacentConstruction',
'chemicalErosion',
'repairAndReinforce',
'historicalCalamity',
'functionalChange',
]
export default class investigation extends Component {
state = {
loading: true,
codes: {
houseHouseSite: [],
houseAdjacentConstruction: [],
houseChemicalErosion: [],
houseStructuralDismantling: [],
houseAddingLayer: [],
houseRepairAndReinforce: [],
houseHistoricalCalamity: [],
houseFunctionalChange: [],
},
options: {},
}
// 表单实例
form = React.createRef()
// 初始化数据
record = {}
/**
* 阻止外部组件引发的渲染,提升性能
* 可自行添加渲染条件
* [必要]
* @param {*} props
* @param {*} state
* @returns
*/
shouldComponentUpdate(props, state) {
return !isEqual(this.state, state)
}
/**
* DOM加载完成钩子,绑定数据
*/
componentDidMount() {
this.fillData({
record: this.props.record,
})
}
/**
* 加载完成,通知父级组件并传递自身
*/
call() {
const { onRef } = this.props
if (onRef) onRef(this)
}
/**
* 填充数据
* 可以在设置this.record之后对其作出数据结构调整
* [异步,必要]
* @param {*} params
*/
async fillData(params) {
this.record = cloneDeep(params.record)
//#region 从后端转换成前段所需格式
if (this.record) {
const { patrolInfo } = this.record
// checkbox
checkboxKeys.forEach(key => {
if (patrolInfo[key]) {
patrolInfo[key] = patrolInfo[key].split(',')
}
})
}
const codes = await getDictData(
'house_house_site',
'house_adjacent_construction',
'house_chemical_erosion',
'house_structural_dismantling',
'house_adding_layer',
'house_repair_and_reinforce',
'house_historical_calamity',
'house_functional_change'
)
this.setState({ codes })
//#endregion
this.form.current.setFieldsValue(this.record)
this.setState({ loading: false })
this.call()
}
/**
* 获取数据
* 可以对postData进行数据结构调整
* [异步,必要]
* @returns
*/
async getData() {
const form = this.form.current
const valid = await form.validateFields()
if (valid) {
const postData = form.getFieldsValue()
//#region 从前段转换后端所需格式
const { patrolInfo } = postData
// checkbox
checkboxKeys.forEach(key => {
if (patrolInfo[key]) {
patrolInfo[key] = sortBy(patrolInfo[key], p => +p).join(',')
}
})
//#endregion
return postData
}
}
//#region 自定义方法
/**
* 表单change事件处理,包括了所有字段的change
* [异步,非必要]
* @param {*} changedValues
* @param {*} allValues
*/
async onValuesChange(changedValues, allValues) {
const { patrolInfo } = changedValues
const key = Object.keys(patrolInfo).shift()
if (
[
'adjacentConstruction',
'chemicalErosion',
'repairAndReinforce',
'historicalCalamity',
'functionalChange',
].includes(key)
) {
this.checkedNone(patrolInfo[key], key)
}
}
checkedNone(value, key) {
const form = this.form.current
if (first(value) == 0 && value.length > 1) {
// 在'无'之后选中其他值
value.shift()
form.setFieldsValue({
patrolInfo: { [key]: value },
})
} else if (last(value) == 0 && value.length > 1) {
// 在其他值之后选中'无'
value = ['0']
form.setFieldsValue({
patrolInfo: { [key]: value },
})
}
return value
}
//#endregion
render() {
const { loading, codes } = this.state
return (
<Spin spinning={loading} indicator={<AntIcon type="loading" />}>
<Form
initialValues={initialValues}
ref={this.form}
{...layout}
onValuesChange={(changedValues, allValues) =>
this.onValuesChange(changedValues, allValues)
}
>
<Form.Item
label="房屋场地"
name={['patrolInfo', 'houseSite']}
rules={[{ required: true, message: '请选择房屋场地' }]}
>
<Checkbox.Group>
{codes.houseHouseSite.map(item => (
<Checkbox key={item.code} value={item.code}>
{item.value}
</Checkbox>
))}
</Checkbox.Group>
</Form.Item>
<Form.Item
label="相邻施工"
name={['patrolInfo', 'adjacentConstruction']}
rules={[{ required: true, message: '请选择相邻施工' }]}
>
<Checkbox.Group>
{codes.houseAdjacentConstruction.map(item => (
<Checkbox key={item.code} value={item.code}>
{item.value}
</Checkbox>
))}
</Checkbox.Group>
</Form.Item>
<Form.Item
label="化学侵蚀"
name={['patrolInfo', 'chemicalErosion']}
rules={[{ required: true, message: '请选择化学侵蚀' }]}
>
<Checkbox.Group>
{codes.houseChemicalErosion.map(item => (
<Checkbox key={item.code} value={item.code}>
{item.value}
</Checkbox>
))}
</Checkbox.Group>
</Form.Item>
<Form.Item
label="结构拆改"
name={['patrolInfo', 'structuralDismantling']}
rules={[{ required: true, message: '请选择结构拆改' }]}
>
<Radio.Group buttonStyle="solid">
{codes.houseStructuralDismantling.map(item => (
<Radio.Button key={item.code} value={+item.code}>
{item.value}
</Radio.Button>
))}
</Radio.Group>
</Form.Item>
<Form.Item
label="加层改造"
name={['patrolInfo', 'addingLayer']}
rules={[{ required: true, message: '请选择加层改造' }]}
>
<Radio.Group buttonStyle="solid">
{codes.houseAddingLayer.map(item => (
<Radio.Button key={item.code} value={+item.code}>
{item.value}
</Radio.Button>
))}
</Radio.Group>
</Form.Item>
<Form.Item
label="修缮加固"
name={['patrolInfo', 'repairAndReinforce']}
rules={[{ required: true, message: '请选择修缮加固' }]}
>
<Checkbox.Group>
{codes.houseRepairAndReinforce.map(item => (
<Checkbox key={item.code} value={item.code}>
{item.value}
</Checkbox>
))}
</Checkbox.Group>
</Form.Item>
<Form.Item
label="历史灾害"
name={['patrolInfo', 'historicalCalamity']}
rules={[{ required: true, message: '请选择历史灾害' }]}
>
<Checkbox.Group>
{codes.houseHistoricalCalamity.map(item => (
<Checkbox key={item.code} value={item.code}>
{item.value}
</Checkbox>
))}
</Checkbox.Group>
</Form.Item>
<Form.Item
label="使用功能变更"
name={['patrolInfo', 'functionalChange']}
rules={[{ required: true, message: '请选择使用功能变更' }]}
>
<Checkbox.Group>
{codes.houseFunctionalChange.map(item => (
<Checkbox key={item.code} value={item.code}>
{item.value}
</Checkbox>
))}
</Checkbox.Group>
</Form.Item>
<Form.Item label="其他调查内容" name={['patrolInfo', 'otherContents']}>
<Input.TextArea autoSize placeholder="请输入其他调查内容" />
</Form.Item>
</Form>
</Spin>
)
}
}