{/* 底部工具栏(需放在前面) */}
-
+
+ {/* 可以在工具栏中增加其他控件(只能在一行内) */}
- {/* 可以在工具栏中增加其他控件(只能在一行内) */}
-
-
-
-
+
+
-
+
+
+ }>
+
+
+ {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.children.push(c)}
+ />
+
+ )
+ }
+ return <>
+ })}
diff --git a/web-react/src/pages/business/house/task/index.jsx b/web-react/src/pages/business/house/task/index.jsx
new file mode 100644
index 0000000..9d8570b
--- /dev/null
+++ b/web-react/src/pages/business/house/task/index.jsx
@@ -0,0 +1,265 @@
+import React, { Component } from 'react'
+import { Button, Card, Form, Input, message as Message, Popconfirm, Radio, Select, Tag } from 'antd'
+import { AntIcon, Auth, Container, ModalForm, QueryTable, QueryTableActions } from 'components'
+import { api } from 'common/api'
+import auth from 'components/authorized/handler'
+import { isEqual } from 'lodash'
+import getDictData from 'util/dic'
+import { toCamelCase } from 'util/format'
+
+/**
+ * 注释段[\/**\/]为必须要改
+ */
+
+/**
+ * 配置页面所需接口函数
+ */
+const apiAction = {
+ page: api.houseTaskPage,
+}
+
+/**
+ * 统一配置权限标识
+ * [必要]
+ */
+const authName = 'houseTask'
+
+export default class index extends Component {
+ state = {
+ codes: {
+ dicHouseType: [],
+ dicHouseIndustry: [],
+ },
+
+ type: '',
+ }
+
+ // 表格实例
+ table = React.createRef()
+
+ // 新增窗口实例
+ addForm = React.createRef()
+ // 编辑窗口实例
+ editForm = React.createRef()
+
+ columns = [
+ {
+ title: '房屋编码',
+ dataIndex: 'houseCode',
+ sorter: true,
+ width: 300,
+ render: (text, record) => (
+ <>
+ {`${record.areaName}-${record.roadName}-${record.commName}-${
+ record.note
+ }-${record.no.toString().padStart(3, '0')}`}
+
+
{text}
+
+ ),
+ },
+ {
+ title: '房屋性质及行业',
+ dataIndex: 'type',
+ sorter: true,
+ width: 150,
+ render: text => this.bindCodeValue(text, 'dic_house_type'),
+ },
+ {
+ title: '地址',
+ dataIndex: 'address',
+ sorter: true,
+ },
+ {
+ title: '任务截止时间',
+ dataIndex: 'endTime',
+ sorter: true,
+ width: 150,
+ },
+ ]
+
+ /**
+ * 构造函数,在渲染前动态添加操作字段等
+ * @param {*} props
+ */
+ constructor(props) {
+ super(props)
+
+ const flag = auth({ houseInfo: 'getByTaskId' })
+
+ if (flag) {
+ this.columns.push({
+ title: '操作',
+ width: 150,
+ dataIndex: 'actions',
+ render: (text, record) => (
+
+
+ this.onOpen(record.id)}>登记
+
+
+ ),
+ })
+ }
+ }
+
+ /**
+ * 阻止外部组件引发的渲染,提升性能
+ * 可自行添加渲染条件
+ * [必要]
+ * @param {*} props
+ * @param {*} state
+ * @returns
+ */
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ /**
+ * 加载字典数据,之后开始加载表格数据
+ * 如果必须要加载字典数据,可直接对表格设置autoLoad=true
+ */
+ componentDidMount() {
+ const { onLoading, onLoadData } = this.table.current
+ onLoading()
+ getDictData('dic_house_type', 'dic_house_industry').then(codes => {
+ this.setState({ codes }, () => {
+ onLoadData()
+ })
+ })
+ }
+
+ /**
+ * 调用加载数据接口,可在调用前对query进行处理
+ * [异步,必要]
+ * @param {*} params
+ * @param {*} query
+ * @returns
+ */
+ loadData = async (params, query) => {
+ const { data } = await apiAction.page({
+ ...params,
+ ...query,
+ })
+ return data
+ }
+
+ /**
+ * 绑定字典数据
+ * @param {*} code
+ * @param {*} name
+ * @returns
+ */
+ bindCodeValue(code, name) {
+ name = toCamelCase(name)
+ const codes = this.state.codes[name]
+ if (codes) {
+ const c = codes.find(p => p.code == code)
+ if (c) {
+ return c.value
+ }
+ }
+ return null
+ }
+
+ /**
+ * 打开新增/编辑弹窗
+ * @param {*} modal
+ * @param {*} record
+ */
+ onOpen(taskId) {
+ window.openContentWindow({
+ title: '房屋登记',
+ path: 'business/house/info/form',
+ param: {
+ taskId,
+ },
+ })
+ }
+
+ /**
+ * 对表格上的操作进行统一处理
+ * [异步]
+ * @param {*} action
+ * @param {*} successMessage
+ */
+ async onAction(action, successMessage) {
+ const { onLoading, onLoaded, onReloadData } = this.table.current
+ onLoading()
+ try {
+ if (action) {
+ await action
+ }
+ if (successMessage) {
+ Message.success(successMessage)
+ }
+ onReloadData()
+ } catch {
+ onLoaded()
+ }
+ }
+
+ //#region 自定义方法
+ //#endregion
+
+ render() {
+ const { codes, type } = this.state
+
+ return (
+
+
+
+ {
+ if (values.hasOwnProperty('type')) {
+ this.setState({ type: values.type })
+ }
+ }}
+ query={
+
+
+
+ 全部
+ {codes.dicHouseType.map(item => (
+
+ {item.value}
+
+ ))}
+
+
+ {type == 2 && (
+
+
+
+ )}
+
+
+
+
+
+
+
+ }
+ />
+
+
+ )
+ }
+}
From 727e52c0aa10c2d5d12b49f788aa36d45b9a9370 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: Mon, 21 Jun 2021 17:18:56 +0800
Subject: [PATCH 02/20] =?UTF-8?q?add=20=E8=A1=A8=E5=8D=95=E7=A7=8D?=
=?UTF-8?q?=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web-react/public/seed/form-tabs/index.jsx | 141 ++++++++++++++++
web-react/public/seed/form-tabs/tab/index.jsx | 124 ++++++++++++++
web-react/public/seed/form-tabs/tab/parts.jsx | 111 ++++++++++++
web-react/public/seed/form/index.jsx | 159 ++++++++++++++++++
web-react/public/seed/form/part.jsx | 111 ++++++++++++
5 files changed, 646 insertions(+)
create mode 100644 web-react/public/seed/form-tabs/index.jsx
create mode 100644 web-react/public/seed/form-tabs/tab/index.jsx
create mode 100644 web-react/public/seed/form-tabs/tab/parts.jsx
create mode 100644 web-react/public/seed/form/index.jsx
create mode 100644 web-react/public/seed/form/part.jsx
diff --git a/web-react/public/seed/form-tabs/index.jsx b/web-react/public/seed/form-tabs/index.jsx
new file mode 100644
index 0000000..eb0a9c4
--- /dev/null
+++ b/web-react/public/seed/form-tabs/index.jsx
@@ -0,0 +1,141 @@
+import React, { Component } from 'react'
+import { Button, Tabs } from 'antd'
+import { ComponentDynamic, Container } from 'components'
+import { isEqual } from 'lodash'
+
+const tabs = [
+ {
+ title: '标题',
+ component: () => import('./tab'),
+ show: true,
+ },
+]
+
+export default class index extends Component {
+ state = {
+ actived: '0',
+ loading: true,
+ record: null,
+ saving: false,
+ }
+
+ // 子表单实例集合
+ children = []
+
+ // 整合提交数据
+ formData = {}
+
+ /**
+ * 阻止外部组件引发的渲染,提升性能
+ * 可自行添加渲染条件
+ * [必要]
+ * @param {*} props
+ * @param {*} state
+ * @returns
+ */
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ /**
+ * DOM加载完成钩子,可在此获取详细数据赋值到record
+ */
+ componentDidMount() {}
+
+ async onSubmit() {
+ for (const child of this.children) {
+ try {
+ const data = await child.getData()
+ this.formData = {
+ ...this.formData,
+ ...data,
+ }
+ } catch (e) {
+ return e
+ }
+ }
+
+ //#region 提交数据
+ this.setState({ saving: true })
+ this.setState({ saving: false })
+ //#endregion
+ }
+
+ render() {
+ const { actived, loading, record, saving } = this.state
+
+ return (
+
+
+ {/* 底部工具栏(需放在前面) */}
+
+
+
+
+
+
+
+
+
+
+
+ {/* 顶部信息栏,不需要时刻删除 */}
+
+
+
{
+ this.setState({ actived: activeKey })
+ }}
+ >
+ {tabs.map(
+ (tab, i) =>
+ tab.show && (
+
+ )
+ )}
+
+
+ {tabs.map((tab, i) => {
+ if (tab.show) {
+ return (
+
+ this.children.push(c)}
+ />
+
+ )
+ }
+ return <>
+ })}
+
+
+
+
+ )
+ }
+}
diff --git a/web-react/public/seed/form-tabs/tab/index.jsx b/web-react/public/seed/form-tabs/tab/index.jsx
new file mode 100644
index 0000000..ee18b7a
--- /dev/null
+++ b/web-react/public/seed/form-tabs/tab/index.jsx
@@ -0,0 +1,124 @@
+import React, { Component } from 'react'
+import ReactDOM from 'react-dom'
+import { Anchor, Card, Col, Row, Spin } from 'antd'
+import { AntIcon, ComponentDynamic, Container } from 'components'
+import { isEqual } from 'lodash'
+
+const parts = [
+ {
+ // title: '标题',
+ component: () => import('./part'),
+ },
+]
+
+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
+ }
+
+ /**
+ * DDOM加载完成钩子,在此将自身传递给父级
+ */
+ componentDidMount() {
+ if (this.props.onRef) {
+ this.props.onRef(this)
+ }
+ }
+
+ /**
+ * 从下级组件获取表单数据,并传递给更上级组件
+ * [异步,必要]
+ * @returns
+ */
+ async getData() {
+ for (const child of this.children) {
+ const data = await child.getData()
+ this.formData = {
+ ...this.formData,
+ ...data,
+ }
+ }
+ return this.formData
+ }
+
+ /**
+ * 设置锚点容器
+ * [非必要]
+ * @param {*} container
+ */
+ setContainer(container) {
+ this.container = (ReactDOM.findDOMNode(container) || {}).parentNode
+ }
+
+ /**
+ * 渲染
+ * 当前渲染结构已完善,非必要可以不用修改
+ * [必要]
+ * @returns
+ */
+ render() {
+ const { id, loading } = this.props
+
+ return (
+
this.setContainer(e)}>
+
+
+
+
+
+ {parts.map((item, i) => (
+
+ ))}
+
+
+ {/* 锚点,如果不需要可以删除以下节点 */}
+
+ this.container}
+ offsetTop={24}
+ targetOffset={100}
+ wrapperStyle={{ backgroundColor: 'transparent' }}
+ onClick={e => e.preventDefault()}
+ >
+ {parts.map((part, i) => (
+
+ ))}
+
+
+
+
+ )
+ }
+}
diff --git a/web-react/public/seed/form-tabs/tab/parts.jsx b/web-react/public/seed/form-tabs/tab/parts.jsx
new file mode 100644
index 0000000..0785128
--- /dev/null
+++ b/web-react/public/seed/form-tabs/tab/parts.jsx
@@ -0,0 +1,111 @@
+import React, { Component } from 'react'
+import { Form, Spin } from 'antd'
+import { AntIcon } from 'components'
+import { cloneDeep, isEqual } from 'lodash'
+
+const initialValues = {}
+
+const layout = {
+ labelCol: { flex: '150px' },
+ wrapperCol: { flex: '1' },
+}
+
+export default class part extends Component {
+ state = {
+ loading: true,
+ codes: {},
+ options: {},
+ }
+
+ // 表单实例
+ form = React.createRef()
+
+ // 初始化数据
+ record = {}
+
+ /**
+ * 阻止外部组件引发的渲染,提升性能
+ * 可自行添加渲染条件
+ * [必要]
+ * @param {*} props
+ * @param {*} state
+ * @returns
+ */
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ /**
+ * DOM加载完成钩子,在此将自身传递给父级,并且绑定数据
+ */
+ componentDidMount() {
+ if (this.props.onRef) {
+ this.props.onRef(this)
+ }
+ this.fillData({
+ record: this.props.record,
+ })
+ }
+
+ /**
+ * 填充数据
+ * 可以在设置this.record之后对其作出数据结构调整
+ * [异步,必要]
+ * @param {*} params
+ */
+ async fillData(params) {
+ this.record = cloneDeep(params.record)
+ //#region 从后端转换成前段所需格式
+ //#endregion
+ this.form.current.setFieldsValue(this.record)
+
+ this.setState({
+ loading: false,
+ })
+ }
+
+ /**
+ * 获取数据
+ * 可以对postData进行数据结构调整
+ * [异步,必要]
+ * @returns
+ */
+ async getData() {
+ const form = this.form.current
+
+ const valid = await form.validateFields()
+ if (valid) {
+ const postData = form.getFieldsValue()
+ //#region 从前段转换后端所需格式
+ //#endregion
+ return postData
+ }
+ }
+
+ //#region 自定义方法
+ /**
+ * 表单change事件处理,包括了所有字段的change
+ * [异步,非必要]
+ * @param {*} changedValues
+ * @param {*} allValues
+ */
+ async onValuesChange(changedValues, allValues) {}
+ //#endregion
+
+ render() {
+ const { loading } = this.state
+
+ return (
+
}>
+
+
+ )
+ }
+}
diff --git a/web-react/public/seed/form/index.jsx b/web-react/public/seed/form/index.jsx
new file mode 100644
index 0000000..c2d80e4
--- /dev/null
+++ b/web-react/public/seed/form/index.jsx
@@ -0,0 +1,159 @@
+import React, { Component } from 'react'
+import ReactDOM from 'react-dom'
+import { Anchor, Button, Card, Col, Row, Spin } from 'antd'
+import { AntIcon, ComponentDynamic, Container } from 'components'
+import { isEqual } from 'lodash'
+
+const parts = [
+ {
+ // title: '标题',
+ component: () => import('./part'),
+ },
+]
+
+export default class index extends Component {
+ state = {
+ loading: true,
+ record: null,
+ saving: false,
+ }
+
+ // 子表单实例集合
+ children = []
+
+ // 整合提交数据
+ formData = {}
+
+ // 锚点挂载DOM
+ container = window
+
+ /**
+ * 阻止外部组件引发的渲染,提升性能
+ * 可自行添加渲染条件
+ * [必要]
+ * @param {*} props
+ * @param {*} state
+ * @returns
+ */
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ /**
+ * DOM加载完成钩子,可在此获取详细数据赋值到record
+ */
+ componentDidMount() {}
+
+ /**
+ * 提交
+ * [异步,必要]
+ * @returns
+ */
+ async onSubmit() {
+ for (const child of this.children) {
+ try {
+ const data = await child.getData()
+ this.formData = {
+ ...this.formData,
+ ...data,
+ }
+ } catch (e) {
+ return e
+ }
+ }
+
+ //#region 提交数据
+ this.setState({ saving: true })
+ this.setState({ saving: false })
+ //#endregion
+ }
+
+ /**
+ * 设置锚点容器
+ * [非必要]
+ * @param {*} container
+ */
+ setContainer(container) {
+ this.container = (ReactDOM.findDOMNode(container) || {}).parentNode
+ }
+
+ /**
+ * 渲染
+ * 当前渲染结构已完善,非必要可以不用修改
+ * [必要]
+ * @returns
+ */
+ render() {
+ const { id } = this.props
+
+ const { loading, record, saving } = this.state
+
+ return (
+
+
this.setContainer(e)}>
+
+
+
+
+
+ {parts.map((item, i) => (
+
+ ))}
+
+
+ {/* 锚点,如果不需要可以删除以下节点 */}
+
+ this.container}
+ offsetTop={24}
+ targetOffset={100}
+ wrapperStyle={{ backgroundColor: 'transparent' }}
+ onClick={e => e.preventDefault()}
+ >
+ {parts.map((part, i) => (
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+}
diff --git a/web-react/public/seed/form/part.jsx b/web-react/public/seed/form/part.jsx
new file mode 100644
index 0000000..0785128
--- /dev/null
+++ b/web-react/public/seed/form/part.jsx
@@ -0,0 +1,111 @@
+import React, { Component } from 'react'
+import { Form, Spin } from 'antd'
+import { AntIcon } from 'components'
+import { cloneDeep, isEqual } from 'lodash'
+
+const initialValues = {}
+
+const layout = {
+ labelCol: { flex: '150px' },
+ wrapperCol: { flex: '1' },
+}
+
+export default class part extends Component {
+ state = {
+ loading: true,
+ codes: {},
+ options: {},
+ }
+
+ // 表单实例
+ form = React.createRef()
+
+ // 初始化数据
+ record = {}
+
+ /**
+ * 阻止外部组件引发的渲染,提升性能
+ * 可自行添加渲染条件
+ * [必要]
+ * @param {*} props
+ * @param {*} state
+ * @returns
+ */
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
+ /**
+ * DOM加载完成钩子,在此将自身传递给父级,并且绑定数据
+ */
+ componentDidMount() {
+ if (this.props.onRef) {
+ this.props.onRef(this)
+ }
+ this.fillData({
+ record: this.props.record,
+ })
+ }
+
+ /**
+ * 填充数据
+ * 可以在设置this.record之后对其作出数据结构调整
+ * [异步,必要]
+ * @param {*} params
+ */
+ async fillData(params) {
+ this.record = cloneDeep(params.record)
+ //#region 从后端转换成前段所需格式
+ //#endregion
+ this.form.current.setFieldsValue(this.record)
+
+ this.setState({
+ loading: false,
+ })
+ }
+
+ /**
+ * 获取数据
+ * 可以对postData进行数据结构调整
+ * [异步,必要]
+ * @returns
+ */
+ async getData() {
+ const form = this.form.current
+
+ const valid = await form.validateFields()
+ if (valid) {
+ const postData = form.getFieldsValue()
+ //#region 从前段转换后端所需格式
+ //#endregion
+ return postData
+ }
+ }
+
+ //#region 自定义方法
+ /**
+ * 表单change事件处理,包括了所有字段的change
+ * [异步,非必要]
+ * @param {*} changedValues
+ * @param {*} allValues
+ */
+ async onValuesChange(changedValues, allValues) {}
+ //#endregion
+
+ render() {
+ const { loading } = this.state
+
+ return (
+
}>
+
+
+ )
+ }
+}
From f31f79d59d74eee92bb7f55608b9bbf964443793 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: Mon, 21 Jun 2021 17:19:20 +0800
Subject: [PATCH 03/20] =?UTF-8?q?update=20=E5=AE=8C=E5=96=84=E7=BC=96?=
=?UTF-8?q?=E7=A0=81=E4=BF=A1=E6=81=AF=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../HouseCode/Dto/HouseCodeInput.cs | 6 +
.../HouseCode/Dto/HouseCodeOutput.cs | 14 +
.../HouseSafety/HouseCode/HouseCodeService.cs | 10 +
.../business/houseSafety/houseCode.js | 1 +
.../pages/business/house/code/form/index.jsx | 79 +++--
.../pages/business/house/code/form/part.jsx | 309 ++++++++++++------
.../src/pages/business/house/code/index.jsx | 184 ++++++-----
.../pages/business/house/info/form/index.jsx | 36 +-
web-react/src/views/login/index.jsx | 66 ++--
9 files changed, 459 insertions(+), 246 deletions(-)
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeInput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeInput.cs
index 8017786..d105eda 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeInput.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeInput.cs
@@ -56,4 +56,10 @@ namespace Ewide.Application
public string ZoonId { get; set; }
public int Type { get; set; }
}
+
+ public class GetHouseCodeInput
+ {
+ [Required(ErrorMessage = "房屋编码ID不可为空")]
+ public string Id { get; set; }
+ }
}
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs b/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs
index 08bb370..0316d8b 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseCode/Dto/HouseCodeOutput.cs
@@ -25,4 +25,18 @@ namespace Ewide.Application
public string Lng { get; set; }
public string Lat { get; set; }
}
+
+ public class GetHouseCodeOutput
+ {
+ public string Id { get; set; }
+ public int Type { get; set; }
+ public int Industry { get; set; }
+ public string AreaCode { get; set; }
+ public string ProjectId { get; set; }
+ public int No { get; set; }
+ public string ZoneId { get; set; }
+ public string Address { get; set; }
+ public string Lng { get; set; }
+ public string Lat { get; set; }
+ }
}
diff --git a/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs b/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs
index fb526c0..e57b2b2 100644
--- a/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs
@@ -73,6 +73,16 @@ LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) ";
return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] {"Type", "Address", "HouseCode" });
}
+ [HttpGet("/houseCode/detail")]
+ public async Task
GetHouserCode([FromQuery] GetHouseCodeInput input)
+ {
+ var houseCode = await _houseCodeRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == input.Id);
+ var areaCode = (await Db.GetRepository().DetachedEntities.FirstOrDefaultAsync(p => p.Id == houseCode.ProjectId)).AreaCode;
+ var result = houseCode.Adapt();
+ result.AreaCode = areaCode;
+ return result;
+ }
+
///
/// 获取同一区域下的下一个编号
///
diff --git a/web-react/src/common/api/requests/business/houseSafety/houseCode.js b/web-react/src/common/api/requests/business/houseSafety/houseCode.js
index 8aa62a1..67c442a 100644
--- a/web-react/src/common/api/requests/business/houseSafety/houseCode.js
+++ b/web-react/src/common/api/requests/business/houseSafety/houseCode.js
@@ -3,6 +3,7 @@ const urls = {
houseCodeEdit: ['/houseCode/edit', 'post'],
houseCodePage: ['/houseCode/page', 'post'],
houseCodeNo: '/houseCode/getNextNoByCode',
+ houseCodeDetail: '/houseCode/detail'
}
export default urls
\ No newline at end of file
diff --git a/web-react/src/pages/business/house/code/form/index.jsx b/web-react/src/pages/business/house/code/form/index.jsx
index c6028dc..e8f16be 100644
--- a/web-react/src/pages/business/house/code/form/index.jsx
+++ b/web-react/src/pages/business/house/code/form/index.jsx
@@ -1,6 +1,6 @@
import React, { Component } from 'react'
-import { Button, Card, message as Message, Modal } from 'antd'
-import { ComponentDynamic, Container } from 'components'
+import { Button, Card, Col, message as Message, Modal, Row, Spin } from 'antd'
+import { AntIcon, ComponentDynamic, Container } from 'components'
import { isEqual } from 'lodash'
import { api } from 'common/api'
@@ -12,6 +12,9 @@ const parts = [
export default class index extends Component {
state = {
+ loading: true,
+ record: null,
+
saving: false,
}
@@ -23,6 +26,19 @@ export default class index extends Component {
return !isEqual(this.state, state)
}
+ componentDidMount() {
+ // 获取详细数据
+ const { id } = this.props.param
+ if (id) {
+ api.houseCodeDetail({ id }).then(({ data }) => {
+ this.setState({
+ record: data,
+ loading: false,
+ })
+ })
+ }
+ }
+
async onSubmit() {
for (const child of this.children) {
try {
@@ -36,8 +52,9 @@ export default class index extends Component {
}
}
+ //#region 提交数据
this.setState({ saving: true })
- if (!this.props.param.record) {
+ if (!this.state.record) {
// 新增
try {
const { success } = await api.houseCodeAdd(this.formData)
@@ -57,7 +74,10 @@ export default class index extends Component {
} else {
// 编辑
try {
- const { success } = await api.houseCodeEdit(this.formData)
+ const { success } = await api.houseCodeEdit({
+ id: this.state.record.id,
+ ...this.formData,
+ })
if (success) {
Message.success('保存成功')
}
@@ -65,39 +85,54 @@ export default class index extends Component {
this.setState({ saving: false })
}
}
+ //#endregion
}
render() {
- const { id, param } = this.props
+ const { id } = this.props
+
+ const { loading, record, saving } = this.state
return (
-
-
-
-
- {parts.map((item, i) => (
-
- ))}
-
+
+
+
+
+
+
+ {parts.map((item, i) => (
+
+ ))}
+
+
+
-
+
diff --git a/web-react/src/pages/business/house/code/form/part.jsx b/web-react/src/pages/business/house/code/form/part.jsx
index ed86511..071ef89 100644
--- a/web-react/src/pages/business/house/code/form/part.jsx
+++ b/web-react/src/pages/business/house/code/form/part.jsx
@@ -1,36 +1,49 @@
import React, { Component } from 'react'
-import { Button, Cascader, Form, Input, InputNumber, Radio, Spin, Select, Row, Col, Tag, Alert, Tooltip } from 'antd'
+import {
+ Button,
+ Cascader,
+ Form,
+ Input,
+ InputNumber,
+ Radio,
+ Spin,
+ Select,
+ Row,
+ Col,
+ Tag,
+ Alert,
+ Tooltip,
+} from 'antd'
import { AntIcon, Auth } from 'components'
-import { cloneDeep } from 'lodash'
+import { cloneDeep, isEqual } from 'lodash'
import getDictData from 'util/dic'
import { api } from 'common/api'
import { CITY } from 'util/global'
const initialValues = {
type: 1,
- industry: 1
+ industry: 1,
}
const labelCol = { flex: '150px' }
const wrapperCol = { flex: '1' }
export default class form extends Component {
-
state = {
// 加载状态
loading: true,
codes: {
dicHouseType: [],
- dicHouseIndustry: []
+ dicHouseIndustry: [],
},
options: {
areaTree: [],
projects: [],
- zones: []
+ zones: [],
},
houseCode: '',
- showIndustry: false
+ showIndustry: false,
}
// 表单实例
@@ -41,6 +54,10 @@ export default class form extends Component {
// 初始化数据
record = {}
+ shouldComponentUpdate(props, state) {
+ return !isEqual(this.state, state)
+ }
+
/**
* mount后回调
*/
@@ -48,7 +65,9 @@ export default class form extends Component {
if (this.props.onRef) {
this.props.onRef(this)
}
- this.fillData(this.props.param)
+ this.fillData({
+ record: this.props.record,
+ })
}
componentWillUnmount() {
@@ -59,10 +78,9 @@ export default class form extends Component {
* 填充数据
* 可以在设置this.record之后对其作出数据结构调整
* [异步,必要]
- * @param {*} params
+ * @param {*} params
*/
async fillData(params) {
-
this.record = cloneDeep(params.record)
//#region 从后端转换成前段所需格式
await this.initMap()
@@ -75,12 +93,12 @@ export default class form extends Component {
areaCode.substr(0, 4),
areaCode.substr(0, 6),
areaCode.substr(0, 9),
- areaCode
+ areaCode,
]
// 获取项目和片区列表
const data = await this.getProjectsAndZones({
areaCode: this.record.areaCode,
- type
+ type,
})
Object.assign(options, data)
// 定位
@@ -93,14 +111,14 @@ export default class form extends Component {
options.areaTree = areaTree
this.setState({
codes,
- options
+ options,
})
this.showHouseCode()
//#endregion
this.form.current.setFieldsValue(this.record)
this.setState({
- loading: false
+ loading: false,
})
}
@@ -108,7 +126,7 @@ export default class form extends Component {
* 获取数据
* 可以对postData进行数据结构调整
* [异步,必要]
- * @returns
+ * @returns
*/
async getData() {
const form = this.form.current
@@ -116,9 +134,6 @@ export default class form extends Component {
const valid = await form.validateFields()
if (valid) {
const postData = form.getFieldsValue()
- if (this.record) {
- postData.id = this.record.id
- }
//#region 从前段转换后端所需格式
if (postData.areaCode) {
postData.areaCode = postData.areaCode[3]
@@ -130,7 +145,6 @@ export default class form extends Component {
//#region 自定义方法
initMap() {
-
// eslint-disable-next-line no-undef
const amap = AMap
@@ -140,7 +154,7 @@ export default class form extends Component {
const district = new amap.DistrictSearch({
subdistrict: 0,
extensions: 'all',
- level: 'city'
+ level: 'city',
})
district.search(city, (status, result) => {
@@ -152,15 +166,15 @@ export default class form extends Component {
const geocoder = new amap.Geocoder({ city })
geocoder.getLocation(city, (status, result) => {
-
- if (status !== 'complete' || !(result.geocodes && result.geocodes.length)) return
+ if (status !== 'complete' || !(result.geocodes && result.geocodes.length))
+ return
this.citycode = result.geocodes[0].addressComponent.citycode
this.map = new amap.Map(this.refs.map, {
mask,
zoom: 12,
- center: result.geocodes[0].location
+ center: result.geocodes[0].location,
})
this.map.on('click', e => {
@@ -176,7 +190,7 @@ export default class form extends Component {
path,
strokeColor: '#ccc',
strokeWeight: 4,
- map: this.map
+ map: this.map,
})
}
@@ -186,13 +200,13 @@ export default class form extends Component {
const auto = new amap.AutoComplete({
input: this.refs['map-search'].input,
city,
- citylimit: true
+ citylimit: true,
})
const placeSearch = new amap.PlaceSearch({
city,
citylimit: true,
- pageSize: 1
+ pageSize: 1,
})
auto.on('select', ({ poi: { name: keywords, adcode } }) => {
@@ -206,15 +220,13 @@ export default class form extends Component {
}
})
})
-
})
})
})
}
setMarker(position, geocoder) {
-
- const set = (position) => {
+ const set = position => {
if (this.marker) {
this.marker.setPosition(position)
} else {
@@ -242,7 +254,6 @@ export default class form extends Component {
set(position)
resolve(position)
-
} else {
console.error('根据经纬度查询地址失败')
@@ -260,7 +271,7 @@ export default class form extends Component {
this.form.current.setFieldsValue({
address,
lng,
- lat
+ lat,
})
}
@@ -279,13 +290,13 @@ export default class form extends Component {
if (mode.includes('projects')) {
const { data: projects } = await api.houseProjectList({
areaCode: areaCode[3],
- type
+ type,
})
result.projects = projects
}
if (mode.includes('zones')) {
const { data: zones } = await api.houseZoneList({
- areaCode: areaCode[3]
+ areaCode: areaCode[3],
})
result.zones = zones
}
@@ -300,7 +311,7 @@ export default class form extends Component {
this.setState({ loading: true })
const { data: no } = await api.houseCodeNo({ projectId })
this.form.current.setFieldsValue({
- no
+ no,
})
this.setState({ loading: false })
}
@@ -308,7 +319,7 @@ export default class form extends Component {
showHouseCode(values) {
if (this.record) {
this.setState({
- houseCode: this.record.houseCode
+ houseCode: this.record.houseCode,
})
} else if (values) {
const { type, industry, areaCode, projectId, no } = values
@@ -323,7 +334,8 @@ export default class form extends Component {
if (!industry) {
this.setState({ houseCode: '' })
} else {
- const tag = this.state.codes.dicHouseIndustry.find(p => p.code == industry).extCode.tag
+ const tag = this.state.codes.dicHouseIndustry.find(p => p.code == industry)
+ .extCode.tag
houseCode += `-${tag}`
this.setState({ houseCode })
}
@@ -340,16 +352,16 @@ export default class form extends Component {
if (changedValues.hasOwnProperty('type')) {
this.setState({
showIndustry: changedValues.type == 2,
- loading: true
+ loading: true,
})
const data = await this.getProjectsAndZones()
form.setFieldsValue({ projectId: undefined })
this.setState({
options: {
...this.state.options,
- ...data
+ ...data,
},
- loading: false
+ loading: false,
})
this.showHouseCode(form.getFieldsValue())
}
@@ -362,9 +374,9 @@ export default class form extends Component {
this.setState({
options: {
...this.state.options,
- ...data
+ ...data,
},
- loading: false
+ loading: false,
})
this.showHouseCode(form.getFieldsValue())
}
@@ -392,15 +404,14 @@ export default class form extends Component {
this.setState({
options: {
...this.state.options,
- ...data
+ ...data,
},
- loading: false
+ loading: false,
})
}
//#endregion
render() {
-
const { loading, codes, options, showIndustry, houseCode } = this.state
return (
@@ -409,61 +420,70 @@ export default class form extends Component {
ref={this.form}
// labelCol={labelCol}
// wrapperCol={wrapperCol}
- onValuesChange={(changedValues, allValues) => this.onValuesChange(changedValues, allValues)}
+ onValuesChange={(changedValues, allValues) =>
+ this.onValuesChange(changedValues, allValues)
+ }
layout="vertical"
-
>
}>
-
-
+
+
{codes.dicHouseType.map(item => (
- {item.value}
+
+ {item.value}
+
))}
- {
- showIndustry &&
-
-
+ {showIndustry && (
+
+
{codes.dicHouseIndustry.map(item => (
- {item.value}
+
+ {item.value}
+
))}
- }
+ )}
-
+
labels.join(' - ')}
+ displayRender={labels => labels.join(' - ')}
fieldNames={{
label: 'name',
value: 'code',
- children: 'children'
+ children: 'children',
}}
options={options.areaTree}
expandTrigger="hover"
@@ -473,13 +493,20 @@ export default class form extends Component {
-
+
@@ -488,8 +515,18 @@ export default class form extends Component {
-
- } onClick={() => this.onReloadProjectsOrZones('projects')}>
+
+ }
+ onClick={() =>
+ this.onReloadProjectsOrZones(
+ 'projects'
+ )
+ }
+ >
@@ -497,9 +534,12 @@ export default class form extends Component {
-
+
value.padStart(3, '0')}
+ formatter={value => value.padStart(3, '0')}
max={999}
min={1}
precision={0}
@@ -509,14 +549,10 @@ export default class form extends Component {
/>
- {
- showIndustry &&
- -
- }
+ {showIndustry && -}
- {
- houseCode &&
+ {houseCode && (
{houseCode}
+ >
+ {houseCode}
+
- }
+ )}
房屋编码说明}
- description={<>
- 房屋所在市—县（市、区）—街道（乡、镇）—社区、居（村）委会）—项目—实物幢序号。 根据省厅既有建筑物编号规则，房屋所在区域编号按照市、县（市、区）、街道（乡、镇）、社区、居（村）委会）、项目分类，其中市、县（市）区部分按照《中华人民共和国行政区划代码》（GB2260）标准编码，街道（乡、镇）按《县以下行政区划代码编码规则》（GB10114-88）标准编码，社区、居（村）委会部分按照统计局提供编码设定。各地上报各街道社区名称后，上述编号由系统自动生成。
各社区下辖项目由各地负责统一编码，住宅项目序号一般一个小区一号，采用3位数，001号起编，范围为001~999。实物幢序号由各地负责统一编码，以幢为单位，采用3位数，001号起编，范围为001~999。
- } />
+ description={
+ <>
+ 房屋所在市
+
+
+
+
+ —县（市、区）
+
+
+ —街道（乡、镇）
+
+
+
+ —社区、居（村）委会）
+
+
+
+ —项目
+
+
+
+ —实物幢序号
+
+
+ 。
+ 根据省厅既有建筑物编号规则，房屋所在区域编号按照市、县（市、区）、街道（乡、镇）、社区、居（村）委会）、项目分类，其中市、县（市）区部分按照《中华人民共和国行政区划代码》（GB2260）标准编码，街道（乡、镇）按《县以下行政区划代码编码规则》（GB10114-88）标准编码，社区、居（村）委会部分按照统计局提供编码设定。各地上报各街道社区名称后，上述编号由系统自动生成。
+
+ 各社区下辖项目由各地负责统一编码，住宅项目序号一般一个小区一号，采用3位数，001号起编，范围为001~999。实物幢序号由各地负责统一编码，以幢为单位，采用3位数，001号起编，范围为001~999。
+
+ }
+ />
-
-
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/web-react/src/pages/business/house/code/index.jsx b/web-react/src/pages/business/house/code/index.jsx
index 9582ffa..489a27d 100644
--- a/web-react/src/pages/business/house/code/index.jsx
+++ b/web-react/src/pages/business/house/code/index.jsx
@@ -1,5 +1,16 @@
import React, { Component } from 'react'
-import { Button, Card, Cascader, Form, Input, InputNumber, Popconfirm, message as Message, Radio, Select } from 'antd'
+import {
+ Button,
+ Card,
+ Cascader,
+ Form,
+ Input,
+ InputNumber,
+ Popconfirm,
+ message as Message,
+ Radio,
+ Select,
+} from 'antd'
import { isEqual } from 'lodash'
import { AntIcon, Auth, Container, QueryTable, QueryTableActions } from 'components'
import { api } from 'common/api'
@@ -10,25 +21,24 @@ import { getSearchInfo } from 'util/query'
// 配置页面所需接口函数
const apiAction = {
- page: api.houseCodePage
+ page: api.houseCodePage,
}
// 用于弹窗标题
const name = '房屋编码'
export default class index extends Component {
-
state = {
codes: {
dicHouseType: [],
- dicHouseIndustry: []
+ dicHouseIndustry: [],
},
options: {
- areaTree: []
+ areaTree: [],
},
- type: ''
+ type: '',
}
// 表格实例
@@ -41,14 +51,21 @@ export default class index extends Component {
dataIndex: 'houseCode',
sorter: true,
width: 300,
- render: (text, record) => `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${record.no.toString().padStart(3, '0')}`
+ render: (text, record) =>
+ `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${record.no
+ .toString()
+ .padStart(3, '0')}`,
},
{
title: '房屋性质及行业',
dataIndex: 'type',
sorter: true,
width: 150,
- render: (text, record) => this.bindCodeValue(text, 'dic_house_type') + (text === 2 ? `(${this.bindCodeValue(record.industry, 'dic_house_industry')})` : '')
+ render: (text, record) =>
+ this.bindCodeValue(text, 'dic_house_type') +
+ (text === 2
+ ? `(${this.bindCodeValue(record.industry, 'dic_house_industry')})`
+ : ''),
},
{
title: '地址',
@@ -65,7 +82,7 @@ export default class index extends Component {
/**
* 构造函数,在渲染前动态添加操作字段等
- * @param {*} props
+ * @param {*} props
*/
constructor(props) {
super(props)
@@ -77,20 +94,22 @@ export default class index extends Component {
title: '操作',
width: 150,
dataIndex: 'actions',
- render: (text, record) => (
-
- this.onOpen(record)}>编辑
-
-
- this.onDelete(record)}
- >
- 删除
-
-
- )
+ render: (text, record) => (
+
+
+ this.onOpen(record)}>编辑
+
+
+ this.onDelete(record)}
+ >
+ 删除
+
+
+
+ ),
})
}
}
@@ -99,9 +118,9 @@ export default class index extends Component {
* 阻止外部组件引发的渲染,提升性能
* 可自行添加渲染条件
* [必要]
- * @param {*} props
- * @param {*} state
- * @returns
+ * @param {*} props
+ * @param {*} state
+ * @returns
*/
shouldComponentUpdate(props, state) {
return !isEqual(this.state, state)
@@ -114,28 +133,30 @@ export default class index extends Component {
componentDidMount() {
const { onLoading, onLoadData } = this.table.current
onLoading()
- getDictData('dic_house_type', 'dic_house_industry').then(async (res) => {
+ getDictData('dic_house_type', 'dic_house_industry').then(async res => {
const { data } = await api.getAreaTree()
- this.setState({
- codes: res,
- options: {
- areaTree: data
+ this.setState(
+ {
+ codes: res,
+ options: {
+ areaTree: data,
+ },
+ },
+ () => {
+ onLoadData()
}
- }, () => {
- onLoadData()
- })
+ )
})
}
/**
* 调用加载数据接口,可在调用前对query进行处理
* [异步,必要]
- * @param {*} params
- * @param {*} query
- * @returns
+ * @param {*} params
+ * @param {*} query
+ * @returns
*/
loadData = async (params, query) => {
-
if (query.areaCode) {
query.areaCode = query.areaCode.pop()
}
@@ -146,8 +167,8 @@ export default class index extends Component {
no: '=',
type: '=',
address: 'like',
- houseCode: 'like'
- }
+ houseCode: 'like',
+ },
})
const { data } = await apiAction.page({
@@ -159,15 +180,15 @@ export default class index extends Component {
/**
* 绑定字典数据
- * @param {*} code
- * @param {*} name
- * @returns
+ * @param {*} code
+ * @param {*} name
+ * @returns
*/
bindCodeValue(code, name) {
name = toCamelCase(name)
const codes = this.state.codes[name]
if (codes) {
- const c = codes.find((p) => p.code == code)
+ const c = codes.find(p => p.code == code)
if (c) {
return c.value
}
@@ -177,8 +198,8 @@ export default class index extends Component {
/**
* 打开新增/编辑弹窗
- * @param {*} modal
- * @param {*} record
+ * @param {*} modal
+ * @param {*} record
*/
onOpen(record) {
const path = 'business/house/code/form'
@@ -187,11 +208,13 @@ export default class index extends Component {
title: record ? '修改房屋编码' : '新增房屋编码',
subTitle:
record &&
- `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${record.no.toString().padStart(3, '0')}`,
+ `${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${record.no
+ .toString()
+ .padStart(3, '0')}`,
path,
param: {
- record
- }
+ id: record.id,
+ },
})
// modal.current.open({
// record
@@ -201,8 +224,8 @@ export default class index extends Component {
/**
* 对表格上的操作进行统一处理
* [异步]
- * @param {*} action
- * @param {*} successMessage
+ * @param {*} action
+ * @param {*} successMessage
*/
async onAction(action, successMessage) {
const { onLoading, onLoaded, onReloadData } = this.table.current
@@ -222,20 +245,16 @@ export default class index extends Component {
/**
* 删除
- * @param {*} record
+ * @param {*} record
*/
onDelete(record) {
- this.onAction(
- apiAction.delete(record),
- '删除成功'
- )
+ this.onAction(apiAction.delete(record), '删除成功')
}
//#region 自定义方法
//#endregion
render() {
-
const { options, codes, type } = this.state
return (
@@ -248,9 +267,9 @@ export default class index extends Component {
loadData={this.loadData}
columns={this.columns}
queryInitialValues={{
- type: ''
+ type: '',
}}
- onQueryChange={(values) => {
+ onQueryChange={values => {
if (values.hasOwnProperty('type')) {
this.setState({ type: values.type })
}
@@ -259,11 +278,11 @@ export default class index extends Component {
labels.join(' - ')}
+ displayRender={labels => labels.join(' - ')}
fieldNames={{
label: 'name',
value: 'code',
- children: 'children'
+ children: 'children',
}}
options={options.areaTree}
className="w-400"
@@ -273,7 +292,7 @@ export default class index extends Component {
value && value.padStart(3, '0')}
+ formatter={value => value && value.padStart(3, '0')}
max={999}
min={1}
precision={0}
@@ -284,31 +303,28 @@ export default class index extends Component {
全部
- {
- codes.dicHouseType.map(item => (
- {item.value}
- ))
- }
+ {codes.dicHouseType.map(item => (
+
+ {item.value}
+
+ ))}
- {
- type == 2 &&
+ {type == 2 && (
-
- }
+ )}
@@ -322,7 +338,9 @@ export default class index extends Component {
}
onClick={() => this.onOpen()}
- >新增{name}
+ >
+ 新增{name}
+
}
/>
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 3641db9..f3c5602 100644
--- a/web-react/src/pages/business/house/info/form/index.jsx
+++ b/web-react/src/pages/business/house/info/form/index.jsx
@@ -1,6 +1,6 @@
import React, { Component } from 'react'
import { Button, Descriptions, message as Message, Spin, Tabs } from 'antd'
-import { defaultsDeep, isEqual } from 'lodash'
+import { isEqual, truncate } from 'lodash'
import { AntIcon, ComponentDynamic, Container } from 'components'
import { api } from 'common/api'
@@ -54,6 +54,8 @@ export default class index extends Component {
loading: true,
record: null,
+
+ saving: false,
}
children = []
@@ -65,8 +67,8 @@ export default class index extends Component {
}
componentDidMount() {
+ // 获取详细数据
const { taskId } = this.props.param
-
if (taskId) {
api.houseInfoGetByTaskId({ taskId }).then(({ data }) => {
this.setState({
@@ -90,13 +92,18 @@ export default class index extends Component {
}
}
- console.log(this.formData)
+ //#region 提交数据
+ this.setState({ saving: true })
- Message.success('提交成功')
+ setTimeout(() => {
+ Message.success('提交成功')
+ this.setState({ saving: false })
+ }, 3000)
+ //#endregion
}
render() {
- const { loading, record } = this.state
+ const { loading, record, saving } = this.state
return (
@@ -105,12 +112,16 @@ export default class index extends Component {
-
{/* 可以在工具栏中增加其他控件(只能在一行内) */}
+
-
@@ -175,16 +186,15 @@ export default class index extends Component {
return (
this.children.push(c)}
diff --git a/web-react/src/views/login/index.jsx b/web-react/src/views/login/index.jsx
index 031b9c3..e04b7ea 100644
--- a/web-react/src/views/login/index.jsx
+++ b/web-react/src/views/login/index.jsx
@@ -8,47 +8,46 @@ import { token } from 'common/token'
import './index.less'
export default class index extends Component {
-
state = {
loading: false,
focusUser: false,
- focusPassword: false
+ focusPassword: false,
}
backgroundImage = require(`assets/image/login-bg-0${Math.floor(Math.random() * 4)}.jpg`)
focus = {
user: false,
- password: false
+ password: false,
}
form = React.createRef()
- onLogin = (values) => {
- this.setState({
- loading: true
- })
+ onLogin = values => {
+ this.setState({ loading: true })
let { account, password } = values
password = encryptByRSA(password, RSA_PUBLIC_KEY)
- api.login({ account, password }).then(({ success, data, message }) => {
- if (success) {
- token.value = data
- Message.success('登录成功')
- this.props.history.replace('/')
- } else {
- Message.error(message)
- }
- }).catch(({ message }) => {
- if (typeof message === 'object' && message[0]) {
- Message.error(message[0].messages[0])
- }
- })
+ api.login({ account, password })
+ .then(({ success, data, message }) => {
+ if (success) {
+ token.value = data
+ Message.success('登录成功')
+ this.props.history.replace('/')
+ } else {
+ Message.error(message)
+ }
+ })
+ .catch(({ message }) => {
+ if (typeof message === 'object' && message[0]) {
+ Message.error(message[0].messages[0])
+ }
+ this.setState({ loading: false })
+ })
}
render() {
-
return (
@@ -62,8 +61,14 @@ export default class index extends Component {
label="用户名"
>
{ this.setState({ focusUser: !!this.form.current.getFieldValue('account') }); }}
- onFocus={() => { this.setState({ focusUser: true }) }}
+ onBlur={() => {
+ this.setState({
+ focusUser: !!this.form.current.getFieldValue('account'),
+ })
+ }}
+ onFocus={() => {
+ this.setState({ focusUser: true })
+ }}
size="large"
autoComplete="off"
/>
@@ -75,8 +80,15 @@ export default class index extends Component {
label="密码"
>
{ this.setState({ focusPassword: !!this.form.current.getFieldValue('password') }) }}
- onFocus={() => { this.setState({ focusPassword: true }) }}
+ onBlur={() => {
+ this.setState({
+ focusPassword:
+ !!this.form.current.getFieldValue('password'),
+ })
+ }}
+ onFocus={() => {
+ this.setState({ focusPassword: true })
+ }}
size="large"
autoComplete="off"
/>
@@ -89,7 +101,9 @@ export default class index extends Component {
htmlType="submit"
size="large"
type="primary"
- >登录
+ >
+ 登录
+
From f05f476789989b9ea51ac2b07faf537c351faf3b 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: Tue, 22 Jun 2021 11:00:21 +0800
Subject: [PATCH 04/20] =?UTF-8?q?update=20=E5=AE=8C=E6=88=90=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E4=B8=AD=E4=B8=8A=E4=BC=A0=E6=8E=A7=E4=BB=B6=E7=9A=84?=
=?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Api/Ewide.Core/applicationconfig.json | 1 +
.../business/house/info/form/base/aspect.vue | 28 +-
.../house/info/form/base/attachments.vue | 28 +-
web-react/public/seed/form-tabs/index.jsx | 16 +-
web-react/public/seed/form-tabs/tab/index.jsx | 16 +-
.../form-tabs/tab/{parts.jsx => part.jsx} | 18 +-
web-react/public/seed/form/index.jsx | 17 +-
web-react/public/seed/form/part.jsx | 18 +-
web-react/src/components/index.js | 2 +-
.../src/components/photo-preview/index.jsx | 74 ++++++
.../src/components/photo-swipe/index.jsx | 11 -
.../pages/business/house/code/form/index.jsx | 2 +-
.../business/house/info/form/base/aspect.jsx | 230 +++++++++++++++++
.../house/info/form/base/attachments.jsx | 238 +++++++++++++++++
.../house/info/form/base/building.jsx | 240 +++++++++++++++---
.../business/house/info/form/base/index.jsx | 29 ++-
.../pages/business/house/info/form/index.jsx | 21 +-
17 files changed, 883 insertions(+), 106 deletions(-)
rename web-react/public/seed/form-tabs/tab/{parts.jsx => part.jsx} (90%)
create mode 100644 web-react/src/components/photo-preview/index.jsx
delete mode 100644 web-react/src/components/photo-swipe/index.jsx
create mode 100644 web-react/src/pages/business/house/info/form/base/aspect.jsx
create mode 100644 web-react/src/pages/business/house/info/form/base/attachments.jsx
diff --git a/Api/Ewide.Core/applicationconfig.json b/Api/Ewide.Core/applicationconfig.json
index 1568099..0266d1e 100644
--- a/Api/Ewide.Core/applicationconfig.json
+++ b/Api/Ewide.Core/applicationconfig.json
@@ -93,6 +93,7 @@
"sysDictType:dropDowns",
"sysFileInfo:upload",
"sysFileInfo:download",
+ "sysFileInfo:detail",
"sysFileInfo:preview",
"sysUser:updateInfo",
"sysUser:updatePwd",
diff --git a/Web/src/pages/business/house/info/form/base/aspect.vue b/Web/src/pages/business/house/info/form/base/aspect.vue
index 878c07e..90ae890 100644
--- a/Web/src/pages/business/house/info/form/base/aspect.vue
+++ b/Web/src/pages/business/house/info/form/base/aspect.vue
@@ -104,15 +104,25 @@ export default {
if (record) {
const fileList = !!record.houseInfo.facadePhoto ? record.houseInfo.facadePhoto.split(',') : [];
for (let i = 0; i < fileList.length; i++) {
- const file = await PreviewFile(fileList[i]);
- const base64 = await BlobToBase64(file);
- facadePhoto.push({
- uid: fileList[i],
- response: fileList[i], // 用于和新上传的文件一同回传
- name: file.name,
- url: base64,
- status: 'done',
- });
+ try {
+ const file = await PreviewFile(fileList[i]);
+ const base64 = await BlobToBase64(file);
+ facadePhoto.push({
+ uid: fileList[i],
+ response: fileList[i], // 用于和新上传的文件一同回传
+ name: file.name,
+ url: base64,
+ status: 'done',
+ });
+ } catch {
+ const { data: file } = await this.$api.sysFileInfoDetail({ id: fileList[i] });
+ facadePhoto.push({
+ uid: fileList[i],
+ response: '文件已丢失',
+ name: file.fileOriginName,
+ status: 'error',
+ });
+ }
}
}
defaultForm.houseInfo.facadePhoto = facadePhoto;
diff --git a/Web/src/pages/business/house/info/form/base/attachments.vue b/Web/src/pages/business/house/info/form/base/attachments.vue
index db16ab8..69162a5 100644
--- a/Web/src/pages/business/house/info/form/base/attachments.vue
+++ b/Web/src/pages/business/house/info/form/base/attachments.vue
@@ -173,15 +173,25 @@ export default {
const fileList =
!form.houseInfo[key] || form.houseInfo[key].length == 0 ? [] : form.houseInfo[key].split(',');
for (let i = 0; i < fileList.length; i++) {
- const file = await PreviewFile(fileList[i]);
- const base64 = await BlobToBase64(file);
- fileValue.push({
- uid: fileList[i],
- response: fileList[i], // 用于和新上传的文件一同回传
- name: file.name,
- url: base64,
- status: 'done',
- });
+ try {
+ const file = await PreviewFile(fileList[i]);
+ const base64 = await BlobToBase64(file);
+ fileValue.push({
+ uid: fileList[i],
+ response: fileList[i], // 用于和新上传的文件一同回传
+ name: file.name,
+ url: base64,
+ status: 'done',
+ });
+ } catch {
+ const { data: file } = await this.$api.sysFileInfoDetail({ id: fileList[i] });
+ fileValue.push({
+ uid: fileList[i],
+ response: '文件已丢失',
+ name: file.fileOriginName,
+ status: 'error',
+ });
+ }
}
form.houseInfo[key] = fileValue;
}
diff --git a/web-react/public/seed/form-tabs/index.jsx b/web-react/public/seed/form-tabs/index.jsx
index eb0a9c4..3cd7e70 100644
--- a/web-react/public/seed/form-tabs/index.jsx
+++ b/web-react/public/seed/form-tabs/index.jsx
@@ -16,6 +16,7 @@ export default class index extends Component {
actived: '0',
loading: true,
record: null,
+ saveDisabled: true,
saving: false,
}
@@ -42,6 +43,16 @@ export default class index extends Component {
*/
componentDidMount() {}
+ /**
+ * 接收到所有子组件已加载完成,并启用提交按钮
+ */
+ 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 onSubmit() {
for (const child of this.children) {
try {
@@ -62,7 +73,7 @@ export default class index extends Component {
}
render() {
- const { actived, loading, record, saving } = this.state
+ const { actived, loading, record, saveDisabled, saving } = this.state
return (
@@ -77,6 +88,7 @@ export default class index extends Component {
取消
)
diff --git a/web-react/public/seed/form-tabs/tab/index.jsx b/web-react/public/seed/form-tabs/tab/index.jsx
index ee18b7a..c67e687 100644
--- a/web-react/public/seed/form-tabs/tab/index.jsx
+++ b/web-react/public/seed/form-tabs/tab/index.jsx
@@ -34,11 +34,13 @@ export default class index extends Component {
}
/**
- * DDOM加载完成钩子,在此将自身传递给父级
+ * 加载完成,通知父级组件并传递自身
*/
- componentDidMount() {
- if (this.props.onRef) {
- this.props.onRef(this)
+ call(child, index) {
+ this.children[index] = child
+ if (this.children.filter(p => p).length === parts.length) {
+ const { onRef } = this.props
+ if (onRef) onRef(this)
}
}
@@ -85,17 +87,17 @@ export default class index extends Component {
{parts.map((item, i) => (