update

任务表新增字段 IsEnbaled  是否有效
提交审核、审核新增房屋流转日志步骤
选房逻辑调整

web-react/src/common/api/requests/business/houseSafety/houseInfo.js

@@ -1,6 +1,7 @@
 const urls = {
     houseInfoGetByTaskId: ['/houseInfo/getByTaskId', 'get'],
     houseInfoSave: ['houseInfo/save', 'post'],
+    houseInfoCheck: ['houseInfo/check', 'post'],
     houseInfoSubmitToCheck: ['/houseInfo/submitToCheck', 'post']
 }
 

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

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { Form, Button, Input, Descriptions, message as Message, Modal, Spin, Tabs } from 'antd'
 import { merge, isEqual, pickBy } from 'lodash'
-import { AntIcon, ComponentDynamic, Container } from 'components'
+import { AntIcon, ComponentDynamic, Container, Auth } from 'components'
 import { api } from 'common/api'
 
 const tabs = [
@@ -58,7 +58,7 @@ const actions = {
         after: 'close',
     },
     check: {
-        action: 'houseInfoSave',
+        action: 'houseInfoCheck',
         remark: '审核',
         after: 'close',
     },
@@ -222,41 +222,43 @@ export default class index extends Component {
                         <Container mode="fluid">
                             <div className="yo-form-page--bar-inner">
                                 <span>
-                                    {this.state.taskStatus == 3 && (
-                                        <Form ref={this.checkForm} layout="inline">
-                                            <Form.Item
-                                                label="审核意见"
-                                                name={['taskCheckRecord', 'content']}
-                                                rules={[
-                                                    {
-                                                        required: true,
-                                                        message: '请输入审核意见',
-                                                    },
-                                                ]}
-                                            >
-                                                <Input.TextArea
-                                                    autoSize
-                                                    autoComplete="off"
-                                                    placeholder="请输入审核意见"
-                                                    className="w-500"
-                                                />
-                                            </Form.Item>
-                                            <Form.Item>
-                                                <Button
-                                                    type="primary"
-                                                    onClick={() => this.onCheck(6)}
+                                    <Auth auth={{ houseInfo: 'check' }}>
+                                        {this.state.taskStatus == 3 && (
+                                            <Form ref={this.checkForm} layout="inline">
+                                                <Form.Item
+                                                    label="审核意见"
+                                                    name={['taskCheckRecord', 'content']}
+                                                    rules={[
+                                                        {
+                                                            required: true,
+                                                            message: '请输入审核意见',
+                                                        },
+                                                    ]}
                                                 >
-                                                    通过
-                                                </Button>
-                                                <Button
-                                                    type="primary"
-                                                    onClick={() => this.onCheck(-1)}
-                                                >
-                                                    退回
-                                                </Button>
-                                            </Form.Item>
-                                        </Form>
-                                    )}
+                                                    <Input.TextArea
+                                                        autoSize
+                                                        autoComplete="off"
+                                                        placeholder="请输入审核意见"
+                                                        className="w-500"
+                                                    />
+                                                </Form.Item>
+                                                <Form.Item>
+                                                    <Button
+                                                        type="primary"
+                                                        onClick={() => this.onCheck(6)}
+                                                    >
+                                                        通过
+                                                    </Button>
+                                                    <Button
+                                                        type="primary"
+                                                        onClick={() => this.onCheck(-1)}
+                                                    >
+                                                        退回
+                                                    </Button>
+                                                </Form.Item>
+                                            </Form>
+                                        )}
+                                    </Auth>
                                 </span>
                                 <span>
                                     {this.state.taskStatus >= -1 && this.state.taskStatus < 3 && (
@@ -302,7 +304,7 @@ export default class index extends Component {
                                             `${record.houseCode.areaName}-${
                                                 record.houseCode.roadName
                                             }-${record.houseCode.commName}-${
-                                                record.houseCode.projectFullName
+                                                record.houseCode.fullProjName
                                             }-${record.houseCode.no.toString().padStart(3, '0')}`}
                                     </Descriptions.Item>
                                     <Descriptions.Item span="2" label="编码">

web-react/src/pages/business/house/task/check/index.jsx

@@ -56,7 +56,7 @@ export default class index extends Component {
             render: (text, record) => (
                 <>
                     {`${record.areaName}-${record.roadName}-${record.commName}-${
-                        record.note
+                        record.fullProjName
                     }-${record.no.toString().padStart(3, '0')}`}
                     <br />
                     <Tag color="purple">{text}</Tag>