{/* 底部工具栏(需放在前面) */}
-
+
+
- {/* 可以在工具栏中增加其他控件(只能在一行内) */}
-
-
-
-
+
+
-
+
+
+ }>
+
+
+ {record && record.houseCode.areaName}
+
+
+ {record && record.houseCode.roadName}
+
+
+ {record && record.houseCode.commName}
+
+
+ {record && record.houseCode.zoneName}
+
+
+ {record &&
+ `${record.houseCode.areaName}-${
+ record.houseCode.roadName
+ }-${record.houseCode.commName}-${
+ record.houseCode.projectFullName
+ }-${record.houseCode.no.toString().padStart(3, '0')}`}
+
+
+ {record && record.houseCode.houseCode}
+
+
+
+
+
{ this.setState({ actived: activeKey }) }}
+ onChange={activeKey => {
+ this.setState({ actived: activeKey })
+ }}
>
- {
- tabs.map((tab, i) => {
- if (tab.show) {
- return (
-
- )
- }
- return <>
- })
- }
+ {tabs.map((tab, i) => {
+ if (tab.show) {
+ return (
+
+ )
+ }
+ return <>
+ })}
- {
- tabs.map((tab, i) => {
- if (tab.show) {
- return (
-
- this.forms.push(c)} />
-
- )
- }
- return <>
- })
- }
+ {tabs.map((tab, i) => {
+ if (tab.show) {
+ return (
+
+ this.call(child, i)}
+ />
+
+ )
+ }
+ return <>
+ })}
diff --git a/web-react/src/pages/business/house/info/form/patrol/base.jsx b/web-react/src/pages/business/house/info/form/patrol/base.jsx
new file mode 100644
index 0000000..e231a6d
--- /dev/null
+++ b/web-react/src/pages/business/house/info/form/patrol/base.jsx
@@ -0,0 +1,112 @@
+import React, { Component } from 'react'
+import { Row, Col, Form, Input, DatePicker, Spin } from 'antd'
+import { cloneDeep, isEqual } from 'lodash'
+import { AntIcon } from 'components'
+import moment from 'moment'
+import { CITY } from 'util/global'
+
+const layout = {
+ labelCol: { flex: '150px' },
+ wrapperCol: { flex: '1' },
+}
+
+export default class base extends Component {
+ state = {
+ loading: true,
+ }
+
+ form = React.createRef()
+
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ componentDidMount() {
+ this.fillData({
+ record: this.props.record,
+ })
+ }
+
+ call() {
+ if (this.props.onRef) {
+ this.props.onRef(this)
+ }
+ }
+
+ /**
+ * 填充数据
+ * 可以在设置this.record之后对其作出数据结构调整
+ * [异步,必要]
+ * @param {*} params
+ */
+ async fillData(params) {
+ this.record = cloneDeep(params.record)
+ //#region 从后端转换成前段所需格式
+ if (this.record) {
+ const { patrolDate } = this.record.patrolInfo
+ this.record.patrolInfo.patrolDate = patrolDate ? moment(patrolDate) : patrolDate
+ }
+ //#endregion
+ this.form.current && 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 从前段转换后端所需格式
+ if (postData.patrolInfo.patrolDate) {
+ postData.patrolInfo.patrolDate = postData.patrolInfo.patrolDate.format('YYYY-MM-DD')
+ }
+ //#endregion
+ return postData
+ }
+ }
+
+ render() {
+ const { loading } = this.state
+ return (
+
}>
+
+
+ )
+ }
+}
diff --git a/web-react/src/pages/business/house/info/form/patrol/grade.jsx b/web-react/src/pages/business/house/info/form/patrol/grade.jsx
new file mode 100644
index 0000000..6e23fc6
--- /dev/null
+++ b/web-react/src/pages/business/house/info/form/patrol/grade.jsx
@@ -0,0 +1,183 @@
+import React, { Component } from 'react'
+import { Form, Tooltip, Radio, Spin } from 'antd'
+import { AntIcon } from 'components'
+import { cloneDeep, first, isEqual, last, sortBy } from 'lodash'
+import getDictData from 'util/dic'
+import store from 'store'
+
+const { getState, subscribe } = store
+
+const layout = {
+ labelCol: { flex: '150px' },
+ wrapperCol: { flex: '1' },
+}
+
+export default class handling extends Component {
+ state = {
+ loading: true,
+ codes: {
+ housePatrolInitGrade: [],
+ housePatrolDamageGrade: [],
+ houseGrade: [],
+ },
+ }
+ form = React.createRef()
+
+ constructor(props) {
+ super(props)
+
+ this.unsubscribe = subscribe('business', business => {
+ const initGrade = this.getInitGrade(business.completedDate)
+ this.form.current.setFieldsValue({
+ patrolInfo: {
+ initGrade,
+ },
+ })
+ })
+ }
+
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ componentDidMount() {
+ this.fillData({
+ record: this.props.record,
+ })
+ }
+
+ componentWillUnmount() {
+ this.unsubscribe()
+ }
+
+ call() {
+ if (this.props.onRef) {
+ this.props.onRef(this)
+ }
+ }
+
+ /**
+ * 填充数据
+ * 可以在设置this.record之后对其作出数据结构调整
+ * [异步,必要]
+ * @param {*} params
+ */
+ async fillData(params) {
+ this.record = cloneDeep(params.record)
+
+ const _state = { loading: false }
+ //#region 从后端转换成前段所需格式
+ if (this.record) {
+ const { patrolInfo } = this.record
+ patrolInfo.initGrade = this.getInitGrade(getState('business').completedDate)
+ }
+ _state.codes = await getDictData(
+ 'house_patrol_init_grade',
+ 'house_patrol_damage_grade',
+ 'house_grade'
+ )
+ //#endregion
+ this.form.current && this.form.current.setFieldsValue(this.record)
+
+ this.setState(_state)
+ this.call()
+ }
+
+ /**
+ * 获取数据
+ * 可以对postData进行数据结构调整
+ * [异步,必要]
+ * @returns
+ */
+ async getData() {
+ const form = this.form.current
+
+ const valid = await form.validateFields()
+ if (valid) {
+ const postData = form.getFieldsValue()
+ //#region 从前段转换后端所需格式
+
+ //#endregion
+ return postData
+ }
+ }
+
+ getInitGrade(completedDate) {
+ const date = completedDate.find(p => p.id === this.props.id)
+ if (date) {
+ const { value: year } = date
+ if (year > 1999) {
+ return 1
+ }
+ if (year > 1994 && year < 2000) {
+ return 2
+ }
+ if (year > 1979 && year < 1995) {
+ return 3
+ }
+ if (year < 1980) {
+ return 4
+ }
+ }
+ }
+
+ render() {
+ const { loading, codes, initGradeValue } = this.state
+ console.log(initGradeValue)
+ return (
+
}>
+
+
+ )
+ }
+}
diff --git a/web-react/src/pages/business/house/info/form/patrol/handling.jsx b/web-react/src/pages/business/house/info/form/patrol/handling.jsx
new file mode 100644
index 0000000..0bce3c6
--- /dev/null
+++ b/web-react/src/pages/business/house/info/form/patrol/handling.jsx
@@ -0,0 +1,131 @@
+import React, { Component } from 'react'
+import { Form, Input, Radio, Spin } from 'antd'
+import { AntIcon } from 'components'
+import { cloneDeep, first, isEqual, last, sortBy } from 'lodash'
+import getDictData from 'util/dic'
+
+const layout = {
+ labelCol: { flex: '150px' },
+ wrapperCol: { flex: '1' },
+}
+
+export default class handling extends Component {
+ state = {
+ loading: true,
+ codes: {
+ housePatrolHandlingOpinion: [],
+ housePatrolRectifyReform: [],
+ },
+ }
+ form = React.createRef()
+
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ componentDidMount() {
+ this.fillData({
+ record: this.props.record,
+ })
+ }
+
+ call() {
+ if (this.props.onRef) {
+ this.props.onRef(this)
+ }
+ }
+
+ /**
+ * 填充数据
+ * 可以在设置this.record之后对其作出数据结构调整
+ * [异步,必要]
+ * @param {*} params
+ */
+ async fillData(params) {
+ this.record = cloneDeep(params.record)
+ const _state = { loading: false }
+ //#region 从后端转换成前段所需格式
+ _state.codes = await getDictData(
+ 'house_patrol_handling_opinion',
+ 'house_patrol_rectify_Reform'
+ )
+ //#endregion
+ this.form.current && this.form.current.setFieldsValue(this.record)
+
+ this.setState(_state)
+ this.call()
+ }
+
+ /**
+ * 获取数据
+ * 可以对postData进行数据结构调整
+ * [异步,必要]
+ * @returns
+ */
+ async getData() {
+ const form = this.form.current
+
+ const valid = await form.validateFields()
+ if (valid) {
+ const postData = form.getFieldsValue()
+ //#region 从前段转换后端所需格式
+
+ //#endregion
+ return postData
+ }
+ }
+ render() {
+ const { loading, codes } = this.state
+ return (
+
}>
+
+
+ )
+ }
+}
diff --git a/web-react/src/pages/business/house/info/form/patrol/index.jsx b/web-react/src/pages/business/house/info/form/patrol/index.jsx
new file mode 100644
index 0000000..79f7503
--- /dev/null
+++ b/web-react/src/pages/business/house/info/form/patrol/index.jsx
@@ -0,0 +1,146 @@
+import React, { Component } from 'react'
+import ReactDOM from 'react-dom'
+import { Anchor, Card, Col, Divider, Row, Spin } from 'antd'
+import { AntIcon, ComponentDynamic, Container } from 'components'
+import { isEqual, merge } from 'lodash'
+
+const parts = [
+ {
+ title: '巡查基本情况',
+ component: () => import('./base'),
+ },
+ {
+ title: '房屋检查',
+ component: () => import('./inspection'),
+ },
+ {
+ title: '等级划分',
+ component: () => import('./grade'),
+ },
+ {
+ title: '处理情况',
+ component: () => import('./handling'),
+ },
+ {
+ title: '本期巡查结果',
+ component: () => import('./result'),
+ },
+]
+
+export default class index extends Component {
+ // 子表单实例集合
+ children = []
+
+ // 整合提交数据
+ formData = {}
+
+ // 锚点挂载DOM
+ container = window
+
+ /**
+ * 阻止外部组件引发的渲染,提升性能
+ * 可自行添加渲染条件
+ * [必要]
+ * @param {*} props
+ * @param {*} state
+ * @returns
+ */
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state) || this.props.loading !== props.loading
+ }
+
+ /**
+ * 加载完成,通知父级组件并传递自身
+ */
+ call(child, index) {
+ this.children[index] = child
+ if (this.children.filter(p => p).length === parts.length) {
+ const { onRef } = this.props
+ if (onRef) onRef(this)
+ }
+ }
+
+ /**
+ * 从下级组件获取表单数据,并传递给更上级组件
+ * [异步,必要]
+ * @returns
+ */
+ async getData() {
+ for (const child of this.children) {
+ const data = await child.getData()
+ merge(this.formData, data)
+ }
+ return this.formData
+ }
+
+ /**
+ * 设置锚点容器
+ * [非必要]
+ * @param {*} container
+ */
+ setContainer = container => {
+ this.container = (ReactDOM.findDOMNode(container) || {}).parentNode
+ }
+
+ /**
+ * 渲染
+ * 当前渲染结构已完善,非必要可以不用修改
+ * [必要]
+ * @returns
+ */
+ render() {
+ const { id, loading } = this.props
+
+ return (
+
+
+
+
+
+
+ {parts.map((item, i) => (
+
+
+ {i < parts.length - 1 && }
+
+ ))}
+
+
+ {/* 锚点,如果不需要可以删除以下节点 */}
+
+ this.container}
+ offsetTop={24}
+ targetOffset={100}
+ wrapperStyle={{ backgroundColor: 'transparent' }}
+ onClick={e => e.preventDefault()}
+ >
+ {parts.map((part, i) => (
+
+ ))}
+
+
+
+
+ )
+ }
+}
diff --git a/web-react/src/pages/business/house/info/form/patrol/inspection.jsx b/web-react/src/pages/business/house/info/form/patrol/inspection.jsx
new file mode 100644
index 0000000..088f61b
--- /dev/null
+++ b/web-react/src/pages/business/house/info/form/patrol/inspection.jsx
@@ -0,0 +1,291 @@
+import React, { Component } from 'react'
+import { Col, Form, Input, Row, Spin, Upload } from 'antd'
+import { AntIcon, PhotoPreview } from 'components'
+import { cloneDeep, isEqual } from 'lodash'
+import { BlobToBase64, GetFileName, PreviewFile } from 'util/file'
+import { api } from 'common/api'
+
+const initialValues = {}
+
+const layout = {
+ labelCol: { flex: '150px' },
+ wrapperCol: { flex: '1' },
+}
+
+const imageUploads = [{ key: 'settlementTiltFiles' }, { key: 'otherInfoFiles' }]
+
+export default class inspection extends Component {
+ state = {
+ loading: true,
+ codes: {},
+ options: {},
+ }
+
+ // 表单实例
+ form = React.createRef()
+
+ photoPreview = 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
+ const keys = imageUploads.map(p => p.key)
+ for (const key of keys) {
+ const fileValue = []
+ const fileList =
+ !patrolInfo[key] || !patrolInfo[key].length ? [] : patrolInfo[key].split(',')
+ for (const fileId of fileList) {
+ try {
+ const file = await PreviewFile(fileId)
+ const base64 = await BlobToBase64(file)
+ fileValue.push({
+ uid: fileId,
+ response: fileId,
+ name: file.name,
+ url: base64,
+ status: 'done',
+ })
+ } catch {
+ const { data: file } = await api.sysFileInfoDetail({ id: fileId })
+ fileValue.push({
+ uid: fileId,
+ response: '文件已丢失',
+ name: file.fileOriginName,
+ status: 'error',
+ })
+ }
+ }
+
+ patrolInfo[key] = fileValue
+ }
+ }
+ //#endregion
+ this.form.current && 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
+ const keys = imageUploads.map(p => p.key)
+ for (const key of keys) {
+ patrolInfo[key] = patrolInfo[key]
+ .map(item => (item.uid.startsWith('rc-upload') ? item.response : item.uid))
+ .join(',')
+ }
+ //#endregion
+ return postData
+ }
+ }
+
+ //#region 自定义方法
+ /**
+ * 表单change事件处理,包括了所有字段的change
+ * [异步,非必要]
+ * @param {*} changedValues
+ * @param {*} allValues
+ */
+ async onValuesChange(changedValues, allValues) {}
+
+ async onFileUpload({ file, onProgress, onSuccess, onError }) {
+ onProgress({
+ percent: 0,
+ })
+ const fd = new FormData()
+ fd.append('file', file)
+ try {
+ const { data: fileId } = await api.sysFileInfoUpload(fd)
+ onSuccess(fileId)
+ } catch {
+ onError()
+ }
+ }
+
+ async onFilePreview(file, key) {
+ const fileList = this.form.current
+ .getFieldValue(['patrolInfo', key])
+ .filter(p => p.status === 'done')
+ const items = []
+ for (const _file of fileList) {
+ const img = new Image()
+ const src = _file.url || _file.thumbUrl
+ img.src = src
+ items.push({
+ src,
+ w: img.naturalWidth,
+ h: img.naturalHeight,
+ })
+ }
+ this.photoPreview.current.initPhotoSwipe(items, {
+ index: fileList.indexOf(file),
+ })
+ }
+
+ async onFileDownload(file) {
+ const { data, headers } = await api.sysFileInfoDownload({ id: file.response })
+ const url = window.URL.createObjectURL(data)
+ const fileName = GetFileName(headers['content-disposition'])
+ const a = document.createElement('a')
+ a.href = url
+ a.download = fileName
+ a.click()
+ window.URL.revokeObjectURL(url)
+ a.remove()
+ }
+ //#endregion
+
+ render() {
+ const { loading } = this.state
+
+ return (
+
}>
+
+
+
+
+ )
+ }
+}
diff --git a/web-react/src/pages/business/house/info/form/patrol/result.jsx b/web-react/src/pages/business/house/info/form/patrol/result.jsx
new file mode 100644
index 0000000..6fbd040
--- /dev/null
+++ b/web-react/src/pages/business/house/info/form/patrol/result.jsx
@@ -0,0 +1,102 @@
+import React, { Component } from 'react'
+import { Form, Input, Radio, Spin } from 'antd'
+import { AntIcon } from 'components'
+import { cloneDeep, first, isEqual, last, sortBy } from 'lodash'
+
+const layout = {
+ labelCol: { flex: '150px' },
+ wrapperCol: { flex: '1' },
+}
+
+export default class result extends Component {
+ state = {
+ loading: true,
+ codes: {
+ patrolResult: [
+ { code: '0', value: '正常' },
+ { code: '-1', value: '异常' },
+ ],
+ },
+ }
+ form = React.createRef()
+
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ componentDidMount() {
+ this.fillData({
+ record: this.props.record,
+ })
+ }
+
+ call() {
+ if (this.props.onRef) {
+ this.props.onRef(this)
+ }
+ }
+
+ /**
+ * 填充数据
+ * 可以在设置this.record之后对其作出数据结构调整
+ * [异步,必要]
+ * @param {*} params
+ */
+ async fillData(params) {
+ this.record = cloneDeep(params.record)
+ //#region 从后端转换成前段所需格式
+
+ //#endregion
+ this.form.current && 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 从前段转换后端所需格式
+
+ //#endregion
+ return postData
+ }
+ }
+ render() {
+ const { loading, codes } = this.state
+
+ return (
+
}>
+
+
+ )
+ }
+}
diff --git a/web-react/src/pages/business/house/member/selector/index.jsx b/web-react/src/pages/business/house/member/selector/index.jsx
index de667fc..a9c08ed 100644
--- a/web-react/src/pages/business/house/member/selector/index.jsx
+++ b/web-react/src/pages/business/house/member/selector/index.jsx
@@ -45,7 +45,7 @@ export default class index extends Component {
const { userId } = this.state
return (
-
+
this.bindCodeValue(text, 'dic_house_type'),
+ render: text => this.bindCodeValue(text, 'house_type'),
},
{
title: '地址',
@@ -91,7 +91,7 @@ export default class index extends Component {
componentDidMount() {
const { onLoading, onLoadData } = this.table.current
onLoading()
- getDictData('dic_house_type', 'dic_house_industry').then(codes => {
+ getDictData('house_type', 'house_industry').then(codes => {
this.setState({ codes }, () => {
onLoadData()
})
@@ -218,7 +218,7 @@ export default class index extends Component {
全部
- {codes.dicHouseType.map(item => (
+ {codes.houseType.map(item => (
{item.value}
@@ -228,7 +228,7 @@ export default class index extends Component {
{type == 2 && (