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

update 去除所有dic前缀

Browse Source
This commit is contained in:
自带大佬气场
2021-06-23 14:08:38 +08:00
parent 02c16da121
commit 3734dda2db
13 changed files with 181 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web-react/src/pages/business/house/code/form/part.jsx
View File

@@ -33,8 +33,8 @@ export default class form extends Component {
// 加载状态 // 加载状态
loading: true, loading: true,
codes: { codes: {
dicHouseType: [], houseType: [],
dicHouseIndustry: [], houseIndustry: [],
}, },
options: { options: {
areaTree: [], areaTree: [],
@@ -106,7 +106,7 @@ export default class form extends Component {
this.setMarker(position) this.setMarker(position)
this.map.setCenter(position) this.map.setCenter(position)
} }
const codes = await getDictData('dic_house_type', 'dic_house_industry') const codes = await getDictData('house_type', 'house_industry')
const { data: areaTree } = await api.getAreaTree() const { data: areaTree } = await api.getAreaTree()
options.areaTree = areaTree options.areaTree = areaTree
this.setState({ this.setState({
@@ -334,7 +334,7 @@ export default class form extends Component {
if (!industry) { if (!industry) {
this.setState({ houseCode: '' }) this.setState({ houseCode: '' })
} else { } else {
const tag = this.state.codes.dicHouseIndustry.find(p => p.code == industry) const tag = this.state.codes.houseIndustry.find(p => p.code == industry)
.extCode.tag .extCode.tag
houseCode += `-${tag}` houseCode += `-${tag}`
this.setState({ houseCode }) this.setState({ houseCode })
@@ -446,7 +446,7 @@ export default class form extends Component {
rules={[{ required: true, message: '请选择房屋性质' }]} rules={[{ required: true, message: '请选择房屋性质' }]}
> >
<Radio.Group disabled={!!this.record} buttonStyle="solid"> <Radio.Group disabled={!!this.record} buttonStyle="solid">
{codes.dicHouseType.map(item => ( {codes.houseType.map(item => (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -460,7 +460,7 @@ export default class form extends Component {
rules={[{ required: true, message: '请选择所属行业、系统' }]} rules={[{ required: true, message: '请选择所属行业、系统' }]}
> >
<Radio.Group disabled={!!this.record} buttonStyle="solid"> <Radio.Group disabled={!!this.record} buttonStyle="solid">
{codes.dicHouseIndustry.map(item => ( {codes.houseIndustry.map(item => (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>

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

@@ -30,8 +30,8 @@ const name = '房屋编码'
export default class index extends Component { export default class index extends Component {
state = { state = {
codes: { codes: {
dicHouseType: [], houseType: [],
dicHouseIndustry: [], houseIndustry: [],
}, },
options: { options: {
@@ -62,10 +62,8 @@ export default class index extends Component {
sorter: true, sorter: true,
width: 150, width: 150,
render: (text, record) => render: (text, record) =>
this.bindCodeValue(text, 'dic_house_type') + this.bindCodeValue(text, 'house_type') +
(text === 2 (text === 2 ? `(${this.bindCodeValue(record.industry, 'house_industry')})` : ''),
? `(${this.bindCodeValue(record.industry, 'dic_house_industry')})`
: ''),
}, },
{ {
title: '地址', title: '地址',
@@ -133,7 +131,7 @@ export default class index extends Component {
componentDidMount() { componentDidMount() {
const { onLoading, onLoadData } = this.table.current const { onLoading, onLoadData } = this.table.current
onLoading() onLoading()
getDictData('dic_house_type', 'dic_house_industry').then(async res => { getDictData('house_type', 'house_industry').then(async res => {
const { data } = await api.getAreaTree() const { data } = await api.getAreaTree()
this.setState( this.setState(
{ {
@@ -303,7 +301,7 @@ export default class index extends Component {
<Form.Item label="房屋性质" name="type"> <Form.Item label="房屋性质" name="type">
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
<Radio.Button value="">全部</Radio.Button> <Radio.Button value="">全部</Radio.Button>
{codes.dicHouseType.map(item => ( {codes.houseType.map(item => (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -317,7 +315,7 @@ export default class index extends Component {
className="w-150" className="w-150"
placeholder="请选择行业" placeholder="请选择行业"
> >
{codes.dicHouseIndustry.map(item => ( {codes.houseIndustry.map(item => (
<Select.Option key={item.code} value={item.code}> <Select.Option key={item.code} value={item.code}>
{item.value} {item.value}
</Select.Option> </Select.Option>

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

@@ -32,15 +32,15 @@ export default class building extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
dicLandAttribute: [], landAttribute: [],
dicHouseStructureType: [], houseStructureType: [],
dicHouseAseismicGrade: [], houseAseismicGrade: [],
dicHouseBaseInfo: [], houseBaseInfo: [],
dicHouseInsulationMaterial: [], houseInsulationMaterial: [],
dicHouseWallMaterial: [], houseWallMaterial: [],
dicHouseFireproofGrade: [], houseFireproofGrade: [],
dicHouseBuildingCurtainWall: [], houseBuildingCurtainWall: [],
dicHouseElevator: [], houseElevator: [],
}, },
showMap: false, showMap: false,
@@ -107,15 +107,15 @@ export default class building extends Component {
} }
} }
_state.codes = await getDictData( _state.codes = await getDictData(
'dic_land_attribute', 'land_attribute',
'dic_house_structure_type', 'house_structure_type',
'dic_house_aseismic_grade', 'house_aseismic_grade',
'dic_house_base_info', 'house_base_info',
'dic_house_insulation_material', 'house_insulation_material',
'dic_house_wall_material', 'house_wall_material',
'dic_house_fireproof_grade', 'house_fireproof_grade',
'dic_house_building_curtain_wall', 'house_building_curtain_wall',
'dic_house_elevator' 'house_elevator'
) )
//#endregion //#endregion
@@ -385,7 +385,7 @@ export default class building extends Component {
rules={[{ required: true, message: '请选择土地性质' }]} rules={[{ required: true, message: '请选择土地性质' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicLandAttribute.map(item => { {codes.landAttribute.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -456,7 +456,7 @@ export default class building extends Component {
rules={[{ required: true, message: '请选择结构类型' }]} rules={[{ required: true, message: '请选择结构类型' }]}
> >
<Radio.Group buttonStyle="solid" placeholder="请选择结构类型"> <Radio.Group buttonStyle="solid" placeholder="请选择结构类型">
{codes.dicHouseStructureType.map(item => { {codes.houseStructureType.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -473,7 +473,7 @@ export default class building extends Component {
rules={[{ required: true, message: '请选择抗震等级' }]} rules={[{ required: true, message: '请选择抗震等级' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseAseismicGrade.map(item => { {codes.houseAseismicGrade.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -490,7 +490,7 @@ export default class building extends Component {
rules={[{ required: true, message: '请选择基础情况' }]} rules={[{ required: true, message: '请选择基础情况' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseBaseInfo.map(item => { {codes.houseBaseInfo.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -504,7 +504,7 @@ export default class building extends Component {
<Form.Item label="外墙保温材料" name={['houseInfo', 'insulationMaterial']}> <Form.Item label="外墙保温材料" name={['houseInfo', 'insulationMaterial']}>
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseInsulationMaterial.map(item => { {codes.houseInsulationMaterial.map(item => {
return ( return (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
@@ -524,7 +524,7 @@ export default class building extends Component {
)} )}
<Form.Item label="外墙墙体材料" name={['houseInfo', 'wallMaterial']}> <Form.Item label="外墙墙体材料" name={['houseInfo', 'wallMaterial']}>
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseWallMaterial.map(item => { {codes.houseWallMaterial.map(item => {
return ( return (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
@@ -544,7 +544,7 @@ export default class building extends Component {
name={['houseInfo', 'fireproofGrade']} name={['houseInfo', 'fireproofGrade']}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseFireproofGrade.map(item => { {codes.houseFireproofGrade.map(item => {
return ( return (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>
{item.value} {item.value}
@@ -559,7 +559,7 @@ export default class building extends Component {
rules={[{ required: true, message: '请选择建筑幕墙' }]} rules={[{ required: true, message: '请选择建筑幕墙' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseBuildingCurtainWall.map(item => { {codes.houseBuildingCurtainWall.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -603,7 +603,7 @@ export default class building extends Component {
rules={[{ required: true, message: '请选择电梯' }]} rules={[{ required: true, message: '请选择电梯' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseElevator.map(item => { {codes.houseElevator.map(item => {
return ( return (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>
{item.value} {item.value}

6
web-react/src/pages/business/house/info/form/base/drawing.jsx
View File

@@ -15,7 +15,7 @@ export default class drawing extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
dicHouseStorageOfDrawings: [], houseStorageOfDrawings: [],
}, },
options: {}, options: {},
@@ -77,7 +77,7 @@ export default class drawing extends Component {
!!houseInfo.drawingMaterial && houseInfo.drawingMaterial.includes('100'), !!houseInfo.drawingMaterial && houseInfo.drawingMaterial.includes('100'),
}) })
} }
const codes = await getDictData('dic_house_storage_of_drawings') const codes = await getDictData('house_storage_of_drawings')
console.log(codes) console.log(codes)
this.setState({ codes }) this.setState({ codes })
//#endregion //#endregion
@@ -144,7 +144,7 @@ export default class drawing extends Component {
rules={[{ required: true, message: '请选择图纸资料存档处' }]} rules={[{ required: true, message: '请选择图纸资料存档处' }]}
> >
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseStorageOfDrawings.map(item => ( {codes.houseStorageOfDrawings.map(item => (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
</Checkbox> </Checkbox>

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

@@ -15,10 +15,10 @@ export default class identification extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
dicHouseIdentification: [], houseIdentification: [],
dicHouseGovernment: [], houseGovernment: [],
dicHouseUsedStatus: [], houseUsedStatus: [],
dicHouseGrade: [], houseGrade: [],
}, },
options: {}, options: {},
} }
@@ -68,10 +68,10 @@ export default class identification extends Component {
this.record = cloneDeep(params.record) this.record = cloneDeep(params.record)
//#region 从后端转换成前段所需格式 //#region 从后端转换成前段所需格式
const codes = await getDictData( const codes = await getDictData(
'dic_house_identification', 'house_identification',
'dic_house_government', 'house_government',
'dic_house_used_status', 'house_used_status',
'dic_house_grade' 'house_grade'
) )
this.setState({ codes }) this.setState({ codes })
//#endregion //#endregion
@@ -128,7 +128,7 @@ export default class identification extends Component {
rules={[{ required: true, message: '请选择房屋使用状态' }]} rules={[{ required: true, message: '请选择房屋使用状态' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseUsedStatus.map(item => ( {codes.houseUsedStatus.map(item => (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -141,7 +141,7 @@ export default class identification extends Component {
rules={[{ required: true, message: '请选择综合等级' }]} rules={[{ required: true, message: '请选择综合等级' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseGrade.map(item => ( {codes.houseGrade.map(item => (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>

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

@@ -24,14 +24,14 @@ export default class investigation extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
dicHouseHouseSite: [], houseHouseSite: [],
dicHouseAdjacentConstruction: [], houseAdjacentConstruction: [],
dicHouseChemicalErosion: [], houseChemicalErosion: [],
dicHouseStructuralDismantling: [], houseStructuralDismantling: [],
dicHouseAddingLayer: [], houseAddingLayer: [],
dicHouseRepairAndReinforce: [], houseRepairAndReinforce: [],
dicHouseHistoricalCalamity: [], houseHistoricalCalamity: [],
dicHouseFunctionalChange: [], houseFunctionalChange: [],
}, },
options: {}, options: {},
} }
@@ -90,14 +90,14 @@ export default class investigation extends Component {
}) })
} }
const codes = await getDictData( const codes = await getDictData(
'dic_house_house_site', 'house_house_site',
'dic_house_adjacent_construction', 'house_adjacent_construction',
'dic_house_chemical_erosion', 'house_chemical_erosion',
'dic_house_structural_dismantling', 'house_structural_dismantling',
'dic_house_adding_layer', 'house_adding_layer',
'dic_house_repair_and_reinforce', 'house_repair_and_reinforce',
'dic_house_historical_calamity', 'house_historical_calamity',
'dic_house_functional_change' 'house_functional_change'
) )
this.setState({ codes }) this.setState({ codes })
//#endregion //#endregion
@@ -193,7 +193,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择房屋场地' }]} rules={[{ required: true, message: '请选择房屋场地' }]}
> >
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseHouseSite.map(item => ( {codes.houseHouseSite.map(item => (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
</Checkbox> </Checkbox>
@@ -206,7 +206,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择相邻施工' }]} rules={[{ required: true, message: '请选择相邻施工' }]}
> >
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseAdjacentConstruction.map(item => ( {codes.houseAdjacentConstruction.map(item => (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
</Checkbox> </Checkbox>
@@ -219,7 +219,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择化学侵蚀' }]} rules={[{ required: true, message: '请选择化学侵蚀' }]}
> >
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseChemicalErosion.map(item => ( {codes.houseChemicalErosion.map(item => (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
</Checkbox> </Checkbox>
@@ -232,7 +232,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择结构拆改' }]} rules={[{ required: true, message: '请选择结构拆改' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseStructuralDismantling.map(item => ( {codes.houseStructuralDismantling.map(item => (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -245,7 +245,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择加层改造' }]} rules={[{ required: true, message: '请选择加层改造' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseAddingLayer.map(item => ( {codes.houseAddingLayer.map(item => (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -258,7 +258,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择修缮加固' }]} rules={[{ required: true, message: '请选择修缮加固' }]}
> >
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseRepairAndReinforce.map(item => ( {codes.houseRepairAndReinforce.map(item => (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
</Checkbox> </Checkbox>
@@ -271,7 +271,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择历史灾害' }]} rules={[{ required: true, message: '请选择历史灾害' }]}
> >
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseHistoricalCalamity.map(item => ( {codes.houseHistoricalCalamity.map(item => (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
</Checkbox> </Checkbox>
@@ -284,7 +284,7 @@ export default class investigation extends Component {
rules={[{ required: true, message: '请选择使用功能变更' }]} rules={[{ required: true, message: '请选择使用功能变更' }]}
> >
<Checkbox.Group> <Checkbox.Group>
{codes.dicHouseFunctionalChange.map(item => ( {codes.houseFunctionalChange.map(item => (
<Checkbox key={item.code} value={item.code}> <Checkbox key={item.code} value={item.code}>
{item.value} {item.value}
</Checkbox> </Checkbox>

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

@@ -15,7 +15,7 @@ export default class ownership extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
dicHousePropertyRights: [], housePropertyRights: [],
}, },
options: {}, options: {},
} }
@@ -64,7 +64,7 @@ export default class ownership extends Component {
async fillData(params) { async fillData(params) {
this.record = cloneDeep(params.record) this.record = cloneDeep(params.record)
//#region 从后端转换成前段所需格式 //#region 从后端转换成前段所需格式
const codes = await getDictData('dic_house_property_rights') const codes = await getDictData('house_property_rights')
this.setState({ codes }) this.setState({ codes })
//#endregion //#endregion
this.form.current && this.form.current.setFieldsValue(this.record) this.form.current && this.form.current.setFieldsValue(this.record)
@@ -116,7 +116,7 @@ export default class ownership extends Component {
> >
<Form.Item label="产权性质" name={['houseInfo', 'propertyRights']}> <Form.Item label="产权性质" name={['houseInfo', 'propertyRights']}>
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHousePropertyRights.map(item => ( {codes.housePropertyRights.map(item => (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>

18
web-react/src/pages/business/house/info/form/patrol/grade.jsx
View File

@@ -16,9 +16,9 @@ export default class handling extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
dicHousePatrolInitGrade: [], housePatrolInitGrade: [],
dicHousePatrolDamageGrade: [], housePatrolDamageGrade: [],
dicHouseGrade: [], houseGrade: [],
}, },
} }
form = React.createRef() form = React.createRef()
@@ -72,9 +72,9 @@ export default class handling extends Component {
patrolInfo.initGrade = this.getInitGrade(getState('business').completedDate) patrolInfo.initGrade = this.getInitGrade(getState('business').completedDate)
} }
_state.codes = await getDictData( _state.codes = await getDictData(
'dic_house_patrol_init_grade', 'house_patrol_init_grade',
'dic_house_patrol_damage_grade', 'house_patrol_damage_grade',
'dic_house_grade' 'house_grade'
) )
//#endregion //#endregion
this.form.current && this.form.current.setFieldsValue(this.record) this.form.current && this.form.current.setFieldsValue(this.record)
@@ -134,7 +134,7 @@ export default class handling extends Component {
> >
<Tooltip title="初始等级无法手动更改，由房屋详情的竣工日期决定：2000年之后竣工的为一级，1995年~1999年竣工的为二级，1980年~1994年竣工的为三级，早于1980年竣工的为四级。选择房屋竣工日期后，初始等级会自动填充。"> <Tooltip title="初始等级无法手动更改，由房屋详情的竣工日期决定：2000年之后竣工的为一级，1995年~1999年竣工的为二级，1980年~1994年竣工的为三级，早于1980年竣工的为四级。选择房屋竣工日期后，初始等级会自动填充。">
<Radio.Group disabled buttonStyle="solid"> <Radio.Group disabled buttonStyle="solid">
{codes.dicHousePatrolInitGrade.map(item => { {codes.housePatrolInitGrade.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -151,7 +151,7 @@ export default class handling extends Component {
rules={[{ required: true, message: '请选择损坏等级' }]} rules={[{ required: true, message: '请选择损坏等级' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHousePatrolDamageGrade.map(item => { {codes.housePatrolDamageGrade.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -167,7 +167,7 @@ export default class handling extends Component {
rules={[{ required: true, message: '请选择综合等级' }]} rules={[{ required: true, message: '请选择综合等级' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHouseGrade.map(item => { {codes.houseGrade.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}

12
web-react/src/pages/business/house/info/form/patrol/handling.jsx
View File

@@ -13,8 +13,8 @@ export default class handling extends Component {
state = { state = {
loading: true, loading: true,
codes: { codes: {
dicHousePatrolHandlingOpinion: [], housePatrolHandlingOpinion: [],
dicHousePatrolRectifyReform: [], housePatrolRectifyReform: [],
}, },
} }
form = React.createRef() form = React.createRef()
@@ -46,8 +46,8 @@ export default class handling extends Component {
const _state = { loading: false } const _state = { loading: false }
//#region 从后端转换成前段所需格式 //#region 从后端转换成前段所需格式
_state.codes = await getDictData( _state.codes = await getDictData(
'dic_house_patrol_handling_opinion', 'house_patrol_handling_opinion',
'dic_house_patrol_rectify_Reform' 'house_patrol_rectify_Reform'
) )
//#endregion //#endregion
this.form.current && this.form.current.setFieldsValue(this.record) this.form.current && this.form.current.setFieldsValue(this.record)
@@ -85,7 +85,7 @@ export default class handling extends Component {
rules={[{ required: true, message: '请选择处理建议' }]} rules={[{ required: true, message: '请选择处理建议' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHousePatrolHandlingOpinion.map(item => { {codes.housePatrolHandlingOpinion.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}
@@ -108,7 +108,7 @@ export default class handling extends Component {
rules={[{ required: true, message: '请选择整改情况' }]} rules={[{ required: true, message: '请选择整改情况' }]}
> >
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
{codes.dicHousePatrolRectifyReform.map(item => { {codes.housePatrolRectifyReform.map(item => {
return ( return (
<Radio.Button key={item.code} value={+item.code}> <Radio.Button key={item.code} value={+item.code}>
{item.value} {item.value}

12
web-react/src/pages/business/house/member/selector/selected-list.jsx
View File

@@ -27,8 +27,8 @@ const authName = 'houseSelector'
export default class index extends Component { export default class index extends Component {
state = { state = {
codes: { codes: {
dicHouseType: [], houseType: [],
dicHouseIndustry: [], houseIndustry: [],
}, },
saving: false, saving: false,
@@ -57,7 +57,7 @@ export default class index extends Component {
dataIndex: 'type', dataIndex: 'type',
sorter: true, sorter: true,
width: 150, width: 150,
render: text => this.bindCodeValue(text, 'dic_house_type'), render: text => this.bindCodeValue(text, 'house_type'),
}, },
{ {
title: '地址', title: '地址',
@@ -91,7 +91,7 @@ export default class index extends Component {
componentDidMount() { componentDidMount() {
const { onLoading, onLoadData } = this.table.current const { onLoading, onLoadData } = this.table.current
onLoading() onLoading()
getDictData('dic_house_type', 'dic_house_industry').then(codes => { getDictData('house_type', 'house_industry').then(codes => {
this.setState({ codes }, () => { this.setState({ codes }, () => {
onLoadData() onLoadData()
}) })
@@ -218,7 +218,7 @@ export default class index extends Component {
<Form.Item label="房屋性质" name="type"> <Form.Item label="房屋性质" name="type">
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
<Radio.Button value="">全部</Radio.Button> <Radio.Button value="">全部</Radio.Button>
{codes.dicHouseType.map(item => ( {codes.houseType.map(item => (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -228,7 +228,7 @@ export default class index extends Component {
{type == 2 && ( {type == 2 && (
<Form.Item label="行业" name="industry"> <Form.Item label="行业" name="industry">
<Select allowClear className="w-150" placeholder="请选择行业"> <Select allowClear className="w-150" placeholder="请选择行业">
{codes.dicHouseIndustry.map(item => ( {codes.houseIndustry.map(item => (
<Select.Option key={item.code} value={item.code}> <Select.Option key={item.code} value={item.code}>
{item.value} {item.value}
</Select.Option> </Select.Option>

12
web-react/src/pages/business/house/member/selector/selector-list.jsx
View File

@@ -27,8 +27,8 @@ const authName = 'houseSelector'
export default class index extends Component { export default class index extends Component {
state = { state = {
codes: { codes: {
dicHouseType: [], houseType: [],
dicHouseIndustry: [], houseIndustry: [],
}, },
saving: false, saving: false,
@@ -57,7 +57,7 @@ export default class index extends Component {
dataIndex: 'type', dataIndex: 'type',
sorter: true, sorter: true,
width: 150, width: 150,
render: text => this.bindCodeValue(text, 'dic_house_type'), render: text => this.bindCodeValue(text, 'house_type'),
}, },
{ {
title: '地址', title: '地址',
@@ -91,7 +91,7 @@ export default class index extends Component {
componentDidMount() { componentDidMount() {
const { onLoading, onLoadData } = this.table.current const { onLoading, onLoadData } = this.table.current
onLoading() onLoading()
getDictData('dic_house_type', 'dic_house_industry').then(codes => { getDictData('house_type', 'house_industry').then(codes => {
this.setState({ codes }, () => { this.setState({ codes }, () => {
onLoadData() onLoadData()
}) })
@@ -218,7 +218,7 @@ export default class index extends Component {
<Form.Item label="房屋性质" name="type"> <Form.Item label="房屋性质" name="type">
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
<Radio.Button value="">全部</Radio.Button> <Radio.Button value="">全部</Radio.Button>
{codes.dicHouseType.map(item => ( {codes.houseType.map(item => (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -228,7 +228,7 @@ export default class index extends Component {
{type == 2 && ( {type == 2 && (
<Form.Item label="行业" name="industry"> <Form.Item label="行业" name="industry">
<Select allowClear className="w-150" placeholder="请选择行业"> <Select allowClear className="w-150" placeholder="请选择行业">
{codes.dicHouseIndustry.map(item => ( {codes.houseIndustry.map(item => (
<Select.Option key={item.code} value={item.code}> <Select.Option key={item.code} value={item.code}>
{item.value} {item.value}
</Select.Option> </Select.Option>

63
web-react/src/pages/business/house/project/index.jsx
View File

@@ -1,6 +1,14 @@
import React, { Component } from 'react' import React, { Component } from 'react'
import { Button, Card, Form, Input, message as Message, Popconfirm } from 'antd' import { Button, Card, Form, Input, message as Message, Popconfirm } from 'antd'
import { AntIcon, Auth, Container, ModalForm, QueryTable, QueryTableActions, QueryTreeLayout } from 'components' import {
AntIcon,
Auth,
Container,
ModalForm,
QueryTable,
QueryTableActions,
QueryTreeLayout,
} from 'components'
import { api } from 'common/api' import { api } from 'common/api'
import auth from 'components/authorized/handler' import auth from 'components/authorized/handler'
import { toCamelCase } from 'util/format' import { toCamelCase } from 'util/format'
@@ -13,17 +21,16 @@ const apiAction = {
page: api.getHouseProjectPage, page: api.getHouseProjectPage,
add: api.houseProejctAdd, add: api.houseProejctAdd,
edit: api.houseProejctEdit, edit: api.houseProejctEdit,
delete: api.houseProejctDelete delete: api.houseProejctDelete,
} }
const name = '项目' const name = '项目'
export default class index extends Component { export default class index extends Component {
state = { state = {
codes: { codes: {
dicHouseType: [] houseType: [],
} },
} }
// 表格实例 // 表格实例
@@ -37,7 +44,6 @@ export default class index extends Component {
// 树选中节点 // 树选中节点
selectCode = undefined selectCode = undefined
columns = [ columns = [
{ {
title: '项目名称', title: '项目名称',
dataIndex: 'name', dataIndex: 'name',
@@ -57,8 +63,8 @@ export default class index extends Component {
title: '类型', title: '类型',
dataIndex: 'type', dataIndex: 'type',
sorter: true, sorter: true,
render: text => (<>{this.bindCodeValue(text, 'dic_house_type')}</>) render: text => <>{this.bindCodeValue(text, 'house_type')}</>,
} },
] ]
/** /**
* 构造函数,在渲染前动态添加操作字段等 * 构造函数,在渲染前动态添加操作字段等
@@ -74,7 +80,8 @@ export default class index extends Component {
title: '操作', title: '操作',
width: 150, width: 150,
dataIndex: 'actions', dataIndex: 'actions',
render: (text, record) => (<QueryTableActions> render: (text, record) => (
<QueryTableActions>
<Auth auth="houseProjectInfo:edit"> <Auth auth="houseProjectInfo:edit">
<a onClick={() => this.onOpen(this.editForm, record)}>编辑</a> <a onClick={() => this.onOpen(this.editForm, record)}>编辑</a>
</Auth> </Auth>
@@ -87,7 +94,8 @@ export default class index extends Component {
<a>删除</a> <a>删除</a>
</Popconfirm> </Popconfirm>
</Auth> </Auth>
</QueryTableActions>) </QueryTableActions>
),
}) })
} }
} }
@@ -109,12 +117,15 @@ export default class index extends Component {
*/ */
componentDidMount() { componentDidMount() {
this.table.current.onLoading() this.table.current.onLoading()
getDictData('dic_house_type').then(res => { getDictData('house_type').then(res => {
this.setState({ this.setState(
codes: res {
}, () => { codes: res,
},
() => {
this.table.current.onLoadData() this.table.current.onLoadData()
}) }
)
}) })
} }
/** /**
@@ -125,10 +136,9 @@ export default class index extends Component {
* @returns * @returns
*/ */
loadData = async (params, query) => { loadData = async (params, query) => {
query = { query = {
...query, ...query,
pid: this.selectCode pid: this.selectCode,
} }
//首次加载根据code列升序排序 //首次加载根据code列升序排序
// if (!params.sortField) { // if (!params.sortField) {
@@ -172,7 +182,7 @@ export default class index extends Component {
name = toCamelCase(name) name = toCamelCase(name)
const codes = this.state.codes[name] const codes = this.state.codes[name]
if (codes) { if (codes) {
const c = codes.find((p) => +p.code === code) const c = codes.find(p => +p.code === code)
if (c) { if (c) {
return c.value return c.value
} }
@@ -188,7 +198,7 @@ export default class index extends Component {
onOpen(modal, record) { onOpen(modal, record) {
modal.current.open({ modal.current.open({
pid: this.selectCode, pid: this.selectCode,
record record,
}) })
} }
@@ -214,10 +224,7 @@ export default class index extends Component {
* @param {*} record * @param {*} record
*/ */
onDelete(record) { onDelete(record) {
this.onAction( this.onAction(apiAction.delete(record), '删除成功')
apiAction.delete(record),
'删除成功'
)
} }
render() { render() {
@@ -225,7 +232,7 @@ export default class index extends Component {
<QueryTreeLayout <QueryTreeLayout
loadData={this.loadTreeData} loadData={this.loadTreeData}
defaultExpanded={true} defaultExpanded={true}
onSelect={(key) => this.onSelectTree(key)} onSelect={key => this.onSelectTree(key)}
replaceFields={{ value: 'code', title: 'name', children: 'children' }} replaceFields={{ value: 'code', title: 'name', children: 'children' }}
> >
<Container mode="fluid"> <Container mode="fluid">
@@ -250,12 +257,12 @@ export default class index extends Component {
<Button <Button
icon={<AntIcon type="plus" />} icon={<AntIcon type="plus" />}
onClick={() => this.onOpen(this.addForm)} onClick={() => this.onOpen(this.addForm)}
>新增{name}</Button> >
新增{name}
</Button>
</Auth> </Auth>
} }
> ></QueryTable>
</QueryTable>
</Card> </Card>
</Container> </Container>
<ModalForm <ModalForm

12
web-react/src/pages/business/house/task/index.jsx
View File

@@ -27,8 +27,8 @@ const authName = 'houseTask'
export default class index extends Component { export default class index extends Component {
state = { state = {
codes: { codes: {
dicHouseType: [], houseType: [],
dicHouseIndustry: [], houseIndustry: [],
}, },
type: '', type: '',
@@ -63,7 +63,7 @@ export default class index extends Component {
dataIndex: 'type', dataIndex: 'type',
sorter: true, sorter: true,
width: 150, width: 150,
render: text => this.bindCodeValue(text, 'dic_house_type'), render: text => this.bindCodeValue(text, 'house_type'),
}, },
{ {
title: '地址', title: '地址',
@@ -122,7 +122,7 @@ export default class index extends Component {
componentDidMount() { componentDidMount() {
const { onLoading, onLoadData } = this.table.current const { onLoading, onLoadData } = this.table.current
onLoading() onLoading()
getDictData('dic_house_type', 'dic_house_industry').then(codes => { getDictData('house_type', 'house_industry').then(codes => {
this.setState({ codes }, () => { this.setState({ codes }, () => {
onLoadData() onLoadData()
}) })
@@ -227,7 +227,7 @@ export default class index extends Component {
<Form.Item label="房屋性质" name="type"> <Form.Item label="房屋性质" name="type">
<Radio.Group buttonStyle="solid"> <Radio.Group buttonStyle="solid">
<Radio.Button value="">全部</Radio.Button> <Radio.Button value="">全部</Radio.Button>
{codes.dicHouseType.map(item => ( {codes.houseType.map(item => (
<Radio.Button key={item.code} value={item.code}> <Radio.Button key={item.code} value={item.code}>
{item.value} {item.value}
</Radio.Button> </Radio.Button>
@@ -241,7 +241,7 @@ export default class index extends Component {
className="w-150" className="w-150"
placeholder="请选择行业" placeholder="请选择行业"
> >
{codes.dicHouseIndustry.map(item => ( {codes.houseIndustry.map(item => (
<Select.Option key={item.code} value={item.code}> <Select.Option key={item.code} value={item.code}>
{item.value} {item.value}
</Select.Option> </Select.Option>