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

2021-07-06 18:28:10 +08:00
parent 1d672586b3 40a267997f
commit 5ac860c119
10 changed files with 62 additions and 27 deletions
--- a/Api/Ewide.Application/Ewide.Application.xml
+++ b/Api/Ewide.Application/Ewide.Application.xml
@@ -726,11 +726,11 @@
            <param name="input"></param>
            <returns></returns>
        </member>
-        <member name="M:Ewide.Application.Service.HouseProjectInfo.HouseProjectInfoService.GetProjectById(System.String)">
+        <member name="M:Ewide.Application.Service.HouseProjectInfo.HouseProjectInfoService.GetById(System.String)">
            <summary>
            通过ID获取项目
            </summary>
-            <param name="id"></param>
+            <param name="projectId"></param>
            <returns></returns>
        </member>
        <member name="M:Ewide.Application.Service.HouseProjectInfo.HouseProjectInfoService.QueryProjectPageList(Ewide.Application.Service.HouseProjectInfo.Dto.PageProjectInput)">
--- a/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/HouseProjectInfoService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/HouseProjectInfoService.cs
@@ -69,12 +69,12 @@ namespace Ewide.Application.Service.HouseProjectInfo
        /// <summary>
        /// 通过ID获取项目
        /// </summary>
-        /// <param name="id"></param>
+        /// <param name="projectId"></param>
        /// <returns></returns>
-        [HttpGet("/houseProjectInfo/detailById")]
-        public async Task<BsHouseProjectInfo> GetProjectById([Required] string id)
+        [HttpGet("/houseProjectInfo/getById")]
+        public async Task<BsHouseProjectInfo> GetById([Required] string projectId)
        {
-            return await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == id);
+            return await _houseProjectInfoRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == projectId);
        }

        /// <summary>
--- a/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/IHouseProjectInfoService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseProjectInfo/IHouseProjectInfoService.cs
@@ -14,7 +14,7 @@ namespace Ewide.Application.Service.HouseProjectInfo
        Task AddProject(AddProjectInput input);
        Task DeleteProject(DeleteProjectInput input);
        Task UpdateProject(UpdateProjectInput input);
-        Task<BsHouseProjectInfo> GetProjectById([FromRoute] string id);
+        Task<BsHouseProjectInfo> GetById([FromRoute] string projectId);
        Task<dynamic> GetProject([FromQuery] QueryProjectInput input);
        Task<dynamic> QueryProjectPageList([FromQuery] PageProjectInput input);

--- a/Api/Ewide.Application/Service/HouseSafety/HouseZone/HouseZoneService.cs
+++ b/Api/Ewide.Application/Service/HouseSafety/HouseZone/HouseZoneService.cs
@@ -64,6 +64,12 @@ namespace Ewide.Application.Service
                .ToListAsync();
        }

+        [HttpGet("/houseZone/getById")]
+        public async Task<dynamic> GetById([Required] string zoneId)
+        {
+            return await _sysOrgRep.DetachedEntities.FirstOrDefaultAsync(p => p.Id == zoneId);
+        }
+
        /// <summary>
        /// 分页查询片区
        /// </summary>
--- a/web-react/src/common/api/requests/business/houseSafety/houseProjectInfo.js
+++ b/web-react/src/common/api/requests/business/houseSafety/houseProjectInfo.js
@@ -5,7 +5,8 @@ const urls = {
    houseProejctDelete: ['/houseProjectInfo/delete', 'post'],
    houseProejctDetail: ['/houseProjectInfo/detail', 'get'],
    houseProjectNextSort: ['/houseProjectInfo/nextSort', 'get'],
-    houseProjectList: ['houseProjectInfo/list', 'get']
+    houseProjectList: ['houseProjectInfo/list', 'get'],
+    houseProjectGetById: ['houseProjectInfo/getById', 'get']
 }

 export default urls
--- a/web-react/src/common/api/requests/business/houseSafety/houseZone.js
+++ b/web-react/src/common/api/requests/business/houseSafety/houseZone.js
@@ -8,7 +8,8 @@ const urls = {
    houseZoneList: '/houseZone/list',
    houseZoneAutoIncrement: '/houseZone/autoIncrement',
    houseZoneAdd: ['/houseZone/add', 'post'],
-    houseZoneEdit: ['/houseZone/edit', 'post']
+    houseZoneEdit: ['/houseZone/edit', 'post'],
+    houseZoneGetById: ['/houseZone/getById', 'get']
 }

 export default urls
--- a/web-react/src/pages/business/house/project/form.jsx
+++ b/web-react/src/pages/business/house/project/form.jsx
@@ -41,19 +41,29 @@ export default class form extends Component {
     * @param {*} params
     */
    async fillData(params) {
-        const areaCodeDefault = params.record
-            ? params.record.areaCode
-            : params.pid
-            ? params.pid
-            : ''
+        let areaCodeDefault = params.pid ? params.pid : ''
        this.houseType = params.record ? params.record.type : 1
-        this.record = cloneDeep(params.record)
+        if (params.id) {
+            this.setState({
+                loading: true,
+            })
+
+            api.houseProjectGetById({ projectId: params.id }).then(({ data }) => {
+                areaCodeDefault = data.areaCode
+                this.record = data
+
+                this.setState({
+                    loading: false,
+                })
+            })
+        }
+        // this.record = cloneDeep(params.record)
        this.initRecord = cloneDeep(params.record)
        //#region 从后端转换成前段所需格式
        const areaData = await this.loadAreaData()

        this.setState({
-            exist: !!params.record,
+            exist: !!params.id,
            options: { areaData },
        })

@@ -81,7 +91,9 @@ export default class form extends Component {
        if (areaCodeDefault) {
            findCode(areaData)
            this.areaCode = areaCodeDefault
-            this.nextSort(this.areaCode, this.houseType)
+            if (!this.state.exist) {
+                this.nextSort(this.areaCode, this.houseType)
+            }
        }

        this.record = {
--- a/web-react/src/pages/business/house/project/index.jsx
+++ b/web-react/src/pages/business/house/project/index.jsx
@@ -88,7 +88,7 @@ export default class index extends Component {
                render: (text, record) => (
                    <QueryTableActions>
                        <Auth auth="houseProjectInfo:edit">
-                            <a onClick={() => this.onOpen(this.editForm, record)}>编辑</a>
+                            <a onClick={() => this.onOpen(this.editForm, record.id)}>编辑</a>
                        </Auth>
                        <Auth auth="houseProjectInfo:delete">
                            <Popconfirm
@@ -200,10 +200,11 @@ export default class index extends Component {
     * @param {*} modal
     * @param {*} record
     */
-    onOpen(modal, record) {
+    onOpen(modal, id) {
        modal.current.open({
            pid: this.selectCode,
-            record,
+            // record,
+            id,
        })
    }

--- a/web-react/src/pages/business/house/zone/form.jsx
+++ b/web-react/src/pages/business/house/zone/form.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { Form, Input, InputNumber, Spin, TreeSelect } from 'antd'
 import { AntIcon } from 'components'
-import { cloneDeep } from 'lodash'
+import { cloneDeep, pickBy } from 'lodash'
 import { api } from 'common/api'
 import { numberToChinese } from 'util/format'
 import store from 'store'
@@ -54,12 +54,25 @@ export default class form extends Component {
     */
    async fillData(params) {
        const { user } = this.state
-        this.record = cloneDeep(params.record)
+        if (params.id) {
+            this.setState({
+                loading: true,
+            })
+
+            api.houseZoneGetById({ zoneId: params.id }).then(({ data }) => {
+                this.record = data
+
+                this.setState({
+                    loading: false,
+                })
+            })
+        }
+        // this.record = cloneDeep(params.record)
        //#region 从后端转换成前段所需格式
        const orgData = await this.loadOrgData()

        this.setState({
-            exist: !!params.record,
+            exist: !!params.id,
            options: { orgData },
        })

@@ -78,7 +91,7 @@ export default class form extends Component {
        }

        //#endregion
-        if (!params.record && !!params.orgId) {
+        if (!params.id && !!params.orgId) {
            this.onOrgIdChanged(params.orgId)
        }
        this.form.current.setFieldsValue(this.record)
--- a/web-react/src/pages/business/house/zone/index.jsx
+++ b/web-react/src/pages/business/house/zone/index.jsx
@@ -80,7 +80,7 @@ export default class index extends Component {
                render: (text, record) => (
                    <QueryTableActions>
                        <Auth auth="houseZone:edit">
-                            <a onClick={() => this.onOpen(this.editForm, record)}>编辑</a>
+                            <a onClick={() => this.onOpen(this.editForm, record.id)}>编辑</a>
                        </Auth>
                        <Auth auth="houseZone:delete">
                            <Popconfirm
@@ -180,10 +180,11 @@ export default class index extends Component {
     * @param {*} modal
     * @param {*} record
     */
-    onOpen(modal, record) {
+    onOpen(modal, id) {
        modal.current.open({
            orgId: this.selectId,
-            record,
+            // record,
+            id,
        })
    }