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

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

@@ -5,7 +5,7 @@ import {
     Cascader,
     Form,
     Input,
-    InputNumber,
+    Tag,
     Popconfirm,
     message as Message,
     Radio,
@@ -51,10 +51,15 @@ 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')}`}
+                    <br />
+                    <Tag color="purple">{text}</Tag>
+                </>
+            ),
         },
         {
             title: '房屋性质及行业',
@@ -288,7 +293,10 @@ export default class index extends Component {
                                         placeholder="请选择所在区域"
                                     />
                                 </Form.Item>
-                                <Form.Item label="编号" name="no">
+                                <Form.Item label="房屋唯一编码" name="houseCode">
+                                    <Input autoComplete="off" placeholder="请输入房屋唯一编码" />
+                                </Form.Item>
+                                {/* <Form.Item label="编号" name="no">
                                     <InputNumber
                                         formatter={value => value && value.padStart(3, '0')}
                                         max={999}
@@ -297,7 +305,7 @@ export default class index extends Component {
                                         step={1}
                                         placeholder="请输入房屋序号"
                                     />
-                                </Form.Item>
+                                </Form.Item> */}
                                 <Form.Item label="房屋性质" name="type">
                                     <Radio.Group buttonStyle="solid">
                                         <Radio.Button value="">全部</Radio.Button>
@@ -326,9 +334,6 @@ export default class index extends Component {
                                 <Form.Item label="地址" name="address">
                                     <Input autoComplete="off" placeholder="请输入地址" />
                                 </Form.Item>
-                                <Form.Item label="房屋唯一编码" name="houseCode">
-                                    <Input autoComplete="off" placeholder="请输入房屋唯一编码" />
-                                </Form.Item>
                             </Auth>
                         }
                         operator={

web-react/src/util/query/index.js

@@ -103,5 +103,7 @@ export const QueryType = {
     LessThan: '<',
     LessThanOrEqual: '<=',
     Like: 'LIKE',
-    Equal: '='
+    Equal: '=',
+    StartWith: 'STRAT',
+    EndWith: 'END'
 }